From 15caf265b15f29f7588fa322f99649e2eaed92ca Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 21 Dec 2018 18:33:34 +0530 Subject: [PATCH 1/3] std code changes in neighbour hood --- .../edit-pd-applicant/edit-pd-applicant.component.ts | 2 +- .../forms/neighbour-hood/neighbour-hood.component.html | 10 +++++++--- .../forms/neighbour-hood/neighbour-hood.component.ts | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index 0cceec89d..247b93d73 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -43,6 +43,7 @@ export class EditPdApplicantComponent implements OnInit { fk_applicant_primary_id: [null], applicant_name: [null, Validators.compose([Validators.required])], mobile_no: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12)])], + stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], landline: [null, Validators.compose([Validators.minLength(8),Validators.maxLength(12)])], company_name: [null], applicant_type: [1], @@ -54,7 +55,6 @@ export class EditPdApplicantComponent implements OnInit { loadApplicantFormData() { let stdcodesearch = this.mainApplicantData[0].landline.search("-"); let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch); - console.log(stdcode); let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8); this._EditApplicantForm = this._fb.group({ fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index e8da740ae..d137527b2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -57,11 +57,15 @@ - + Enter Valid Mobile Number. - + + + Enter Valid STD Code. + - + Enter Valid Landline Number. @@ -77,7 +81,7 @@ - +

Period of Relationship

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 9919dd140..ce94b7288 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -16,7 +16,7 @@ export class NeighbourHoodComponent implements OnInit { form_id:number; private notifier: NotifierService; check_type:any=[{'id':0,'type_name':'Neighbourhood'},{'id':1,'type_name':'Reference Check'}] - default_reference_details: any= {'reference_name':'','mobile':'','landline':'','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':''}; + default_reference_details: any= {'reference_name':'','mobile':'','landline':'-','location':'','relationship_with':'','year_relation_applicant':'','months_relation_applicant':'','business_volume_amount':'','business_volume_unit':''}; default_neighbourhood_details: any= {'neighbourhood_name':'','do_know':'','how_long_do_know':'','is_applicant_owner':''}; busineesRelationshipList:any=[]; @@ -128,10 +128,14 @@ export class NeighbourHoodComponent implements OnInit { // create reference check form array createReerenceCheck(elementValue:any){ + let stdcodesearch = elementValue.landline.search("-"); + let stdcode = elementValue.landline.substr(0,stdcodesearch); + let landline = elementValue.landline.substr(+stdcodesearch + 1,8); return this._fb.group({ reference_name: [elementValue.reference_name, Validators.required], mobile: [elementValue.mobile,Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(10)])], - landline: [elementValue.landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], + std_code: [stdcode,Validators.compose([Validators.minLength(2),Validators.maxLength(4)])], + landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], location:[elementValue.location,Validators.required], relationship_with:[elementValue.relationship_with,Validators.required], others: [elementValue.others], @@ -217,7 +221,7 @@ export class NeighbourHoodComponent implements OnInit { referencecheck_list.push({ "reference_name":element.reference_name, "mobile":element.mobile, - "landline":element.landline, + "landline":element.std_code+'-'+element.landline, "location":element.location, "relationship_with":element.relationship_with, "others":element.others, From 551690e1f20cbfa00aec02202e7110b7d6211b56 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 21 Dec 2018 18:34:22 +0530 Subject: [PATCH 2/3] merge : kms --- .../forms/address/address.component.html | 95 ++++++----- .../assets-info/assets-info.component.html | 4 +- .../assets-info/assets-info.component.ts | 13 +- .../business-info.component.html | 20 +-- .../current-loan/current-loan.component.html | 2 +- .../current-loan/current-loan.component.ts | 6 +- .../financial-info.component.html | 2 +- .../loan-details/loan-details.component.html | 40 +++-- .../start-pd/forms/stock/stock.component.html | 21 ++- .../start-pd/forms/stock/stock.component.ts | 151 ++++++++++-------- .../supplier-info.component.html | 24 +-- .../list-pd/view-pd/view-pd.component.html | 16 +- .../settings/service/entity/entity.service.ts | 3 +- 13 files changed, 240 insertions(+), 157 deletions(-) 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 78a36ac59..6f2bfb35d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -19,26 +19,29 @@ - - +
+
+ + - - +
+
+ {{m_addressType.address_type}} - - + - - +
+
+ {{m_locality.locality_name}} @@ -46,27 +49,65 @@ - + - - +
+ + +
+
+
+ {{data.description}} - - +
+
+ {{data.rating}} +
+
+ + + + {{ownerShip.name}} + + + + + + + + + + + +
+
+
+
+ + + Yes + No + + + +
+
- - - - {{ownerShip.name}} - - - - - - - - - - - - - - - Yes - No - - + + +
- +
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/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index afaceb53b..f25950d8d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -33,8 +33,7 @@ -
-
+ @@ -44,6 +43,12 @@ + + + {{list.name}} + +
- - - {{list.name}} - - + - + +
+ - +
+ + +
+
+ Yes No +
+ +
+ +
- + {{"₹"}} {{balTxrfAmtInWords}} Only - + Yes No - + {{ btLen.lender_name }} - + - + {{"₹"}} {{topUpAmtInWords}} Only
- + {{"₹"}} {{ownContributionInWords}} Only - + {{ sour.name }} @@ -102,7 +118,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 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 b43043049..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 @@ -17,26 +17,26 @@
Raw Material #{{l+1}}
- + - + - +
- + - + {{ pm.name }} - +
@@ -70,26 +70,26 @@
Trading Product #{{l+1}}
- + - + - +
- + - + {{ pm.name }} - +
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'; From a4c7e9665602c04c78bb80f1ebc6ceb541c12f71 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 21 Dec 2018 22:21:18 +0530 Subject: [PATCH 3/3] Issues Fixes : ps --- .../forms/address/address.component.html | 18 +++-- .../forms/address/address.component.ts | 53 ++++++++------ .../assets-info/assets-info.component.html | 36 ++++++++-- .../assets-info/assets-info.component.ts | 69 ++++++++++++------- .../start-pd/forms/stock/stock.component.html | 28 ++++---- .../start-pd/forms/stock/stock.component.ts | 34 +++++++-- 6 files changed, 165 insertions(+), 73 deletions(-) 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 78a36ac59..b609e9e9a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -101,7 +101,17 @@ No - + + +
+ + + + + + + +
-

Type of Premises

-
+ +
{{at.address_type}}
@@ -162,7 +172,7 @@ formControlName="premises_remarks" style="width: 65%;" autocomplete="off">
- + @@ -329,7 +329,7 @@
- + {{ asset.name }} @@ -504,6 +504,30 @@ + + + + {{owner.applicant_name}} + + + +
+ + + +
+
+ + + + {{relations.name}} + + + +
@@ -511,12 +535,12 @@ Yes No - NAN + NA - - + + 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 827c39105..b4d11a7e7 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 @@ -197,10 +197,12 @@ public m_investmentType = []; }; ngOnInit() { + + this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => { + this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ; + }); this.getPdSupplierFormDetails(); - this.getOwnerName(); - this.getM_Assets_Type(); this.getM_PropertyType(); this.getM_InvestmentType(); @@ -210,11 +212,7 @@ 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( @@ -329,7 +327,7 @@ getOwnerName(){ this.initDetails(), ]), business_assets_details : this._formBuilder.array([ - this.initBusinessDetails(), + this.initBusinessDetails(this.businessProfessionName), ]), assets_form_remark:[''] }); @@ -363,12 +361,12 @@ getOwnerName(){ }); } - initBusinessDetails() { + initBusinessDetails(data) { return this._formBuilder.group({ business_assets_mode: ['', Validators.compose([Validators.required])], business_details: this._formBuilder.array([]), business_approximate_market_value: ['', Validators.compose([])], - business_name_of_the_owner: [this.businessProfessionName, Validators.compose([])], + business_name_of_the_owner: [data], // other_owner:[''], // relation:[''], // purchase_year: ['', Validators.compose([])], @@ -441,9 +439,14 @@ getOwnerName(){ break; } case '8': { - const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray - : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('details') as FormArray ; - control.push(this.otherAssetsDescription()); + if(flag == 1){ + const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray ; + control.push(this.otherAssetsDescription()); + } + else if (flag == 2){ + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.otherBusinessAssetsDescription()); + } break; } default: { @@ -473,6 +476,19 @@ getOwnerName(){ } otherAssetsDescription() { + return this._formBuilder.group({ + any_other_assets: ['', Validators.compose([Validators.required])], + name_of_the_owner:[''], + other_owner:[''], + relation:[''], + any_other_asset_value : [''], + any_other_asset_loan : [''], + other_asset_emi_amt : [''] + + }); + } + + otherBusinessAssetsDescription() { return this._formBuilder.group({ any_other_assets: ['', Validators.compose([Validators.required])], any_other_asset_value : [''], @@ -522,13 +538,6 @@ getOwnerName(){ }); } - loadPropertyWithData2(data) { - return this._formBuilder.group({ - property_type: [data.property_type, Validators.compose([Validators.required])] - //property_type:[''] - }); - } - loadJwellDescriptionWithData(data) { return this._formBuilder.group({ jwell_description: [data.jwell_description, Validators.compose([Validators.required])] @@ -544,12 +553,26 @@ getOwnerName(){ otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], + name_of_the_owner:[data.name_of_the_owner], + other_owner:[data.other_owner], + relation:[data.relation], any_other_asset_value : [data.any_other_asset_value], any_other_asset_loan : [data.any_other_asset_loan], other_asset_emi_amt : [data.other_asset_emi_amt] }); } + otherBusinessAssetsDescriptionWithData(data) { + return this._formBuilder.group({ + any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], + any_other_asset_value : [data.any_other_asset_value], + any_other_asset_loan : [data.any_other_asset_loan], + other_asset_emi_amt : [data.other_asset_emi_amt] + }); + } + + + loadInsuranceDescriptionWithData(data) { return this._formBuilder.group({ //insurance_type: [data.insurance_type, Validators.compose([Validators.required])], @@ -748,7 +771,7 @@ getOwnerName(){ switch (assets_details_mode) { case '1': { const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.loadPropertyWithData2(data)); + control.push(this.loadPropertyWithData(data)); break; } case '2': { @@ -781,7 +804,7 @@ getOwnerName(){ } case '8': { const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.otherAssetsDescriptionWithData(data)); + control.push(this.otherBusinessAssetsDescriptionWithData(data)); break; } default: { @@ -798,7 +821,7 @@ getOwnerName(){ control.push(this.initDetails()); }else if(flag == 2){ const control = this._assetsQuesFrom.controls['business_assets_details']; - control.push(this.initBusinessDetails()); + control.push(this.initBusinessDetails(this.businessProfessionName)); } } removeLanguage(i: number,flag) { 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 397353269..184df23a6 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 @@ -49,8 +49,8 @@ - - {{"₹"}} {{M_rawValueInWords}} Only (keyup)="inWords($event,1)" + + {{"₹"}} {{M_rawValueInWords}} Only @@ -96,8 +96,8 @@ - - {{"₹"}} {{M_goodsValueInWords}} Only (keyup)="inWords($event,2)" + + {{"₹"}} {{M_goodsValueInWords}} Only @@ -144,8 +144,8 @@ - - {{"₹"}} {{M_tradedGoodsValueInWords}} Only(keyup)="inWords($event,3)" + + {{"₹"}} {{M_tradedGoodsValueInWords}} Only @@ -204,8 +204,8 @@ - - {{"₹"}} {{R_goodsValueInWords}} Only(keyup)="inWords($event,4)" + + {{"₹"}} {{R_goodsValueInWords}} Only @@ -253,8 +253,8 @@ - - {{"₹"}} {{R_tradedGoodsValueInWords}} Only(keyup)="inWords($event,5)" + + {{"₹"}} {{R_tradedGoodsValueInWords}} Only @@ -314,8 +314,8 @@ - - {{"₹"}} {{T_goodsValueInWords}} Only(keyup)="inWords($event,6)" + + {{"₹"}} {{T_goodsValueInWords}} Only @@ -364,8 +364,8 @@ - - {{"₹"}} {{T_tradedGoodsValueInWords}} Only (keyup)="inWords($event,7)" + + {{"₹"}} {{T_tradedGoodsValueInWords}} Only 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 6c83ae348..d220137bd 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 @@ -122,7 +122,7 @@ export class StockComponent implements OnInit { } public initstockForms(record){ - +console.log(record); let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = this.form_id; @@ -301,8 +301,11 @@ export class StockComponent implements OnInit { manufacturingForm: Boolean = false; manufacturingFormCreation(record) { + console.log(record); let arr = record.filter(data => data.type_of_activity_id == 1); + console.log(arr); if (arr.length > 0) { + console.log(arr.length); this.manufacturingForm = true; return this.fb.group({ manufacturing_raw_materials: this.fb.array([]), @@ -368,19 +371,26 @@ export class StockComponent implements OnInit { // console.log(305,'else') for (let val of datas.manufacturing_raw_materials) { // console.log(val); - + if(val.raw_value){ + this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value); + } rawMaterial.push(this.createRawmaterial(val)); + } for (let val of datas.manufacturing_finished_goods) { // console.log(val); - + if(val.goods_value){ + this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); + } finishedGoods.push(this.createGoods(val)); } for (let val of datas.manufacturing_traded_goods) { // console.log(val); - + if(val.estimated_traded_goods_value){ + this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); + } tradedGoods.push(this.createTradedGoods(val)); } @@ -449,12 +459,18 @@ export class StockComponent implements OnInit { for (let val of datas.retail_finished_goods) { // console.log(val); - + + if(val.goods_value){ + this.R_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); + } finishedGoods.push(this.createGoods(val)); } for (let val of datas.retail_traded_goods) { // console.log(val); + if(val.estimated_traded_goods_value){ + this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); + } tradedGoods.push(this.createTradedGoods(val)); } @@ -531,12 +547,17 @@ export class StockComponent implements OnInit { for (let val of datas.trading_finished_goods) { // console.log(val); - + if(val.goods_value){ + this.T_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); + } finishedGoods.push(this.createGoods(val)); } for (let val of datas.trading_traded_goods) { // console.log(val); + if(val.estimated_traded_goods_value){ + this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); + } tradedGoods.push(this.createTradedGoods(val)); } @@ -758,6 +779,7 @@ export class StockComponent implements OnInit { /** To Convert Amount into Words */ inWords(e,flag:number){ + switch(flag){ case 1 : this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value);