diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts
index 3dee29773..57965effe 100644
--- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts
@@ -477,18 +477,19 @@ export class QcPdReportComponent implements OnInit {
this.pdf_src=''
this.pdf_viewer_split_size='70'
this.html_viewer_split_size='30'
- console.log("data datacontainer",this.dataContainer)
+
let modifiedHtml=''
if(this.dataContainer != undefined){
- modifiedHtml =this.dataContainer.nativeElement.outerHTML;
+ modifiedHtml =this.dataContainer.nativeElement.innerHTML;
+ console.log("data datacontainer",this.dataContainer.nativeElement.innerHTML)
}
console.log(this.dataContainer);
let encryptReportRandomString = atob(this.route.snapshot.params['string']);
this.pdTrigerService.getPDReportPDFpreview(encryptReportRandomString,this.startPD,modifiedHtml).subscribe(response=>{
// if(response['dataStatus']){
- // 'https://cors-anywhere.herokuapp.com/'
- this.pdf_src=response['link']
+ this.pdf_src='https://cors-anywhere.herokuapp.com/'+response['link'];
+ // this.pdf_src=response['link']
// window.open(this.pdf_src);
console.log("pdf source",this.pdf_src)
//}
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
index 2fdd4901d..702095ac7 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
@@ -130,7 +130,7 @@ export class QcReviewComponent implements OnInit {
statusChangeClick(): void {
let template = this.ngForm.value;
- let savePDRemark_values={'pd_id':this.data.startId,'remark':template.change_status_remark}
+ let savePDRemark_values={'pd_id':this.data.startId,'remark':template.change_status_remark,is_revert_remark:'1'}
this.serviceFromPD.savePDRemark(savePDRemark_values).subscribe(result=>{
let changeStatus_values={'pd_id':this.data.startId,random_string:this.data.random_string,parent_pd_id:this.data.startId,pd_status:template.pd_status}
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
index 8f9cbc901..d0f577934 100644
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
@@ -3,7 +3,8 @@
PD MIS Report
-
+
+
@@ -237,7 +238,7 @@
-
+
| Sr. No. |
@@ -360,6 +361,24 @@
+
+ Bounced
+ DD:MM:YYYY HH:MM |
+
+ {{row.bounced | date: 'dd-MM-yyyy hh:mm a'}}
+ 00-00-0000 00:00
+ |
+
+
+
+ Allocated to Bounced
+ HH:MM:SS |
+
+ {{row.allocated_to_bounced }}
+ 00:00:00
+ |
+
+
Accepted
DD:MM:YYYY HH:MM |
@@ -531,7 +550,7 @@
|
-
+
No records found
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
index 9c20976ad..eb280efe7 100644
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
@@ -6,6 +6,7 @@ import { FormGroup, FormControl,FormBuilder } from '@angular/forms';
import * as XLSX from 'xlsx';
import { MatSort,MatPaginator, MatTableDataSource,PageEvent } from '@angular/material';
import { NotifierService } from 'angular-notifier';
+import { AngularCsv } from 'angular-csv-ext/dist/Angular-csv';
@Component({
selector: 'app-pd-mis',
@@ -48,6 +49,8 @@ export class PdMisComponent implements OnInit {
'draft_to_trigger',
'allocated',
'triggered_to_allocated',
+ 'bounced',
+ 'allocated_to_bounced',
'accepted',
'allocated_to_accepted',
'confirmation_pd_date',
@@ -79,6 +82,7 @@ export class PdMisComponent implements OnInit {
constructor(private reportsService:ReportsService,private route:ActivatedRoute,private router:Router,private form_builder:FormBuilder,private notifier:NotifierService) {
this.reportform = this.form_builder.group({ from_date:[null],to_date:[null],city:[null],branch:[null],applicant_id:[null],lender_short_name:[null] });
+
}
ngOnInit(){
@@ -118,6 +122,7 @@ export class PdMisComponent implements OnInit {
@ViewChild(MatSort) sort: MatSort;
// @ViewChild('TABLE') table: ElementRef;
@ViewChild('TABLE',{ read: ElementRef }) table: ElementRef;
+ @ViewChild('exporter') exp
exportAsExcel():void {
@@ -128,7 +133,23 @@ export class PdMisComponent implements OnInit {
/* save to file */
XLSX.writeFile(wb, 'Daily MIS Report.xlsx');
}
-
+ exportAsCSV(){
+ console.log(this.table.nativeElement.innerText,this.exp)
+ var options = {
+ fieldSeparator: ',',
+ quoteStrings: '"',
+ decimalseparator: '.',
+ showLabels: true,
+ showTitle: true,
+ title: 'Your title',
+ useBom: true,
+ noDownload: true,
+ headers: this.displayedColumns,
+ nullToEmptyString: true,
+ };
+ // console.log(this.table.nativeElement)
+ new AngularCsv(this.dataSource.data,'sample')
+ }
ngAfterViewInit() {
this.dataSource.paginator = this.paginator;
diff --git a/ng6-seed/src/app/reports/reports.module.ts b/ng6-seed/src/app/reports/reports.module.ts
index 649893f44..dfc86e3c8 100644
--- a/ng6-seed/src/app/reports/reports.module.ts
+++ b/ng6-seed/src/app/reports/reports.module.ts
@@ -26,6 +26,7 @@ import { ReportsService } from '../reports/reports.service';
import { ReportsRoutingModule } from './reports-routing.module';
import { PdMisComponent } from './pd-mis/pd-mis.component';
import {NotifierModule,NotifierOptions} from 'angular-notifier'
+import { MatTableExporterModule } from 'mat-table-exporter';
const pdCustomNotifierOptions: NotifierOptions = {
@@ -93,6 +94,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
MatTooltipModule,
MatListModule,
MatDatepickerModule,
+ MatTableExporterModule
],
exports: [MatExpansionModule],
declarations: [PdMisComponent],
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
index 76fc47b1d..d7bf9b717 100755
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
@@ -78,13 +78,15 @@
You must Include Contact Person Email.
+
+