From eca2f5a0798ad37fb4d7185c3d452aec5a22bd85 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 30 Jul 2019 12:21:05 +0530 Subject: [PATCH] Fairoj: Banking information ques added & issues Fixed --- .vscode/settings.json | 3 ++ .../banking-details.component.html | 7 ++++ .../banking-details.component.ts | 22 ++++++++++-- .../business-banking-details.component.html | 7 ++++ .../business-banking-details.component.ts | 22 ++++++++++-- .../client-info/client-info.component.html | 8 ++--- .../final-remarks/final-remarks.component.ts | 14 ++++---- .../loan-details/loan-details.component.ts | 2 +- .../supplier-info.component.html | 4 +-- .../supplier-info/supplier-info.component.ts | 2 +- .../list-pd/view-pd/view-pd.component.html | 34 +++++++++++++++++++ .../list-pd/view-pd/view-pd.component.scss | 14 ++++++++ .../list-pd/view-pd/view-pd.component.ts | 30 ++++++++++++++++ .../pd-service/pd-triger.service.ts | 5 +++ .../qc-pd-report/qc-pd-report.component.html | 3 +- .../qc-review/qc-review.component.html | 20 +++++++++++ .../qc-review/qc-review.component.ts | 15 ++++++++ .../app/session/login/login-component.html | 3 +- 18 files changed, 194 insertions(+), 21 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..5d20645cc --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "javascript.implicitProjectConfig.experimentalDecorators": true +} \ No newline at end of file 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 5ece9b577..aab4d98aa 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 @@ -87,6 +87,13 @@ + + + Select + Yes + No + +
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 08d512c52..0c797091a 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 @@ -145,11 +145,14 @@ export class BankingDetailsComponent implements OnInit { const control = this.bankingForm.controls['itemRows']; if (data.status == 200) { this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark); + let bank_info=data.records.hasOwnProperty('bank_info_available') ? data.records.bank_info_available == true ? 'Yes' : 'No' : 'Yes' + console.log("bank_info",bank_info) + this.bankingForm.controls.bank_info_available.setValue(bank_info); var result = Object.keys(data.records.banking_details).map(function (key) { return data.records.banking_details[key]; }); if (result.length == 0) { - control.push(this.createBankarray()); + // control.push(this.createBankarray()); } else { result.forEach((datas, index) => { // this.selectedBorrower(datas.applicant_name,index); @@ -160,7 +163,7 @@ export class BankingDetailsComponent implements OnInit { this.bankingForm.controls.itemRows.setValue(result); } } else { - control.push(this.createBankarray()); + // control.push(this.createBankarray()); } }); @@ -192,6 +195,7 @@ export class BankingDetailsComponent implements OnInit { public initBankingForm(): void { this.bankingForm = this.fb.group({ banking_form_remark: [''], + bank_info_available:[''], itemRows: this.fb.array([]) }); } @@ -289,6 +293,7 @@ export class BankingDetailsComponent implements OnInit { records.pdid = this.pdid; records.formid = '7'; records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; + records.bank_info_available=this.bankingForm.controls.bank_info_available.value == 'Yes' ? true : this.bankingForm.controls.bank_info_available.value == 'No' ? false : '' // records.fk_createdby = '252'; records.banking_details = this.bankingForm.controls['itemRows'].value; @@ -425,5 +430,18 @@ export class BankingDetailsComponent implements OnInit { } }); } + onChangeAvailable(value){ + console.log(value) + const control = this.bankingForm.controls['itemRows']; + if(value == 'Yes'){ + control.push(this.createBankarray()) + } + else{ + while(control.length!=0){ + control.removeAt(0) + } + } + + } } 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 879f78b64..a94b50109 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 @@ -17,6 +17,13 @@ + + + Select + Yes + No + +
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 e65436b61..abc9232ed 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 @@ -143,11 +143,14 @@ export class BusinessBankingDetailsComponent implements OnInit { const control = this.bankingForm.controls['itemRows']; if (data.status == 200) { this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark); + let bank_info=data.records.hasOwnProperty('bank_info_available') ? data.records.bank_info_available == true ? 'Yes' : 'No' : 'Yes' + // console.log("bank_info",bank_info) + this.bankingForm.controls.bank_info_available.setValue(bank_info); var result = Object.keys(data.records.banking_details).map(function (key) { return data.records.banking_details[key]; }); if (result.length == 0) { - control.push(this.createBankarray()); + // control.push(this.createBankarray()); } else { result.forEach((datas, index) => { @@ -160,7 +163,7 @@ export class BusinessBankingDetailsComponent implements OnInit { this.bankingForm.controls.itemRows.setValue(result); } } else { - control.push(this.createBankarray()); + // control.push(this.createBankarray()); } }); this.retriveFile(); @@ -190,6 +193,7 @@ export class BusinessBankingDetailsComponent implements OnInit { public initBankingForm(): void { this.bankingForm = this.fb.group({ banking_form_remark: [''], + bank_info_available:[''], itemRows: this.fb.array([]) }); } @@ -284,6 +288,7 @@ export class BusinessBankingDetailsComponent implements OnInit { records.pdid = this.pdid; records.formid = '21'; records.company_id = this.company_id; records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; + records.bank_info_available=this.bankingForm.controls.bank_info_available.value == 'Yes' ? true : this.bankingForm.controls.bank_info_available.value == 'No' ? false : '' // records.fk_createdby = '252'; records.banking_details = this.bankingForm.controls['itemRows'].value; @@ -465,4 +470,17 @@ export class BusinessBankingDetailsComponent implements OnInit { } }); } + onChangeAvailable(value){ + console.log(value) + const control = this.bankingForm.controls['itemRows']; + if(value == 'Yes'){ + control.push(this.createBankarray()) + } + else{ + while(control.length!=0){ + control.removeAt(0) + } + } + + } } 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 731a99e94..f333a7f4e 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 @@ -80,7 +80,7 @@ - Person Designatione Required + Person Designatione Required
@@ -94,12 +94,12 @@ + type="text" OnlyNumber > Enter Valid STD Code Number.   -   + formControlName="person_landline" type="text" OnlyNumber maxlength="8"> Enter Valid LandLine Number.
@@ -354,7 +354,7 @@ - Person Designation Required + Person Designation Required
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 a020cb506..f733d55c9 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 @@ -111,13 +111,13 @@ export class FinalRemarksComponent implements OnInit { this._finalRemarkForm.removeControl('sealing_activity'); this._finalRemarkForm.removeControl('demolition_activity'); } - if(this.product_abbr != 'LAEP'){ - this._finalRemarkForm.controls['final_form_remarks'].setValidators(Validators.compose([Validators.required])) - } - else{ - this._finalRemarkForm.controls['final_form_remarks'].clearValidators() - this._finalRemarkForm.controls['final_form_remarks'].updateValueAndValidity(); - } + // if(this.product_abbr != 'LAEP'){ + // this._finalRemarkForm.controls['final_form_remarks'].setValidators(Validators.compose([Validators.required])) + // } + // else{ + // this._finalRemarkForm.controls['final_form_remarks'].clearValidators() + // this._finalRemarkForm.controls['final_form_remarks'].updateValueAndValidity(); + // } this.getM_Type(); 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 459192eff..a1551f248 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 @@ -379,7 +379,7 @@ export class LoanDetailsComponent implements OnInit { return data; } - else if (data.group_name == that.productAbbr && data.sub_group_name == null && data.isactive == 1) { + else if (data.group_name == that.productAbbr && data.sub_group_name == null || data.sub_group_name == '' && data.isactive == 1) { return data; } 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 3e892e04d..4e00ea916 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 @@ -97,13 +97,13 @@ + formControlName="person_stdcode" type="text" OnlyNumber > Enter Valid STD Code Number.   -   + formControlName="person_landline" type="text" OnlyNumber maxlength="8"> Enter Valid LandLine Number.
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 e6f566ff7..2b3ff5f98 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 @@ -603,7 +603,7 @@ export class SupplierInfoComponent implements OnInit { } else { var answerFormValues = this._supplierQuesFrom.value; - this._supplierQuesFrom.value.supplier_info_available == 'Yes' ? answerFormValues.client_info_available = true : answerFormValues.client_info_available = false ; + this._supplierQuesFrom.value.supplier_info_available == 'Yes' ? answerFormValues.supplier_info_available = true : answerFormValues.supplier_info_available = false ; this._supplierQuesFrom.value.bill_info == 'Yes' ? answerFormValues.bill_info = true: answerFormValues.bill_info = false ; //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 39b2a6d2f..6bef042d9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -328,6 +328,40 @@ + + Notes + + Notes + + + +
+
+ + + + {{master.log_time}}  + {{master.createdby}}
{{master.remark | titlecase}} + + + + + + + + +
+
+ + +

No History

+ + + QC Notes
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss index 62f3666a2..fab8a37ac 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss @@ -13,6 +13,20 @@ .metaDataStyle{ height:89px !important; } +.odd{ + padding: 10px; + background-color:rgb(235, 231, 231); + border-radius: 5px; +// // font-size: 34px; +} +.even{ + padding: 10px; + // background-color:rgb(255, 242, 242); + background-color:rgb(243, 240, 240); + + border-radius: 5px; + // font-size: 22px; +} // .headerdesign{ // border-radius: 5px !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index 9b18faf07..965cffa6d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -40,6 +40,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { FilteredFieldNames: any = []; localcount: any; localstring: any; + newNotes:any; + display_new_notes:any=[] localMandatoryFields: any = [{ 'backEnd_FieldName': "fk_lender_id", 'frontEnd_FieldName': "Lender Name" }, { 'backEnd_FieldName': "lender_applicant_id", 'frontEnd_FieldName': "Loan Applicant ID" }, @@ -104,9 +106,13 @@ export class ViewPdComponent implements OnInit, OnDestroy { // this.viewID = this.route.snapshot.params['pdid']; // this.masterRandomString = this.route.snapshot.params['rdmstr']; this.viewPdDetails(this.viewID,this.masterRandomString); + this.getAllNotes(); + } pd_QC_Rating: Number; + + viewPdDetails(editID: string,masterRandomString : string) { // console.log('inside Function',masterRandomString); this.pdMasterData = []; @@ -476,5 +482,29 @@ export class ViewPdComponent implements OnInit, OnDestroy { } } + getAllNotes(){ //for getting the value of Notes Tab + this._pd.getQCReportFinalReviewDetails(this.viewID,'ALL_REMARKS').subscribe(result=>{ + this.display_new_notes=result['records'] + let value=this.display_new_notes; + this.display_new_notes=[] + for(let i=value.length-1;i>=0;i--){ + console.log("value",value[i]); + this.display_new_notes.push(value[i]) + } + console.log("dis",this.display_new_notes) + }) + } + saveNotes(){ + console.log(this.newNotes); + let param={pd_id:this.viewID,remark:this.newNotes} + this._pd.savePDRemark(param).subscribe(res=>{ + if(res['dataStatus']){ + this.notifier.notify("success","Saved Successfully") + this.getAllNotes(); + this.newNotes='' + } + }) + + } } \ 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 246622815..6344f66b9 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 @@ -743,5 +743,10 @@ export class PdTrigerService { return this._http.post(this.apiUrl + 'updatePDPhoto', { "records":values }) .pipe(catchError(this.handleError('role', []))) } + savePDRemark(values){ + values.createdby=this._aws.getlocale(); + return this._http.post(this.apiUrl+'savePDRemark',values) + .pipe(catchError(this.handleError('role',[]))) + } } diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html index 711154a23..a7679b7a2 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html @@ -45,7 +45,8 @@ - + + diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.html index bda833b4f..99ef6ff1d 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.html @@ -46,4 +46,24 @@ +
+ +
+

PD Officer Notes

+ +
+
+
+ + Remarks + + +
+
+
+ + + + +
\ No newline at end of file diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts index cbad935cf..78845f5ba 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts @@ -58,6 +58,21 @@ export class QcReviewComponent implements OnInit { this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); // alert(err.html_format); }); + }else if( this.showStatus === 'pd_officer_notes'){ + type = 'OFFICER_REMARKS'; + this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, type).subscribe(data => { + if(data['dataStatus']){ + this.recordData = data.records[0]; + this.ngForm = this._formBuilder.group({ + pd_qc_note: [this.recordData.pd_qc_note], + pd_status: [this.recordData.pd_status] + }) + this.showForm = true; + } + }, error => { + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!'); + // alert(err.html_format); + }); } else if(this.showStatus === 'COMPLETE') { type = 'QC'; this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, type).subscribe(data => { diff --git a/ng6-seed/src/app/session/login/login-component.html b/ng6-seed/src/app/session/login/login-component.html index 291756fcc..2f2332183 100755 --- a/ng6-seed/src/app/session/login/login-component.html +++ b/ng6-seed/src/app/session/login/login-component.html @@ -34,7 +34,8 @@
- info@sineedge.com | +91 9910112704 / +91 987104039 + info@pdgenie.com +