diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json index 0b81ab213..ed7e8f852 100644 --- a/ng6-seed/package-lock.json +++ b/ng6-seed/package-lock.json @@ -4294,12 +4294,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4314,17 +4316,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4441,7 +4446,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4453,6 +4459,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4467,6 +4474,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4474,12 +4482,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4498,6 +4508,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4578,7 +4589,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4590,6 +4602,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4711,6 +4724,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 32233108b..c773c9964 100644 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -119,12 +119,12 @@ export class DashboardComponent { const LastDateForPreMonth = new Date(today.getFullYear(), today.getMonth(), 0); const FirstDateForPreMonth = new Date(today.getFullYear(), today.getMonth()-1, 1); - console.log('FromDateMin:',fromMin); - console.log('FromDateMax:',fromMax); - console.log('ToDateMin',toMin); - console.log('ToDateMax',toMax); - console.log('LastDateForPreMonth',LastDateForPreMonth); - console.log('FirstDateForPreMonth',FirstDateForPreMonth); + // console.log('FromDateMin:',fromMin); + // console.log('FromDateMax:',fromMax); + // console.log('ToDateMin',toMin); + // console.log('ToDateMax',toMax); + // console.log('LastDateForPreMonth',LastDateForPreMonth); + // console.log('FirstDateForPreMonth',FirstDateForPreMonth); // const resetRange = {fromDate: today, toDate: today}; // this.dateRangePicker.resetDates(resetRange); // will trigger selectedDateRangeChanged @@ -134,7 +134,7 @@ export class DashboardComponent { this.options = { presets: this.presets, format: 'mediumDate', - range: {fromDate:FirstDateForPreMonth, toDate: LastDateForPreMonth}, + range: {fromDate:FirstDateForPreMonth, toDate: fromMax}, applyLabel: "Submit", calendarOverlayConfig: { shouldCloseOnBackdropClick: false, @@ -191,10 +191,7 @@ getDoughnutChartData(){ this._dashboardService.getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr).subscribe(data => { this.flag = 1; - console.log(' ***** Doughnut Chart Data *****'); - console.log('Whole Data',data); - console.log('Monthly Status',data.records.current_month); - + console.log(' ***** Doughnut Chart Data *****',data); let DraftIndexvalue = this.doughnutChartLabels.indexOf('Draft'); let TriggedIndexvalue = this.doughnutChartLabels.indexOf('Triggered'); @@ -475,8 +472,11 @@ getDoughnutChartData(){ } else{ - //console.log('Else Condition month'); + this.tempDataFullPD = [0,0,0,0,0,0,0]; + this.tempDataSmartPD = [0,0,0,0,0,0,0]; + this.tempDataTelePD = [0,0,0,0,0,0,0]; } + this.doughnutChartDataForFullPD = this.tempDataFullPD; this.doughnutChartDataForSmartPD = this.tempDataSmartPD; this.doughnutChartDataForTelePD = this.tempDataTelePD; @@ -484,17 +484,10 @@ getDoughnutChartData(){ this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); - console.log('Final full Data Completed',this.doughnutChartDataForFullPD); - console.log('temp full Data',this.tempDataFullPD); - console.log('Final Smart Data Completed',this.doughnutChartDataForSmartPD); - console.log('temp Smart Data',this.tempDataSmartPD); - console.log('Final Tele Data Completed',this.doughnutChartDataForTelePD); - console.log('temp Tele Data',this.tempDataTelePD); - console.log('total3',this.total3); - console.log('total2',this.total2); - console.log('total1',this.total1); - - + console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); + console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); + console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); + }) } @@ -518,7 +511,7 @@ onChange(e :any,flag: any) { let fromdate; let todate; - console.log('flag',flag); + if(flag == 1){ fromdate = new Date(e.fromDate); @@ -543,16 +536,12 @@ onChange(e :any,flag: any) { } - // console.log('fromdate',fromdate); - // console.log('todate',todate); - // console.log('lenderarr',this.selectedLender); - // console.log('cityarr',this.selectedCity); this._dashboardService.getPDDetailForDoughnut(fromdate,todate,this.selectedCity,this.selectedLender).subscribe(data => { - console.log(' *****Updated Date Doughnut Chart Data *****'); - console.log('Whole Data',data); + console.log(' *****Updated Date Doughnut Chart Data *****',data); + if(data.records.current_month.length != 0){ this.total1 = 0; this.total2 = 0; @@ -848,34 +837,26 @@ onChange(e :any,flag: any) { } else{ - //console.log('Else Condition month'); + this.tempDataFullPD = [0,0,0,0,0,0,0]; + this.tempDataSmartPD = [0,0,0,0,0,0,0]; + this.tempDataTelePD = [0,0,0,0,0,0,0]; } this.doughnutChartDataForFullPD= this.tempDataFullPD; this.doughnutChartDataForSmartPD = this.tempDataSmartPD; this.doughnutChartDataForTelePD = this.tempDataTelePD; this.doughnutChartLabels = this.doughnutChartLabels; - this.total1 = this.tempDataFullPD.reduce((a, b) => a + b, 0); - this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); - this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); - console.log('Canvas Full',this.FullCanvas) ; - console.log('Canvas Smart',this.SmartCanvas); - console.log('Canvas Tele',this.TeleCanvas); + this.total1 = this.tempDataFullPD.reduce((a, b) => a + b, 0); + this.total2 = this.tempDataSmartPD.reduce((a, b) => a + b, 0); + this.total3 = this.tempDataTelePD.reduce((a, b) => a + b, 0); + this.FullCanvas.chart.update(); this.SmartCanvas.chart.update(); this.TeleCanvas.chart.update(); - //: string[] = ['Draft','Triggered','Allocated','Scheduled','InProgress','Completed','QC Completed']; - console.log('Final full Data Completed',this.doughnutChartDataForFullPD); - console.log('temp full Data',this.tempDataFullPD); - console.log('Final Smart Data Completed',this.doughnutChartDataForSmartPD); - console.log('temp Smart Data',this.tempDataSmartPD); - console.log('Final Tele Data Completed',this.doughnutChartDataForTelePD); - console.log('temp Tele Data',this.tempDataTelePD); - - console.log('total3',this.total3); - console.log('total2',this.total2); - console.log('total1',this.total1); - + + console.log('Final Full Data '+ this.doughnutChartDataForFullPD+'Temp Data'+this.tempDataFullPD+'Full Total '+this.total1); + console.log('Final Smart Data '+ this.doughnutChartDataForSmartPD+' Temp Data '+this.tempDataSmartPD+'Smart Total '+this.total2); + console.log('Final Tele Data '+ this.doughnutChartDataForTelePD+' Temp Data'+this.tempDataTelePD+'Tele Total '+this.total3); }) diff --git a/ng6-seed/src/app/dashboard/dashboard.service.ts b/ng6-seed/src/app/dashboard/dashboard.service.ts index f9c663f5c..545c97924 100644 --- a/ng6-seed/src/app/dashboard/dashboard.service.ts +++ b/ng6-seed/src/app/dashboard/dashboard.service.ts @@ -21,7 +21,6 @@ const currentdate = new Date().toJSON().slice(0,19).replace('T',' '); export class DashboardService { private apiUrl = environment.apiEndpoint; - //private apiUrl = 'http://localhost/sparqapi/api/'; constructor(private _http: HttpClient, private _aws:AwsService) { } @@ -53,17 +52,17 @@ export class DashboardService { // } getPDDetailForDoughnut(fromdate,todate,cityarr,lenderarr): Observable { - console.log(')))))'); -console.log(fromdate); -console.log(todate); -console.log(cityarr); -console.log(lenderarr); -console.log('((('); + +console.log('From',fromdate); +console.log('To',todate); +console.log('Lender Arr',lenderarr); +console.log('City Arr',cityarr); + + return this._http.post(this.apiUrl+'getDashBoardMaster', { - "fromdate":fromdate, - "todate": todate, - "cityarr":cityarr, - "lenderarr": lenderarr}) + "fromdate":fromdate != '' && fromdate != null && fromdate != undefined ? fromdate : '', + "todate": todate != '' && todate != null && todate != undefined ? todate : '', + "lenderarr": lenderarr,"cityarr":cityarr}) .pipe(catchError(this.handleError('role', [])) ) 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 78cda05de..c92d835ae 100644 --- 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 @@ -54,7 +54,7 @@

Neighbourhood

-
+
{{m_neighbourStatus}} - + 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 5bc3597ae..b529da169 100644 --- 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 @@ -333,7 +333,7 @@ public m_investmentType = []; } case '4': { const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadJwellDescription()); + //control.push(this.loadJwellDescription()); break; } case '5': { @@ -542,7 +542,7 @@ public m_investmentType = []; } case '4': { const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadJwellDescriptionWithData(data)); + //control.push(this.loadJwellDescriptionWithData(data)); break; } case '5': { 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 b007e5558..02dfce354 100644 --- 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 @@ -105,10 +105,14 @@ export class BankingDetailsComponent implements OnInit { account_type: ['', Validators.compose([Validators.required])], salary: ['', Validators.compose([Validators.required])], limit: ['', Validators.compose([Validators.required])], - is_main: ['', Validators.compose([Validators.required])], + //is_main: ['', Validators.compose([Validators.required])], + //is_main: [this.pd_cus_segment == 'SAL' ? '' : '', Validators.compose([Validators.required])], + //is_main:[''], + is_main: this.pd_cus_segment == 'SAL' ? [''] : ['', Validators.compose([Validators.required])], vintage_year: ['', Validators.compose([Validators.required])], vintage_month: ['', Validators.compose([Validators.required])], }); + } addBankdetails(index, event) { @@ -117,6 +121,10 @@ export class BankingDetailsComponent implements OnInit { let length = control.length; this.step = length; control.push(this.createBankarray()); + // if(this.pd_cus_segment != 'SAL') { + // this.bankingForm.controls.is_main.setValidators([Validators.required]); + // this.bankingForm.controls.is_main.updateValueAndValidity(); + // } } deleteBankdetails(index: number) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html new file mode 100644 index 000000000..c2aecc047 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.html @@ -0,0 +1,190 @@ + + +

Rental Information Form

+
+ + + + + + + Applicant + co-applicant + Parental + + + + + Residential/commercial + other + + + + +
+ + + + +
{{i+1}} Rental Home Details
+ + + + + + + Complete address of the property + + + + + + + + + + + + + + + Yes + No + + +
+ + + + + + + + + + + + + + + + + Yes + No + + +
+ + +

How is rent received? (Is it in bank or cash, how much in which mode)

+ + + + + + + + + + + + + + + + + + + + + + +

Details of the tenants (eg Name and Mobile No and other details)

+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + Yes + No + + + + + + + + +
+
+ +
+
+ + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss new file mode 100644 index 000000000..79de302fd --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.scss @@ -0,0 +1,27 @@ +.address { + display: flex; + padding: 0 2%; + flex-direction: column; +} + +.address > * { + width: 100%; +} +.matcard mat-form-field { + margin: 0 2%; + width:40%; +} +.address .button { + float: right; + width: 10px; + background: #62B013; + color: white; +} +mat-form-field { + width: 27%; + margin: 0 2%; +} +.fields mat-form-field { + width: 45%; + 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/rental-info/rental-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts new file mode 100644 index 000000000..3b5741e70 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-info/rental-info.component.ts @@ -0,0 +1,167 @@ +import {Component, OnInit, Input, Output} from '@angular/core'; +import {FormBuilder, FormGroup, Validators, FormControl, FormArray} from '@angular/forms'; +import {NotifierService} from 'angular-notifier'; +import {PdTrigerService} from './../../../../../pd-service/pd-triger.service'; +import {Key} from 'protractor'; + +@Component({ + selector: 'app-rental-info', + templateUrl: './rental-info.component.html', + styleUrls: ['./rental-info.component.scss'] +}) +export class RentalInfoComponent implements OnInit { + + // @Input() pdid: string; + // @Input() pd_all_details: any; + // form_id: number; + @Input() pdid: number; + @Input() form_id: number; + step: number; + + public rentalForm: FormGroup; + tenantsList: FormArray; + propertyList: FormGroup; + private notifier: NotifierService; + + constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService) { + this.notifier = notifier; + // this.form_id = 3; + } + + ngOnInit() { + this.step = 0; + this.inintRentalForm(); + this.createpropertyArray(); + let params: any = {}; + params.pd_id = this.pdid; + params.pd_form_id = this.form_id; + this._pd.retriveForm(params).subscribe(value => { + let subArray: any; + const control = this.rentalForm.controls['rental_home']; + if (value.status == 200) { + let rentalinfo = value.records; + var result = Object.keys(value.records.rental_home).map(function (key) { + return value.records.rental_home[key]; + }); + if (result.length == 0) { + const control = this.rentalForm.controls['rental_home']; + control.push(this.createpropertyArray()); + } else { + result.forEach((datas, index) => { + control.push(this.createpropertyArray()); + const parentControl = this.rentalForm.controls['rental_home']['controls'][index]; + const sub = parentControl.controls['details_tenants']; + console.log('control', parentControl); + subArray = Object.keys(datas.details_tenants).map(function (key) { + return datas.details_tenants[key]; + }); + if (subArray.length > 0) { + subArray.forEach((val) => { + console.log('val', val); + sub.push(this.createTenatsArray()); + }) + sub.removeAt(0); + } + datas.details_tenants = subArray; + }); + } + rentalinfo.rental_home = result; + rentalinfo.pdid = this.pdid; + rentalinfo.formid = this.form_id; + rentalinfo.fk_createdby = this.pdid; + this.rentalForm.setValue(rentalinfo); + } else { + control.push(this.createpropertyArray()); + } + }); + } + + inintRentalForm() { + this.rentalForm = this._fb.group({ + pdid: this.pdid, + formid: this.form_id, + fk_createdby: this.pdid, + person_met: ['', Validators.compose([Validators.required])], + property_own: ['', Validators.compose([Validators.required])], + nature_property: ['', Validators.compose([Validators.required])], + rental_home: this._fb.array([]) + }); + } + + createpropertyArray() { + this.propertyList = this._fb.group({ + complete_add: ['', Validators.compose([Validators.required])], + area_of_property: ['', Validators.compose([Validators.required])], + structure_property: ['', Validators.compose([Validators.required])], + total_room: ['', Validators.compose([Validators.required])], + is_rent: ['', Validators.compose([Validators.required])], + date_agreement: [''], + date_validity: [''], + rent_agreement: [''], + actual_rent: [''], + photo_areegment: [''], + bank: ['', Validators.compose([Validators.required])], + cash: ['', Validators.compose([Validators.required])], + rent_each_floor: ['', Validators.compose([Validators.required])], + total_rent: ['', Validators.compose([Validators.required])], + related_doc_owner: ['', Validators.compose([Validators.required])], + property_photographs: ['', Validators.compose([Validators.required])], + third_party_check: ['', Validators.compose([Validators.required])], + details_tenants: this._fb.array([this.createTenatsArray()]), + }); + return this.propertyList; + } + + createTenatsArray() { + return this._fb.group({ + name: ['', Validators.compose([Validators.required])], + mobile_no: ['', Validators.compose([Validators.required])], + tenants_seen: ['', Validators.compose([Validators.required])], + tenants_con_owner: ['', Validators.compose([Validators.required])], + staying_since: ['', Validators.compose([Validators.required])], + rent_paid: ['', Validators.compose([Validators.required])], + }); + } + + addProperty(event) { + event.stopPropagation(); + + const control = this.rentalForm.controls['rental_home']; + control.push(this.createpropertyArray()); + let length = control.length; + this.step = length - 1; + } + + deleteProperty(index) { + const control = this.rentalForm.controls['rental_home']; + control.removeAt(index); + } + + addTenant(parentIndex:number) { + const parentControl = this.rentalForm.controls['rental_home']['controls'][parentIndex]; + const control = parentControl.controls['details_tenants']; + console.log(parentControl); + console.log(control); + control.push(this.createTenatsArray()); + } + + deleteTenant(idx, parentIndex) { + const parentControl = this.rentalForm.controls['rental_home']['controls'][parentIndex]; + const control = parentControl.controls['details_tenants']; + control.removeAt(idx); + } + + rentalSubmit() { + if (!this.rentalForm.valid) { + return; + } + console.log('form', this.rentalForm.value); + let records = this.rentalForm.value; + this._pd.saveForm(records).subscribe(data => { + console.log('data', data); + this.notifier.notify('success', 'Saved Successfully.'); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }) + } +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index c7af108fe..b426f5d57 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -31,9 +31,12 @@ {{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }} - - + + + + + @@ -433,9 +436,12 @@ - + + +
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index 627291c50..34c87317c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -29,6 +29,7 @@ export class StartPdComponent implements OnInit, OnDestroy { answerList: any = []; ansPDList: any = []; relationDetails: any = [1]; + rentalDetail: any = { form_id: "16", form_name: "Rental Information", isAnswered: true} // errorMessage:any; // selectedCategory:any=[]; // categoryList: any=[]; @@ -294,6 +295,7 @@ pdFullDetails:any=[]; this.pdMasterList=data.records.pdmaster_details; this.categoryList=data.records.question_answers; this.categoryFormButtons = data.records.template_forms; + console.log('formButtons', this.categoryFormButtons); let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); this.mainApplicantName = filterApplicantName[0].applicant_name; this.currentPDStatus = data.records.pdmaster_details.pd_status; @@ -625,6 +627,7 @@ pdFullDetails:any=[]; OnSelectDirectForms(details: any) { this.formsCategoryEnable = true; this.selectedFormsCategory = details; + console.log('select..', this.selectedFormsCategory); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 1acaa56a1..7c88cf7cc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -9,7 +9,7 @@ import { MatProgressBarModule, MatDialogModule, MatSortModule, MatToolbarModule, MatSelectModule, MatListModule, MatGridListModule, MatTabsModule, MatCheckboxModule, MatBadgeModule, MatExpansionModule, MatStepperModule, MatSidenavModule, MatMenuModule, MatButtonToggleModule, - MatAutocompleteModule + MatAutocompleteModule, MatDatepickerModule } from '@angular/material'; import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; @@ -62,8 +62,12 @@ import {FinancialInfoComponent} from "./list-pd/start-pd/forms/financial-info/fi import { LenderRepresentativeComponent } from './list-pd/start-pd/forms/lender-representative/lender-representative.component'; import { TelePdAllocationComponent } from './list-pd/tele-pd-allocation/tele-pd-allocation.component'; + import { PdReportComponent } from './list-pd/pd-report/pd-report.component'; +import {RentalInfoComponent} from "./list-pd/start-pd/forms/rental-info/rental-info.component"; + + /** * Custom angular notifier options */ @@ -136,7 +140,7 @@ const pdCustomNotifierOptions: NotifierOptions = { // AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule, // OwlNativeDateTimeModule, // ], - declarations: [TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent], + declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent], // exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent], // providers: [PdTrigerService, GetGeometricLocationService], @@ -161,7 +165,8 @@ const pdCustomNotifierOptions: NotifierOptions = { ReactiveFormsModule, FileUploadModule, TreeModule, - MatDialogModule,MatSortModule, + MatDatepickerModule, + MatDialogModule,MatSortModule, NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule, AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}),OwlDateTimeModule, OwlNativeDateTimeModule, diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts index b4e93019b..160249623 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts @@ -6,24 +6,26 @@ import { FormBuilder, import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; + /** Service */ import { MastersService } from '../../service/masters/masters.service'; import { PdTeamService } from '../../service/masters/pd-team.service'; - import { NotifierService } from 'angular-notifier'; + import { Router } from '@angular/router'; + import { empty } from 'rxjs'; -import { Router } from '@angular/router'; -import { empty } from 'rxjs'; /**sweet alert */ import Swal from 'sweetalert2'; + @Component({ selector: 'app-pd-team-add', templateUrl: './pd-team-add.component.html', styleUrls: ['./pd-team-add.component.scss'] }) + export class PdTeamAddComponent implements OnInit { public _pdTeamForm: FormGroup; -private notifier: NotifierService; + color = 'primary'; errorMessage:string; @@ -42,17 +44,16 @@ selectedProductDatas : any=[]; selectedSegmentDatas : any=[]; constructor(private _formBuilder: FormBuilder, - private _notifier: NotifierService, private _pdTeamService: PdTeamService, private _router: Router, private _masterService: MastersService) { - this.notifier = _notifier; + } ngOnInit() { - //console.log(this.notifier); + this.PdTeamFormDatas(); /** For Checking City Validation datas - checking purpose - Already exists are not */ @@ -143,15 +144,16 @@ onSubmit() { this._pdTeamService.addPdTeamDetail(this._pdTeamForm.value).subscribe( dataresult => { if(dataresult.dataStatus == true) { - this.notifier.notify('success', 'Record Saved Successfully.!'); + Swal('Record Saved Successfully.!','success'); this._router.navigate(['/setting/pdteam/pdteamlist']); + } else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - Swal('Wrong.!'); - //alert('Some Thing Wents Wrong Try Again !'); + + //Swal('Wrong.!'); + Swal('Some Thing Wents Wrong Try Again !'); //this.errorMessage = "Some Thing Wents Wrong Try Again !"; } }); @@ -225,13 +227,12 @@ onChangeEntityId($event){ } if($event.isUserInput != false){ - //console.log(this.CityValidation,lenderId); + //console.log(this.CityValidation,lenderId); this._pdTeamService.getLenderData(lenderId).subscribe( dataresult => { - if(dataresult.dataStatus == true) { this.CityValidation = dataresult.records; - console.log(this.CityValidation); + //console.log(this.CityValidation); } }, error => this.errorMessage = error); } @@ -263,7 +264,7 @@ onChangeCityDatas($event){ mycheck = 1; } } - } + } if(mycheck == 0){ this.selectedCityDatas.push(cityName.name); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html index 4a7f784b1..c15dee04b 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts index ed79490e0..2a2f6067c 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts @@ -6,9 +6,9 @@ import { FormBuilder, /** Service */ import { MastersService } from '../../service/masters/masters.service'; import { PdTeamService } from '../../service/masters/pd-team.service'; -import { NotifierService } from 'angular-notifier'; /** Here this component is like as a partent component */ -import { PdTeamListComponent } from './../pd-team-list/pd-team-list.component'; +import { Router,ActivatedRoute } from '@angular/router'; + /**sweet alert */ import Swal from 'sweetalert2'; @Component({ @@ -22,14 +22,15 @@ export class PdTeamEditComponent implements OnInit { public _pdTeamForm: FormGroup; public submitted = false; public listView: any = true; - private notifier: NotifierService; color = 'primary'; errorMessage:string; lenderId:any; + teamID: any; + apiFinishLoad: boolean; //This "childMessage" to get the function or data from partent component - @Input() public childMessage: any; - + //@Input() public childMessage: any; + public childMessage: any[]; //This Type Of Array Declaration for select dropdown to list the datas citydatas: any[]; lenderdatas: any[]; @@ -51,27 +52,33 @@ export class PdTeamEditComponent implements OnInit { selectedCityDatas : any=[]; selectedProductDatas : any=[]; selectedSegmentDatas : any=[]; + //EditDatasforFormGroup: any; constructor(private _formBuilder: FormBuilder, - private _notifier: NotifierService, + private _router: Router,private route: ActivatedRoute, private _pdTeamService: PdTeamService, - private _PdTeamListComponent: PdTeamListComponent, private _masterService: MastersService) { - this.notifier = _notifier; + } /** Onready function */ ngOnInit() { + //console.log(atob(this.route.snapshot.params['id'])); + this.teamID = atob(this.route.snapshot.params['id']); + //console.log(this.teamID); + this._pdTeamForm = this._formBuilder.group({ + pdteam_id: ['', Validators.compose([Validators.required])], + team_name: ['', Validators.compose([Validators.required])], + fk_lender: ['', Validators.compose([Validators.required])], + fk_city: ['', Validators.compose([Validators.required])], + fk_customer_segment: ['', Validators.compose([Validators.required])], + fk_product:['', Validators.compose([Validators.required])], + }); + this.PdTeamFormDatas(); - //console.log('hai I am Child This onready function',this.childMessage); - // this._pdTeamService.getAllPDTeamWithPDTeamID(this.childMessage).subscribe( - // dataresult => { - // console.log(dataresult); - // this.EditDatasforFormGroup = dataresult.records; - // console.log(this.EditDatasforFormGroup); - // }); + /** For Checking City Validation datas - checking purpose - Already exists are not */ this._pdTeamService.getAllPdTeamCityMapping().subscribe( dataresult => { @@ -117,18 +124,30 @@ export class PdTeamEditComponent implements OnInit { this.customerSegmentdatas = this.customerSegmentdatas.filter(segment=>segment.isactive == 1 ); } }, error => this.errorMessage = error); - this.lenderId = this._pdTeamForm.value['fk_lender']; - this._pdTeamService.getLenderData(this.lenderId).subscribe( - dataresult => { - if(dataresult.dataStatus == true){ - this.CityValidation = dataresult.records; - } - }, error => this.errorMessage = error); + + // this.lenderId = this._pdTeamForm.value.fk_lender; + // console.log('form data',this._pdTeamForm); + // console.log('form data Particular Value',this._pdTeamForm.value.fk_lender); + // this._pdTeamService.getLenderData(this.lenderId).subscribe( + // dataresult => { + // if(dataresult.dataStatus == true){ + // this.CityValidation = dataresult.records; + // } + // }); } /** Pd Team Form Datas */ PdTeamFormDatas(){ + this._pdTeamService.getAllPDTeamWithPDTeamID(this.teamID).subscribe( + dataresult => { + //console.log('Response Data',dataresult); + if(dataresult.status == 200) + this.childMessage = dataresult.records; + + // console.log('Record Data',dataresult.records); + // console.log('sdafd',this.childMessage[0].team_name); + //console.log('Patricular pdteam_id Datas',this.childMessage); // let PdTeamcity:any = []; @@ -142,7 +161,7 @@ export class PdTeamEditComponent implements OnInit { let PdTeamCity:any = []; for(let ptc of this.childMessage[0].CITYMAP){ PdTeamCity.push(ptc.city_id); - } + } let PdTeamProduct:any = []; // for(let ptp of this.childMessage[0].PRODUCTS){ @@ -173,17 +192,37 @@ export class PdTeamEditComponent implements OnInit { } } }, error => this.errorMessage = error); + + this._pdTeamForm.controls['pdteam_id'].setValue(this.childMessage[0].pdteam_id); + this._pdTeamForm.controls['team_name'].setValue(this.childMessage[0].team_name); + this._pdTeamForm.controls['fk_lender'].setValue(this.childMessage[0].fk_lender_id); + this._pdTeamForm.controls['fk_city'].setValue(PdTeamCity); + this._pdTeamForm.controls['fk_customer_segment'].setValue(this.DBCustomerSegmentDatas); + this._pdTeamForm.controls['fk_product'].setValue(this.DBProductDatas); + this.apiFinishLoad = true; + + + // this.lenderId = this._pdTeamForm.get('fk_customer_segment').value; + // console.log('asf',this.lenderId); + // console.log('form data',this._pdTeamForm); + + this._pdTeamService.getLenderData(this.childMessage[0].fk_lender_id).subscribe( + dataresult => { + if(dataresult.dataStatus == true){ + this.CityValidation = dataresult.records; + } + }); - this._pdTeamForm = this._formBuilder.group({ - pdteam_id: [this.childMessage[0].pdteam_id, Validators.compose([Validators.required])], - team_name: [this.childMessage[0].team_name, Validators.compose([Validators.required])], - fk_lender: [this.childMessage[0].fk_lender_id, Validators.compose([Validators.required])], - fk_city: [PdTeamCity, Validators.compose([Validators.required])], - fk_customer_segment: [this.DBCustomerSegmentDatas, Validators.compose([Validators.required])], - fk_product:[this.DBProductDatas, Validators.compose([Validators.required])], + // this._pdTeamForm = this._formBuilder.group({ + // pdteam_id: [this.childMessage[0].pdteam_id, Validators.compose([Validators.required])], + // team_name: [this.childMessage[0].team_name, Validators.compose([Validators.required])], + // fk_lender: [this.childMessage[0].fk_lender_id, Validators.compose([Validators.required])], + // fk_city: [PdTeamCity, Validators.compose([Validators.required])], + // fk_customer_segment: [this.DBCustomerSegmentDatas, Validators.compose([Validators.required])], + // fk_product:[this.DBProductDatas, Validators.compose([Validators.required])], + // }); + }); - - } /** convenience getter for easy access to form fields */ @@ -191,9 +230,9 @@ export class PdTeamEditComponent implements OnInit { /** For Popup Close Button */ onNoClick(): void { - this._PdTeamListComponent.changeListView(); + this._router.navigate(['/setting/pdteam/pdteamlist']); } - + /** To Reset Popup Data For Add*/ // onResetForEdit(){ // this.PdTeamFormDatas(); @@ -225,9 +264,9 @@ export class PdTeamEditComponent implements OnInit { this._pdTeamService.editPdTeamchildDetails(ActiveDatas,'PDTEAMCUSTOMERSEGMENT') .subscribe(dataresult=>{ if (dataresult.dataStatus == true){ - //alert('InActive Changes Done in cs'); - let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name); - this.selectedSegmentDatas.splice(index,1); + // alert('InActive Changes Done in cs'); + // let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name); + // this.selectedSegmentDatas.splice(index,1); }else{} }); @@ -326,6 +365,7 @@ export class PdTeamEditComponent implements OnInit { else if($event.source._selected == false ){ console.log('Return False for city Selection Data'); + let index = this.selectedCityDatas.indexOf(cityName.name); this.selectedCityDatas.splice(index,1); @@ -336,16 +376,20 @@ export class PdTeamEditComponent implements OnInit { dataresult => { if (dataresult.dataStatus == true) { data = dataresult.records; + //console.log('data',data); data = data.filter(pdteamcity=>pdteamcity.fk_city_id == $event.source.value); data = data.filter(pdteamcity=>pdteamcity.fk_pdteam_id == this._pdTeamForm.value.pdteam_id)[0]; - //console.log(data.pdteam_city_id); + // console.log('cityID',data.pdteam_city_id); + // console.log('Event value',$event.source.value); + this._pdTeamService.deletePDteamCity($event.source.value).subscribe(data=>{ - if (dataresult.dataStatus == true) {//alert('Deleted'); - let index = this.selectedCityDatas.indexOf(cityName.name); - this.selectedCityDatas.splice(index,1); - //this._PdTeamListComponent.changeListView(); - } + // console.log('Response Data',data); + // if (dataresult.dataStatus == true) { + // alert('Deleted'); + // // let index = this.selectedCityDatas.indexOf(cityName.name); + // // this.selectedCityDatas.splice(index,1); + // } }); } }, error => this.errorMessage = error); @@ -378,17 +422,17 @@ export class PdTeamEditComponent implements OnInit { dataresult => { if (dataresult.dataStatus == true) { data = dataresult.records; - console.log('data',data); + //console.log('data',data); data = data.filter(pdteamproduct=>pdteamproduct.fk_product_id == $event.source.value && pdteamproduct.isactive == 1); data = data.filter(pdteamcity=>pdteamcity.fk_pdteam_id == this._pdTeamForm.value.pdteam_id)[0]; - console.log(data.pdteam_city_id); + //console.log(data.pdteam_city_id); let ActiveDatas = { 'pdteam_product_id':data.pdteam_product_id,'isactive': '0'} ; this._pdTeamService.editPdTeamchildDetails(ActiveDatas,'PDTEAMPRODUCT') .subscribe(dataresult=>{ if (dataresult.dataStatus == true){ - //alert('InActive Changes Done in product'); - let index = this.selectedProductDatas.indexOf(productName.name); - this.selectedProductDatas.splice(index,1); + // alert('InActive Changes Done in product'); + // let index = this.selectedProductDatas.indexOf(productName.name); + // this.selectedProductDatas.splice(index,1); } else{ //alert("Sorry Try Again !"); @@ -411,11 +455,13 @@ export class PdTeamEditComponent implements OnInit { dataresult=>{ if (dataresult.dataStatus == true){ Swal("Data Edited Successfully"); - // this.notifier.notify('success', 'Record Edited Successfully.!'); + + this._router.navigate(['/setting/pdteam/pdteamlist']); + } else{ Swal("SomeThing Wents Wrong Try Again !"); - // this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !'); + } }); diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html index c81881908..eeba5d56a 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html @@ -1,4 +1,4 @@ -
+
@@ -57,7 +57,7 @@ Action - + @@ -71,8 +71,7 @@
-
+ - \ No newline at end of file diff --git a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts index bbbe37999..7cb76a8eb 100644 --- a/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts @@ -9,8 +9,7 @@ MatTableDataSource } from '@angular/material'; import { MastersService } from '../../service/masters/masters.service'; import { PdTeamService } from '../../service/masters/pd-team.service'; -import { NotifierService } from 'angular-notifier'; -import { Router } from '@angular/router'; +import { Router,ActivatedRoute } from '@angular/router'; /**sweet alert */ import Swal from 'sweetalert2'; @@ -38,47 +37,36 @@ export class PdTeamListComponent implements OnInit { userData = null; noRecordFound: boolean = false; - private notifier: NotifierService; - public listView: any = true; + public dataLength: number; public dataSource = new MatTableDataSource(); - public parentMessage: any = []; - + displayedColumns = ['serialno','team_name','lender_name','actions','isactive']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - constructor(notifier: NotifierService, - private router: Router, + constructor( + private router: Router,private route: ActivatedRoute, private _MasterService: MastersService, private _PdTeamService: PdTeamService) { this.getPdTeam(); - this.notifier = notifier; } ngOnInit() { this.getPdTeam(); } /** To edit data */ - editPdTeam(detail){ - - this._PdTeamService.getAllPDTeamWithPDTeamID(detail).subscribe( - dataresult => { - this.parentMessage = dataresult; - this.parentMessage = this.parentMessage.records; - this.listView = false; - - }); - } -/**To Manage Team */ -managepdteam(){ - this.router.navigate(['/setting/pdteam/pdteammanage']); -} - changeListView(){ - this.getPdTeam(); - this.listView = true; + toEditPdTeam(pdteam_id){ + //this.router.navigate(['/setting/pdteam/editpdteam',pdteam_id]); + console.log(btoa(pdteam_id)); + this.router.navigate(['/setting/pdteam/editpdteam',btoa(pdteam_id)]); } + + /**To Manage Team */ + managepdteam(){ + this.router.navigate(['/setting/pdteam/pdteammanage']); + } /** To get data for listing */ getPdTeam() { diff --git a/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts index 6c6fa741b..3c065b3e4 100755 --- a/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts +++ b/ng6-seed/src/app/settings/pd-team/pd-team.routing.ts @@ -15,7 +15,7 @@ export const PdTeamRoutes: Routes = [{ path: 'addpdteam', component: PdTeamAddComponent },{ - path:'editpdteam', + path:'editpdteam/:id', component:PdTeamEditComponent },{ path:'pdteammanage',