From 3ba32ce89f02ce1a4d890d4fb7f5bec4b8a39268 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 12 Jan 2019 10:32:45 +0530
Subject: [PATCH] issues : ps

---
 .../edit-pd-master.component.html              |  8 ++++----
 .../edit-pd-master/edit-pd-master.component.ts |  9 +++++----
 .../list-pd/view-pd/view-pd.component.html     | 18 +++++++++---------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index d0492e4af..544a5fbe7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -36,8 +36,8 @@
                                                 <mat-form-field style="width: 32%">
                                                     <input matInput placeholder="Lender Contact Person" formControlName="pd_contact_person" type="text" required>
                                             </mat-form-field>
-                                            <mat-form-field style="width: 32%">
-                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" required (keypress)="keyPress($event)">
+                                            <mat-form-field style="width: 25%">
+                                                <input matInput placeholder="Lender Contact Number" formControlName="pd_contact_mobileno" type="text" (keypress)="keyPress($event)">
                                                 <mat-error *ngIf="pdMain.pd_contact_mobileno.hasError('pattern') || pdMain.pd_contact_mobileno.hasError('maxlength') || pdMain.pd_contact_mobileno.hasError('minlength')">Enter Valid Mobile Number. </mat-error>  
                                             </mat-form-field>
                                                 <mat-form-field style="width: 10%">
@@ -45,10 +45,10 @@
                                                                 <!-- <span matPrefix>+91</span> -->
                                                                 <mat-error *ngIf="pdMain.lender_stdcode.hasError('maxlength') || pdMain.lender_stdcode.hasError('minlength')">Enter Valid STD Code. </mat-error>  
                                                 </mat-form-field> &nbsp;-&nbsp;
-                                                    <mat-form-field style="width: 20%">
+                                                <mat-form-field style="width: 20%">
                                                               <input matInput placeholder="LandLine Number" formControlName="lender_landline" type="text" (keypress)="keyPress($event)">
                                                               <mat-error *ngIf="pdMain.lender_landline.hasError('maxlength') || pdMain.lender_landline.hasError('minlength')">Enter Valid Landline Number. </mat-error>  
-                                                    </mat-form-field>
+                                                </mat-form-field>
                                         <mat-form-field style="width: 32%">
                                                 <mat-select  placeholder="Product Name" formControlName="fk_product_id" (selectionChange)="getSubproductList(pdMain.fk_product_id.value)">
                                                         <mat-option>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
index b8242a4e2..d0efd9207 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts
@@ -112,6 +112,7 @@ export class EditPdMasterComponent implements OnInit {
            }
           
          loadFormData() {
+          console.log('this.data.record',this.data.records);
           let stdcode;
           let landline;
           if(this.data.records.pd_contact_landline){
@@ -130,7 +131,7 @@ export class EditPdMasterComponent implements OnInit {
              fk_lender_id: [this.data.records.fk_lender_id, Validators.compose([Validators.required])],
              lender_applicant_id: [this.data.records.lender_applicant_id, Validators.compose([Validators.required])],
              pd_contact_person: [this.data.records.pd_contact_person, Validators.compose([Validators.required])],
-             pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])],
+             pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])],
              lender_stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])],
              lender_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])],
              fk_product_id: [this.data.records.fk_product_id],
@@ -251,7 +252,7 @@ export class EditPdMasterComponent implements OnInit {
           }
           else{
             let my_array = this._EditPDtriggerForm.value;
-            if((my_array.pd_contact_person == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){
+            if((my_array.pd_contact_mobileno == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){
               this.notifier.notify('warning', 'Either Mobile or Landline Need.!');
               return;
             }
@@ -262,7 +263,7 @@ export class EditPdMasterComponent implements OnInit {
                       concat_landline = null;
                   }else{
                       let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode;
-                      let landline = my_array.lender_landerline == '' ? '' : my_array.lender_landerline;
+                      let landline = my_array.lender_landline == '' ? '' : my_array.lender_landline;
                       concat_landline = std+'-'+landline;
                   }
               }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){
@@ -277,7 +278,7 @@ export class EditPdMasterComponent implements OnInit {
                 "lender_applicant_id": my_array.lender_applicant_id, 
                 "pd_contact_person": my_array.pd_contact_person, 
                 "pd_contact_mobileno": my_array.pd_contact_mobileno,
-                "pd_Contant_landline": concat_landline,
+                "pd_contact_landline": concat_landline,
                 "fk_product_id": my_array.fk_product_id,
                 "fk_subproduct_id": my_array.fk_subproduct_id,
                 "fk_pd_type": my_array.fk_pd_type,
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 6f2358bfc..6b60700f7 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -43,12 +43,12 @@
                     
                     <div fxLayout="row" class="ml-xs mr-xs">  
                       <div fxFlex="100" style="text-align: right;">                             
-                        <div *ngFor="let master of pdMasterData">
-                              <button  *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
+                        <span *ngFor="let master of pdMasterData">
+                              <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
                               <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.COMPLETED && currentPDStatus!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
                               <button *ngIf="master.pd_type_name && currentPDStatus!=pdStatusCheck.DRAFT && currentPDStatus!=pdStatusCheck.TRIGGERED && currentPDStatus!=pdStatusCheck.DRAFT && enableStartPD" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
                               <button *ngIf="master.pd_type_name && currentPDStatus===pdStatusCheck.QC_COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Report" matTooltipPosition="above" (click)="getPDIDReport(viewID)"><mat-icon>ballot</mat-icon></button>
-                        </div>
+                        </span>
                               <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>   
                       </div>
                      </div>
@@ -61,7 +61,7 @@
                           <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
                              <div fxFlex="10">
-                               <span><i class="fa-1x fa fa-suitcase" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                               <span *ngIf="master.product_name"><i class="fa-1x fa fa-suitcase" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                              </div> 
                              <div fxFlex="90"> 
                                 <span *ngIf="master.product_name"> {{master.product_name}}<span *ngIf="master.subproduct_name"> /  {{master.subproduct_name}} </span></span>
@@ -71,7 +71,7 @@
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
                             <div fxFlex="10">
-                              <span><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                              <span *ngIf="master.loan_amount"><i class="fa-1x fa fa-rupee" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                             </div>
                             <div fxFlex="90">
                            <span *ngIf="master.loan_amount"> {{master.loan_amount}}</span>
@@ -81,7 +81,7 @@
                          <div fxLayout="row">
                           <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
                             <div fxFlex="10">
-                              <span><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                              <span *ngIf="master.pd_type_name"><i class="fa-1x fa fa-check-circle" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                             </div>
                             <div fxFlex="90">
                               <span *ngIf="master.pd_type_name"> {{master.pd_type_name}}</span>
@@ -91,7 +91,7 @@
                           <div fxLayout="row">
                             <div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="profile-center">
                                  <div fxFlex="10">
-                                   <span><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
+                                   <span *ngIf="master.state_name"><i class="fa-1x fa fa-map-marker" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i></span>
                                  </div> 
                                  <div fxFlex="90">                        
                               <span *ngIf="master.state_name" class="hover-icon"> {{master.addressline1}},<br> {{master.city_name}},<br>{{master.state_name}}-{{master.pincode}} </span>
@@ -167,8 +167,8 @@
                         <i class="fa-1x fa fa-phone" style="width: 37px;padding: 8px 9px 8px 9px;border-bottom: 2px solid red;"></i>
                         &nbsp;{{applicant.landline}}
                       </span>
-                      <span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">( Main Applicant ) </span>
-                      <ng-template #codetails><span>( {{applicant.relation_name}} )</span></ng-template>
+                      <span *ngIf="applicant.applicant_type=='1';else codetails" style="font-size:12px;">( Main Applicant )</span>
+                      <ng-template #codetails><span> {{applicant.relation_name}} </span></ng-template>
                     </p>
                   </mat-list-item>
                 </mat-list>