Fairoj : smc credit pd feedbacks

ng6-seed/package.json

@@ -3,8 +3,8 @@
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
-    "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true",
-    "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod  --configuration=staging --base-href /dist/",
+    "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod --build-optimizer=true --base-href /lender/",
+    "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod  --configuration=staging --base-href /lenderdemo/",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.html

@@ -37,7 +37,8 @@
                           </mat-panel-description>  -->
                 </mat-expansion-panel-header>
                 <!-- {{json_answers[parent_ques.group_key][0] | json}} -->
-                <div *ngFor="let singleQues of parent_ques.group_questions[g_i];let s_i=index" fxFlex.xs="100" fxFlex.sm="100"  [fxFlex]="singleQues.hasOwnProperty('field_width') && singleQues.field_width ? singleQues.field_width : '100'" >
+                <div *ngFor="let singleQues of parent_ques.group_questions[g_i];let s_i=index" fxFlex.xs="100" fxFlex.sm="100"  [fxFlex]="singleQues.hasOwnProperty('field_width') && singleQues.field_width ? singleQues.field_width : '100'" 
+                [ngStyle.xs]="{'margin-bottom' : (singleQues.field_type == 'numtoword' || singleQues.field_type == 'str&numtoword') ? '5%' : '0' }">
                   <!-- {{s_i}} -->
                   <!-- {{json_answers[parent_ques.group_key][s_i] | json}} -->
                   <app-dynamic-question-template [group_key] = parent_ques.group_key [currFormArrayObj]="singleQues" [json_answers] = "json_answers != null && json_answers ? json_answers[parent_ques.group_key] : null" [formGroupN]="group_ques" [whole_form]="form_group_name"

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.html

@@ -27,7 +27,7 @@
     </mat-form-field>
 
     <mat-form-field style="width:100%"
-    *ngIf="parent_ques.type == '9'"  [ngStyle]="{'margin-bottom':parent_ques.field_type == 'numtoword' || parent_ques.field_type == 'str&numtoword' ? '5%' : '0' }">
+    *ngIf="parent_ques.type == '9'" >
     <mat-label>{{parent_ques.question}}</mat-label>
     <input matInput  [type]="parent_ques.field_type == 'num' || parent_ques.field_type == 'numtoword' ?  'number' : parent_ques.field_type== 'string' || parent_ques.field_type == 'str&numtoword'  ? 'text' : parent_ques.field_type"
     [formControlName]="parent_ques.question_key" [placeholder]="parent_ques.place_holder" 

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-question-template/dynamic-question-template.component.ts

@@ -337,6 +337,7 @@ export class DynamicQuestionTemplateComponent implements OnInit {
                 console.log("sdfffffffffff",this.whole_json,curr_obj.insert_control);
           }
           if(formArray.value.length < 2) {
+            console.log("1 OBJ RETURN")
             return;
           }
           value_index = curr_index-1
@@ -351,6 +352,11 @@ export class DynamicQuestionTemplateComponent implements OnInit {
             expression_value = expression_value.split(value+'['+index_str+']').join(control_value)
           }
           else{
+            if(formArray.value.length > curr_index+1) {
+              console.log("Current index",curr_index,this.json_index)
+              this.setModifiedValuetoControl_frommultiple(curr_obj,formArray,curr_index+1)
+            }
+            console.log("No Control RETURN")
             return
           }
         }

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts

@@ -72,7 +72,7 @@ export class FormComponent implements OnInit {
     //  let localId = this.getLocalFormId()
     console.log("d",this.pd_all_details.form_id,Number(this.pd_all_details.form_id))
     // this.pdTriggerService.loadTemplate(Number(this.pd_all_details.form_id)).subscribe(result=>{
-      let params = {"fk_entity_id":"35","fk_product_id":this.pd_all_details.pdmaster_details.fk_product_id,"pd_form_id":this.pd_all_details.form_id,"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id}
+      let params = {"fk_entity_id":this.pd_all_details.pdmaster_details.fk_lender_id,"fk_product_id":this.pd_all_details.pdmaster_details.fk_product_id,"pd_form_id":this.pd_all_details.form_id,"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id}
       this.pdTriggerService.loadCreditPDTemplate(params).subscribe(result=>{
         if(!environment.production){
         //  result.dataStatus = false

ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/10.json

@@ -87,6 +87,15 @@
                        "sales_revenue"
                      ],
                      "insert_control":"sales_py"
+                  },
+                  {
+                     "purpose":"answer_value_arr",
+                     "arr_include":["py","now"],
+                     "expression":"(((Number(net_profit_sales_percent[now])-Number(net_profit_sales_percent[py]))/Number(net_profit_sales_percent[py]))*100).toFixed(2)",
+                     "value_keys":[
+                       "net_profit_sales_percent"
+                     ],
+                     "insert_control":"netprofit_py_percent"
                   }
                 ],
                 "is_repeatable":null,