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 1ea0be4fa..f769ea80e 100755 --- 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 @@ -17,8 +17,15 @@ +
+ + Remarks + + Remarks required + +
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts index 6648bce87..d54197baa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild , Input, Inject} from '@angular/core'; import { NotifierService } from "angular-notifier"; import {MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material'; import { PdTrigerService } from '../../../pd-service/pd-triger.service'; +import { FormControl, Validators } from '@angular/forms'; @Component({ selector: 'app-pd-status-change-dialogue', @@ -23,7 +24,8 @@ export class PdStatusChangeDialogueComponent implements OnInit { public masterRandomString : string; fk_pd_type: any; pd_completeness_override: String = '0'; - + is_remarks_enabled:boolean = false + remarks:FormControl = new FormControl('',Validators.compose([Validators.required])) constructor(notifier: NotifierService , private pd: PdTrigerService,private dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; @@ -35,6 +37,7 @@ export class PdStatusChangeDialogueComponent implements OnInit { this.masterRandomString = this.data.random_string; this.fk_pd_type = this.data.pd_type console.log("sdf@@@@@@@@@@2",this.fk_pd_type) + this.is_remarks_enabled = this.data.pd_status == 'CANCELLED' } ngOnInit() { @@ -71,6 +74,14 @@ export class PdStatusChangeDialogueComponent implements OnInit { if(this.pd_completeness_override == '1') { update_status.complete_override_data = this.dialoge_subcontent } + if(this.is_remarks_enabled) { + console.log(this.remarks); + if(this.remarks.invalid) { + this.notifier.notify("warning","Remarks is Required"); + return; + } + update_status.remark = this.remarks.value + } this.pd.editPdMasterDetails(update_status, status,this.masterRandomString).subscribe(result => { if (result.status == 200) { this.dialogRef.close({update_status:true}); 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 7bf1792c3..abebff2fe 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 @@ -20,7 +20,7 @@ - + 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 29113a2f3..4e194b85c 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 @@ -84,7 +84,7 @@ - + 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 ffc423b93..82f378bbb 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 @@ -14,7 +14,7 @@ - + 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 837d09678..d28d66c4b 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 @@ -19,7 +19,7 @@ - +
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 899605dfd..249039c73 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 @@ -14,7 +14,7 @@
- + 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 fdeb8368f..5c1ce9a1f 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 @@ -18,7 +18,7 @@ - +
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 949520cb4..90ca5ebcc 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 @@ -14,7 +14,7 @@ - +
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 65394f2ec..2cf26f0c4 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 @@ -13,7 +13,7 @@ - +
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 ec5f257ef..a1eaa48d2 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 @@ -13,7 +13,7 @@ - + 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 42274b528..3f5b96b0d 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 @@ -27,6 +27,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { analyzeAndValidateNgModules } from '@angular/compiler'; import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component'; import { CdkTextareaAutosize } from '@angular/cdk/text-field'; +import { distinctUntilChanged, pairwise } from 'rxjs/operators'; @Component({ selector: 'app-final-remarks', @@ -145,6 +146,7 @@ export class FinalRemarksComponent implements OnInit { this.getM_Type(); this.getM_Recommendation(); this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''} + this.listenRecommendationChange() } @ViewChild('autosize') autosize: CdkTextareaAutosize; @@ -154,9 +156,9 @@ export class FinalRemarksComponent implements OnInit { }); } - addRecommendationPositive() { + addRecommendationPositive(data=null) { const control = this._finalRemarkForm.controls['recommendation_positive']; - control.push(this.CreateRecommendationPositive(null)); + control.push(this.CreateRecommendationPositive(data)); } deleteRecommendationPositive(index) { const control = this._finalRemarkForm.controls['recommendation_positive']; @@ -168,9 +170,9 @@ export class FinalRemarksComponent implements OnInit { reason_for_negative: data == null ? [''] : [data.reason_for_negative], }); } - addRecommendationNegative() { + addRecommendationNegative(data=null) { const control = this._finalRemarkForm.controls['recommendation_negative']; - control.push(this.CreateRecommendationNegative(null)); + control.push(this.CreateRecommendationNegative(data)); } deleteRecommendationNegative(index) { const control = this._finalRemarkForm.controls['recommendation_negative']; @@ -181,9 +183,9 @@ export class FinalRemarksComponent implements OnInit { reason_for_refer_to_credit: data == null ? [''] : [data.reason_for_refer_to_credit], }); } - addRecommendationReferToCredit() { + addRecommendationReferToCredit(data=null) { const control = this._finalRemarkForm.controls['recommendation_refer_to_credit']; - control.push(this.CreateRecommendationReferToCredit(null)); + control.push(this.CreateRecommendationReferToCredit(data)); } deleteRecommendationReferToCredit(index) { const control = this._finalRemarkForm.controls['recommendation_refer_to_credit']; @@ -540,7 +542,7 @@ export class FinalRemarksComponent implements OnInit { if (recommendationNegativeCtrl.controls.length > 0) { let i: number = 0; for (i; i < recommendationNegativeCtrl.controls.length; i++) { - + recommendationNegativeCtrl.removeAt(i + 1); recommendationNegativeCtrl = recommendationNegativeCtrl.controls[0]; @@ -641,6 +643,63 @@ export class FinalRemarksComponent implements OnInit { } } } + + // addRecommendationData(e,value,index,old_key) { + + // console.log(value[index],old_key) + // if(!value[index][old_key]) { + // return + // } + // if(e == 2) { + // value[index].reason_for_positive = value[index][old_key] + // if(index == 0) { + // this.deleteRecommendationPositive(0) + // } + // this.addRecommendationPositive(value[index]) + // if(index+1 == value.length-1) { + // if(value[index+1]){ + // value[index+1].reason_for_positive = value[index+1][old_key] + // this.addRecommendationPositive(value[index+1]) + // } + // } + // } + // if(e == 3) { + // value[index].reason_for_negative = value[index][old_key] + // if(index == 0) { + // this.deleteRecommendationNegative(0) + // } + // this.addRecommendationNegative(value[index]) + // if(index+1 == value.length-1) { + // if(value[index+1]){ + // value[index+1].reason_for_negative = value[index+1][old_key] + // this.addRecommendationNegative(value[index+1]) + // } + // } + + + // // value.reason_for_negative = value[old_key] + // // this.deleteRecommendationNegative(0) + // // this.addRecommendationNegative(value) + // } + // if(e == 4) { + // value[index].reason_for_refer_to_credit = value[index][old_key] + // if(index == 0) { + // this.deleteRecommendationReferToCredit(0) + // } + // this.addRecommendationReferToCredit(value[index]) + // if(index+1 == value.length-1) { + // if(value[index+1]){ + // value[index+1].reason_for_refer_to_credit = value[index+1][old_key] + // this.addRecommendationReferToCredit(value[index+1]) + // } + // } + + + // // value.reason_for_refer_to_credit = value[old_key] + // // this.deleteRecommendationReferToCredit(0) + // // this.addRecommendationReferToCredit(value) + // } + // } RecommendationChange2(e) { // if(this._finalRemarkForm.controls.pd_officers_recommendation.value == 1){ @@ -729,6 +788,43 @@ export class FinalRemarksComponent implements OnInit { e== 'yes' ? this._finalRemarkForm.addControl('sealing_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('sealing_activity_pic'); } } + listenRecommendationChange() { + this._finalRemarkForm.get('pd_officers_recommendation').valueChanges.pipe(distinctUntilChanged(), pairwise() // gets a pair of old and new value + ).subscribe(([old_value,new_value])=>{ + if((old_value != '2' && old_value != '3' && old_value != '4') || (new_value != '2' && new_value != '3' && new_value != '4')) { + return; + } + console.log(old_value, new_value) + let control2: any = this._finalRemarkForm.get('recommendation_positive') as FormArray; + let control3: any = this._finalRemarkForm.get('recommendation_negative') as FormArray; + let control4: any = this._finalRemarkForm.get('recommendation_refer_to_credit') as FormArray; + let key2 = 'reason_for_positive' + let key3 = 'reason_for_negative' + let key4 = 'reason_for_refer_to_credit' + let temp_data = eval('control'+old_value) + if(temp_data) { + temp_data = JSON.parse(JSON.stringify(temp_data.value)) + console.log(temp_data) + if(eval('control'+new_value)) { + if(temp_data.length > 1) { + for (let i=1;i - +
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 b486ecb0b..7afcb34cd 100755 --- 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 @@ -13,7 +13,7 @@ - + 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 002a6dedb..553b18486 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 @@ -16,7 +16,7 @@ - + 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 62cfa175a..d0a8128f7 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 @@ -18,7 +18,7 @@ - +
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 a52763cdb..92c53dc8c 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 @@ -15,7 +15,7 @@ - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 7e282bc12..2df0b5fe1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -17,7 +17,7 @@ - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 9e064c601..e7814c021 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -15,7 +15,7 @@ - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html index 2364668d2..2122fc0c1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html @@ -13,7 +13,7 @@ - +
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 0ea3951a7..db9608ef5 100755 --- 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 @@ -19,7 +19,7 @@ - + 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 7a034828b..b8424f875 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 @@ -15,7 +15,7 @@ - +
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 5a80b4eae..29da1073e 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 @@ -14,7 +14,7 @@ - + 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 57370c363..79bde6973 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 @@ -187,10 +187,16 @@
+
-
+
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 3be315474..64918270c 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 @@ -186,6 +186,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1); + // this.pdMasterData[0].cancel_remark = "Applicant reject the loan in bank. so that he is not available to attend the pd visit" + this.currentPDStatus = data.records.pd_master_details[0].pd_status; this.pdAdditionalReqData = data.records.pd_additional_requirements; this.pdCollectedDocument = data.records.docs_to_be_collected; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts index 59a23f447..0341d3612 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.ts @@ -193,7 +193,9 @@ export class QcPdReportComponent implements OnInit { this.ngOnInit(); // this.getPdReportVersionList(); } else { - this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + let msg = data.hasOwnProperty('msg') && data.msg ? data.msg : 'Something Went Wrong Try Again.!' + this.notifier.notify('warning', msg); + // this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); } }, err => { this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (err.error_type == 2 ? err.error_status + ' ( ' + err.error_text + ' ) ' : ' ( ' + err.error_text + ' ) ') +'\" Error Occur.!'); @@ -233,10 +235,11 @@ export class QcPdReportComponent implements OnInit { window.open(data.records); this.notifier.notify('success', 'Done Successfully..!'); } else { - this.notifier.notify('warning', 'Something Went Wrong Try Again.!'); + let msg = data.hasOwnProperty('msg') && data.msg ? data.msg : 'Something Went Wrong Try Again.!' + this.notifier.notify('warning', msg); } }, err => { - this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (err.error_type == 2 ? err.error_status + ' ( ' + err.error_text + ' ) ' : ' ( ' + err.error_text + ' ) ') +'\" Error Occur.!'); + this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (err.error_type == 2 ? err.error_status + ' ( ' + err.error_text + ' ) ' : ' ( ' + err.error_text + ' ) ') +'\" Error Occur.!'); // alert(err.html_format); }); } diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html index b4348faf5..7a1322573 100755 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html @@ -50,12 +50,12 @@ - + - + diff --git a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html index c4cbab7c8..46dfe32b1 100755 --- a/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html +++ b/ng6-seed/src/app/sales-pd/mis-reports/mis-reports.component.html @@ -51,12 +51,12 @@ - + - + diff --git a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts index 3ac29330f..9bafdf9de 100755 --- a/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd-list/sales-pd.component.ts @@ -13,7 +13,7 @@ export class SalesPdComponent implements OnInit { public dataSourceTab4 = new MatTableDataSource(); filter_input:string=''; - displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Sales PD Type','Officer Name','status','Create On','Action']; + displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Officer Name','status','Create On','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; diff --git a/ng6-seed/src/app/sales-pd/sales-pd.module.ts b/ng6-seed/src/app/sales-pd/sales-pd.module.ts index 44a4a8e6b..28ff27df4 100755 --- a/ng6-seed/src/app/sales-pd/sales-pd.module.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd.module.ts @@ -5,8 +5,9 @@ import { SalesPdRoutingModule } from './sales-pd-routing.module'; import { SalesPdComponent } from './sales-pd-list/sales-pd.component'; import { MaterialModule } from './material_modules/material.module'; import { MisReportsComponent } from './mis-reports/mis-reports.component'; -import { MAT_DATE_LOCALE } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material'; import { AdvanceFilterComponent } from './sales-pd-list/advance-filter/advance-filter.component'; +import { MAT_MOMENT_DATE_FORMATS, MomentDateAdapter } from '@angular/material-moment-adapter'; @NgModule({ imports: [ @@ -15,6 +16,7 @@ import { AdvanceFilterComponent } from './sales-pd-list/advance-filter/advance-f MaterialModule ], declarations: [SalesPdComponent, MisReportsComponent, AdvanceFilterComponent], - providers:[{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' }] + providers:[{ provide: MAT_DATE_LOCALE, useValue: 'en-GB' },{provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, + {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}] }) export class SalesPdModule { }