From 83d771eafd5aabbf9c55dcaafb1fd8f8768b3903 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 22 Jan 2019 18:32:21 +0530 Subject: [PATCH 1/4] delete button : ps --- .../forms/address/address.component.html | 12 +++++++--- .../assets-info/assets-info.component.html | 12 +++++++--- .../banking-details.component.html | 13 +++++++---- .../business-assets-info.component.html | 14 ++++++++---- .../current-loan/current-loan.component.html | 22 +++++++++++++++---- .../other-income/other-income.component.html | 14 +++++++----- .../start-pd/forms/stock/stock.component.html | 14 +++++++----- 7 files changed, 72 insertions(+), 29 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 fb7e5ee9a..b4085b39b 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 @@ -217,15 +217,21 @@ formControlName="premises_remarks" autocomplete="off"> - + +
- 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 eeae9ec63..d1f8d8890 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 @@ -314,15 +314,21 @@
--> - + +
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 3264a1536..4b1b9c480 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -160,20 +160,25 @@ +
- --> + + - {{applicants | json}} + @@ -262,15 +262,21 @@
- + +
-
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 b7ee5981c..3a6a487b6 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 @@ -98,7 +98,7 @@ -->
- + @@ -106,20 +106,34 @@ Invalid Balance Tenure. - +
- + --> + + + +
+ +
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 68766265c..83a13c3df 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -88,15 +88,17 @@ add --> - + +
- + +
+ 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 d9948a67d..4e8de11ac 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 @@ -143,15 +143,19 @@ --> - + - From ef4fa7d6980739df7b9024633761523d87c91a1c Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 22 Jan 2019 18:49:24 +0530 Subject: [PATCH 2/4] deleted button :ps --- .../start-pd/forms/address/address.component.html | 4 +++- .../forms/assets-info/assets-info.component.html | 4 +++- .../banking-details/banking-details.component.html | 4 +++- .../business-assets-info.component.html | 11 +++++++---- .../forms/current-loan/current-loan.component.html | 6 +++--- .../forms/other-income/other-income.component.html | 6 ++++-- .../pd-service/pd-triger.service.ts | 2 +- 7 files changed, 24 insertions(+), 13 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 b4085b39b..3c70f193b 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 @@ -228,10 +228,12 @@ matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last"> Delete Additional Unit --> +
+
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 d1f8d8890..dbd40f65e 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 @@ -325,10 +325,12 @@ matTooltip="Delete"matTooltipPosition="left" color="primary" *ngIf="!last"> Delete Other Assets --> +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 4b1b9c480..2f63c207e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -175,9 +175,11 @@ --> - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index fe1508d39..dbe46dee9 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -263,6 +263,12 @@ +
+ +
--> - +
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 3a6a487b6..0342e300a 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 @@ -121,11 +121,11 @@ --> - - +
--> - +
+
+
diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index f6afb25e4..01624e801 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -466,7 +466,7 @@ export class PdTrigerService { **/ stockFormAccess(pdid: any,companyid: any): Observable { // - { "pd_id":"104","company_id":"1"} - return this._http.post(this.apiUrl + "getProductsWithTypeofActivityFromBusiness", { "records": { "pd_id" : pdid , "company_id":companyid} }) + return this._http.post(this.apiUrl + "getProductsFromBusiness", { "records": { "pd_id" : pdid , "company_id":companyid} }) .pipe( catchError(this.handleError('operation', [])) ) From 49e639778d8f4bfc8173645f6f325d7f357a9abe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 22 Jan 2019 21:56:32 +0530 Subject: [PATCH 3/4] changes:ps --- .../start-pd/forms/stock/stock.component.ts | 389 +++++++----------- .../pd-service/pd-triger.service.ts | 4 +- 2 files changed, 152 insertions(+), 241 deletions(-) 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 308563dbc..84dc9d661 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 @@ -51,12 +51,14 @@ export class StockComponent implements OnInit { rawMaterialAccess: boolean; finishedGoodsAccess: boolean; tradeConcernAccess: boolean; + public submitted = false; noRecordsFound: Boolean = false; serviceProviderForm: Boolean = false; suppliers_raw_materials : any = []; suppliers_trade_details : any = []; suppliers_finished_goods : any =[]; + suppliers_service_product : any = []; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -97,15 +99,66 @@ export class StockComponent implements OnInit { // }, err => { // this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!'); // }) - + // "Manufacturing" + // products + // : + // (2) ["Rwas1", "123"] + // type_of_activity_id + // : + // 2 //this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe( + // console.log(this.pdid); + // console.log(this.company_id); this._pd.stockFormAccess(this.pdid,this.company_id).subscribe(data => { - console.log(data); + // console.log(data); + // console.log(data.record); + // return; if(data.dataStatus == true){ - let datas = data.records; - if(datas.type_of_activity != undefined){ - this.initstockForms(datas.type_of_activity) + let tempcount = 0; + + let datas = data.record; + + + let api = Object.keys(datas).map(function (key) { + return datas[key]; + }); + if(api.length > 0){ + // for(let val of api){ + // if (val.type_of_activity_id == 2) { + // let suppliers = datas.products; + // console.log(suppliers); + // } + // } + + api.forEach(val => { + if (val.type_of_activity_id == 2) { + this.suppliers_raw_materials = val.products; + console.log(this.suppliers_raw_materials); + } + if (val.type_of_activity_id == 3) { + this.suppliers_finished_goods = val.products; + console.log(this.suppliers_finished_goods); + } + if (val.type_of_activity_id == 4) { + this.suppliers_trade_details = val.products; + console.log(this.suppliers_trade_details); + } + if (val.type_of_activity_id == 5) { + this.suppliers_service_product = val.products; + console.log(this.suppliers_service_product); + } + tempcount++; + }); + console.log('tempcount',tempcount); + if(tempcount>0){ + this.initstockForms(datas); + } + else{ + this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!'); + } + + } else{ this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!'); @@ -127,6 +180,20 @@ export class StockComponent implements OnInit { } public initstockForms(record){ + // console.log(record); +// {: 2, name: "Manufacturing", products: Array(2)} +// 1 +// : +// {type_of_activity_id: 3, name: "Retail trading", products: Array(1)} +// 2 +// : +// {type_of_activity_id: 4, name: "Wholesale Trade", products: Array(1)} +// 3 +// : +// {type_of_activity_id: 5, name: "Service Provider", products: Array(1)} + + + let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = this.form_id; @@ -146,169 +213,28 @@ export class StockComponent implements OnInit { }); let arr = record.filter(data => data.type_of_activity_id == 2); - if(arr.length > 0) { - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - // console.log('136',value); - if(value.status == 200){ - this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; + if(arr.length > 0) { let manufacturing_temparr = []; manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods; manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods; this.initManufacturingDetails(manufacturing_temparr); - } - else{ - let manufacturing_temparr = []; - manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; - manufacturing_temparr['manufacturing_finished_goods'] = dataForm.manufacturing_details[0].manufacturing_finished_goods; - manufacturing_temparr['manufacturing_traded_goods'] = dataForm.manufacturing_details[0].manufacturing_traded_goods; - this.initManufacturingDetails(manufacturing_temparr); - } - }); - // console.log(1,dataForm); - // console.log(164,dataForm.manufacturing_details); - // console.log(2,dataForm.retail_details); - // console.log(3,dataForm.retail_details[0]); - // console.log(4,dataForm.retail_details[0].retail_finished_goods); - // console.log(5,dataForm.retail_details[0].retail_traded_goods); - //let retail_finished_goods; - // let manufacturing_raw_materials; - // let manufacturing_finished_goods; - // let manufacturing_traded_goods; - // if(dataForm.manufacturing_raw_materials !==undefined){ - // manufacturing_raw_materials = Object.keys(dataForm.manufacturing_raw_materials).map(function (key) { - // return dataForm.manufacturing_raw_materials[key]; - // }); - // } - // if(dataForm.manufacturing_finished_goods !==undefined){ - // manufacturing_finished_goods = Object.keys(dataForm.manufacturing_finished_goods).map(function (key) { - // return dataForm.manufacturing_finished_goods[key]; - // }); - // } - // else{ - // manufacturing_finished_goods = null; - // } - // if(dataForm.manufacturing_traded_goods !==undefined){ - // manufacturing_traded_goods = Object.keys(dataForm.manufacturing_traded_goods).map(function (key) { - // return dataForm.manufacturing_traded_goods[key]; - // }); - // } - // else{ - // manufacturing_traded_goods = null; - // } - - //console.log(retail_finished_goods,manufacturing_traded_goods); - // console.log(163,dataForm.manufacturing_details.manufacturing_raw_materials); - // console.log(164,dataForm.manufacturing_details[0]); - // console.log(164,dataForm.manufacturing_details[0].manufacturing_raw_materials); - - //this.initManufacturingDetails(dataForm); - } let arr1 = record.filter(data => data.type_of_activity_id == 3); if(arr1.length > 0) { - // let retail_finished_goods; - // let retail_traded_goods; - - - // if(dataForm.retail_traded_goods !==undefined){ - // retail_traded_goods = Object.keys(dataForm.retail_traded_goods).map(function (key) { - // return dataForm.retail_traded_goods[key]; - // }); - // } - // else{ - // retail_traded_goods = null; - // } - // if(dataForm.retail_finished_goods !==undefined) - // { - // retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key) - // { - // return dataForm.retail_finished_goods[key]; - // }) - // } - // else{ - // retail_finished_goods = null; - // } - // console.log(dataForm.retail_finished_goods); - // console.log(dataForm.retail_traded_goods); - - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - // console.log('136',value); - if(value.status == 200){ - // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - this.suppliers_finished_goods = value.records.trade_details[0].trading_products; - // this.suppliers_trade_details = value.records.trade_details[0].trading_products; - let retail_temparr = []; - retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; - retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods; - this.initRetailDetails(retail_temparr); - } - else{ let retail_temparr = []; retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods; this.initRetailDetails(retail_temparr); - } - }); - - // let retail_temparr = []; - // retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; - // retail_temparr['retail_finished_goods'] = dataForm.retail_details[0].retail_finished_goods; - // this.initRetailDetails(retail_temparr); - //this.initRetailDetails(dataForm); - //this.initRetailDetails(null); } let arr2 = record.filter(data => data.type_of_activity_id == 4); if(arr2.length > 0) { - // let trading_finished_goods; - // let trading_traded_goods; - - // if(dataForm.trading_finished_goods !==undefined){ - - // trading_finished_goods = Object.keys(dataForm.trading_finished_goods).map(function (key) { - // return dataForm.trading_finished_goods[key]; - // }); - // } - // else{ - // trading_finished_goods = null; - // } - - - // if(dataForm.trading_traded_goods !==undefined) - // { - // trading_traded_goods = Object.keys(dataForm.trading_traded_goods).map(function(key) - // { - // return dataForm.trading_traded_goods[key]; - // }) - // } - - // let trading_temparr = []; - // trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods; - // trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; - // //this.initTradingDetails(trading_temparr); - // this.initTradingDetails(trading_temparr); - - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - // console.log('136',value); - if(value.status == 200){ - // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - this.suppliers_trade_details = value.records.trade_details[0].trading_products; let trading_temparr = []; trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods; trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; this.initTradingDetails(trading_temparr); - } - else{ - let trading_temparr = []; - trading_temparr['trading_finished_goods'] = dataForm.trade_details[0].trading_finished_goods; - trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; - //this.initTradingDetails(trading_temparr); - this.initTradingDetails(trading_temparr); - } - }); - } let arr3 = record.filter(data => data.type_of_activity_id == 5); if(arr3.length > 0) { @@ -327,52 +253,30 @@ 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 == 2); if(arr.length > 0) { - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - this.initManufacturingDetails(null); - } - else{ this.initManufacturingDetails(null); - } - }); - // this.initManufacturingDetails(null); } - let arr1 = record.filter(data => data.type_of_activity_id == 2); + let arr1 = record.filter(data => data.type_of_activity_id == 3); if(arr1.length > 0) { - - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - this.suppliers_finished_goods = value.records.trade_details[0].trading_products; - //trade_product_name; - this.initRetailDetails(null); - } - else{ - this.initRetailDetails(null); - } - }); - - + this.initRetailDetails(null); } - let arr2 = record.filter(data => data.type_of_activity_id == 3); + let arr2 = record.filter(data => data.type_of_activity_id == 4); if(arr2.length > 0) { - // this.initTradingDetails(null); - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - // this.suppliers_finished_goods - this.suppliers_trade_details = value.records.trade_details[0].trading_products; - this.initTradingDetails(null); - } - else{ - this.initTradingDetails(null); - } - }); + this.initTradingDetails(null); + // this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { + // if(value.status == 200){ + // // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; + // // this.suppliers_finished_goods + // this.suppliers_trade_details = value.records.trade_details[0].trading_products; + // this.initTradingDetails(null); + // } + // else{ + // this.initTradingDetails(null); + // } + // }); } - let arr3 = record.filter(data => data.type_of_activity_id == 4); + let arr3 = record.filter(data => data.type_of_activity_id == 5); if(arr3.length > 0) { this.serviceProviderForm = true; } @@ -388,46 +292,46 @@ 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 == 2); if(arr.length > 0) { - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; - this.initManufacturingDetails(null); - } - else{ + // this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { + // if(value.status == 200){ + // this.suppliers_raw_materials = value.records.manufacturing_details[0].main_raw_materials; + // this.initManufacturingDetails(null); + // } + // else{ this.initManufacturingDetails(null); - } - }); + // } + // }); } - let arr1 = record.filter(data => data.type_of_activity_id == 2); + let arr1 = record.filter(data => data.type_of_activity_id == 3); if(arr1.length > 0) { - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - this.suppliers_finished_goods = value.records.trade_details[0].trading_products; - // value.records.manufacturing_details[0].main_raw_materials; - this.initRetailDetails(null); - } - else{ + // this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { + // if(value.status == 200){ + // this.suppliers_finished_goods = value.records.trade_details[0].trading_products; + // // value.records.manufacturing_details[0].main_raw_materials; + // this.initRetailDetails(null); + // } + // else{ this.initRetailDetails(null); - } - }); + // } + // }); } - let arr2 = record.filter(data => data.type_of_activity_id == 3); + let arr2 = record.filter(data => data.type_of_activity_id == 4); if(arr2.length > 0) { - this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { - if(value.status == 200){ - this.suppliers_trade_details = value.records.trade_details[0].trading_products; - this.initTradingDetails(null); - } - else{ + // this._pd.retriveForm({pd_id:this.pdid,pd_form_id:1}).subscribe(value => { + // if(value.status == 200){ + // this.suppliers_trade_details = value.records.trade_details[0].trading_products; + + // } + // else{ this.initTradingDetails(null); - } - }); + // } + // this.initTradingDetails(null); } - let arr3 = record.filter(data => data.type_of_activity_id == 4); + let arr3 = record.filter(data => data.type_of_activity_id == 5); if(arr3.length > 0) { this.serviceProviderForm = true; } @@ -445,7 +349,7 @@ export class StockComponent implements OnInit { manufacturingForm: Boolean = false; manufacturingFormCreation(record) { - let arr = record.filter(data => data.type_of_activity_id == 1); + let arr = record.filter(data => data.type_of_activity_id == 2); if (arr.length > 0) { this.manufacturingForm = true; return this.fb.group({ @@ -462,7 +366,7 @@ 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 == 3); if (arr.length > 0) { this.retailForm = true; return this.fb.group({ @@ -477,7 +381,7 @@ retailFormCreation(val) { 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 == 4); if (arr.length > 0) { this.tradingForm = true; return this.fb.group({ @@ -502,9 +406,11 @@ tradingFormCreation(val) { const tradedGoods = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials']; if(datas === null){ + console.log('sdzsgfasdfasddfasdf'); + console.log(this.suppliers_raw_materials); if(this.suppliers_raw_materials.length > 0){ - for (let val of this.suppliers_raw_materials) { - let Ref_RawMaterials : any = {'raw_name': val.manufacturing_raw_material_name, + this.suppliers_raw_materials.records.forEach(val => { + let Ref_RawMaterials : any = {'raw_name': val, 'stock_observed':'', 'raw_quantity': '', 'raw_uom': '', @@ -513,14 +419,15 @@ tradingFormCreation(val) { 'is_sufficiant_raw': '', 'rawmaterial_remarks':''}; rawMaterial.push(this.createRawmaterial(Ref_RawMaterials)); - } + }); } else{ rawMaterial.push(this.createRawmaterial(null)); } if(this.suppliers_finished_goods.length > 0){ - for (let val of this.suppliers_finished_goods) { - let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name, + // for (let val of this.suppliers_finished_goods) { + this.suppliers_finished_goods.records.forEach(val => { + let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', 'goods_uom': '', @@ -530,16 +437,16 @@ tradingFormCreation(val) { 'finishedgoods_remarks':''}; finishedGoods.push(this.createGoods(Ref_Finished_Goods)); // finishedGoods.push(this.createGoods(null)); - } + }); } else{ finishedGoods.push(this.createGoods(null)); } if(this.suppliers_trade_details.length > 0){ - for (let val of this.suppliers_trade_details) { + this.suppliers_trade_details.records.forEach(val => { let Ref_Trade_Goods : any = { - 'traded_goods_name': val.trade_product_name, + 'traded_goods_name': val, 'traded_goods_observed': '', 'traded_goods_quantity': '', 'traded_goods_uom': '', @@ -548,7 +455,7 @@ tradingFormCreation(val) { 'is_sufficiant_traded_goods': '', 'traded_goods_remarks':''}; tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); - } + }); } else{ tradedGoods.push(this.createTradedGoods(null)); @@ -560,6 +467,7 @@ tradingFormCreation(val) { // console.log(datas.manufacturing_raw_materials); if(datas.manufacturing_raw_materials != undefined){ for (let val of datas.manufacturing_raw_materials) { + // console.log(val); if(val.raw_value){ this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value); @@ -644,8 +552,9 @@ tradingFormCreation(val) { // finishedGoods.push(this.createGoods(null)); if(this.suppliers_finished_goods.length > 0){ - for (let val of this.suppliers_finished_goods) { - let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name, + // for (let val of this.suppliers_finished_goods) { + this.suppliers_finished_goods.records.forEach(val => { + let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', 'goods_uom': '', @@ -654,7 +563,7 @@ tradingFormCreation(val) { 'is_sufficiant_goods': '', 'finishedgoods_remarks':''}; finishedGoods.push(this.createGoods(Ref_Finished_Goods)); - } + }); } else{ finishedGoods.push(this.createGoods(null)); @@ -662,9 +571,9 @@ tradingFormCreation(val) { if(this.suppliers_trade_details.length > 0){ console.log(this.suppliers_trade_details); - for (let val of this.suppliers_trade_details) { + this.suppliers_trade_details.records.forEach(val => { let Ref_Trade_Goods : any = { - 'traded_goods_name': val.trade_product_name, + 'traded_goods_name': val, 'traded_goods_observed': '', 'traded_goods_quantity': '', 'traded_goods_uom': '', @@ -673,7 +582,7 @@ tradingFormCreation(val) { 'is_sufficiant_traded_goods': '', 'traded_goods_remarks':''}; tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); - } + }); } else{ tradedGoods.push(this.createTradedGoods(null)); @@ -781,8 +690,9 @@ tradingFormCreation(val) { // finishedGoods.push(this.createGoods(null)); // tradedGoods.push(this.createTradedGoods(null)); if(this.suppliers_finished_goods.length > 0){ - for (let val of this.suppliers_finished_goods) { - let Ref_Finished_Goods : any = {'goods_name': val.trade_product_name, + // for (let val of this.suppliers_finished_goods) { + this.suppliers_finished_goods.records.forEach(val => { + let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', 'goods_uom': '', @@ -791,16 +701,17 @@ tradingFormCreation(val) { 'is_sufficiant_goods': '', 'finishedgoods_remarks':''}; finishedGoods.push(this.createGoods(Ref_Finished_Goods)); - } + }); } else{ finishedGoods.push(this.createGoods(null)); } if(this.suppliers_trade_details.length > 0){ - for (let val of this.suppliers_trade_details) { + // for (let val of this.suppliers_trade_details) { + this.suppliers_trade_details.records.forEach(val => { let Ref_Trade_Goods : any = { - 'traded_goods_name': val.trade_product_name, + 'traded_goods_name': val, 'traded_goods_observed': '', 'traded_goods_quantity': '', 'traded_goods_uom': '', @@ -809,7 +720,7 @@ tradingFormCreation(val) { 'is_sufficiant_traded_goods': '', 'traded_goods_remarks':''}; tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); - } + }); } else{ tradedGoods.push(this.createTradedGoods(null)); diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 01624e801..fc5dff8ea 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -465,8 +465,8 @@ export class PdTrigerService { * To Get The Products With TypeofActivity From Business **/ stockFormAccess(pdid: any,companyid: any): Observable { - // - { "pd_id":"104","company_id":"1"} - return this._http.post(this.apiUrl + "getProductsFromBusiness", { "records": { "pd_id" : pdid , "company_id":companyid} }) + // { "pd_id":"104","company_id":"1"} + return this._http.post(this.apiUrl + "getProductsFromBusiness", { "pd_id" : pdid , "company_id":companyid }) .pipe( catchError(this.handleError('operation', [])) ) From e6ed8918f56fafc3fe70a4d341c7d5d086683072 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 22 Jan 2019 22:34:38 +0530 Subject: [PATCH 4/4] changes:ps --- .../start-pd/forms/stock/stock.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 84dc9d661..8df7713f5 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 @@ -409,7 +409,7 @@ tradingFormCreation(val) { console.log('sdzsgfasdfasddfasdf'); console.log(this.suppliers_raw_materials); if(this.suppliers_raw_materials.length > 0){ - this.suppliers_raw_materials.records.forEach(val => { + this.suppliers_raw_materials.forEach(val => { let Ref_RawMaterials : any = {'raw_name': val, 'stock_observed':'', 'raw_quantity': '', @@ -426,7 +426,7 @@ tradingFormCreation(val) { } if(this.suppliers_finished_goods.length > 0){ // for (let val of this.suppliers_finished_goods) { - this.suppliers_finished_goods.records.forEach(val => { + this.suppliers_finished_goods.forEach(val => { let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', @@ -444,7 +444,7 @@ tradingFormCreation(val) { } if(this.suppliers_trade_details.length > 0){ - this.suppliers_trade_details.records.forEach(val => { + this.suppliers_trade_details.forEach(val => { let Ref_Trade_Goods : any = { 'traded_goods_name': val, 'traded_goods_observed': '', @@ -553,7 +553,7 @@ tradingFormCreation(val) { // finishedGoods.push(this.createGoods(null)); if(this.suppliers_finished_goods.length > 0){ // for (let val of this.suppliers_finished_goods) { - this.suppliers_finished_goods.records.forEach(val => { + this.suppliers_finished_goods.forEach(val => { let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', @@ -571,7 +571,7 @@ tradingFormCreation(val) { if(this.suppliers_trade_details.length > 0){ console.log(this.suppliers_trade_details); - this.suppliers_trade_details.records.forEach(val => { + this.suppliers_trade_details.forEach(val => { let Ref_Trade_Goods : any = { 'traded_goods_name': val, 'traded_goods_observed': '', @@ -691,7 +691,7 @@ tradingFormCreation(val) { // tradedGoods.push(this.createTradedGoods(null)); if(this.suppliers_finished_goods.length > 0){ // for (let val of this.suppliers_finished_goods) { - this.suppliers_finished_goods.records.forEach(val => { + this.suppliers_finished_goods.forEach(val => { let Ref_Finished_Goods : any = {'goods_name': val, 'goods_observed': '', 'goods_quantity': '', @@ -709,7 +709,7 @@ tradingFormCreation(val) { if(this.suppliers_trade_details.length > 0){ // for (let val of this.suppliers_trade_details) { - this.suppliers_trade_details.records.forEach(val => { + this.suppliers_trade_details.forEach(val => { let Ref_Trade_Goods : any = { 'traded_goods_name': val, 'traded_goods_observed': '',