diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 0571707b9..5bc8d63e2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -146,11 +146,11 @@ - +
- +
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 4304d3314..827c39105 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -31,6 +31,7 @@ export class AssetsInfoComponent implements OnInit { pageTitle: string ="Assets Details"; //@Input() pdid: number; pdid:string; + businessProfessionName :string; public _assetsQuesFrom: FormGroup; public submitted = false; @@ -198,7 +199,8 @@ public m_investmentType = []; ngOnInit() { this.getPdSupplierFormDetails(); - + this.getOwnerName(); + this.getM_Assets_Type(); this.getM_PropertyType(); this.getM_InvestmentType(); @@ -208,6 +210,11 @@ public m_investmentType = []; } // ====================== +getOwnerName(){ + this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { + this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ; + }); +} getM_Assets_Type() { this.pdTrigerService.getAllMasterDatas('ASSETTYPE').subscribe( @@ -361,7 +368,7 @@ public m_investmentType = []; business_assets_mode: ['', Validators.compose([Validators.required])], business_details: this._formBuilder.array([]), business_approximate_market_value: ['', Validators.compose([])], - business_name_of_the_owner: ['', Validators.compose([])], + business_name_of_the_owner: [this.businessProfessionName, Validators.compose([])], // other_owner:[''], // relation:[''], // purchase_year: ['', Validators.compose([])], @@ -556,7 +563,7 @@ public m_investmentType = []; loadInvestDescriptionWithData(data) { return this._formBuilder.group({ investments_type: [data.investments_type, Validators.compose([Validators.required])], - other_investment_type : [data.other_investment_type], + other_investments_type : [data.other_investments_type], amount_of_invest: [data.amount_of_invest, Validators.compose([Validators.required])], bank_name: [data.bank_name, Validators.compose([Validators.required])] }); 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 f1a738b42..aea09fcdc 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 @@ -200,4 +200,10 @@
- \ No newline at end of file + + +
+
{{ errorMessage }}
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index 67ec1a524..1da10a7a3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -101,6 +101,7 @@ export class ClientInfoComponent implements OnInit { }; noRecordsFound: Boolean = false; + errorMessage: any = ''; ngOnInit() { this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { @@ -135,10 +136,12 @@ export class ClientInfoComponent implements OnInit { }else { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = data.msg; } }, err => { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = 'No Records Found , Something went Wrong!'; }) // this.getM_FreqOfPurchase(); 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 6f215861d..b4154fdeb 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 @@ -46,7 +46,7 @@ {{freq.name}} - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 8a35d1bfc..d3a9f368e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -103,7 +103,8 @@ export class CurrentLoanComponent implements OnInit { } } } else { - control.push(this.createLoanDetail()); + // console.log('overall else'); + // control.push(this.createLoanDetail()); } }) } @@ -116,10 +117,13 @@ export class CurrentLoanComponent implements OnInit { } selectedLoanChanges(e): void { + console.log(e); if (e.value == 'Yes') { + // console.log('if()'); const control = this.currentLoanForm.controls['loan_details']; control.push(this.createLoanDetail()); } else if (e.value == 'No') { + // console.log('else()'); const arr = this.currentLoanForm.controls.loan_details; arr.removeAt(0); } 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 f632b397b..56803b3fd 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 @@ -269,181 +269,277 @@ + - - \ No newline at end of file + +--> diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 93585e27d..5f32b8ba6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -254,4 +254,354 @@ export class FamilyDetailsComponent implements OnInit { // } // } -} \ No newline at end of file +} + + + + + + + +// =================== other family details multiple add + +// import { +// Component, +// OnInit, +// Inject, +// Input, Output +// } from '@angular/core'; + +// import { +// FormBuilder, +// FormGroup, +// Validators, +// FormArray, FormControl, AbstractControl, +// } from '@angular/forms'; + +// import { NotifierService } from 'angular-notifier'; + +// import { +// MatDialog, +// MatDialogRef, +// MAT_DIALOG_DATA +// } from '@angular/material'; +// /** Service */ +// import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; +// import {ActivatedRoute, Router} from "@angular/router"; + +// @Component({ +// selector: 'app-family-details', +// templateUrl: './family-details.component.html', +// styleUrls: ['./family-details.component.scss'] +// }) +// export class FamilyDetailsComponent implements OnInit { +// //@Input() pdid: number; +// pageTitle: string ="Other Family Details"; +// pdid : string; +// form_id : number; + +// private notifier: NotifierService; +// public familyForm: FormGroup; +// public selectPerson; +// // selectPerson = [{ +// // name : 'person 1', +// // id : 111 +// // }, { +// // name : 'person 2', +// // id : 222 +// // }]; + +// earningStatus = [{ +// type: 'Earning', +// id: 1 +// }, { +// type: 'Non Earning', +// id: 2 +// }] + +// relationData: any = []; +// occupationData: any = []; +// //personMetData: any = []; +// ownerShipData: any = []; +// customerSegData: any = []; +// // earnMemberArrCount :any ; +// // nonEarnMemberArrCount :any ; +// count : number; +// constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, +// private router: Router, +// private _pd: PdTrigerService, +// @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { +// console.log(pd_all_details); +// this.selectPerson = this.pd_all_details.pdapplicants_detials; +// this.pdid = this.pd_all_details.pdmaster_details.pd_id; +// this.form_id = 6; +// this.notifier = notifier; +// } +// ngOnInit() { +// this.getMasterDetails('RELATIONSHIPS',1); +// this.getMasterDetails('OCCUPATIONMEMBERS',2); +// //this.getMasterDetails('PERSONSMET',3); +// this.getMasterDetails('RESIDENCEOWNERSHIP',4); +// this.getMasterDetails('CUSTOMERSEGMENT',5); +// this.initFamilyFormDetails(); +// let params: any = {}; +// params.pd_id = this.pdid; +// params.pd_form_id = '6'; +// this._pd.retriveForm(params).subscribe(data => { +// const control = this.familyForm.controls['nonEarningMembers']; +// const value = this.familyForm.controls['earningMembers']; +// if (data.status == 200) { +// this.initFamilyForm(data.records); +// // this.familyForm.controls.selected_person.setValue(data.records.selected_person); +// // this.familyForm.controls.residence_place.setValue(data.records.residence_place); +// // this.familyForm.controls.residence_city.setValue(data.records.residence_city); +// // this.familyForm.controls.residence_state.setValue(data.records.residence_state); +// // this.familyForm.controls.residence_pin.setValue(data.records.residence_pin); +// // this.familyForm.controls.residence_No_of_years.setValue(data.records.residence_No_of_years); +// // this.familyForm.controls.residence_ownership.setValue(data.records.residence_ownership); +// // this.familyForm.controls.ownershipOther.setValue(data.records.ownershipOther); +// // this.familyForm.controls.rent.setValue(data.records.rent); +// // this.familyForm.controls.total_number_of_family_members.setValue(data.records.total_number_of_family_members); +// // this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); +// // this.generateFamilyMembersDetailsGetData(data.records.family_members_details); +// } else { +// // value.push(this.createMembers()); +// // control.push(this.createNonMembers()); +// } +// }); +// } + +// initgenerateFamilyMembersDetailsGet(val): FormGroup { +// return this.fb.group({ +// family_member_name : [val.family_member_name, Validators.compose([])], +// family_member_relationship : [val.family_member_relationship, Validators.compose([])], +// family_member_age : [val.family_member_age, Validators.compose([])], +// family_member_earning_status : [val.family_member_earning_status, Validators.compose([])], +// earning_segment: [val.earning_segment, Validators.compose([])], +// earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])], +// earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])], +// earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])], +// non_earning_occupation: [val.non_earning_occupation, Validators.compose([])], +// non_earning_if_others: [val.non_earning_if_others, Validators.compose([])], +// non_earning_if_retired_from: [val.non_earning_if_retired_from, Validators.compose([])], +// }) +// } + +// generateFamilyMembersDetailsGetData(data) { +// var result = Object.keys(data).map(function (key) { +// return data[key]; +// }); +// if (result.length > 0) { +// for (let val of result) { +// const control = this.familyForm.controls['family_members_details']; +// control.push(this.initgenerateFamilyMembersDetailsGet(val)); +// } +// } +// } + +// onSearchChange(e):void { +// e.preventDefault(); +// } +// public initFamilyFormDetails(): void { +// this.familyForm = this.fb.group({ +// family_details: this.fb.array([]), +// family_details_form_remark: [''] +// }) +// } + +// public noRecordsFound: Boolean = false; + +// public initFamilyForm(records): void { +// // let data = [...records]; +// let recordss = { +// "selected_person":"95", +// "residence_place":"check ", +// "residence_city":"check ", +// "residence_state":"check ", +// "residence_pin":"123456", +// "residence_No_of_years":"2", +// "residence_ownership":"1", +// "ownershipOther":"", +// "rent":"", +// "total_number_of_family_members":"2", +// "family_members_details":{ +// "1":{ +// "family_member_name":"name", +// "family_member_relationship":"1", +// "family_member_age":"21", +// "family_member_earning_status":"1", +// "earning_segment":"1", +// "earning_gross_income_per_month":"12000", +// "earning_name_of_the_employer_or_business":"check", +// "earning_number_of_years_in_employment_or_business":"2", +// "non_earning_occupation":"", +// "non_earning_if_others":"", +// "non_earning_if_retired_from":"" +// }, +// "2":{ +// "family_member_name":"chekc ", +// "family_member_relationship":"2", +// "family_member_age":"31", +// "family_member_earning_status":"2", +// "earning_segment":"", +// "earning_gross_income_per_month":"", +// "earning_name_of_the_employer_or_business":"", +// "earning_number_of_years_in_employment_or_business":"", +// "non_earning_occupation":"9", +// "non_earning_if_others":"others check ", +// "non_earning_if_retired_from":"" +// } +// }, +// "family_details_form_remark":"check remark" +// }; +// if(recordss === null) { +// this.fb.group({ +// selected_person: ['', Validators.compose([Validators.required])], +// residence_place: ['', Validators.compose([])], +// residence_city: ['', Validators.compose([])], +// residence_state: ['', Validators.compose([])], +// residence_pin: ['', Validators.compose([])], +// residence_No_of_years: ['', Validators.compose([])], +// residence_ownership: ['', Validators.compose([])], +// ownershipOther: [''], +// rent: [''], +// total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])], +// family_members_details: this.fb.array([this.addFamilyMemberDetails()]), +// }); +// } else { +// let formData: FormGroup = this.fb.group({ +// selected_person: ['1', Validators.compose([Validators.required])], +// residence_place: ['as', Validators.compose([])], +// residence_city: ['as', Validators.compose([])], +// residence_state: ['sa', Validators.compose([])], +// residence_pin: ['sa', Validators.compose([])], +// residence_No_of_years: ['sa', Validators.compose([])], +// residence_ownership: ['s', Validators.compose([])], +// ownershipOther: ['s'], +// rent: ['as'], +// total_number_of_family_members: ['1', Validators.compose([Validators.min(1), Validators.max(20)])], +// family_members_details: this.fb.array([]), +// }); + +// const control = this.familyForm.controls['family_details']; +// control.push(formData); +// console.log(this.familyForm.value); +// } +// this.noRecordsFound = true; +// } + +// addFamilyMemberDetails(): void { + +// } + +// addMoreApplicantFamilyDetails(e): void { +// e.stopPropagation(); +// this.initFamilyForm('chck'); +// } + +// getNumberOfFamilyMemberDetails(inx){ +// // alert(inx); +// let formData = this.familyForm.controls['family_details']['controls'][inx].controls; +// // alert(formData['total_number_of_family_members'].value); +// // alert(this.familyForm.controls.total_number_of_family_members.valid); +// if(formData['total_number_of_family_members'].valid){ +// let totalMem = formData['total_number_of_family_members'].value; +// const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; +// if(totalMem > control.length) { +// let len = totalMem - control.length; +// for(let i = 0; i < len; i++){ +// control.push(this.generateFamilyMembersDetailsGet()); +// } +// } else if (totalMem < control.length) { +// // control.controls.slice(0, totalMem); +// control.controls = []; +// for(let i = 0; i < totalMem; i++){ +// control.push(this.generateFamilyMembersDetailsGet()); +// } +// } +// } else { + +// } +// } + +// generateFamilyMembersDetailsGet(): FormGroup { +// return this.fb.group({ +// family_member_name : ['', Validators.compose([])], +// family_member_relationship : ['', Validators.compose([])], +// family_member_age : ['', Validators.compose([])], +// family_member_earning_status : ['', Validators.compose([])], +// earning_segment: ['', Validators.compose([])], +// earning_gross_income_per_month: ['', Validators.compose([])], +// earning_name_of_the_employer_or_business: ['', Validators.compose([])], +// earning_number_of_years_in_employment_or_business: ['', Validators.compose([])], +// non_earning_occupation: ['', Validators.compose([])], +// non_earning_if_others: ['', Validators.compose([])], +// non_earning_if_retired_from: ['', Validators.compose([])], +// }) +// } + +// // get all master details +// getMasterDetails(table:string,type:number){ +// this._pd.getAllMasterDatas(table).subscribe( +// data => { +// if (data.status == 200) { +// if(type==1){ +// this.relationData=data.records.filter(item => item.isactive == 1); +// } +// else if(type==2){ +// this.occupationData=data.records.filter(item => item.isactive == 1); +// } +// // else if(type==3){ +// // this.personMetData=data.records.filter(item => item.isactive == 1); +// // } +// else if(type==4){ +// this.ownerShipData=data.records.filter(item => item.isactive == 1); +// } +// else if(type==5){ +// this.customerSegData=data.records.filter(item => item.isactive == 1); +// } + +// } +// }); +// } + +// submitFamily() { +// if (!this.familyForm.valid) { +// return; +// } +// var records = this.familyForm.value; +// //To Remove The "Null" With Key also +// Object.keys(records).forEach((key) => (records[key] == null) && delete records[key]); +// // records.other_family_details = answerFormValues; +// records.pdid = this.pdid; +// records.formid = '6'; +// // records.fk_createdby = '251'; +// console.log(JSON.stringify(records)); +// this._pd.saveForm(records).subscribe(data => { +// this.notifier.notify('success', 'Saved Successfully.'); +// }, error => { +// this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); +// }); +// } +// // validateAllFormFields(formGroup: FormGroup) { +// // Object.keys(formGroup.controls).forEach(field => { +// // const control = formGroup.get(field); +// // if (control instanceof FormControl) { +// // control.markAsTouched({onlySelf: true}); +// // } else if (control instanceof FormGroup) { +// // this.validateAllFormFields(control); +// // } +// // }); +// // } + +// // /** On Key Press Event For Age */ +// // keyPress(event: any) { +// // const pattern = /[0-9]/; + +// // let inputChar = String.fromCharCode(event.charCode); +// // if (event.keyCode != 8 && !pattern.test(inputChar)) { +// // event.preventDefault(); +// // } +// // } + +// } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 6ee1a4bb7..0b90adbee 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -135,7 +135,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 495143ec5..25f21ceb7 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 @@ -35,8 +35,9 @@ {{relation.controls.applicant_name.value | titlecase}} + - + @@ -66,7 +67,17 @@ +
+ + +
+ + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 6dd11f334..7f18d0981 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -127,7 +127,7 @@ export class GeneralInfoComponent implements OnInit { return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_name: [elementValue.applicant_name], - company_name: [elementValue.company_name], + company_name: [elementValue.company_name,], exist_status:[elementValue.exist_status==1 && elementValue.pd_co_applicant_id > 0 ? true : false] }); } @@ -192,6 +192,18 @@ export class GeneralInfoComponent implements OnInit { } } + // remove other details + removeOthers(index, item: any){ + console.log(item) + if(item.pd_co_applicant_id==0){ + let relationControl = this._generalForm.controls['applicant_relation']; + relationControl.removeAt(index); + // remove related to details + let pos_name=this.fetch_related_details.indexOf(item.applicant_name); + this.fetch_related_details.splice(pos_name, 1); + } + } + // submit form details submitGeneralForm(formData:any) { if (this._generalForm.invalid) { 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 ea0fce859..397353269 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 @@ -50,7 +50,7 @@ - + {{"₹"}} {{M_rawValueInWords}} Only (keyup)="inWords($event,1)" @@ -97,7 +97,7 @@ - + {{"₹"}} {{M_goodsValueInWords}} Only (keyup)="inWords($event,2)" @@ -145,7 +145,7 @@ - + {{"₹"}} {{M_tradedGoodsValueInWords}} Only(keyup)="inWords($event,3)" @@ -205,7 +205,7 @@ - + {{"₹"}} {{R_goodsValueInWords}} Only(keyup)="inWords($event,4)" @@ -254,7 +254,7 @@ - + {{"₹"}} {{R_tradedGoodsValueInWords}} Only(keyup)="inWords($event,5)" @@ -315,7 +315,7 @@ - + {{"₹"}} {{T_goodsValueInWords}} Only(keyup)="inWords($event,6)" @@ -365,7 +365,7 @@ - + {{"₹"}} {{T_tradedGoodsValueInWords}} Only (keyup)="inWords($event,7)" @@ -399,6 +399,13 @@ + + + +

Service Provider

+ +
Service Provider Details Not applicable here !!
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 9eff1689c..6c83ae348 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -40,14 +40,23 @@ export class StockComponent implements OnInit { public uomData : any = []; rawmaterial : any; - goodsValueInWords : any; - rawValueInWords : any; - tradedGoodsValueInWords : any; + + M_rawValueInWords : any; + + M_goodsValueInWords : any; + R_goodsValueInWords : any; + T_goodsValueInWords : any; + + M_tradedGoodsValueInWords : any; + R_tradedGoodsValueInWords : any; + T_tradedGoodsValueInWords : any; + rawMaterialAccess: boolean; finishedGoodsAccess: boolean; tradeConcernAccess: boolean; public submitted = false; noRecordsFound: Boolean = false; + serviceProviderForm: Boolean = false; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -85,37 +94,27 @@ export class StockComponent implements OnInit { // this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!'); // }) - this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { - // if(data.dataStatus === undefined){ - let datas = { - "profession_name": "Others", - "type_of_activity": [ - { - "type_of_activity_id": 1, - "name": "Manufacturing Details" - }, - { - "type_of_activity_id": 2, - "name": "Retail trading" - }, - { - "type_of_activity_id": 3, - "name": "Trading Concern" - }, - { - "type_of_activity_id": 4, - "name": "Service Provider" - } - ] - }; - this.initstockForms(datas.type_of_activity); - // }else { - // this.notifier.notify('warning', 'No Category Records Found.!'); - // this.noRecordsFound = false; - // } + //this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe( + this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(data => { + + if(data.dataStatus == true){ + let datas = data.records; + if(datas.type_of_activity != undefined){ + this.initstockForms(datas.type_of_activity) + } + else{ + this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!'); + } + }else if(data.dataStatus == false) + { + this.notifier.notify('warning', data.msg); + return; + } + else{ + return; + } }, err => { - - this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!'); + this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!'); this.noRecordsFound = false; }) @@ -133,7 +132,7 @@ export class StockComponent implements OnInit { let dataForm = value.records; if(dataForm !== undefined) { - console.log('dtaForm',dataForm); + this.stockForms = this.fb.group({ pdid: [this.pdid], formid: [this.form_id], @@ -142,7 +141,12 @@ export class StockComponent implements OnInit { retail_details : this.fb.array([this.retailFormCreation(record)]), trade_details: this.fb.array([this.tradingFormCreation(record)]), }); - let arr = record.filter(data => data.type_of_activity_id === 1); + + let arr0 = Object.keys(record).map(function (key) { + return record[key]; + }); + let arr = record.filter(data => data.type_of_activity_id == 1); + if(arr.length > 0) { let retail_finished_goods; let manufacturing_raw_materials; @@ -175,7 +179,7 @@ export class StockComponent implements OnInit { manufacturing_temparr['manufacturing_traded_goods'] = manufacturing_traded_goods;manufacturing_temparr['manufacturing_finished_goods'] = manufacturing_finished_goods;manufacturing_temparr['manufacturing_raw_materials'] = manufacturing_raw_materials; this.initManufacturingDetails(manufacturing_temparr); } - let arr1 = record.filter(data => data.type_of_activity_id === 2); + let arr1 = record.filter(data => data.type_of_activity_id == 2); if(arr1.length > 0) { let retail_finished_goods; let retail_traded_goods; @@ -199,7 +203,7 @@ export class StockComponent implements OnInit { retail_temparr['retail_finished_goods'] = retail_finished_goods; this.initRetailDetails(retail_temparr); } - let arr2 = record.filter(data => data.type_of_activity_id === 3); + let arr2 = record.filter(data => data.type_of_activity_id == 3); if(arr2.length > 0) { let trading_finished_goods; let trading_traded_goods; @@ -223,10 +227,14 @@ export class StockComponent implements OnInit { trading_temparr['trading_traded_goods'] = trading_traded_goods; this.initTradingDetails(trading_temparr); } + let arr3 = record.filter(data => data.type_of_activity_id == 4); + if(arr3.length > 0) { + this.serviceProviderForm = true; + } this.noRecordsFound = true; } else{ - console.log('dataForm',dataForm); + // console.log('dataForm',dataForm); this.stockForms = this.fb.group({ pdid: [this.pdid], formid: [this.form_id], @@ -235,21 +243,21 @@ export class StockComponent implements OnInit { retail_details : this.fb.array([this.retailFormCreation(record)]), trade_details: this.fb.array([this.tradingFormCreation(record)]), }); - let arr = record.filter(data => data.type_of_activity_id === 1); + let arr = record.filter(data => data.type_of_activity_id == 1); if(arr.length > 0) { this.initManufacturingDetails(null); } - let arr1 = record.filter(data => data.type_of_activity_id === 2); + let arr1 = record.filter(data => data.type_of_activity_id == 2); if(arr1.length > 0) { this.initRetailDetails(null); } - let arr2 = record.filter(data => data.type_of_activity_id === 3); + let arr2 = record.filter(data => data.type_of_activity_id == 3); if(arr2.length > 0) { this.initTradingDetails(null); } - let arr3 = record.filter(data => data.type_of_activity_id === 4); + let arr3 = record.filter(data => data.type_of_activity_id == 4); if(arr3.length > 0) { - //this.serviceProviderForm = true; + this.serviceProviderForm = true; } this.noRecordsFound = true; } @@ -263,21 +271,21 @@ export class StockComponent implements OnInit { retail_details : this.fb.array([this.retailFormCreation(record)]), trade_details: this.fb.array([this.tradingFormCreation(record)]), }); - let arr = record.filter(data => data.type_of_activity_id === 1); + let arr = record.filter(data => data.type_of_activity_id == 1); if(arr.length > 0) { this.initManufacturingDetails(null); } - let arr1 = record.filter(data => data.type_of_activity_id === 2); + let arr1 = record.filter(data => data.type_of_activity_id == 2); if(arr1.length > 0) { this.initRetailDetails(null); } - let arr2 = record.filter(data => data.type_of_activity_id === 3); + let arr2 = record.filter(data => data.type_of_activity_id == 3); if(arr2.length > 0) { this.initTradingDetails(null); } - let arr3 = record.filter(data => data.type_of_activity_id === 4); + let arr3 = record.filter(data => data.type_of_activity_id == 4); if(arr3.length > 0) { - //this.serviceProviderForm = true; + this.serviceProviderForm = true; } this.noRecordsFound = true; } @@ -292,8 +300,8 @@ export class StockComponent implements OnInit { } manufacturingForm: Boolean = false; - manufacturingFormCreation(val) { - let arr = val.filter(data => data.type_of_activity_id === 1); + manufacturingFormCreation(record) { + let arr = record.filter(data => data.type_of_activity_id == 1); if (arr.length > 0) { this.manufacturingForm = true; return this.fb.group({ @@ -309,7 +317,8 @@ export class StockComponent implements OnInit { retailForm: Boolean = false; retailFormCreation(val) { - let arr = val.filter(data => data.type_of_activity_id === 2); + + let arr = val.filter(data => data.type_of_activity_id == 2); if (arr.length > 0) { this.retailForm = true; return this.fb.group({ @@ -324,7 +333,7 @@ export class StockComponent implements OnInit { tradingForm: Boolean = false; tradingFormCreation(val) { - let arr = val.filter(data => data.type_of_activity_id === 3); + let arr = val.filter(data => data.type_of_activity_id == 3); if (arr.length > 0) { this.tradingForm = true; return this.fb.group({ @@ -350,32 +359,32 @@ export class StockComponent implements OnInit { const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; if(datas === null){ - console.log(299,'if'); + // console.log(299,'if'); // rawMaterial.push(this.createRawmaterial(null)); // finishedGoods.push(this.createGoods(null)); // tradedGoods.push(this.createTradedGoods(null)); } else { - console.log(305,'else') + // console.log(305,'else') for (let val of datas.manufacturing_raw_materials) { - console.log(val); + // console.log(val); rawMaterial.push(this.createRawmaterial(val)); } for (let val of datas.manufacturing_finished_goods) { - console.log(val); + // console.log(val); finishedGoods.push(this.createGoods(val)); } for (let val of datas.manufacturing_traded_goods) { - console.log(val); + // console.log(val); tradedGoods.push(this.createTradedGoods(val)); } - console.log(310,rawMaterial); + // console.log(310,rawMaterial); } } @@ -439,13 +448,13 @@ export class StockComponent implements OnInit { } else { for (let val of datas.retail_finished_goods) { - console.log(val); + // console.log(val); finishedGoods.push(this.createGoods(val)); } for (let val of datas.retail_traded_goods) { - console.log(val); + // console.log(val); tradedGoods.push(this.createTradedGoods(val)); } @@ -521,13 +530,13 @@ export class StockComponent implements OnInit { // } for (let val of datas.trading_finished_goods) { - console.log(val); + // console.log(val); finishedGoods.push(this.createGoods(val)); } for (let val of datas.trading_traded_goods) { - console.log(val); + // console.log(val); tradedGoods.push(this.createTradedGoods(val)); } @@ -751,13 +760,25 @@ export class StockComponent implements OnInit { inWords(e,flag:number){ switch(flag){ case 1 : - this.rawValueInWords = this._pd.convertNumberToWords(e.target.value); + this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value); break; case 2 : - this.goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value); break; case 3 : - this.tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); + this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 4 : + this.R_goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 5 : + this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 6 : + this.T_goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 7 : + this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value); break; default: break; 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 9b4adab9e..982ab5fdf 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 @@ -131,4 +131,9 @@ - \ No newline at end of file + +
+
{{ errorMessage }}
+
+ \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index 0e9ab8f5b..9dad4a868 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 @@ -74,8 +74,8 @@ export class SupplierInfoComponent implements OnInit { }; noRecordsFound: Boolean = false; + errorMessage: any = ''; ngOnInit() { - this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { if(data.dataStatus){ // let datas = { @@ -100,10 +100,12 @@ export class SupplierInfoComponent implements OnInit { }else { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = data.msg; } }, err => { this.notifier.notify('warning', 'No Category Records Found.!'); this.noRecordsFound = false; + this.errorMessage = 'No Records Found , Something went Wrong!'; }) // this.getM_FreqOfPurchase(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index 38778876d..ce04f2137 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -60,7 +60,7 @@ mat-card .child_mat_card > mat-card { transition: box-shadow 0.5s, transform 0.5s; &:hover { cursor: pointer; - background-color: #e00201 !important; + // background-color: #e00201 !important; transform: scale(1); box-shadow: 5px 20px 30px rgba(0, 0, 0, 0.2); } 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 3c7d65a08..8c26e9ebf 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 @@ -82,10 +82,18 @@

- -  {{applicant.applicant_name}}     - -  {{applicant.mobile_no}}
Main Applicant + +  {{applicant.applicant_name}} +     + + +  {{applicant.mobile_no}} +     + + +  {{applicant.landline}} + +
Main Applicant {{applicant.relation_name}}

diff --git a/ng6-seed/src/app/settings/service/entity/entity.service.ts b/ng6-seed/src/app/settings/service/entity/entity.service.ts index d40a3639e..8fb6020ae 100755 --- a/ng6-seed/src/app/settings/service/entity/entity.service.ts +++ b/ng6-seed/src/app/settings/service/entity/entity.service.ts @@ -11,10 +11,10 @@ import { environment } from 'environments/environment'; /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; + /** Consant Value For Created Date And Updated Date */ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); - @Injectable({ providedIn: 'root' }) @@ -24,6 +24,7 @@ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); * Kdk */ export class EntityService { + private apiUrl = environment.apiEndpoint; private serviceUrl = 'https://jsonplaceholder.typicode.com/users';