From fb2eabd4f544e61af69fe34239ef7890aa5186ec Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 24 Jun 2019 19:12:00 +0530 Subject: [PATCH] img edit --- .../layouts/admin/admin-layout.component.html | 16 +- .../list-pd/all-pd/all-pd.component.ts | 6 +- .../completed-pd/completed-pd.component.html | 2 +- .../completed-pd/completed-pd.component.ts | 22 +- .../inprogress-pd/inprogress-pd.component.ts | 24 +- .../pd-status-change-dialogue.component.html | 2 +- .../qc-completed-pd.component.ts | 12 +- .../scheduled-pd/scheduled-pd.component.ts | 11 +- .../forms/address/address.component.html | 17 +- .../forms/address/address.component.scss | 8 +- .../forms/address/address.component.ts | 16 +- .../assessed-income.component.html | 55 +- .../assessed-income.component.scss | 6 +- .../assessed-income.component.ts | 43 ++ .../assets-info/assets-info.component.html | 63 +- .../assets-info/assets-info.component.scss | 6 + .../assets-info/assets-info.component.ts | 62 +- .../banking-details.component.html | 65 +- .../banking-details.component.scss | 6 +- .../banking-details.component.ts | 60 +- .../business-assets-info.component.html | 80 +- .../business-assets-info.component.scss | 6 +- .../business-assets-info.component.ts | 61 +- .../business-banking-details.component.html | 66 +- .../business-banking-details.component.scss | 6 +- .../business-banking-details.component.ts | 60 +- .../business-info.component.html | 75 +- .../business-info.component.scss | 5 + .../business-info/business-info.component.ts | 61 +- .../client-info/client-info.component.html | 65 +- .../client-info/client-info.component.scss | 5 + .../client-info/client-info.component.ts | 60 +- .../current-loan/current-loan.component.html | 65 +- .../current-loan/current-loan.component.scss | 5 + .../current-loan/current-loan.component.ts | 61 +- .../image-crop/image-crop.component.html | 30 +- .../image-crop/image-crop.component.ts | 121 ++- .../employment-info.component.html | 65 +- .../employment-info.component.scss | 5 + .../employment-info.component.ts | 60 +- .../family-details.component.html | 65 +- .../family-details.component.scss | 6 +- .../family-details.component.ts | 60 +- .../final-remarks.component.html | 85 ++- .../final-remarks.component.scss | 5 + .../final-remarks/final-remarks.component.ts | 62 +- .../financial-info.component.html | 65 +- .../financial-info.component.scss | 6 +- .../financial-info.component.ts | 60 +- ...ns-and-business-environment.component.html | 80 +- ...ns-and-business-environment.component.scss | 6 +- ...lans-and-business-environment.component.ts | 59 +- .../general-info/general-info.component.html | 687 ++++++++++-------- .../general-info/general-info.component.scss | 6 +- .../general-info/general-info.component.ts | 165 +++-- .../lender-representative.component.html | 65 +- .../lender-representative.component.scss | 5 + .../lender-representative.component.ts | 59 +- .../loan-details/loan-details.component.html | 65 +- .../loan-details/loan-details.component.scss | 6 +- .../loan-details/loan-details.component.ts | 60 +- .../neighbour-hood.component.html | 65 +- .../neighbour-hood.component.scss | 6 +- .../neighbour-hood.component.ts | 61 +- .../other-income/other-income.component.html | 65 +- .../other-income/other-income.component.scss | 5 + .../other-income/other-income.component.ts | 60 +- .../manage-rental-verification.component.html | 63 +- .../manage-rental-verification.component.scss | 5 + .../manage-rental-verification.component.ts | 61 +- .../start-pd/forms/stock/stock.component.html | 65 +- .../start-pd/forms/stock/stock.component.scss | 6 +- .../start-pd/forms/stock/stock.component.ts | 61 +- .../supplier-info.component.html | 65 +- .../supplier-info.component.scss | 6 +- .../supplier-info/supplier-info.component.ts | 60 +- .../pd-service/pd-triger.service.ts | 10 + .../qc-list/qc-list.component.html | 5 +- .../app/session/login/login-component.html | 3 +- ng6-seed/src/assets/images/PD.jpeg | Bin 0 -> 40636 bytes 80 files changed, 2368 insertions(+), 1445 deletions(-) create mode 100644 ng6-seed/src/assets/images/PD.jpeg diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 0fb390162..b367c8c37 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -4,10 +4,12 @@
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts index bc910a016..049222c85 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.ts @@ -194,12 +194,14 @@ export class AllPdComponent implements OnInit, OnChanges { if(res['dataStatus']==true) { this.dataSourceTab1.data = res['records']; - // console.log('res[records]',res['records']); + console.log('records',res['records']); this.dataSourceTab1.paginator = this.paginator; }else{ this.notifier.notify('warning', 'No Records Found !'); + this.dataSourceTab1.paginator['length'] = 0; + this.dataSourceTab1.paginator['pageIndex'] = 0; this.dataSourceTab1.data = []; - this.dataSourceTab1.paginator = null; + console.log('records-records',res['records']); } },error => { this.errorMessage.push(error); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 96b207760..4342e3a12 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -1,6 +1,6 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts index 80beed35b..93d5948c3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.ts @@ -20,17 +20,14 @@ export class CompletedPdComponent implements OnInit, OnChanges { ENTITY: any[]=[]; PDType: any[]=[]; pdStatus: any[]=[]; + searchForm:FormGroup; + pipe = new DatePipe('en-US'); + private notifier: NotifierService; recordStatus: boolean; errorMessage:any[]=[]; tabStatus:string="COMPLETED"; - pipe = new DatePipe('en-US'); - todaydate:Date = new Date(); - private notifier: NotifierService; public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); - tempStore = new MatTableDataSource(); - - searchForm:FormGroup; displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @@ -48,6 +45,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { pageIndex = 0; pageSize = 10; pageEvent: PageEvent; + todaydate:Date = new Date(); constructor(private _pd: PdTrigerService,public _fb:FormBuilder,notifier: NotifierService,) { this.notifier = notifier; @@ -76,8 +74,9 @@ export class CompletedPdComponent implements OnInit, OnChanges { // get changes for filter from parent componnet filter ngOnChanges(changes: SimpleChanges) { - let filteredText = changes.bindFilterValue.currentValue; - filteredText = filteredText ? filteredText.trim() : filteredText; + // let filteredText = changes.bindFilterValue.currentValue; + let filteredText = changes.bindFilterValue.currentValue ? changes.bindFilterValue.currentValue.trim() : changes.bindFilterValue.currentValue; + // filteredText = filteredText ? filteredText.trim() : filteredText; filteredText = filteredText ? filteredText.toLowerCase() : filteredText; this.dataSourceTab4.filter = filteredText; } @@ -92,7 +91,6 @@ export class CompletedPdComponent implements OnInit, OnChanges { this.completedPdListData = data.records; this.dataLengthTab4 = data.records.length; this.dataSourceTab4.data = this.completedPdListData; - this.tempStore.data } else{ this.completedPdListData=[]; @@ -103,6 +101,7 @@ export class CompletedPdComponent implements OnInit, OnChanges { // , error => this.errorMessage = error); ,error => { this.errorMessage.push(error); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur'); alert(error.html_format); }); } @@ -207,10 +206,13 @@ export class CompletedPdComponent implements OnInit, OnChanges { if(res['dataStatus']==true) { this.dataSourceTab4 = res['records']; + this.dataSourceTab4.paginator = this.paginator; }else{ this.notifier.notify('warning', 'No Records Found !'); + + this.dataSourceTab4.paginator['length'] = 0; + this.dataSourceTab4.paginator['pageIndex'] = 0; this.dataSourceTab4.data = []; - this.dataSourceTab4.paginator = null; } },error => { this.errorMessage.push(error); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts index fa03c54e9..dfd27ad49 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.ts @@ -26,7 +26,7 @@ export class InprogressPdComponent implements OnInit, OnChanges { private notifier: NotifierService; public dataLengthTab2: number; public dataSourceTab2 = new MatTableDataSource(); - tempStore = new MatTableDataSource(); + displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @@ -70,8 +70,9 @@ export class InprogressPdComponent implements OnInit, OnChanges { // get changes for filter from parent componnet filter ngOnChanges(changes: SimpleChanges) { - let filteredText = changes.bindFilterValue.currentValue; - filteredText = filteredText ? filteredText.trim() : filteredText; + // let filteredText = changes.bindFilterValue.currentValue; + // filteredText = filteredText ? filteredText.trim() : filteredText; + let filteredText = changes.bindFilterValue.currentValue ? changes.bindFilterValue.currentValue.trim() : changes.bindFilterValue.currentValue; filteredText = filteredText ? filteredText.toLowerCase() : filteredText; this.dataSourceTab2.filter = filteredText; } @@ -86,13 +87,11 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.progressPdListData = data.records; this.dataLengthTab2 = data.records.length; this.dataSourceTab2.data = this.progressPdListData; - this.tempStore.data = this.progressPdListData; - - }else{ - this.notifier.notify('warning', 'No Records Found !'); - this.dataSourceTab2.data = []; - this.dataSourceTab2.paginator = null; - } + }else{ + this.progressPdListData =[]; + this.dataSourceTab2 = null; + this.recordStatus=true; + } },error => { this.errorMessage.push(error); this.notifier.notify('warning', 'Something Went Wrong Try Again.!' + '-' + error.error_text + ' occur'); @@ -200,8 +199,9 @@ export class InprogressPdComponent implements OnInit, OnChanges { this.dataSourceTab2.paginator = this.paginator; }else{ this.notifier.notify('warning', 'No Records Found !'); - this.dataSourceTab2.data = []; - this.dataSourceTab2.paginator = null; + this.dataSourceTab2.paginator['length'] = 0; + this.dataSourceTab2.paginator['pageIndex'] = 0; + this.dataSourceTab2.data = []; } },error => { this.errorMessage.push(error); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html index 59ff13a8b..b458693ba 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.html @@ -13,7 +13,7 @@
- Loading ... +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts index e718e85b5..9e83f3040 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.ts @@ -27,7 +27,6 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { todaydate:Date = new Date(); public dataLengthTab5: number; public dataSourceTab5 = new MatTableDataSource(); - tempStore = new MatTableDataSource(); searchForm: FormGroup; displayedColumns = ['PDType', 'Name', 'Lenderid', 'Address', 'Status', 'Action']; private notifier: NotifierService; @@ -40,7 +39,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { // data source variable details qcCompletedPdListData: any[] = []; - + // pagination variable details length = 5; pageIndex = 0; @@ -94,7 +93,6 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.qcCompletedPdListData = data.records; this.dataLengthTab5 = data.records.length; this.dataSourceTab5.data = this.qcCompletedPdListData; - this.tempStore.data = this.qcCompletedPdListData; } else { this.qcCompletedPdListData = []; @@ -105,6 +103,7 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { // , error => this.errorMessage = error); ,error => { this.errorMessage.push(error); + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur'); alert(error.html_format); }); } @@ -189,8 +188,9 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.dataSourceTab5.paginator = this.paginator; }else{ this.notifier.notify('warning', 'No Records Found !'); + this.dataSourceTab5.paginator['length'] = 0; + this.dataSourceTab5.paginator['pageIndex'] = 0; this.dataSourceTab5.data = []; - this.dataSourceTab5.paginator = null; } },error => { this.errorMessage.push(error); @@ -204,8 +204,4 @@ export class QcCompletedPdComponent implements OnInit, OnChanges { this.loadPDDetails(); this.xpandStatus = false; } - } - - - diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts index 5bb90b5de..9fa6b5e76 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.ts @@ -28,7 +28,6 @@ export class ScheduledPdComponent implements OnInit, OnChanges { public dataSourceTab3 = new MatTableDataSource(); private notifier: NotifierService; - tempStore = new MatTableDataSource(); displayedColumns = ['PDType','Name','Lenderid','Address','Status','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @@ -76,8 +75,9 @@ export class ScheduledPdComponent implements OnInit, OnChanges { // get changes for filter from parent componnet filter ngOnChanges(changes: SimpleChanges) { - let filteredText = changes.bindFilterValue.currentValue; - filteredText = filteredText ? filteredText.trim() : filteredText; + // let filteredText = changes.bindFilterValue.currentValue; + // filteredText = filteredText ? filteredText.trim() : filteredText; + let filteredText = changes.bindFilterValue.currentValue ? changes.bindFilterValue.currentValue.trim() : changes.bindFilterValue.currentValue; filteredText = filteredText ? filteredText.toLowerCase() : filteredText; this.dataSourceTab3.filter = filteredText; } @@ -92,8 +92,6 @@ export class ScheduledPdComponent implements OnInit, OnChanges { this.scheduledPdListData = data.records; this.dataLengthTab3 = data.records.length; this.dataSourceTab3.data = this.scheduledPdListData; - this.tempStore.data = this.scheduledPdListData - } else{ this.scheduledPdListData=[]; @@ -206,8 +204,9 @@ export class ScheduledPdComponent implements OnInit, OnChanges { this.dataSourceTab3.paginator = this.paginator; }else{ this.notifier.notify('warning', 'No Records Found !'); + this.dataSourceTab3.paginator['length'] = 0; + this.dataSourceTab3.paginator['pageIndex'] = 0; this.dataSourceTab3.data = []; - this.dataSourceTab3.paginator = null; } },error => { this.errorMessage.push(error); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index 12e70eb7b..65753b607 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -351,15 +351,18 @@
-
{{doc.document_name}} +
+ +
+ + {{doc.document_name}} +
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss index f4b60c55c..e3b05bc75 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.scss @@ -107,4 +107,10 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7); // width: 10px; // background: #62B013; // color: white; -// } \ No newline at end of file +// } + +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index 95369ac7e..85f6d15a9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -106,6 +106,7 @@ export class AddressComponent implements OnInit { params.pd_id = this.pdid; params.pd_form_id = '5'; this.setAddressFromDatas(params); + this.retriveFile(); } loadPDAddressesDetails() { @@ -603,12 +604,16 @@ export class AddressComponent implements OnInit { imageCrop(pic) { // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; const imageRef = this.dialog.open(ImageCropComponent, { data: pic, }); imageRef.afterClosed() .subscribe(dataresult => { - console.log(dataresult); + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } }); } @@ -773,18 +778,23 @@ export class AddressComponent implements OnInit { // else { // control.push(this.createAddresses(null)); // } - }); + }); + } + retriveFile(){ this._pd.retriveFile(this.pdid, '5', null).subscribe(data => { + console.log('',data); if (data.status == 200) { if (data.records.length > 0) { data.records.forEach((val, index) => { let splitted = val.pd_document_name.split("."); let DocumentsAndFiles = { + 'document_id':val.pd_document_id, 'document_name': val.pd_document_name, 'document_title': val.pd_document_title, 'document': val.doc_url, - 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image' + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report } this.documentsAndFilesList.push(DocumentsAndFiles); }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 73d1418f8..a426a5610 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -111,7 +111,7 @@ --> - + + +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
+
+
+ + +

No Files

+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 331460801..1ed1b32e2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -172,4 +172,8 @@ // } - \ No newline at end of file + .top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index 69b552d4c..1f3c8ca3f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -6,6 +6,7 @@ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; import { ConfirmAiDetailsComponent } from "./confirm-ai-details/confirm-ai-details.component"; import { RupeeCurrencyFormatPipe } from './../../../../../pd-pipes/rupee-currency-format.pipe'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-assessed-income', @@ -57,6 +58,7 @@ public salesDeclaredCustomer: any=[]; public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList,salesDeclaredCustomer:this.salesDeclaredCustomer}; DailyPurchaseComponent:boolean; PurchaseComponent:boolean; + documentsAndFilesList: any; //public finalData: any; constructor(notifier: NotifierService, private route: ActivatedRoute, private router: Router, @@ -382,4 +384,45 @@ public viewerOptions: any = { }); } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + + retriveFile(){ + + this._pd.retriveFile(this.pdid, '16', this.company_id).subscribe(data => { + + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index b7aeee00b..e93e236df 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -430,40 +430,53 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss index 0f22c49b9..f7000adb6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.scss @@ -14,6 +14,12 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } + +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 5156b9bc4..fcc3a03a6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -24,6 +24,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { element } from '@angular/core/src/render3/instructions'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-assets-info', templateUrl: './assets-info.component.html', @@ -73,6 +74,7 @@ export class AssetsInfoComponent implements OnInit { notifier: NotifierService, private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, + private dialog: MatDialog, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; @@ -147,26 +149,7 @@ export class AssetsInfoComponent implements OnInit { this.getM_Vehicle_Type(); this.getM_UOM_Type(); - this.pdTrigerService.retriveFile(this.pdid,'4',null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); - + this.retriveFile(); } pdf(fileURL){ window.open(fileURL); @@ -988,11 +971,50 @@ export class AssetsInfoComponent implements OnInit { } }); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid,'4',null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} } + + // {id: "4", name: "Equipments and machinaries", isactive: "1", flag: "1", is_others: "0"} // {id: "7", name: "Investments", isactive: "1", flag: "0", is_others: "0"} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 4ec73f682..1a8e552a8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -220,42 +220,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss index 5570024d9..7b44ae4b0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.scss @@ -11,7 +11,11 @@ .mat-form-field-appearance-legacy .mat-hint{ color:rgba(0, 0, 0, 0.8) !important; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index b10703a30..935535f15 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -22,6 +22,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-banking-details', templateUrl: './banking-details.component.html', @@ -53,6 +54,7 @@ export class BankingDetailsComponent implements OnInit { constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, + private dialog: MatDialog, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; @@ -162,25 +164,7 @@ export class BankingDetailsComponent implements OnInit { } }); - this._pd.retriveFile(this.pdid,'7',null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } @@ -400,4 +384,42 @@ export class BankingDetailsComponent implements OnInit { window.open(fileURL); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,'7',null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 83dee25eb..f7f6f4162 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -458,45 +458,55 @@ - -
-
-
-
-
-
-
{{doc.document_name}} -
-
-
-
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - + +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
-
-
-
-
- - -

No Files

-
+ + +

No Files

+
+
- diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss index 1387488cf..8f15fc429 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss @@ -14,7 +14,11 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .matcard mat-form-field { margin: 0 2%; height: 105px !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 0d605734c..900b5e65c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -8,6 +8,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-business-assets-info', @@ -70,6 +71,7 @@ export class BusinessAssetsInfoComponent implements OnInit { private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -124,27 +126,7 @@ export class BusinessAssetsInfoComponent implements OnInit { this.getM_Address_Type(); this.getM_Vehicle_Type(); this.getM_Address_Type(); - - this.pdTrigerService.retriveFile(this.pdid, '22', this.company_id).subscribe(data => { - if (data.status == 200) { - if (data.records.length > 0) { - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else { - this.documentsAndFilesList = []; - } - }); - + this.retriveFile(); } /** init Function Ends Here */ @@ -1164,6 +1146,43 @@ export class BusinessAssetsInfoComponent implements OnInit { pdf(fileURL) { window.open(fileURL); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid, '22', this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} /** For Docs Tab */ public viewerOptions: any = { navbar: false, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html index 9f4a99856..1960956d0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html @@ -148,44 +148,58 @@ + -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.scss index edb0c1f7a..4433ec98b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.scss @@ -11,7 +11,11 @@ .mat-form-field-appearance-legacy .mat-hint{ color:rgba(0, 0, 0, 0.8) !important; } - + .top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index b45d0f232..e3e89ae6a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -22,6 +22,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-business-banking-details', @@ -60,6 +61,7 @@ export class BusinessBankingDetailsComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -161,25 +163,7 @@ export class BusinessBankingDetailsComponent implements OnInit { control.push(this.createBankarray()); } }); - this._pd.retriveFile(this.pdid,'21',this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } // ====================== @@ -441,5 +425,41 @@ export class BusinessBankingDetailsComponent implements OnInit { } - + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,'21',this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index 9e0093c6e..cb63fd4e5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -1856,43 +1856,56 @@ - -
-
-
-
-
-
-
{{doc.document_name}} -
+ +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
-
-
-
-
-
-
- + -

No Files

+

No Files

-
-
- + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss index 3be5ad67b..7d2c3e20e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss @@ -14,6 +14,11 @@ margin: 0 2%; width: 40%; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .matcard mat-form-field { margin: 0 2%; width: 40%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index 282ca9355..3783a5ee2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -25,6 +25,7 @@ import { ActivatedRoute, Router } from "@angular/router"; import { DatePipe } from '@angular/common'; /**sweet alert */ import Swal from 'sweetalert2'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-business-info', templateUrl: './business-info.component.html', @@ -640,27 +641,7 @@ export class BusinessInfoComponent implements OnInit { val.toUpperCase() == 'YES' ? this.businessForm.addControl('month_of_business_run', new FormControl('', Validators.required)) : this.businessForm.removeControl('month_of_business_run'); }); - - this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); - + this.retriveFile(); } public initBusinessForm(): void { this.businessForm = this.fb.group({ @@ -1986,5 +1967,41 @@ export class BusinessInfoComponent implements OnInit { if(Flag == 8) {event.value =='yes' ? this.businessForm.addControl('fire_noc_pic', new FormControl('')) : this.businessForm.removeControl('fire_noc_pic');} } - + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index a9af371d7..501e32090 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -433,42 +433,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss index c76eb4f93..92315ddd2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.scss @@ -11,6 +11,11 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} mat-form-field { margin: 0 2%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index 89b7e278f..b563a688b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -24,6 +24,7 @@ import { } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-client-info', templateUrl: './client-info.component.html', @@ -82,6 +83,7 @@ export class ClientInfoComponent implements OnInit { notifier: NotifierService, private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -184,26 +186,7 @@ export class ClientInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); this.getMasterDetails('COMPANYRELATIONSHIPS', 1); this.getMasterDetails('TITLES', 2); - - this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } // retaildTradingForm: Boolean = false; @@ -785,4 +768,41 @@ export class ClientInfoComponent implements OnInit { } }); } +imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } +}); +} } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 0d0c7c008..c3df769b0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -195,42 +195,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss index 720a1c506..24c30c736 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.scss @@ -24,6 +24,11 @@ color: #fff !important; background-color: #e00201 !important; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .my-mat-hint { line-height: 1.2em; transform: translateY(10px); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 57c83a18b..6406415ea 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -10,6 +10,7 @@ import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material'; import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-current-loan', @@ -48,6 +49,7 @@ export class CurrentLoanComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -378,26 +380,7 @@ export class CurrentLoanComponent implements OnInit { }); } }) - - this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); +this.retriveFile(); } checkTenure(details) { let originalTenure = details.value.original_tenure; @@ -677,7 +660,43 @@ export class CurrentLoanComponent implements OnInit { } } - + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } titleCaseWord(word:string) { const unicodeWordMatch = diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html index 5f3579ee9..9a2e68abe 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.html @@ -2,7 +2,7 @@ crop_original -

{{this.data.document_title}}

+

{{doc_data.document_title}}

@@ -18,21 +18,31 @@
+
- +
+
- - -
-
-
- Preview - Cropped Image + +
- -
+
+ Preview - Cropped Image +
+ +
+ + +
+
+ +
+ +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts index b19a744cc..03d0ef664 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/image-crop/image-crop.component.ts @@ -8,7 +8,6 @@ import { Observable, Observer } from 'rxjs'; import { DomSanitizer, SafeResourceUrl, SafeUrl } from '@angular/platform-browser'; - declare var $: any; @Component({ @@ -23,65 +22,37 @@ export class ImageCropComponent implements OnInit, OnDestroy { baseImage: any; imagePath:any; cropflag:boolean = false; + isBase64Image:boolean = false; + previewflag = false; constructor( notifier: NotifierService, private dialogRef: MatDialogRef, private sanitizer: DomSanitizer, - private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public data: any) { - this.notifier = notifier; - } - - ngOnInit() { - - // let imageUrl = 'https://www.google.com/photos/about/static/images/google.svg'; - - - // this.imagePath = this.sanitizer.bypassSecurityTrustResourceUrl(this.data.document); - this.imagePath = this.data.document; - - this.getBase64ImageFromURL(this.imagePath).subscribe(base64data => { - - this.base64Image = 'data:image/png;base64,' + base64data; - }); - - this.baseImage = this.base64Image; - // this.baseImage = this.data.document; + private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public doc_data: any) { + console.log(this.doc_data); + this.notifier = notifier; + this._pd.getBase64ImageFromURL(this.doc_data.document).subscribe(base64 => { + if (base64.dataStatus) { + console.log(base64); + console.log('data:image/png;base64,'+base64.records); + this.baseImage = 'data:image/png;base64,'+base64.records; + this.isBase64Image = true; + } + }); } - getBase64ImageFromURL(url: string) { - return Observable.create((observer: Observer) => { - let img = new Image(); - img.crossOrigin = 'Anonymous'; - img.src = url; - if (!img.complete) { - img.onload = () => { - observer.next(this.getBase64Image(img)); - observer.complete(); - }; - img.onerror = (err) => { - observer.error(err); - }; - } else { - observer.next(this.getBase64Image(img)); - observer.complete(); - } - }); + transform(){ + return this.sanitizer.bypassSecurityTrustResourceUrl(this.baseImage); } - getBase64Image(img: HTMLImageElement) { - var canvas = document.createElement("canvas"); - canvas.width = img.width; - canvas.height = img.height; - var ctx = canvas.getContext("2d"); - ctx.drawImage(img, 0, 0); - var dataURL = canvas.toDataURL("image/png"); - console.log(dataURL); - return dataURL.replace(/^data:image\/(png|jpg);base64,/, ""); + ngOnInit() { + // this.baseImage = this.data.document; } - //baseImage - Image = 'data:image/png;base64,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'; + + + cropper: any; cropImage: any; // cropper: Cropper; @@ -91,23 +62,6 @@ export class ImageCropComponent implements OnInit, OnDestroy { ngAfterViewInit() {} ngOnDestroy(): void {} - // imageLoaded() { - // this.cropper = new Cropper(this.input.nativeElement, { - // viewMode: 3, - // aspectRatio: 1 / 1, - // dragMode: 'move', - // modal: true, - // guides: false, - // highlight: true, - // background: true, - // autoCrop: true, - // autoCropArea: 0.9, - // responsive: true, - // crop: (e:any) => { - // console.log(e); - // } - // }); - // } clickToCrop() { @@ -121,8 +75,7 @@ export class ImageCropComponent implements OnInit, OnDestroy { crop:function(data) { // data.move(1, -1).rotate(45).scale(1, -1); - that.cropper = data; - + that.cropper = data; }, getCroppedCanvas(datas) { @@ -136,10 +89,40 @@ export class ImageCropComponent implements OnInit, OnDestroy { { var cropcanvas = $('.container > img').cropper('getCroppedCanvas'); var croppng = cropcanvas.toDataURL("image/png") ; + console.log('croppedpng',croppng); + this.previewflag = true; this.cropImage = croppng; - } + + onSubmit(){ + // // "fk_updatedby":"25", + let records: any = { + "pd_document_id": this.doc_data.document_id, + "pd_document_title": this.doc_data.document_title, + "pd_document_name": this.doc_data.document_name, + "is_show_report":this.doc_data.is_show_report, + "image": this.cropImage, + "fk_pd_id":this.doc_data.pdid + }; + + this._pd.updatePDPhoto(records).subscribe( + dataresult=>{ + if (dataresult.dataStatus == true){ + this.notifier.notify('success', 'Saved Successfully.'); + this.dialogRef.close('1'); + } + else{ + this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + //alert("SomeThing Wents Wrong Try Again !"); + } + + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!' + '-' + error.error_text + ' occur'); + }); + } + + rotate(flag) { switch(flag){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 9931f393a..747e56b40 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -280,42 +280,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss index 9ce3b1694..ab2076e37 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.scss @@ -26,6 +26,11 @@ color: #fff !important; background-color: #e00201 !important; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .mat-card-content { background-color: white; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 038df3362..b2d9aab11 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -22,6 +22,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from '@angular/router'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-employment-info', @@ -61,6 +62,7 @@ export class EmploymentInfoComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -183,25 +185,7 @@ export class EmploymentInfoComponent implements OnInit { this.company_relationship_list.push({ 'company_relationship_id': 0, 'name': 'Not Applicable' }); } }); - this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } public initemploymentForm(): void { @@ -595,4 +579,42 @@ export class EmploymentInfoComponent implements OnInit { } } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 1221ed375..1b696d025 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -271,42 +271,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss index e18c2c8f9..e71c57db0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.scss @@ -24,7 +24,11 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .paragraph_change { color: #fff !important; background-color: #e00201 !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index b90b6f70b..4b475b7e9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -10,6 +10,7 @@ import { ActivatedRoute, Router } from "@angular/router"; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ @@ -61,6 +62,7 @@ export class FamilyDetailsComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.form_id = 6; @@ -163,25 +165,7 @@ export class FamilyDetailsComponent implements OnInit { } }); - this._pd.retriveFile(this.pdid,'6',null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } pdf(fileURL){ window.open(fileURL); @@ -694,6 +678,44 @@ export class FamilyDetailsComponent implements OnInit { }); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,'6',null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } + // validateAllFormFields(formGroup: FormGroup) { // Object.keys(formGroup.controls).forEach(field => { // const control = formGroup.get(field); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index e17876ac0..cccef65e0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -221,44 +221,57 @@ - - -
-
-
-
-
-
-
{{doc.document_name}} -
+ + +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
+
-
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
-
-
-
-
-
-
- - -

No Files

-
-
- - + + +

No Files

+
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.scss index 4a0a50800..57876227a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.scss @@ -11,6 +11,11 @@ ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} // ::ng-deep .cdk-overlay-pane{ // max-width: 100vw !important; // width: 100% !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index 6f0857abb..f3a3dfd85 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -23,6 +23,7 @@ import { import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from '@angular/router'; import { analyzeAndValidateNgModules } from '@angular/compiler'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-final-remarks', @@ -57,6 +58,7 @@ export class FinalRemarksComponent implements OnInit { private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -254,26 +256,7 @@ export class FinalRemarksComponent implements OnInit { }, err => { }) - - this.pdTrigerService.retriveFile(this.pdid,params.pd_form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } getM_Recommendation() { @@ -659,4 +642,43 @@ export class FinalRemarksComponent implements OnInit { } }); } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid,'20',null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 8d9cbc3b7..b559b7fd6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -587,42 +587,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss index e1a42d584..07fd5b7ba 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.scss @@ -23,7 +23,11 @@ .toggle{ padding: 1.4rem; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .underline input { border: none; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 5acadd20b..fc4560a46 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -22,6 +22,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import {ActivatedRoute, Router} from '@angular/router'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; //import { Alert } from 'selenium-webdriver'; @Component({ @@ -87,6 +88,7 @@ export class FinancialInfoComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -309,25 +311,7 @@ export class FinancialInfoComponent implements OnInit { } }) - this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } @@ -1982,4 +1966,42 @@ export class FinancialInfoComponent implements OnInit { } }); } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html index 7e2d5efc4..46b821bb8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.html @@ -64,45 +64,55 @@ - -
-
-
-
-
-
-
{{doc.document_name}} -
-
-
-
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - + +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
+
+
+
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
+
+
-
-
-
-
- - -

No Files

-
+ + +

No Files

+
+
- diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss index b60245ae3..c80a4d765 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.scss @@ -10,7 +10,11 @@ .mat-card-actions { background-color: white; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; + } mat-form-field { margin: 0 2%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts index 55f0aaf25..3a747e542 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/future-plans-and-business-environment/future-plans-and-business-environment.component.ts @@ -23,6 +23,7 @@ import { import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from '@angular/router'; import { analyzeAndValidateNgModules } from '@angular/compiler'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ @@ -58,6 +59,7 @@ export class FuturePlansAndBusinessEnvironmentComponent implements OnInit { private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; @@ -139,25 +141,7 @@ export class FuturePlansAndBusinessEnvironmentComponent implements OnInit { }) - this.pdTrigerService.retriveFile(this.pdid,params.pd_form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } /** To Save/Edited Popup Data */ @@ -211,5 +195,42 @@ export class FuturePlansAndBusinessEnvironmentComponent implements OnInit { } }); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index db47f7897..a9c12196b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -13,325 +13,377 @@
+ - - - - - - - Name of Person(s) Met and Individual Loan Applicant(s) - - - - - Name - - - - - - - Is Person Met - - - - - - Is Applicant - - - + + + Name of Person(s) Met and Individual Loan Applicant(s) + + + + + Name + + + + + + + Is Person Met + + + + + + Is Applicant + + + - - - - Age - -
- - Age Required - - -
-
-
- - Qualification - - - {{qual.qualification_name}} - - Qualification Required - - - - - - - - Qualification Details Required - - - - - - - + +
+ + + + Qualification + + + {{qual.qualification_name}} + + Qualification Required + + + + + + + + + Qualification Details + Required + + + + + + + - +
- +
- +
-
-
- - - - + + + + + + - - - - - - + + + + + + - - - Number of Years for which rental income is being received - - Year - - Please Enter Correct Year - - - - Month - - - - + + + Number of Years for which rental income is being received + + Year + + Please Enter + Correct Year + + + + Month + + + + - - - - Company/Firm - - -
- - - - - - - Is Applicant + + + + Company/Firm + + +
+ + + + + + + Is Applicant - - - Select - {{entity.business_entity_type_name}} - - Business Entity Type Required - - - - Please Specify Others Required - + + + Select + + {{entity.business_entity_type_name}} + + Business + Entity Type Required + + + + Please + Specify Others Required + -

Number of Years For Which The Business Has Been Running

- Year - - Please Enter Correct Year - - - Month - - - - - - - +

Number of Years For Which The Business Has Been Running

+ + Year + + Please Enter + Correct Year + + + Month + + + + + + + -
-
- -
+
+
+ +
+
+ +
+ + + +
-
-
- - - -
+ - - - - - - Relationship Between Individuals - - - - - Name - - - - {{details.value.applicant_name | titlecase}} - - - - Relation - - - Select - {{member.name + + + + Relationship Between Individuals + + + + + Name + + + + {{details.value.applicant_name | titlecase}} + + + + Relation + + + Select + {{member.name + ' of' | titlecase}} - Not Applicable - + Not Applicable + - - - - Relationship To - - - Select - - {{appc.applicant_name | titlecase}} - Not Applicable - + + + + Relationship To + + + Select + + {{appc.applicant_name | titlecase}} + + Not Applicable + - - + + - - + + - - - - + +
+
+ - - - + + + - Relationship of Individuals to Company / Firm + Relationship of Individuals to Company / Firm - - + + - + - - Applicant - + + Applicant + - - {{bothC.applicant_name + + {{bothC.applicant_name | titlecase}} - + - - - - Relation - - - Select - - {{comrelShip.name | titlecase}} - - Not Applicable - - - + + + + Relation + + + Select + + {{comrelShip.name | titlecase}} + + Not Applicable + + + - - Company - + + Company + - - Select - - {{comp.company_name}} - - Not Applicable - + + Select + + {{comp.company_name}} + + Not Applicable + - + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
{{doc.document_name}} -
+ + + +
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+
-
-
-
-
-
+
+
+
+
+
+
- picture_as_pdf - {{doc.document_title}} + picture_as_pdf + {{doc.document_title}}
-
-
- - -

No Files

-
-
- - - +
+
+ + +

No Files

+
+
+ + +
@@ -455,7 +523,8 @@
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss index e018e750d..1ebaa5c54 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.scss @@ -12,7 +12,11 @@ mat-form-field { margin: 0 2%; } - + .top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .example-container { // display: flex; flex-direction: column; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 11e29a363..3e956a938 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -6,7 +6,7 @@ import { PdTrigerService } from './../../../../../pd-service/pd-triger.service'; import { OtherApplicantDetailsComponent } from './../dialogue/other-applicant-details/other-applicant-details.component'; import { element } from '@angular/core/src/render3/instructions'; import { ELEMENT_PROBE_PROVIDERS } from '@angular/platform-browser/src/dom/debug/ng_probe'; -import { DatePipe,TitleCasePipe } from '@angular/common'; +import { DatePipe, TitleCasePipe } from '@angular/common'; import { SearchRelationPipe } from './../../../../../pd-pipes/search-relation.pipe'; import { Options } from 'selenium-webdriver/edge'; import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @@ -16,10 +16,31 @@ import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component' selector: 'app-general-info', templateUrl: './general-info.component.html', styleUrls: ['./general-info.component.scss'], - providers: [SearchRelationPipe,TitleCasePipe], + providers: [SearchRelationPipe, TitleCasePipe], }) + export class GeneralInfoComponent implements OnInit { + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } + }; + /* Declaration for Header Variables */ pageTitle: string = "General Information"; @@ -30,7 +51,7 @@ export class GeneralInfoComponent implements OnInit { /* Declaration for Common Variables */ pipe = new DatePipe('en-US'); - + parent_pdid: string; pdid: string; form_id: number; @@ -65,7 +86,7 @@ export class GeneralInfoComponent implements OnInit { /********************** Declaration Section Ends Here *****************/ /** Constructor Section */ - constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef,private titleCase:TitleCasePipe,private imageRef: MatDialogRef) { + constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef, private titleCase: TitleCasePipe, private imageRef: MatDialogRef) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.notifier = notifier; @@ -82,7 +103,7 @@ export class GeneralInfoComponent implements OnInit { /** ng Oninit Section */ ngOnInit() { let get_max_date = this.pd_all_details.pdmaster_details.pd_date_of_initiation ? this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/") : ''; - this.maxDate = get_max_date ? new Date(get_max_date) : new Date(); + this.maxDate = get_max_date ? new Date(get_max_date) : new Date(); this.initFormDetails(); this.getMasterDetails('RELATIONSHIPS', 1); this.getMasterDetails('COMPANYRELATIONSHIPS', 2); @@ -115,27 +136,8 @@ export class GeneralInfoComponent implements OnInit { this.CompanySource.data = ComapnyControl.controls; }); - this._pd.retriveFile(this.pdid,'18',null).subscribe(data => { - - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); -} + this.retriveFile(); + } /***************************** ng Oninit Section Ends Here **********************************/ /** init form */ @@ -231,7 +233,7 @@ export class GeneralInfoComponent implements OnInit { if (exist_personsWithRelationships.length > 0) { exist_personsWithRelationships.forEach((element, index) => { //individualsControl.push(this.createIndividulas(element)) - personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element,index)); + personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element, index)); }); } if (this.customer_segment_abbr != 'SE-RI') { @@ -241,7 +243,7 @@ export class GeneralInfoComponent implements OnInit { if (exist_companyWithRelationships.length > 0) { exist_companyWithRelationships.forEach(element => { //individualsControl.push(this.createIndividulas(element)) - console.log('elementValue.applicant_name',element); + console.log('elementValue.applicant_name', element); companyWithRelationshipsControl.push(this.createCompaniesRelationshipWithData(element)); }); } @@ -317,7 +319,7 @@ export class GeneralInfoComponent implements OnInit { element.qualification = '', element.course_name = '', individualsControl.push(this.createIndividulas(element)); - personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element,key)); + personsWithRelationshipsControl.push(this.createPersonsWithRelationships(element, key)); //let relationControl = this._generalForm.controls['applicant_relation']; // let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name, 'individula_order_id':relationControl.controls.length+1}; @@ -329,14 +331,14 @@ export class GeneralInfoComponent implements OnInit { // create companies if (element.company_name != '' && element.company_name != null) { - let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: element.company_name, is_company_applicant: element.is_company_applicant, business_entity_type: element.business_entity_type, business_entity_type_other: element.business_entity_type_other, business_years: element.business_years, business_month: element.business_month, business_date_object: element.business_date_object, is_new: element.is_new, is_active: true, associate_pd_id:this.pdid } + let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: element.company_name, is_company_applicant: element.is_company_applicant, business_entity_type: element.business_entity_type, business_entity_type_other: element.business_entity_type_other, business_years: element.business_years, business_month: element.business_month, business_date_object: element.business_date_object, is_new: element.is_new, is_active: true, associate_pd_id: this.pdid } companyControl.push(this.createCompanies(setCompanyValues)) } }); companyWithRelationshipsControl.push(this.createCompaniesRelationship()); // check company if null update one row if (companyControl.controls.length == 0) { - let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false, associate_pd_id:this.pdid} + let setCompanyValues: any = { company_order_id: companyControl.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: false, associate_pd_id: this.pdid } companyControl.push(this.createCompanies(setCompanyValues)) } @@ -355,8 +357,8 @@ export class GeneralInfoComponent implements OnInit { applicant_name: [this.titleCase.transform(elementValue.applicant_name)], is_applicant: [elementValue.is_applicant], is_person_met: [elementValue.is_person_met], - is_person_met_pic :[elementValue.is_person_met_pic], - is_person_met_id_proof : [elementValue.is_person_met_id_proof], + is_person_met_pic: [elementValue.is_person_met_pic], + is_person_met_id_proof: [elementValue.is_person_met_id_proof], is_new: [elementValue.is_new], is_main_applicant: [elementValue.is_main_applicant], is_active: [elementValue.is_active], @@ -367,8 +369,8 @@ export class GeneralInfoComponent implements OnInit { }); } - createPersonsWithRelationships(elementValue: any,indexVal:number) { - console.log('elementValue.applicant_name',elementValue.applicant_name); + createPersonsWithRelationships(elementValue: any, indexVal: number) { + console.log('elementValue.applicant_name', elementValue.applicant_name); return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_name: [this.titleCase.transform(elementValue.applicant_name)], @@ -392,7 +394,7 @@ export class GeneralInfoComponent implements OnInit { business_date_object: [elementValue.business_date_object], is_active: [elementValue.is_active], is_new: [elementValue.is_new], - associate_pd_id:[elementValue.associate_pd_id] + associate_pd_id: [elementValue.associate_pd_id] }); } @@ -439,7 +441,7 @@ export class GeneralInfoComponent implements OnInit { // add more companies addMoreCompanies() { let control: any = this._generalForm.get('companies') as FormArray; - let setValues: any = { company_order_id: control.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '',business_date_object: '', is_active: true, is_new: true, associate_pd_id:this.pdid} + let setValues: any = { company_order_id: control.controls.length + 1, company_name: '', is_company_applicant: false, business_entity_type: '', business_entity_type_other: '', business_years: '', business_month: '', business_date_object: '', is_active: true, is_new: true, associate_pd_id: this.pdid } control.push(this.createCompanies(setValues)) } @@ -524,18 +526,6 @@ export class GeneralInfoComponent implements OnInit { control.removeAt(cindex); } - // add more individuals details - imageCrop(pic,pic_name){ - let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} - const imageRef = this.dialog.open(ImageCropComponent, { - data: arr, - }); - imageRef.afterClosed() - .subscribe(dataresult => { - console.log(dataresult); - }); - } - addMoreIndividuals() { const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, { data: '', @@ -557,7 +547,7 @@ export class GeneralInfoComponent implements OnInit { individualsControl.push(this.createIndividulas(element)); let relationControl = this._generalForm.controls['persons_with_relationships']; let applicant_details: any = { 'pd_co_applicant_id': element.pd_co_applicant_id, 'applicant_name': this.titleCase.transform(element.applicant_name), 'relationship': '', 'relation_to': '', 'individuals_order_id': element.individuals_order_id, 'is_active': element.is_active }; - relationControl.push(this.createPersonsWithRelationships(applicant_details,individualsControl.controls.length-1)); + relationControl.push(this.createPersonsWithRelationships(applicant_details, individualsControl.controls.length - 1)); }); } @@ -637,7 +627,7 @@ export class GeneralInfoComponent implements OnInit { // submit form details temp: number = 0; submitGeneralForm(formData: any) { - + // console.log('formData',formData); if (formData.individuals.length > 0) { formData.individuals.forEach((val, index) => { @@ -653,20 +643,20 @@ export class GeneralInfoComponent implements OnInit { this.temp = 0; return; } - else if(this.temp <= formData.individuals.length){ + else if (this.temp <= formData.individuals.length) { this.temp = 0; } let individualCtrl: any = this._generalForm.get('individuals') as FormArray; let individualCtrlLength: any = individualCtrl.controls.length; - + if (individualCtrlLength > 0) { let icnt = 0; while (icnt < individualCtrlLength) { let individualChildCtrl: any = individualCtrl.controls[icnt]; - + individualChildCtrl.controls.age.clearValidators(); individualChildCtrl.controls.qualification.clearValidators(); @@ -684,13 +674,12 @@ export class GeneralInfoComponent implements OnInit { individualChildCtrl.controls.qualification.setValidators(Validators.compose([Validators.required])); } - if(individualChildCtrl.controls.qualification.value == '' || individualChildCtrl.controls.qualification.value == '4' || individualChildCtrl.controls.qualification.value == '6') - {individualChildCtrl.controls.course_name.setValue(''); individualChildCtrl.controls.course_name.clearValidators();}else{ individualChildCtrl.controls.course_name.setValidators(Validators.compose([Validators.required]));} + if (individualChildCtrl.controls.qualification.value == '' || individualChildCtrl.controls.qualification.value == '4' || individualChildCtrl.controls.qualification.value == '6') { individualChildCtrl.controls.course_name.setValue(''); individualChildCtrl.controls.course_name.clearValidators(); } else { individualChildCtrl.controls.course_name.setValidators(Validators.compose([Validators.required])); } individualChildCtrl.controls.age.updateValueAndValidity(); individualChildCtrl.controls.qualification.updateValueAndValidity(); individualChildCtrl.controls.course_name.updateValueAndValidity(); - + icnt++; } } @@ -846,10 +835,10 @@ export class GeneralInfoComponent implements OnInit { }); } /******************* validate all form group and form array fields ENd Here ********/ - pdf(fileURL){ + pdf(fileURL) { window.open(fileURL); } - + // imageCrop(pic,pic_name){ // console.log(pic,pic_name); // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} @@ -861,25 +850,43 @@ export class GeneralInfoComponent implements OnInit { // console.log(dataresult); // }); // } - -/** For DOCS Tab */ -public viewerOptions: any = { - navbar: false, - toolbar: { - zoomIn: 4, - zoomOut: 4, - oneToOne: 4, - reset: 4, - prev: 4, - play: { - show: 4, - size: 'large', - }, - next: 4, - rotateLeft: 4, - rotateRight: 4, - flipHorizontal: 4, - flipVertical: 4, + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if (dataresult == 1) { + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); } -}; + retriveFile() { + this._pd.retriveFile(this.pdid, '18', null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id': val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report': val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index fe8f0d973..388754e33 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -64,42 +64,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss index cc247bddb..ae9dc3e94 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.scss @@ -12,6 +12,11 @@ padding: 0px; color: #e00201; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} // .notificard{ // width: 25%; // margin-top: -66px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 4309bd085..2d023f6b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -11,6 +11,7 @@ import { /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-lender-representative', @@ -41,6 +42,7 @@ export class LenderRepresentativeComponent implements OnInit { private router: Router, // private snackBar: MatSnackBar, private _pd: PdTrigerService, + private dialog: MatDialog, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; @@ -120,25 +122,7 @@ export class LenderRepresentativeComponent implements OnInit { // control.push(this.createLRDetail()); // } }) - this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } public initRepresentative(): void { this.representativeForm = this.fb.group({ @@ -211,5 +195,42 @@ export class LenderRepresentativeComponent implements OnInit { } }); } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index d33677e2a..f03c3a9ed 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -252,42 +252,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss index 3bb315cf9..3d14ee8da 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.scss @@ -13,7 +13,11 @@ .mat-form-field-appearance-legacy .mat-hint{ color:rgba(0, 0, 0, 0.8) !important; } - +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .matcard mat-form-field { margin: 0 2%; width:26%; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index b623d86ad..0016ccb30 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -15,6 +15,7 @@ import { ActivatedRoute, Router } from '@angular/router'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ @@ -85,6 +86,7 @@ export class LoanDetailsComponent implements OnInit { private router: Router, private _pd: PdTrigerService, private dialogRef: MatDialogRef, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.applicants = this.pd_all_details.pdapplicants_detials; @@ -317,25 +319,7 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['owner_name'].updateValueAndValidity(); } - this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } getM_EndUseofLoad() { @@ -918,4 +902,42 @@ export class LoanDetailsComponent implements OnInit { flipVertical: 4, } }; + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 2d08f685b..cc6ef4316 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -227,42 +227,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss index 5e2912012..3449777f2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.scss @@ -16,6 +16,11 @@ // background: #62B013; // color: white; // } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} ::ng-deep .cdk-global-overlay-wrapper{ justify-content: center !important; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 2404c6f6e..57a9e182d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -28,6 +28,7 @@ import { RentalVerificationComponent } from './../rental-verification/rental-ver /**sweet alert */ import Swal from 'sweetalert2'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-other-income', @@ -173,25 +174,7 @@ export class OtherIncomeComponent implements OnInit { //control.push(this.createDetail()); } }) - this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } public initOtherincomeForm(): void { this.otherIncomeForm = this.fb.group({ @@ -463,4 +446,43 @@ export class OtherIncomeComponent implements OnInit { } ChdCtrls.controls.others_income_earned_by.updateValueAndValidity(); } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); + } + retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); + } + } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html index 5bb3cfa30..03c6fc08f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html @@ -698,40 +698,53 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.scss index 13b8a16c4..b4d3fd5f3 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.scss @@ -16,6 +16,11 @@ margin-left: 2%; margin-top: 1%; } +.top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; +} .total-rent-amt{ margin-left: 1%; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts index f305e7e04..21f228a8b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts @@ -7,6 +7,7 @@ import { NotifierService } from 'angular-notifier'; import { PdTrigerService } from './../../../../../../pd-service/pd-triger.service'; /**sweet alert */ import Swal from 'sweetalert2'; +import { ImageCropComponent } from '../../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-manage-rental-verification', @@ -68,7 +69,7 @@ export class ManageRentalVerificationComponent implements OnInit { SwalButtonText: string; SwalMessage: string; - constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef) { + constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef,private dialog: MatDialog) { this.pageTitle = this.data.manage_status==1 ? 'Add RI Details' : 'Update RI Details'; this.parent_pdid = this.data.parentData.pdmaster_details.parent_pd_id; @@ -183,25 +184,7 @@ export class ManageRentalVerificationComponent implements OnInit { }); this.loadFormData(this.data.editData); - this._pd.retriveFile(this.pdid,'17',null).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } @@ -1053,6 +1036,44 @@ export class ManageRentalVerificationComponent implements OnInit { } } + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this._pd.retriveFile(this.pdid,'17',null).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} + // validate all form group and form array fields validateAllFormFields(formGroup: any) { Object.keys(formGroup.controls).forEach(field => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 8d3026592..124f7de79 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -389,42 +389,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss index f7e0b7e79..ec7c21807 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.scss @@ -104,6 +104,10 @@ $product-bg-color-hover: rgba(103, 58, 183, 0.7); } } } - + .top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 698661228..23ddc5058 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -10,6 +10,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from '@angular/router'; import { analyzeAndValidateNgModules } from '@angular/compiler'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-stock', @@ -60,6 +61,7 @@ export class StockComponent implements OnInit { private route: ActivatedRoute, private router: Router, private dialogRef: MatDialogRef, + private dialog: MatDialog, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id @@ -124,25 +126,7 @@ export class StockComponent implements OnInit { this.getUOM(); - this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } public initstockForms(record) { @@ -899,4 +883,43 @@ export class StockComponent implements OnInit { // this.wtrdCommentFlag[index] = false; // } // } + + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this._pd.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} + } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 5edc21461..e3553efcb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -296,42 +296,55 @@ -
-
-
-
-
-
-
{{doc.document_name}} -
+
+
+
+
+
+
+
+ +
+ + {{doc.document_name}} +
+
+ +
-
-
-
-
-
-
- - picture_as_pdf - {{doc.document_title}} - -
+
+
+
+
+
+ + picture_as_pdf + {{doc.document_title}} + +
+
-
- -

No Files

-
-
+ +

No Files

+
+ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss index 411bc5979..cb75a2354 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.scss @@ -92,5 +92,9 @@ } } } - + .top .thumbnail .date { + position: absolute; + top: 4px; + right: -10px; + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index bd8878a13..8772a7163 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -9,6 +9,7 @@ import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; @Component({ selector: 'app-supplier-info', @@ -45,6 +46,7 @@ export class SupplierInfoComponent implements OnInit { notifier: NotifierService, private _formBuilder: FormBuilder, private pdTrigerService: PdTrigerService, + private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -146,25 +148,7 @@ export class SupplierInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); this.getMasterDetails('COMPANYRELATIONSHIPS', 1); this.getMasterDetails('TITLES', 2); - this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { - if (data.status == 200) { - if(data.records.length>0){ - data.records.forEach((val, index) => { - let splitted = val.pd_document_name.split("."); - let DocumentsAndFiles = { - 'document_name': val.pd_document_name, - 'document_title': val.pd_document_title, - 'document': val.doc_url, - 'document_type' : splitted[1] == 'pdf'?'pdf':'image' - } - this.documentsAndFilesList.push(DocumentsAndFiles); - }); - } - } - else{ - this.documentsAndFilesList = []; - } - }); + this.retriveFile(); } @@ -611,5 +595,41 @@ export class SupplierInfoComponent implements OnInit { // } // ] // } - + imageCrop(pic) { + // let arr = { 'pic_name':pic_name,'pic':pic,'from_id':this.form_id} + pic.pdid = this.pdid; + const imageRef = this.dialog.open(ImageCropComponent, { + data: pic, + }); + imageRef.afterClosed() + .subscribe(dataresult => { + if(dataresult == 1){ + this.documentsAndFilesList = []; + this.retriveFile(); + } + }); +} +retriveFile(){ + this.pdTrigerService.retriveFile(this.pdid,this.form_id,this.company_id).subscribe(data => { + if (data.status == 200) { + if (data.records.length > 0) { + data.records.forEach((val, index) => { + let splitted = val.pd_document_name.split("."); + let DocumentsAndFiles = { + 'document_id':val.pd_document_id, + 'document_name': val.pd_document_name, + 'document_title': val.pd_document_title, + 'document': val.doc_url, + 'document_type': splitted[1] == 'pdf' ? 'pdf' : 'image', + 'is_show_report':val.is_show_report + } + this.documentsAndFilesList.push(DocumentsAndFiles); + }); + } + } + else { + this.documentsAndFilesList = []; + } + }); +} } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 4c26b2495..7a3840ae4 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -725,5 +725,15 @@ export class PdTrigerService { ) } + getBase64ImageFromURL(url): Observable { + return this._http.post(this.apiUrl + 'convertBase64', { "img_url":url }) + .pipe(catchError(this.handleError('role', []))) + } + + updatePDPhoto(values): Observable { + values.fk_updatedby = this._aws.getlocale(); + return this._http.post(this.apiUrl + 'updatePDPhoto', { "records":values }) + .pipe(catchError(this.handleError('role', []))) + } } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html index bbe37f0d7..166772fde 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-list.component.html @@ -12,15 +12,12 @@ done Completed - + done_all QC Completed - - - diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 41ee7e92e..291756fcc 100755 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -2,7 +2,8 @@
-

SINEEDGE + +

PD Genie

diff --git a/ng6-seed/src/assets/images/PD.jpeg b/ng6-seed/src/assets/images/PD.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a5ba3e49c5453815ed584ac584a63317129f2841 GIT binary patch literal 40636 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 XnQ09+ok(pVAa)PEAOHRU0|5Wo;Vz8{ literal 0 HcmV?d00001