Fairoj : Template changes and pd type text removed and empty title from template handled

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html

@@ -12,11 +12,11 @@
         </mat-expansion-panel-header>
         <mat-list class="m-gap p-gap">
             <div [formGroup]="searchForm">
-                <mat-form-field style="width:20%" class="matfieldblock">
+                <!-- <mat-form-field style="width:20%" class="matfieldblock">
                     <mat-select multiple formControlName="pd_type" placeholder="PD Type">
                         <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                     </mat-select>
-                </mat-form-field> &nbsp; &nbsp;
+                </mat-form-field> &nbsp; &nbsp; -->
                 <mat-form-field style="width:25%" class="matfieldblock">
                     <mat-select multiple formControlName="pd_status" placeholder="PD Status">
                         <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
@@ -80,7 +80,7 @@
                 <div fxFlex.xs="20" fxFlex.sm="20" class="webhide" style="text-align: center;">
                     <p class="lettericon">{{details.pd_sno_split.lender_name}}<br/>
                         <span style="font-size: 90%">{{details.pd_sno_split.serial_no}}</span></p>
-                         <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span>
+                         <!-- <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span> -->
                 </div>
                 <div fxFlex.xs="80" fxFlex.sm="80" class="webhide">
                   <div fxLayout="row wrap" style="margin-left: 6px;">
@@ -124,7 +124,7 @@
              <div fxLayout="row wrap" *ngFor="let details of pagedList | async">
             <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="12" fxFlex.lg="12" fxFlex.xl="12" class="cell" style="justify-content:flex-end">
                 <div [ngStyle]="{'color': '#e00201','font-weight': 'bold','font-size':'16px'}" mat-line>{{details.pd_sno}}</div>
-                <span mat-line class="cell">{{details.pd_type_name}}</span>
+                <!-- <span mat-line class="cell">{{details.pd_type_name}}</span> -->
             </div>           
             <div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="cell" style="justify-content:flex-end">
                 <span *ngIf="details.is_child" mat-line>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html

@@ -14,11 +14,11 @@
                 </mat-expansion-panel-header>
                 <mat-list class="m-gap p-gap">
                         <div [formGroup]="searchForm">
-                                <mat-form-field style="width:30%">
+                                <!-- <mat-form-field style="width:30%">
                                         <mat-select multiple formControlName="pd_type" placeholder="PD Type">
                                             <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                                         </mat-select>
-                                    </mat-form-field> &nbsp; &nbsp;
+                                    </mat-form-field> &nbsp; &nbsp; -->
                                     <!-- <mat-form-field style="width:30%">
                                         <mat-select multiple formControlName="pd_status" placeholder="PD Status">
                                             <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
@@ -78,7 +78,7 @@
               <div fxFlex.xs="20" fxFlex.sm="20" class="webhide" style="text-align: center;">
                   <p class="lettericon">{{details.pd_sno_split.lender_name}}<br/>
                       <span style="font-size: 90%">{{details.pd_sno_split.serial_no}}</span></p>
-                       <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span>
+                       <!-- <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span> -->
               </div>
               <div fxFlex.xs="80" fxFlex.sm="80" class="webhide">
                 <div fxLayout="row wrap" style="margin-left: 6px;">
@@ -115,7 +115,7 @@
            <div fxLayout="row wrap" *ngFor="let details of pagedList">
             <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="12" fxFlex.lg="12" fxFlex.xl="12" class="cell" style="justify-content:flex-end">
                 <div [ngStyle]="{'color': '#e00201','font-weight': 'bold','font-size':'16px'}" mat-line>{{details.pd_sno}}</div>
-                <span mat-line class="cell">{{details.pd_type_name}}</span>
+                <!-- <span mat-line class="cell">{{details.pd_type_name}}</span> -->
             </div>           
             <div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="cell" style="justify-content:flex-end">
                 <span *ngIf="details.is_child" mat-line>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html

@@ -13,11 +13,11 @@
                 </mat-expansion-panel-header>
                 <mat-list class="m-gap p-gap">
                         <div [formGroup]="searchForm">
-                                <mat-form-field style="width:30%" class="matfieldblock">
+                                <!-- <mat-form-field style="width:30%" class="matfieldblock">
                                         <mat-select multiple formControlName="pd_type" placeholder="PD Type">
                                             <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                                         </mat-select>
-                                    </mat-form-field> &nbsp; &nbsp;
+                                    </mat-form-field> &nbsp; &nbsp; -->
                                     <!-- <mat-form-field style="width:30%">
                                         <mat-select multiple formControlName="pd_status" placeholder="PD Status">
                                             <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
@@ -77,7 +77,7 @@
                 <div fxFlex.xs="20" fxFlex.sm="20" class="webhide" style="text-align: center;">
                     <p class="lettericon">{{details.pd_sno_split.lender_name}}<br/>
                         <span style="font-size: 90%">{{details.pd_sno_split.serial_no}}</span></p>
-                         <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span>
+                         <!-- <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span> -->
                 </div>
                 <div fxFlex.xs="80" fxFlex.sm="80" class="webhide">
                   <div fxLayout="row wrap" style="margin-left: 6px;">
@@ -114,7 +114,7 @@
              <div fxLayout="row wrap" *ngFor="let details of pagedList">
                 <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="12" fxFlex.lg="12" fxFlex.xl="12" class="cell" style="justify-content:flex-end">
                     <div [ngStyle]="{'color': '#e00201','font-weight': 'bold','font-size':'16px'}" mat-line>{{details.pd_sno}}</div>
-                    <span mat-line class="cell">{{details.pd_type_name}}</span>
+                    <!-- <span mat-line class="cell">{{details.pd_type_name}}</span> -->
                 </div>           
                 <div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="cell" style="justify-content:flex-end">
                     <span *ngIf="details.is_child" mat-line>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html

@@ -13,11 +13,11 @@
                 </mat-expansion-panel-header>
                 <mat-list class="m-gap p-gap">
                         <div [formGroup]="searchForm">
-                        <mat-form-field style="width:30%">
+                        <!-- <mat-form-field style="width:30%">
                                 <mat-select multiple formControlName="pd_type" placeholder="PD Type">
                                         <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                                     </mat-select>
-                              </mat-form-field> &nbsp; &nbsp;
+                              </mat-form-field> &nbsp; &nbsp; -->
                               <!-- <mat-form-field style="width:30%">
                                     <mat-select multiple formControlName="pd_status" placeholder="PD Status">
                                             <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name">{{status.pd_status_name}}</mat-option>
@@ -79,7 +79,7 @@
               <div fxFlex.xs="20" fxFlex.sm="20" class="webhide" style="text-align: center;">
                   <p class="lettericon">{{details.pd_sno_split.lender_name}}<br/>
                       <span style="font-size: 90%">{{details.pd_sno_split.serial_no}}</span></p>
-                       <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span>
+                       <!-- <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span> -->
               </div>
               <div fxFlex.xs="80" fxFlex.sm="80" class="webhide">
                 <div fxLayout="row wrap" style="margin-left: 6px;">
@@ -116,7 +116,7 @@
            <div fxLayout="row wrap" *ngFor="let details of pagedList">
             <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="12" fxFlex.lg="12" fxFlex.xl="12" class="cell" style="justify-content:flex-end">
                 <div [ngStyle]="{'color': '#e00201','font-weight': 'bold','font-size':'16px'}" mat-line>{{details.pd_sno}}</div>
-                <span mat-line class="cell">{{details.pd_type_name}}</span>
+                <!-- <span mat-line class="cell">{{details.pd_type_name}}</span> -->
             </div>           
             <div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="cell" style="justify-content:flex-end">
                 <span *ngIf="details.is_child" mat-line>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html

@@ -13,11 +13,11 @@
                 </mat-expansion-panel-header>
                 <mat-list class="m-gap p-gap">
                         <div [formGroup]="searchForm">
-                        <mat-form-field style="width:30%" class="matfieldblock">
+                        <!-- <mat-form-field style="width:30%" class="matfieldblock">
                                 <mat-select multiple formControlName="pd_type" placeholder="PD Type">
                                         <mat-option *ngFor="let type of PDType" [value]="type.pd_type_id">{{type.type_name}}</mat-option>
                                     </mat-select>
-                              </mat-form-field> &nbsp; &nbsp;
+                              </mat-form-field> &nbsp; &nbsp; -->
                               <!-- <mat-form-field style="width:40%" class="matfieldblock">
                                     <mat-select formControlName="pd_status" placeholder="PD Status">
                                             <mat-option *ngFor="let status of pdStatus" [value]="status.pd_status_name" [disabled]="'true'">{{status.pd_status_name}}</mat-option>
@@ -77,7 +77,7 @@
                         <div fxFlex.xs="20" fxFlex.sm="20" class="webhide" style="text-align: center;">
                             <p class="lettericon">{{details.pd_sno_split.lender_name}}<br/>
                                 <span style="font-size: 90%">{{details.pd_sno_split.serial_no}}</span></p>
-                                 <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span>
+                                 <!-- <span class="lettertext" style="color: #e2412f;">{{details.pd_type_name}}</span> -->
                         </div>
                         <div fxFlex.xs="80" fxFlex.sm="80" class="webhide">
                           <div fxLayout="row wrap" style="margin-left: 6px;">
@@ -114,7 +114,7 @@
                      <div fxLayout="row wrap" *ngFor="let details of pagedList">
                         <div fxFlex.xs="20" fxFlex.sm="20" fxFlex.md="12" fxFlex.lg="12" fxFlex.xl="12" class="cell" style="justify-content:flex-end">
                             <div [ngStyle]="{'color': '#e00201','font-weight': 'bold','font-size':'16px'}" mat-line>{{details.pd_sno}}</div>
-                            <span mat-line class="cell">{{details.pd_type_name}}</span>
+                            <!-- <span mat-line class="cell">{{details.pd_type_name}}</span> -->
                         </div>           
                         <div fxFlex.xs="30" fxFlex.sm="30" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" class="cell" style="justify-content:flex-end">
                             <span *ngIf="details.is_child" mat-line>

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

@@ -29,7 +29,7 @@
             <mat-accordion *ngIf="parent_ques.group_type != '6' && parent_ques.group_questions[g_i]" #accordion="matAccordion" >
               <mat-expansion-panel [expanded]="step === g_i" #mapanel="matExpansionPanel" >
                 <mat-expansion-panel-header>
-                  <mat-panel-title>
+                  <mat-panel-title  *ngIf="parent_ques.group_title_shown != '0'">
                     {{parent_ques.group_title}} {{g_i+1}}
                   </mat-panel-title>
                   <!-- <mat-panel-description>

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

@@ -24,14 +24,17 @@ mat-form-field {
   ::ng-deep  .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element {
       background-color:rgba(224, 22, 22, 0.308);
   }
-  input{
+  input {
     // width: 100px;
     // border-radius: 4px;
     // border-color: gray;
     // font-size: 12px;
-    height: 28px;
+    height: 31px;
   
   }
+  .mat-select, .text-area {
+    margin-top: 8px;
+  }
 
   @-webkit-keyframes highlight-fade {
     0% {
@@ -71,4 +74,8 @@ mat-form-field {
     -o-animation: highlight-fade 4s ease-out;
     animation: highlight-fade 4s ease-out;
     // background: blue;
+  }
+
+  ::ng-deep .mat-form-field-label{
+    white-space: pre-wrap;
   }

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

@@ -74,7 +74,7 @@ export class FormComponent implements OnInit {
     // 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}
       this.pdTriggerService.loadCreditPDTemplate(params).subscribe(result=>{
-        //  result.dataStatus = false
+         result.dataStatus = false
     if(result.dataStatus) {
         let question_template: any = result.records
         if (question_template && question_template != null && question_template != undefined

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html

@@ -21,7 +21,7 @@
                   <div fxFlex="row">
                            <div fxFlex="100">
                       <div fxFlex="100" align="center" *ngIf="master.pd_type_name" style="color:#fff;">
-                              <i class="fa-1x fa fa-check-circle"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_type_name}}</small>
+                              <i class="fa-1x fa fa-check-circle"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_sno}}</small>
                       </div>
                            </div>
                   </div>

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

@@ -151,13 +151,6 @@
                             "parent_question_key":"supplier_info_available",
                             "answers":null,
                             "validations":[  
-                               {  
-                                  "name":"required",
-                                  "isactive":"1",
-                                  "validator":"Validators.required",
-                                  "message":"Field required",
-                                  "value":null
-                               },
                                {  
                                 "name":"pattern",
                                 "isactive":"1",

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

@@ -200,7 +200,7 @@
           "group_key":"neighbourhood_list"
        },
        {  
-        "question":"Status of the neighbour check as per PD officer",
+        "question":"Status of the neighbour check as per Credit Manager",
         "question_key":"neighbourhood_status",
         "type":"3",
         "api_properties":null,

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

@@ -96,7 +96,7 @@
           ]
        },
        {
-          "question":"PD officer recommendation (Positive/negative/ refer to credit)",
+          "question":"Credit Manager recommendation (Positive/negative/ refer to credit)",
           "question_key":"pd_officer_recommendation",
           "type":"3",
           "field_width":"45",
@@ -123,7 +123,7 @@
                            "pd_officer_recommendation"
                         ],
                         "questions":[
-                            {   "question":"Specify PD Officer Recommendation",
+                            {   "question":"Specify Credit Manager Recommendation",
                                 "question_key":"pd_officer_recommendation_other",
                                 "type":"1",
                                 "field_width":"45",
@@ -175,6 +175,7 @@
                                     ],
                                     "is_repeatable":"1",
                                     "group_title":"Remarks",
+                                    "group_title_shown":"0",
                                     "group_key":"pd_officer_recommendation_remarks"
                                             } ] } 
                                 

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

@@ -62,7 +62,7 @@
                            "purpose":"FORM_CTRL",
                            "form_controls":[{
                                "insert_index":"account_type",
-                               "expression":"(String('account_type').toLowerCase() == String('savings'))",
+                               "expression":"(String('account_type').toLowerCase() != String('savings'))",
                                "value_keys":[  
                                   "account_type"
                                ],