From 432d6f1e60cd2524d7f65457628101917fe611c9 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 28 Jan 2019 12:26:49 +0530 Subject: [PATCH] changes:ps --- .../edit-pd-applicant.component.ts | 4 +- .../start-pd/forms/stock/stock.component.html | 233 +----------------- .../start-pd/forms/stock/stock.component.ts | 157 +----------- 3 files changed, 17 insertions(+), 377 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 bc278b693..49d80eae9 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 @@ -88,8 +88,8 @@ export class EditPdApplicantComponent implements OnInit { //console.log(stdcode); landline = listData.landline.substr(+stdcodesearch + 1,8);} else{ - stdcode = null; - landline = null; + stdcode = ''; + landline = ''; } return this._fb.group({ label: ['Co Applicant'], 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 44e08cbbf..1632acb68 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 @@ -168,82 +168,6 @@ - -
-
- - Traded Goods #{{c+1}} - - - - - - - Add Stock Details - No Stock Observed - - - - - - - - - {{uom.name}} - - - - - - - - {{"₹"}} {{M_tradedGoodsValueInWords[c]}} Only - - - - - - Yes - No - - - - Please comment on the Traded Goods stock level observed? - - - - - - - - -
- -
-
- -
- - -
-
@@ -252,86 +176,12 @@ -
Retail Details
+
Retail Trading Details
-
-
- - Finished Goods #{{d+1}} - - - - - - - Add Stock Details - No stock observed - - - - - - - - - {{uom.name}} - - - - - - - - {{"₹"}} {{R_goodsValueInWords[d]}} Only - - - - - - Yes - No - - - - Please comment on the finished goods stock level observed? - - - - - - - -
- -
-
- -
- - -
-
+
@@ -418,87 +268,10 @@ -
Trading Details
+
Wholesale Trading Details
-
-
- - Finished Goods #{{f+1}} - - - - - - - Add Stock Details - No Stock Observed - - - - - - - - - {{uom.name}} - - - - - - - - {{"₹"}} {{T_goodsValueInWords[f]}} Only - - - - - - Yes - No - - - - Please comment on the finished goods stock level observed? - - - - - - - - - -
- -
-
- -
- - -
-
-
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 14dc8a6c3..faaf2e270 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 @@ -152,6 +152,7 @@ export class StockComponent implements OnInit { this.initstockForms(datas); } else{ + console.log('1'); this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID '+ this.company_id ); this.noRecordsFound = false; } @@ -159,21 +160,25 @@ export class StockComponent implements OnInit { } else{ + console.log('2'); this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID '+ this.company_id ); this.noRecordsFound = false; } }else if(data.dataStatus == false) { + console.log('3'); this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID '+ this.company_id ); this.noRecordsFound = false; return; } else{ + console.log('4'); this.notifier.notify('warning', 'Fill Business Form First! / No Company Found at this ID '+ this.company_id ); this.noRecordsFound = false; return; } }, err => { + console.log('5'); this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!'); this.noRecordsFound = false; }) @@ -219,7 +224,6 @@ export class StockComponent implements OnInit { 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); } @@ -227,14 +231,12 @@ export class StockComponent implements OnInit { if(arr1.length > 0) { 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 arr2 = record.filter(data => data.type_of_activity_id == 4); if(arr2.length > 0) { 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); } @@ -358,7 +360,6 @@ export class StockComponent implements OnInit { return this.fb.group({ manufacturing_raw_materials: this.fb.array([]), manufacturing_finished_goods: this.fb.array([]), - manufacturing_traded_goods: this.fb.array([]) }) // } } else { @@ -373,7 +374,6 @@ retailFormCreation(val) { if (arr.length > 0) { this.retailForm = true; return this.fb.group({ - retail_finished_goods: this.fb.array([]), retail_traded_goods: this.fb.array([]) }) // } @@ -388,7 +388,6 @@ tradingFormCreation(val) { if (arr.length > 0) { this.tradingForm = true; return this.fb.group({ - trading_finished_goods: this.fb.array([]), trading_traded_goods: this.fb.array([]) }); } else { @@ -406,10 +405,9 @@ tradingFormCreation(val) { const rawMaterial = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; const finishedGoods = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; - 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('sdzsgfasdfasddfasdf'); console.log(this.suppliers_raw_materials); if(this.suppliers_raw_materials.length > 0){ this.suppliers_raw_materials.forEach(val => { @@ -446,24 +444,6 @@ tradingFormCreation(val) { finishedGoods.push(this.createGoods(null)); } - if(this.suppliers_trade_details.length > 0){ - this.suppliers_trade_details.forEach(val => { - let Ref_Trade_Goods : any = { - 'traded_goods_name': val, - 'traded_goods_observed': '', - 'traded_goods_quantity': '', - 'traded_goods_uom': '', - 'traded_goods_other_uom': '', - 'estimated_traded_goods_value': '', - 'is_sufficiant_traded_goods': '', - 'traded_goods_remarks':''}; - tradedGoods.push(this.createTradedGoods(Ref_Trade_Goods)); - }); - } - else{ - tradedGoods.push(this.createTradedGoods(null)); - } - } else { // console.log(305,'else') // console.log(377,datas); @@ -496,21 +476,6 @@ tradingFormCreation(val) { else{ finishedGoods.push(this.createGoods(null)); } - if(datas.manufacturing_traded_goods !== undefined){ - 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); - // this.M_financialTradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); - } - tradedGoods.push(this.createTradedGoods(val)); - - } - } - else{ - tradedGoods.push(this.createTradedGoods(null)); - } - // console.log(310,rawMaterial); } } @@ -548,30 +513,10 @@ tradingFormCreation(val) { initRetailDetails(datas) { - const finishedGoods = this.stockForms.controls['retail_details']['controls'][0].controls['retail_finished_goods']; const tradedGoods = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; if(datas === null){ - // finishedGoods.push(this.createGoods(null)); - if(this.suppliers_finished_goods.length > 0){ - // for (let val of this.suppliers_finished_goods) { - this.suppliers_finished_goods.forEach(val => { - let Ref_Finished_Goods : any = {'goods_name': val, - 'goods_observed': '', - 'goods_quantity': '', - 'goods_uom': '', - 'goods_other_uom': '', - 'goods_value': '', - '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){ console.log(this.suppliers_trade_details); this.suppliers_trade_details.forEach(val => { @@ -592,24 +537,6 @@ tradingFormCreation(val) { } } else { - //console.log(479,datas.retail_finished_goods); - if(datas.retail_finished_goods != undefined){ - for (let val of datas.retail_finished_goods) { - // console.log(val); - - if(val.goods_value){ - this.R_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); - // this.R_financialGoodsValueInWords =this._pd.convertNumberToWords(val.finished_goods_value); - } - finishedGoods.push(this.createGoods(val)); - - } - } - else{ - finishedGoods.push(this.createGoods(null)); - } - - //console.log(495,datas.retail_traded_goods); if(datas.retail_traded_goods !== undefined){ for (let val of datas.retail_traded_goods) { // console.log(val); @@ -684,31 +611,9 @@ tradingFormCreation(val) { } initTradingDetails(datas) { - - const finishedGoods = this.stockForms.controls['trade_details']['controls'][0].controls['trading_finished_goods']; - const tradedGoods = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; - + const tradedGoods = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; if(datas === null){ - // 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) { - this.suppliers_finished_goods.forEach(val => { - let Ref_Finished_Goods : any = {'goods_name': val, - 'goods_observed': '', - 'goods_quantity': '', - 'goods_uom': '', - 'goods_other_uom': '', - 'goods_value': '', - '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) { @@ -730,31 +635,10 @@ tradingFormCreation(val) { } } else { - // for (let val of datas) { - - // finishedGoods.push(this.createGoods(val.trading_finished_goods)); - // tradedGoods.push(this.createTradedGoods(val.trading_traded_goods)); - - // } - if(datas.trading_finished_goods !==undefined) - { - for (let val of datas.trading_finished_goods) { - // console.log(val); - if(val.goods_value){ - this.T_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); - // this.T_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value); - } - finishedGoods.push(this.createGoods(val)); - - } - } - else{ - finishedGoods.push(this.createGoods(null)); - } if(datas.trading_traded_goods !==undefined) { 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); // this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value); @@ -827,14 +711,10 @@ tradingFormCreation(val) { break; } case 2: { - const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_finished_goods']; - control.push(this.createGoods(null)); break; } case 3: { - const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_finished_goods']; - control.push(this.createGoods(null)); - break; + break; } default: { break; @@ -849,13 +729,9 @@ tradingFormCreation(val) { break; } case 2: { - const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_finished_goods']; - control.removeAt(index); break; } case 3: { - const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_finished_goods']; - control.removeAt(index); break; } default: { @@ -868,16 +744,10 @@ tradingFormCreation(val) { } addTradedGoods(flag) { - // const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; - // //const control = this.stockForms.controls['traded_goods']; - - // control.push(this.createTradedGoods(null)); switch(flag){ case 1: { - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; - control.push(this.createTradedGoods(null)); break; - } + } case 2: { const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; control.push(this.createTradedGoods(null)); @@ -895,11 +765,9 @@ tradingFormCreation(val) { } deleteTradedGoods(index,flag) { switch(flag){ - case 1: { - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; - control.removeAt(index); + case 1:{ break; - } + } case 2: { const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; control.removeAt(index); @@ -915,7 +783,6 @@ tradingFormCreation(val) { } } - //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; //const control = this.stockForms.controls['traded_goods']; }