diff --git a/ng6-seed/SE_PROD_020519FN.zip b/ng6-seed/SE_PROD_020519FN.zip new file mode 100644 index 000000000..54225da90 Binary files /dev/null and b/ng6-seed/SE_PROD_020519FN.zip differ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index ea8523f7c..9941d3b9b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -195,8 +195,7 @@ export class EditPdMasterComponent implements OnInit { this.addressesDeactivited[index] = true; let obj = { pd_address_id:val.pd_address_id, - // addressline1: val.addressline1.toUpperCase(), - addressline1: val.addressline1 != null ? val.addressline1.toUpperCase() : val.addressline1, + addressline1: !val.addressline1 ? null : val.addressline1.toUpperCase(), fk_city: val.fk_city, fk_state: val.fk_state,   pincode: val.pincode_id, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html index 3bf88a8cc..e37c49bb8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html @@ -19,7 +19,7 @@ Applicant - + {{appt.applicant_name | titlecase}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts index 78d0875c9..3140f311b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts @@ -32,14 +32,12 @@ export class InitiateAdditionalPdComponent implements OnInit { }); this.data.type===false ? this.additionalPDForm.controls['fk_customer_segment'].disable():this.additionalPDForm.controls['fk_customer_segment'].enable(); - if(this.data.applicant_id){ this.additionalPDForm.controls['pd_co_applicant_id'].setValue(this.data.applicant_id); + if(this.data.applicant_id){ + this.additionalPDForm.controls['pd_co_applicant_id'].setValue(this.data.applicant_id); + this.getMobileNo(this.data.applicant_id); // this.additionalPDForm.controls['pd_co_applicant_id'].disable(); } // else { this.additionalPDForm.controls['pd_co_applicant_id'].enable(); } - - let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == this.data.applicant_id).map(val=>val.mobile_no)[0] - if(mobile != '' && mobile != null){ this.additionalPDForm.controls['mobile_no'].setValue(mobile); } - } initForm(){ return this.additionalPDForm = this._fb.group({ @@ -52,6 +50,19 @@ export class InitiateAdditionalPdComponent implements OnInit { pd_status:[this.data.pd_status,Validators.required], }); } + /** To Get City And Pincode Data For Address Form + * Param 'stateID' -> selected StateId + */ + getMobileNo(applicantID: string) { + let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == this.data.applicant_id).map(val=>val.mobile_no)[0] + if(mobile != '' && mobile != null){ + this.additionalPDForm.controls['mobile_no'].setValue(mobile); + } + else{ + this.additionalPDForm.controls['mobile_no'].setValue(''); + } + } + // save details submitDetails(values: any) { if (this.additionalPDForm.invalid) { @@ -61,10 +72,20 @@ submitDetails(values: any) { } let update_details: any; if(this.data.type){ - update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED","pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no}; + update_details= {"pd_id":values.pd_id, + "parent_pd_id":values.parent_pd_id, + "fk_customer_segment":values.fk_customer_segment , + "fk_address_id":values.fk_address_id, + "pd_status":"TRIGGERED", + "pd_co_applicant_id":values.pd_co_applicant_id, + "mobile_no":values.mobile_no}; } else{ - update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id,"pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no}; + update_details={"pd_id":values.pd_id, + "pd_status":"TRIGGERED", + "parent_pd_id":values.parent_pd_id, + "fk_customer_segment":values.fk_customer_segment , + "fk_primary_address_id":values.fk_address_id}; } this._pd.initiateAddressPdProcess(update_details).subscribe(data => { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts index b11ed0359..27023c224 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts @@ -20,7 +20,7 @@ export class ManageBusinesExpenseComponent implements OnInit { constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { this.frequencyData=this.data.masterData.frequencyList; this.businessExpenseData = this.data.masterData.businessExpenseList; - this.pageTitle = this.data.manage_status==1 ? 'Add Business Expense Item' : 'Update Business Expense Item'; + this.pageTitle = this.data.manage_status==1 ? 'Add Business Expenses' : 'Update Business Expenses'; this.notifier = notifier; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts index cb1e61b06..4552f1c32 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts @@ -17,7 +17,7 @@ export class ManageHouseHoldComponent implements OnInit { private notifier: NotifierService; constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { this.frequencyData=this.data.masterData.frequencyList; - this.pageTitle = this.data.manage_status==1 ? 'Add House Hold Item' : 'Update House Hold Item'; + this.pageTitle = this.data.manage_status==1 ? 'Add Household Expenses' : 'Update Household Expenses'; this.notifier = notifier; } 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 6ea64611a..73d1418f8 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 @@ -94,12 +94,12 @@ - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html index f92984e6d..8d1fec24c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html @@ -2,7 +2,7 @@
- Business Expense Items + Business Expenses
+
+
+
+ {{master.loan_amount | numberToWords}} +
+
+
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss index 53da6b2ce..bcdec2ace 100644 --- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss +++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.scss @@ -67,7 +67,9 @@ .error-text{ font-size: 6rem !important; } - +.error-wrapper{ + padding-top: 2rem !important;//default is 5 rem +} .error-icon{ width: 100px; font-size: 79px !important; diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts index 160825999..d1cb03950 100755 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts @@ -44,6 +44,7 @@ export class EntityAddComponent implements OnInit { public submitted = false; public entityOptions: any = []; errorMessage: string; + error : any = []; /** * Notifier service @@ -84,6 +85,8 @@ export class EntityAddComponent implements OnInit { this.entityOptions = data.records.filter(data => data.entity_type_id != 1); }, error => { + this.error.push(error); + console.log('this.error',this.error); this.notifier.notify('warning', 'No Answer Type Records Found.!'); this.errorMessage = "No Answer Type Record Found."; } diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.ts index 4f0e1423c..52568ad0a 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.ts @@ -90,11 +90,13 @@ export class DialogAddEditBillingInfo implements OnInit { // this.entity_id = this.route.snapshot.params['entity-id']; // this.entity_id = this.parent.entityId; this.notifier = notifier; + console.log(data); } ngOnInit(): void { this.loadFormData(); - this.loadContactsDetails(this.data.details.contacts); + this.loadContactsDetails(this.data.details == null || this.data.details == undefined ? null : this.data.details.contacts); + // this.loadContactsDetails(this.data.details.contacts); } onNoClick(): void { diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html index 3ce9a691f..97ece6a37 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-add-tat.component.html @@ -14,62 +14,97 @@
- - - TAT 1 Value Required.! - - - - TAT 2 Value Required.! - -
-
-
- +
+ {{pd.type_name}} - PD Type Required.! + -
-
    -
  • - {{pdName.type_name}} -
    • -
-
+ + + {{pdName.type_name}} + +
-
- + +
+ {{prdct.name}} - Product Required.! + -
-
    -
  • - {{prdcName.name}} -
    • -
-
-
-
- - - {{city.name}} - - City Required.! - -
-
    -
  • - {{cityName.name}} -
    • -
-
+ + + {{prdcName.name}} + +
+
+
+ + + + hrs + + +
+ +
+ + + + hrs + + +
+ +
+ + + + hrs + + +
+ +
+ + + + hrs + + +
+ +
+ + + + hrs + + +
+ +
+ + + + hrs + + +
+ +
+ + + + hrs + + +
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts index 6b8ffa1ba..73c67f6ea 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-tat/entity-edit-tat.component.ts @@ -132,6 +132,11 @@ export class DialogEntityEditListTatComponent implements OnInit { this.tatListEditForm = this._formBuilder.group({ tat1: [this.data.tat_details.tat1, Validators.compose([Validators.required])], tat2: [this.data.tat_details.tat2, Validators.compose([Validators.required])], + tat3: [this.data.tat_details.tat3, Validators.compose([Validators.required])], + tat4: [this.data.tat_details.tat4, Validators.compose([Validators.required])], + tat5: [this.data.tat_details.tat5, Validators.compose([Validators.required])], + tat6: [this.data.tat_details.tat6, Validators.compose([Validators.required])], + tat7: [this.data.tat_details.tat7, Validators.compose([Validators.required])] }); this.tatEditAddForm = this._formBuilder.group({ @@ -203,13 +208,13 @@ export class DialogEntityEditListTatComponent implements OnInit { get f() { return this.tatListEditForm.controls }; get f1() { return this.tatEditAddForm.controls }; - onSubmit() { - this.submitted = true; - if (this.tatListEditForm.invalid) { - return; - } else { - } - } + // onSubmit() { + // this.submitted = true; + // if (this.tatListEditForm.invalid) { + // return; + // } else { + // } + // } onSubmitEditAddForm() { @@ -370,7 +375,12 @@ export class DialogEntityAddTatComponent implements OnInit { toppings2: ['', Validators.compose([Validators.required])], toppings3: ['', Validators.compose([Validators.required])], toppings4: ['', Validators.compose([Validators.required])], - toppings5: ['', Validators.compose([Validators.required])] + toppings5: ['', Validators.compose([Validators.required])], + toppings6: ['', Validators.compose([Validators.required])], + toppings7: ['', Validators.compose([Validators.required])], + toppings8: ['', Validators.compose([Validators.required])], + toppings9: ['', Validators.compose([Validators.required])], + toppings0: ['', Validators.compose([Validators.required])] }) } @@ -495,7 +505,14 @@ export class DialogEntityAddTatComponent implements OnInit { transactions: Transaction[] = []; tatValue1 = ''; tatValue2 = ''; + tatValue3 = ''; + tatValue4 = ''; + tatValue5 = ''; + tatValue6 = ''; + tatValue7 = ''; + onSubmit() { + console.log('ads') this.submitted = true; if (this.tatForm.invalid) { return @@ -503,18 +520,22 @@ export class DialogEntityAddTatComponent implements OnInit { this.listShow = true; let arr1 = this.tatForm.controls['toppings1'].value; let arr2 = this.tatForm.controls['toppings2'].value; - let arr3 = this.tatForm.controls['toppings3'].value; + // let arr3 = this.tatForm.controls['toppings3'].value; this.tatValue1 = this.tatForm.controls['toppings4'].value; this.tatValue2 = this.tatForm.controls['toppings5'].value; + this.tatValue3 = this.tatForm.controls['toppings6'].value; + this.tatValue4 = this.tatForm.controls['toppings7'].value; + this.tatValue5 = this.tatForm.controls['toppings8'].value; + this.tatValue6 = this.tatForm.controls['toppings9'].value; + this.tatValue7 = this.tatForm.controls['toppings0'].value; + let array1 = [...arr1]; let array2 = [...arr2]; - let array3 = [...arr3]; + // let array3 = [...arr3]; let result1 = array1.reduce((a1, v1, i1) => - a1.concat(array2.map(w => v1 + "" + w)), []).reduce((a2, v2, i3) => - a2.concat(array3.map(u => v2 + "" + u)), []); - + a1.concat(array2.map(w => v1 + "" + w)), []); let exist = this.resultApi.filter(a => result1.indexOf(a) > -1); if (exist) { @@ -522,11 +543,11 @@ export class DialogEntityAddTatComponent implements OnInit { result1.forEach(a => { let pdName = this.getIdPdName(a[0]); let productName = this.getIdProductName(a[1]); - let cityName = this.getIdCityName(a[2]); + // let cityName = this.getIdCityName(a[2]); let data = { pd_type: pdName, product: productName, - city: cityName + // city: cityName } this.existValArray.push(data); }); @@ -553,6 +574,11 @@ export class DialogEntityAddTatComponent implements OnInit { record.fk_entity_id = this.data.entity_id; record.tat1 = this.tatForm.controls['toppings4'].value; record.tat2 = this.tatForm.controls['toppings5'].value; + record.tat3 = this.tatForm.controls['toppings6'].value; + record.tat4 = this.tatForm.controls['toppings7'].value; + record.tat5 = this.tatForm.controls['toppings8'].value; + record.tat6 = this.tatForm.controls['toppings9'].value; + record.tat7 = this.tatForm.controls['toppings0'].value; record.child = this.transactions.map(data => { return `${data.pd_type.id}${data.product.id}${data.city.id}` }); diff --git a/ng6-seed/src/app/settings/users/register/register.component.ts b/ng6-seed/src/app/settings/users/register/register.component.ts index a9436f4af..0f14d372c 100755 --- a/ng6-seed/src/app/settings/users/register/register.component.ts +++ b/ng6-seed/src/app/settings/users/register/register.component.ts @@ -190,17 +190,17 @@ this.loader = true; this.AWS.register(userData).subscribe(res => { if (res.User.UserStatus != '' && res.User.UserStatus !== undefined && res.User.UserStatus != null) { if(userData.role.role_id == 10){ - this.AWS.UserGroup(res,userData).subscribe(res=>{ - });} + this.AWS.UserGroup(res,userData).subscribe(res=>{});} this.users.saveRecords(res, userData).subscribe(res => { data = res; if (data.status == 200) { - this.AWS.adminUpdateuser(userData, data.record).subscribe(res => { + this.AWS.adminUpdateuser(userData, data.record).subscribe(res => {}); + this.loader =false; // console.log(res); Swal('User Created'); this.router.navigate(['setting/users/userlist']); - }); + } }) //})