Fairoj : issue_fixes

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

@@ -1809,6 +1809,31 @@
                                         
                                     </div>
 
+                                    <div fxLayout="row" *ngIf="businessForm.controls['eb_bill']">
+                                        <mat-form-field>
+                                            <mat-select placeholder="Electricity Bill" formControlName="eb_bill" (selectionChange)="radioChange($event,9)">
+                                                <mat-option value="yes">Yes</mat-option>
+                                                <mat-option value="no">No</mat-option>
+                                                <mat-option value="not applicable">Not Applicable</mat-option>
+                                            </mat-select>
+                                            <mat-error *ngIf="businessForm.controls['eb_bill'].hasError('required')">Electricity Bill Required</mat-error>
+                                        </mat-form-field>
+                                        <!-- <div fxLayoutAlign="none center" *ngIf="businessForm.controls['pf_regn'].value == 'yes'">
+                                            <div *ngIf="businessForm.controls['pf_regn_pic'] && businessForm.controls['pf_regn_pic'].value != ''" >
+                                            <img src="{{businessForm.controls['pf_regn_pic'].value}}"  style ="width: 100px;height: 100px;"  ngxViewer  >
+                                            <p style="text-align: center">PF Regn Image</p>
+                                            
+                                            </div>
+                                         </div> -->
+                                         <span *ngIf="businessForm.controls['eb_bill'].value == 'yes'">
+                                                <span class="carbon-wrap" *ngIf="businessForm.controls['eb_bill_pic'] && businessForm.controls['eb_bill_pic'].value != ''" >
+                                                        <img src="{{businessForm.controls['eb_bill_pic'].value}}" alt="" border="0" height="100" width="130" style="max-width: 130px;" ngxViewer >
+                                                        
+                                                        <p class="carbon-text" > Electricity Bill Image </p>
+                                                </span>
+                                        </span>
+                                    </div>
+
                                     <mat-form-field>
                                         <mat-select placeholder="Do You Want to Add Other Documents?" formControlName="other_documents"
                                             required>

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

@@ -320,6 +320,7 @@ export class BusinessInfoComponent implements OnInit {
                     });
                     if (selectedManufacturing.length > 0) {
                         // this is for auto generate fields 
+                        this.businessForm.addControl('eb_bill',new FormControl('',Validators.compose([Validators.required])))
                         selectedManufacturing.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
                         selectedManufacturing.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('factory_cert');
                         selectedManufacturing.forEach((element, index) => {
@@ -621,6 +622,7 @@ export class BusinessInfoComponent implements OnInit {
               if(data.records.esic_regn =='yes'){  this.businessForm.addControl('esic_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('esic_regn_pic');}
               if(data.records.export_import_cert =='yes'){  this.businessForm.addControl('export_import_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('export_import_cert_pic');}
               if(data.records.fire_noc =='yes'){  this.businessForm.addControl('fire_noc_pic', new FormControl('')); }else{ this.businessForm.removeControl('fire_noc_pic');}
+              if(data.records.eb_bill =='yes' && data.records.manufacturing_activity_details.length > 0){  this.businessForm.addControl('eb_bill_pic', new FormControl('')); }else{ this.businessForm.removeControl('eb_bill_pic');}
               this.businessForm.patchValue(businessVal);
             //   console.log('this.businessForm',this.businessForm);
             } else {
@@ -717,20 +719,21 @@ export class BusinessInfoComponent implements OnInit {
     // businees activity type change event
     changeBusinessActivity(event: any) {
 
-
+        console.log(event);
-
         if (event.value.exist_status == true && event.value.type_of_activity_id == 2) {
 
             this.ManufacturingUnChecked = event.value.exist_status;
             let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
             manufacturingControl.controls = [];
             manufacturingControl.setValue([]);
+            this.businessForm.removeControl('eb_bill')
         }
         else if (event.value.exist_status == false && event.value.type_of_activity_id == 2) {
 
             this.ManufacturingUnChecked = event.value.exist_status;
             let manufacturingControl = <FormArray>this.businessForm.controls['manufacturing_activity_details'];
             manufacturingControl.push(this.createActivity());
+            this.businessForm.addControl('eb_bill',new FormControl('',Validators.compose([Validators.required])))
           
 
         }
@@ -802,6 +805,7 @@ export class BusinessInfoComponent implements OnInit {
         if (this.ManufacturingUnChecked || this.ManufacturingUnChecked == undefined && this.RetailedUnChecked || this.RetailedUnChecked == undefined && this.WholeSalesUnChecked || this.WholeSalesUnChecked == undefined && this.ServiceUnChecked || this.ServiceUnChecked == undefined) {
             this.ExportFlag = false;
         }
+
     }
     // change area of sale options in manufacturing
     changeManufacturingAreaSale(getDetails: any, getIndex) {
@@ -1300,11 +1304,11 @@ export class BusinessInfoComponent implements OnInit {
     // add and create person with relationship details
     createPersonRelationhip(details: any): FormGroup {
         return this.fb.group({
-            other_family_relationship_id: [details.other_family_relationship_id, Validators.required],
+            other_family_relationship_id: [details.other_family_relationship_id],
             family_member_salutation: [details.family_member_salutation],
-            family_member_name: [details.family_member_name, Validators.required],
+            family_member_name: [details.family_member_name],
-            relationship_with_company_id: [details.relationship_with_company_id, Validators.required],
+            relationship_with_company_id: [details.relationship_with_company_id],
-            relation_to_id: [details.relation_to_id, Validators.required],
+            relation_to_id: [details.relation_to_id],
             started_business: [details.started_business],
         });
     }
@@ -1999,6 +2003,7 @@ export class BusinessInfoComponent implements OnInit {
         if(Flag == 7) {event.value =='yes' ? this.businessForm.addControl('esic_regn_pic', new FormControl('')) : this.businessForm.removeControl('esic_regn_pic');}
         if(Flag == 3) {event.value =='yes' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');}
         if(Flag == 8) {event.value =='yes' ? this.businessForm.addControl('fire_noc_pic', new FormControl('')) : this.businessForm.removeControl('fire_noc_pic');}
+        if(Flag == 9) {event.value =='yes' ? this.businessForm.addControl('eb_bill_pic', new FormControl('')) : this.businessForm.removeControl('eb_bill_pic');}
     }
 
    /* imageCrop(pic) {

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts

@@ -10,7 +10,7 @@ import { bool } from 'aws-sdk/clients/signer';
   styleUrls: ['./other-applicant-details.component.scss']
 })
 export class OtherApplicantDetailsComponent implements OnInit {
-  pageTitle: string = "Add Name of Person(s) Met and Individual Loan Applicant(s) ";
+  pageTitle: string = "";
   public _OtherForm: FormGroup;
   applicantInfo: any = { 'pd_co_applicant_id': "", 'applicant_name': '', 'is_applicant': false, 'is_person_met': false, applicant_title_name: '', age: '', qualification: '', course_name: '' };
   titleList: any = [];
@@ -26,11 +26,22 @@ export class OtherApplicantDetailsComponent implements OnInit {
     //   this.EditGeneralFormData = generalFormData.value;
     //   this.EditFlag = true;
     // }
-
+    console.log("data",this.data)
-  }
+    if(this.data.edit_data){
+      this.pageTitle="Update Name of Person(s) Met and Individual Loan Applicant(s) "
+    }
+    else{
+      this.pageTitle="Add Name of Person(s) Met and Individual Loan Applicant(s) "
+    }
+    }
 
   ngOnInit() {
+    if(this.data.edit_data){
+      this.initFormDetails(this.data.previous_value)
+    }
+    else{
     this.initFormDetails(null);
+    }
     this.getMasterDetails('TITLES', 1);
     this.getMasterDetails('EDUQUALIFICATION', 2);
   }
@@ -57,6 +68,11 @@ export class OtherApplicantDetailsComponent implements OnInit {
         applicant_list: this._fb.array([this.createApplicant(this.applicantInfo)]),
       });
     }
+    else{
+      this._OtherForm=this._fb.group({
+          applicant_list:this._fb.array([this.createApplicant(this.data.previous_value)])
+      })
+    }
   }
 
   // create applicant form array
@@ -64,12 +80,12 @@ export class OtherApplicantDetailsComponent implements OnInit {
     return this._fb.group({
       pd_co_applicant_id: [elementValue.pd_co_applicant_id],
       applicant_title_name: [elementValue.applicant_title_name, Validators.required],
-      applicant_name: ['', Validators.required],
+      applicant_name: [elementValue.applicant_name || '', Validators.required],
-      is_applicant: [false],
+      is_applicant: [elementValue.is_applicant || false],
-      is_person_met: [false],
+      is_person_met: [elementValue.is_person_met || false],
-      age: [''],
+      age: [elementValue.age || ''],
-      qualification: [''],
+      qualification: [elementValue.qualification || ''],
-      course_name: ['']
+      course_name: [elementValue.course_name || '']
     });
   }
 

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

@@ -30,10 +30,10 @@
                                 <ng-container matColumnDef="applicant_name">
                                     <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
-                                        <input matInput placeholder="ApplicantName" formControlName="applicant_name"
+                                        <!-- <input matInput placeholder="ApplicantName" formControlName="applicant_name"
                                             [value]="details.get('applicant_name').value | titlecase" autocomplete="off"
-                                            (change)="ApplicantName($event,details.value,i)">
+                                            (change)="ApplicantName($event,details.value,i)"> -->
-                                        <!-- {{details.value.applicant_name | titlecase}} -->
+                                        {{details.value.applicant_name | titlecase}}
                                     </mat-cell>
                                 </ng-container>
                                 <ng-container matColumnDef="is_person_met">
@@ -97,10 +97,10 @@
                                     <mat-header-cell *matHeaderCellDef> </mat-header-cell>
                                     <mat-cell *matCellDef="let details;let i =index;"
                                         [style.visibility]="_generalForm.controls.individuals.value[i].is_main_applicant == true ? 'hidden':'visible'">
-                                        <!-- <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="editIndividuals(details)"
+                                        <button type="button" class="mr-1  hover-icon" mat-raised-button mat-icon-button (click)="editIndividuals(details,i)"
                                        matTooltip="Edit " matTooltipPosition="below">
                                        <mat-icon>edit</mat-icon>
-                                </button> -->
+                                </button>
                                         <button type="button" class="mr-1 hover-icon" mat-raised-button mat-icon-button
                                             (click)="removeIndividuals(i,details)" matTooltip="Remove Individuals"
                                             matTooltipPosition="below">

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

@@ -375,7 +375,7 @@ export class GeneralInfoComponent implements OnInit {
   }
 
   createPersonsWithRelationships(elementValue: any, indexVal: number) {
-    console.log('elementValue.applicant_name', elementValue,indexVal);
+    // console.log('elementValue.applicant_name', elementValue,indexVal);
     return this._fb.group({
       pd_co_applicant_id: [elementValue.pd_co_applicant_id],
       applicant_name: [this.titleCase.transform(elementValue.applicant_name)],
@@ -560,11 +560,32 @@ export class GeneralInfoComponent implements OnInit {
         }
       });
 
+  }
+  editIndividuals(value,index){
+    //console.log(value);
+    const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
+      data: {'pd_id':this.pdid,edit_data:true,previous_value:value.value},
+      width: '40%',
+      disableClose: true
+    });
+    dialogRef.afterClosed()
+      .subscribe(dataRes=>{
+        // console.log("close",dataRes)
+        if(dataRes.data.length >0){ 
+          // dataRes.data.forEach()
+          let individualsControl = <FormArray>this._generalForm.controls['individuals'];
+          // console.log(individualsControl);
+          individualsControl.controls[index].patchValue(dataRes.data[0])
+          let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
+          relationControl.controls[index].patchValue(dataRes.data[0])
+        }
+      })
+
   }
 
   ApplicantName(event, control_value,index1) {
 
-    console.log("d",event,control_value)
+    // console.log("d",event,control_value)
 
     let relationControl = <FormArray>this._generalForm.controls['persons_with_relationships'];
     // let index1 = relationControl.value.map(data => data.pd_co_applicant_id).indexOf(control_value.pd_co_applicant_id);
@@ -576,7 +597,7 @@ export class GeneralInfoComponent implements OnInit {
     // console.log(index1,control,relationControl);
     // console.log(index1 == '-1')
   
-    console.log("dd cha",index1);
+    // console.log("dd cha",index1);
     
     control.controls['applicant_name'].setValue(this.titleCase.transform(event.target.value));
 

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

@@ -23,7 +23,8 @@
      <div *ngFor="let qu of docsCollectedForm.controls.addtional_requirements['controls'];let i=index;" [formGroupName]="i">
         <div *ngFor="let item of queries_docs">
           <mat-form-field style="width:90%">
-            <input matInput type="text" [formControlName]="item.add_req_id" [placeholder]="item.add_requirement">
+            <mat-placeholder style="white-space: normal;">{{item.add_requirement}}</mat-placeholder>
+            <input matInput type="text" [formControlName]="item.add_req_id">
           </mat-form-field>
         </div>
       </div>

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.scss

@@ -6,28 +6,20 @@
   //   margin-top: 20px;
   //   word-wrap: break-word;
   // }
-  // input{
+  input{
-  //   height:50px;
+    height:40px;
-  // }
+  }
   
-  ::-webkit-input-placeholder { /* Chrome/Opera/Safari */
+  .mat-form-field-label {
-    white-space:pre-line;  
+    white-space: normal;
-    position:relative;
+  }
-    top:-7px;
   
+  textarea.mat-input-element {
+    padding: 0px 0;
+    margin: 5px 0;
   }
-  ::-moz-placeholder { /* Firefox 19+ */
+  
-       white-space:pre-line;  
+  .mat-input-placeholder {
-    position:relative;
+    white-space: normal;
-    top:-7px;
-  }
-  :-ms-input-placeholder { /* IE 10+ */
-      white-space:pre-line;  
-    position:relative;
-    top:-7px;
-  }
-  :-moz-placeholder { /* Firefox 18- */
-       white-space:pre-line;  
-    position:relative;
-    top:-7px;
   }
+  

ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html

@@ -74,7 +74,7 @@
                                                 <as-split direction="vertical">
                                                     <as-split-area >
                                                       
-                                                        <p  #dataContainer> </p>  
+                                                        <p  #dataContainer (input)="model_edit=$event.target.textContent"> </p>  
                                                        
                                                     </as-split-area>
                                                 </as-split>

ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts

@@ -33,6 +33,7 @@ export class QcPdReportComponent implements OnInit {
 
   reason = '';
   loadComponent: boolean=false;
+  observer: MutationObserver;
 
   close(reason: string) {
     this.reason = reason;
@@ -67,6 +68,7 @@ export class QcPdReportComponent implements OnInit {
   pdf_src:any='assets/pdf.pdf';
   pdf_viewer_split_size:String='70'
   html_viewer_split_size:String='30'
+  model_edit=''
 
   private notifier: NotifierService;
   constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
@@ -90,6 +92,7 @@ export class QcPdReportComponent implements OnInit {
    
   }
   
+
   getHTMLPDReport(){
   let encryptReportRandomString = atob(this.route.snapshot.params['string']);
   this.pdTrigerService.getPDReportHTML(encryptReportRandomString,this.startPD).subscribe(response=>{
@@ -134,16 +137,19 @@ export class QcPdReportComponent implements OnInit {
 
   getFrameContent(content: any)
   {
-    let getItem = localStorage.getItem('userEdits');
+    // let getItem = localStorage.getItem('userEdits');
     
-    if(getItem !== null){
+    if(this.model_edit !== ''){
     
         //  console.log('Dat is value');
+        let editted_data=this.dataContainer.nativeElement.innerHTML
     
-  this.pdTrigerService.setHTMLContent(this.startPD,getItem,atob(this.route.snapshot.params['string'])).subscribe(data => {
+  this.pdTrigerService.setHTMLContent(this.startPD,editted_data,atob(this.route.snapshot.params['string'])).subscribe(data => {
       if (data.status == 200) {
-        localStorage.removeItem('userEdits');
+        this.model_edit=''
+        // localStorage.removeItem('userEdits');
         this.notifier.notify('success', 'Your Changes Updated.!');
+        this.ngOnInit();
       }
       else {  
         this.notifier.notify('warning', 'Something Went Wrong Try Again.! \t\"' + data.status +'\" Error Occur.!');
@@ -202,7 +208,7 @@ export class QcPdReportComponent implements OnInit {
     };
     this.pdTrigerService.getPDReportFinalDocument(data).subscribe(data => {
       if (data.dataStatus) {
-        console.log("Generate Report Called")
+        // console.log("Generate Report Called")
         // console.log(data.records);
         this.notifier.notify('success', 'Done Successfully..!');
         // this.getPdReportVersionList();
@@ -474,6 +480,8 @@ export class QcPdReportComponent implements OnInit {
     this.listPDComponent.showListView(true);
   }
   getPDreportPDF(){
+    console.log("modal",this.model_edit)
+   
     this.pdf_src=''
     this.pdf_viewer_split_size='70'
     this.html_viewer_split_size='30'
@@ -481,17 +489,17 @@ export class QcPdReportComponent implements OnInit {
     let modifiedHtml=''
     if(this.dataContainer != undefined){
       modifiedHtml  =this.dataContainer.nativeElement.innerHTML;
-      console.log("data datacontainer",this.dataContainer.nativeElement.innerHTML)
+      console.log("data datacontainer",this.dataContainer)
     }
     
-    console.log(this.dataContainer);
+    // console.log(this.dataContainer);
     let encryptReportRandomString = atob(this.route.snapshot.params['string']);
     this.pdTrigerService.getPDReportPDFpreview(encryptReportRandomString,this.startPD,modifiedHtml).subscribe(response=>{
      // if(response['dataStatus']){
-      this.pdf_src='https://cors-anywhere.herokuapp.com/'+response['link'];
+      // this.pdf_src='https://cors-anywhere.herokuapp.com/'+response['link'];
-      // this.pdf_src=response['link']
+      this.pdf_src=response['link']
       // window.open(this.pdf_src);
-      console.log("pdf source",this.pdf_src)
+      // console.log("pdf source",this.pdf_src)
       //}
       // setTimeout(()=>{
       //   this.pdf_src='https://len24.s3.ap-south-1.amazonaws.com/pd1290/pd_reports/%20Vinoth%20Kumar.pdf?X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAJ3QDSPT3LDSWRYUQ%2F20190921%2Fap-south-1%2Fs3%2Faws4_request&X-Amz-Date=20190921T105502Z&X-Amz-SignedHeaders=host&X-Amz-Expires=1800&X-Amz-Signature=a31a8370400e95aeab91ea7fc266d02763539e277e801a69b91ea4d2bbd65bce'
@@ -501,7 +509,7 @@ export class QcPdReportComponent implements OnInit {
       //   this.pdf_src='assets/Vinoth.pdf'
       this.pdf_viewer_split_size='55'
       this.html_viewer_split_size='45'
-      },9000)
+      },6000)
       
     })
   }

ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html

@@ -78,17 +78,47 @@
                       </div>
                   </mat-list-item>                
                    </mat-list>
-                  <div>
+                   <div>
-                      <mat-card-title style="color:#e00201;">Lender Contact Details</mat-card-title>
+                    <mat-card-title style="color:#e00201;">Lender Contact Details</mat-card-title>
-                       <mat-list>
+                     <mat-list >
-                               <mat-list-item align="left" *ngIf="master.pd_contact_person">
+                       <div *ngIf="master.pd_contact_person != '' && master.pd_contact_person != null">
-                                   <i class="fa-1x fa fa-user"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_contact_person}}</small>
+                             <mat-list-item align="left" *ngIf="master.pd_contact_person" style="height:48px !important;">
+                                 <i class="fa-1x fa fa-user"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_contact_person}}</small>
+                               </mat-list-item>
+                               <mat-list-item align="left" *ngIf="master.pd_contact_mobileno" style="height:48px !important;">
+                                   <i class="fa-1x fa fa-phone"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_contact_mobileno}}</small>
                                  </mat-list-item>
-                                 <mat-list-item align="left" *ngIf="master.pd_contact_mobileno">
+                       </div>
-                                     <i class="fa-1x fa fa-phone"></i><small style="margin-left: 2%; font-size: inherit">{{master.pd_contact_mobileno}}</small>
+                           <div *ngIf="master.lender_credit_person_name != '' && master.lender_credit_person_name != null">
-                                   </mat-list-item>
+                             <!-- <mat-list-item> -->
-                             </mat-list>
+                              <mat-card-subtitle>Credit Person</mat-card-subtitle>
-                      </div>              
+                            <!-- </mat-list-item> -->
+                            <div fxLayout="row" fxFlex="100"> 
+                            <!-- <div > -->
+                              <div fxFlex="50" align="left">
+                                  <i class="fa-1x fa fa-user"></i><small style="margin-left: 1%; font-size: inherit">{{master.lender_credit_person_name}}</small>
+                              </div>
+                              <div fxFlex="50" align="right">
+                                  <i class="fa-1x fa fa-phone"></i><small style="margin-left: 1%; font-size: inherit">{{master.lender_credit_person_contact_mobileno}}</small>
+                              </div>
+                            <!-- </div> -->
+                             </div>
+                           </div><br/>
+                           <div  *ngIf="master.lender_sales_person_name != '' && master.lender_sales_person_name != null">
+                              <mat-card-subtitle>Sales Person</mat-card-subtitle><br/>
+                              <div fxFlex="row">
+                             <div fxFlex="100">
+                               <div fxFlex="50" align="left">
+                                   <i class="fa-1x fa fa-user"></i><small style="margin-left: 2%; font-size: inherit">{{master.lender_sales_person_name}}</small>
+                               </div>
+                               <div fxFlex="50" align="right">
+                                   <i class="fa-1x fa fa-phone"></i><small style="margin-left: 2%; font-size: inherit">{{master.lender_sales_contact_mobileno}}</small>
+                               </div>
+                             </div>
+                              </div>
+                            </div>
+                          </mat-list>
+                    </div>         
                             
                  
                     
@@ -397,8 +427,13 @@
                <mat-list class="m-gap p-gap" *ngFor="let master of masterPdLogsData">
                <mat-list-item>
                  <span style="font-size:15px;"><span style="color:#908f8f">{{master.time}}&nbsp;</span>
-                 <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> </span>
+                 <span style="color:#908f8f"> <i> {{master.user}} </i>  </span><br> <span>{{master.log}}</span> 
-
+                 <div *ngIf="master.meta_data && master.meta_data.length>0">
+                  <div *ngFor="let metadata of master.meta_data" style="color:#908f8f"> 
+                    <i>{{metadata.display_name}} </i> : <span>{{metadata.display_value}}</span><br>
+                  </div>
+               </div>
+              </span>
                </mat-list-item>
 
              </mat-list>

ng6-seed/src/app/reports/pd-mis/pd-mis.component.html

@@ -4,7 +4,8 @@
       <div class="ml-xs mr-xs" style="width: 100%;">
         <mat-card-title><span> PD MIS Report </span>
           
-          <button class="btn_export" mat-raised-button color="primary" (click)="exp.exportTable('csv',{fileName:'Daily MIS Report'})" [disabled]="dataLength == 0 ? true : false || dataLength == -1 ? true : false" >Export CSV</button>
+          <button class="btn_export" mat-raised-button color="primary" (click)="exp.exportTable('xlsx',{fileName:'Daily MIS Report'})" [disabled]="dataLength == 0 ? true : false || dataLength == -1 ? true : false" >Export CSV</button>
+          
           <!-- (click)="ExportTOExcel()" -->
         </mat-card-title>
       </div>
@@ -238,7 +239,7 @@
 
         <div class="report-table-container mat-elevation-z8 " #TABLE>
           <div *ngIf="dataLength != 0 && dataLength != -1">
-             <mat-table matTableExporter  [dataSource]="dataSource" matSort  #exporter="matTableExporter">
+             <table mat-table  matTableExporter  [dataSource]="dataSource" matSort  #exporter="matTableExporter">
 
                    <ng-container matColumnDef="serialno" sticky>
                      <th mat-header-cell *matHeaderCellDef mat-sort-header>Sr. No. </th>
@@ -550,7 +551,7 @@
                    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                    <tr mat-row *matRowDef="let row; columns: displayedColumns;">
                    </tr>
-             </mat-table>
+             </table>
           </div>
           <div *ngIf="dataLength == 0" class="nocontent ml-xs mr-xs" style="padding: 1rem !important;">No records found</div>
        </div>

ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts

@@ -134,7 +134,7 @@ export class PdMisComponent implements OnInit {
       XLSX.writeFile(wb, 'Daily MIS Report.xlsx');
     }
     exportAsCSV(){
-      console.log(this.table.nativeElement.innerText,this.exp)
+      console.log(this.exp)
       var options = { 
         fieldSeparator: ',',
         quoteStrings: '"',
@@ -227,12 +227,16 @@ export class PdMisComponent implements OnInit {
          
           this.dataSource.data=res['records'];
           this.dataLength=res['records'].length;
+           setTimeout(()=>{
+              console.log(this.exp);
+            })
           this.expandStatus=false
           if(this.dataLength == 0){
             console.log("data length",this.dataLength)
             this.notifier.notify('warning', 'No Records Found !');
             this.dataSource.data = [];      
             this.dataLength=0
+           
           }
         }
         else{