diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 3e37d78e7..259d90574 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -142,7 +142,7 @@
- +
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 13cd38df4..494caa4a8 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,105 +19,118 @@ -
-
+
+ +
- - - - - -
-
- - - {{m_addressType.address_type}} - - - - - - -
-
- - - {{m_locality.locality_name}} - - - + + + + + +
+ +
+ + + {{m_addressType.address_type}} + + + +
+ +
+ + + +
+ +
+ + + {{m_locality.locality_name}} + + + +
- - - -
- - -
-
-
- - - {{data.description}} - - - -
-
- - - {{data.rating}} - - - -
-
- - - - {{ownerShip.name}} - - - - - - - +
+ + + +
- - - +
+ + + {{data.description}} + + + +
-
-
-
-
- - - Yes - No - - -
-
-
-
- - - - - - - -
-
+
+ + + {{data.rating}} + + + +
+ +
+ + + + {{ownerShip.name}} + + + +
+ +
+ + + + +
+ +
+ + + + +
+
+ +
+
+ + + + + + + +
+
+ + + Yes + No + + +
+
+ + + +
+ + + + + +
@@ -184,7 +205,7 @@ - + @@ -383,10 +404,4 @@ - - - - - - - + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index ff2906a74..82368e70c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -125,61 +125,15 @@ export class AddressComponent implements OnInit { this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); // this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); this.addressForm.controls.locality.setValue(data.records.locality); + if(data.records.locality == 7 ){ + this.addressForm.controls.locality_others.setValue(data.records.locality_others); + } this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark); this.addressForm.controls.address_ownership.setValue(data.records.address_ownership); this.addressForm.controls.other_ownership.setValue(data.records.other_ownership); this.addressForm.controls.rent_amt.setValue(data.records.rent_amt); this.addressForm.controls.bussiness_activity.setValue(data.records.bussiness_activity); - // if(data.records.bussiness_activity == 'yes') { - - // this.bussiness_address_type = []; - - // this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key) - // { - // return data.records.bussiness_address_type[key].premises_types; - // })) - - // // console.log(bussiness_address_type); - - - // let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) { - // return data.records.bussiness_address_type[key]; - // }); - - // let enduse: any = []; - // let existPremises: any =[]; - - // selectedPremisesDBData.forEach(val => { - // enduse.push(val.premises_types); - // existPremises.push(val); - // }); - - // this.formPremisesArray = existPremises; - - - // this.addressForm.controls.bussiness_address_type.setValue(enduse); - - // var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) { - // return data.records.additional_premises[key]; - // }); - - // this.additional_premises = additionalPremisesResult; - - // if (additionalPremisesResult.length == 0) { - // additionalPremisesControl.push(this.createPremises()); - // } else { - // additionalPremisesResult.forEach(datas => { - // additionalPremisesControl.push(this.createPremises()); - // }); - // } - - - // if(data.records.bussiness_address_type == 12) { - // this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others); - // } - // } - if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) { this.addressForm.controls.business_years.setValue(data.records.business_years); this.addressForm.controls.business_month.setValue(data.records.business_month); @@ -198,8 +152,6 @@ export class AddressComponent implements OnInit { }) } - // console.log(this.bussiness_address_type); - // console.log(this.additional_premises); this.selectedValue(this.bussiness_address_type,this.additional_premises); if (data.records.locality_others) { @@ -333,8 +285,9 @@ export class AddressComponent implements OnInit { control.removeAt(index); }*/ onSubmit() { - //console.log('form data', this.addressForm.value); + if (!this.addressForm.valid) { + return; } @@ -345,7 +298,7 @@ export class AddressComponent implements OnInit { records.address_type_others = this.addressForm.controls.address_type_others.value; } records.locality = this.locality.value; - if (this.locality.value == 'Others') { + if (this.locality.value == 7) { records.locality_others = this.addressForm.controls.locality_others.value; } records.pd_location = this.pdLocation.value; @@ -369,16 +322,16 @@ export class AddressComponent implements OnInit { records.bussiness_address_type_others = this.addressForm.controls.bussiness_address_type_others.value; } } + console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value); this.addressForm.controls.additional_premises.value.forEach((val,index)=> - { - //console.log(val); - - if(val.premises_city != ''){ + { + + console.log('val.premises_city',val.premises_city); + if(val.premises_city != '' && val.premises_city != null){ this.formPremisesCityArray = []; val.premises_city.forEach(option => { this.formPremisesCityArray.push({additional_premises_city: option}); this.addressForm.controls.additional_premises.value[index].premises_city = this.formPremisesCityArray; - // console.log(val); }); } else{ @@ -390,15 +343,14 @@ export class AddressComponent implements OnInit { }); records.additional_premises = this.addressForm.controls.additional_premises.value; - // console.log(this.formPremisesCityArray); - // console.log(this.addressForm.controls.premises.value); + records.pdid = this.pdid; records.formid = '5'; // records.fk_createdby = '250'; - console.log('params', records); + this._pd.saveForm(records).subscribe(data => { - //console.log('data', data); + this.notifier.notify('success', 'Saved Successfully.'); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); @@ -414,22 +366,22 @@ export class AddressComponent implements OnInit { SelectedPremises($event){ let premisesData = $event.source.value; - //console.log(premisesData); + if($event.checked === true ){ //this.formPremisesArray.push({member: $event.source.value}); //this.selectedSegmentDatas.push(CustomerSegmentName.name); - //console.log('true',premisesData); + - //console.log(this.formPremisesArray); + this.formPremisesArray.push({premises_types: $event.source.value}); - //console.log(this.formPremisesArray); + const control = this.addressForm.controls['additional_premises']; let array = this.addressData.filter(data => data.address_type_id == premisesData)[0]; - //console.log(array); + if(premisesData == 12){ this.PremisesOtherFlag = true; // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value; @@ -455,7 +407,7 @@ export class AddressComponent implements OnInit { if(premisesData == 12){ this.PremisesOtherFlag = false; } - //console.log(this.formPremisesArray); + let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value); //console.log(index); const control = this.addressForm.controls['additional_premises']; @@ -481,78 +433,9 @@ export class AddressComponent implements OnInit { let z = this.z; this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value; } -// checkaddress(value) -// { -// // console.log(value); -// if(value=="OTHERS") -// { -// this.addressRemarksAccess = true; -// }else -// { -// this.addressRemarksAccess = false; -// } -// } - - - // SelectedPremises($event){ - // console.log('event',$event); - - // let premisesData = $event.source.value; - - - // if($event.source._selected === true ){ - - // //this.formPremisesArray.push({member: $event.source.value}); - // //this.selectedSegmentDatas.push(CustomerSegmentName.name); - // //console.log('true',premisesData); - - // //console.log(this.formPremisesArray); - - // this.formPremisesArray.push({premises_types: $event.source.value}); - - // //console.log(this.formPremisesArray); - - // let array = this.addressData.filter(data => data.address_type_id == premisesData); - - // if(premisesData == 12){ - // this.PremisesOtherFlag = true; - // this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value; - // } - // else{ - // this.PremisesLabel[this.z] = array[0].address_type; - // } - // this.z++; - - - // const control = this.addressForm.controls['additional_premises']; - // control.push(this.createPremises()); - - - - // } - // else if($event.source._selected === false ){ - - // console.log('false',premisesData); - - - // if(premisesData == 12){ - // this.PremisesOtherFlag = false; - // } - - // const control = this.addressForm.controls['additional_premises']; - // control.removeAt(this.z); - // this.z--; - // //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name); - // //this.selectedSegmentDatas.splice(index,1); - // } - - // } selectedValue(e,data) { - // console.log('501 function',); - // console.log('inside function in bussiness_address_type,',e); - // console.log('inside function in this.additional_premises,',data); let premisesData = e ; this.tempArr = []; @@ -562,12 +445,12 @@ export class AddressComponent implements OnInit { that.addressData[key].status = 0; return that.addressData[key]; }) - //console.log(this.addressData); + premisesData.forEach((val,index)=> { - //console.log(val); + this.z++; - // console.log(this.addressTypes); + this.formPremisesArray.push({premises_types: val}); this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]); @@ -579,6 +462,7 @@ export class AddressComponent implements OnInit { { return data[index].premises_city[key].additional_premises_city; }); + //data[index].premises_city = data[index].premises_city.additional_premises_city; } this.addressData.forEach(data=> { @@ -621,7 +505,5 @@ export class AddressComponent implements OnInit { this.addressForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year)); this.addressForm.controls.business_month.setValue(Math.floor(converted_month)); - - } -} +} \ No newline at end of file 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 2c8b9bc4f..5ce935af8 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 @@ -19,7 +19,7 @@
-

About Business

+ About Business
@@ -31,24 +31,24 @@ - + - {{entity | titlecase}} + {{entity.business_entity_type_name | titlecase}} - + - +
+ + + + + + + Relation + + + + {{member.name | titlecase}} + + + Relationship To - {{details.value.relation_to | titlecase}} + + + {{appc.applicant_name | titlecase}} + + + - + Relationship With Company - {{details.value.relationship_with_company | titlecase}} + + + {{comrelShip.name}} + + Started Business - + Select Yes No - - - - Currently Actively Involved In Running The Business - - - - Select - Yes - No - - - + + +
- +
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
+
@@ -306,11 +349,19 @@
- - - -
+ + +
+ + + Yes + No + + +
+
+
@@ -334,6 +385,25 @@ delete
+
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
@@ -355,8 +425,12 @@
- - +
+ + + +
+ @@ -377,21 +451,28 @@ -

Retail Trading

+ Retail Trading Details - + - + Within India Export Both + + + + Yes + No + +
@@ -421,6 +502,24 @@
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
@@ -449,8 +548,16 @@ - - + +
+ + + Yes + No + + +
+
@@ -475,6 +582,26 @@ delete
+
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
+
@@ -496,6 +623,11 @@
+
+ + + +
@@ -518,7 +650,7 @@ -

Wholesale Trade

+ Wholesale Trade Details @@ -526,13 +658,20 @@ - + Within India Export Both + + + + Yes + No + +
@@ -562,6 +701,24 @@
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
@@ -589,8 +746,16 @@ - - + +
+ + + Yes + No + + +
+
@@ -615,6 +780,25 @@ delete
+
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
@@ -636,6 +820,11 @@
+
+ + + +
@@ -658,21 +847,28 @@ -

Service Provider Details

+ Service Provider Details - + - + Within India Export Both + + + + Yes + No + +
@@ -702,6 +898,24 @@
+
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
@@ -712,7 +926,7 @@ - +
+ +
+
+ + + + {{MSL.state_name}} + + + + + + + {{MCL.city_name}} + + + +
+
+
@@ -763,7 +1005,7 @@ - + --> - + -->
@@ -104,66 +147,105 @@ -

Actual Values as per Customer

+

Actual Values as per Customer

 - + + Yes No +
- - - - - - - - - - - - Net Profit - Net Loss - - - - - - - - - - - - - - - - - - - - - {{details.controls['estimate_variation'].value}} {{details.controls['estimate_year'].value}} - - - - - -
@@ -313,10 +395,10 @@ - + - + @@ -355,7 +437,7 @@ - + - - - - - + + + + + + --> - - + + + {{"₹"}} {{emiAmtInWords}} Only @@ -165,7 +181,7 @@ - {{ status.name }} {{status.id}} + {{ status.name }} @@ -183,7 +199,8 @@ + formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" required autocomplete="off"> + {{"₹"}} {{emvAmtInWords}} Only -
- - - - -
-
- - -

Manufacturing Details

- -
-
-
-
-

{{a+1}} . Raw Material

- - - - - - - Yes - No - - - - - - - - - {{uom.name}} - - - - - - - - {{"₹"}} {{M_rawValueInWords}} Only - - - - - - - Yes - No - - - - Please comment on the stock level observed? - - - - - - -
-
- -
-
-

{{b+1}} Finished Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{M_goodsValueInWords}} Only - - - - - - - Yes - No - - - - Please comment on the finished goods stock level observed? - - - - - - - -
-
- -
-
-

{{c+1}} Traded Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{M_tradedGoodsValueInWords}} Only - - - - - - - - Yes - No - - - - Please comment on the Traded Goods stock level observed? - - - - - - - -
-
-
+ + + + + + +
+
+ + +

Manufacturing Details

 + +
+
+
+
+

{{a+1}} . Raw Material

+ + + + + + + Yes + No + + + + + + + + + {{uom.name}} + + + + + + + + {{"₹"}} {{M_rawValueInWords}} Only + + + + + + + Yes + No + + + + Please comment on the stock level observed? + + + + + +
- - - - -

Retail Details

- - -
-
- -
-
-

{{d+1}} Finished Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{R_goodsValueInWords}} Only - - - - - - - - Yes - No - - - - Please comment on the finished goods stock level observed? - - - - - - - -
-
+
-
-
-

{{e+1}} Traded Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{R_tradedGoodsValueInWords}} Only - - - - - - - - Yes - No - - - - Please comment on the Traded Goods stock level observed? - - - +
+
+

{{b+1}} Finished Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{M_goodsValueInWords}} Only + + + + + + + Yes + No + + + + Please comment on the finished goods stock level observed? + + + - + + +
+
+ +
+
+

{{c+1}} Traded Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{M_tradedGoodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the Traded Goods stock level observed? + + + + + - + - - -
-
-
+ +
- - - - - -

Trading Details

- - -
-
-
-
-

{{f+1}} Finished Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{T_goodsValueInWords}} Only - - - - - - - - Yes - No - - - - Please comment on the finished goods stock level observed? - - - - - - - - -
-
- -
-
-

{{g+1}} Traded Goods

- - - - - - - Yes - No - - - - - - - - - {{"₹"}} {{T_tradedGoodsValueInWords}} Only - - - - - - - - Yes - No - - - - Please comment on the Traded Goods stock level observed? - - - - - - - - -
-
-
-
- - - - - -

Service Provider

- -
Service Provider Details Not applicable here !!
- - -
-
- - - - - - -
- - - - - +
+ + + + +

Retail Details

 + + +
+
+ +
+
+

{{d+1}} Finished Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{R_goodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the finished goods stock level observed? + + + + + + + +
+
- -
- - Remarks - - +
+
+

{{e+1}} Traded Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{R_tradedGoodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the Traded Goods stock level observed? + + + + + + + + +
+
+
+
+ + + + + +

Trading Details

 + + +
+
+
+
+

{{f+1}} Finished Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{T_goodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the finished goods stock level observed? + + + + + + + + +
+
+ +
+
+

{{g+1}} Traded Goods

+ + + + + + + Yes + No + + + + + + + + + {{"₹"}} {{T_tradedGoodsValueInWords}} Only + + + + + + + + Yes + No + + + + Please comment on the Traded Goods stock level observed? + + + + + + + + +
+
+
+
+ + + + + +

Service Provider

+ +
Service Provider Details Not applicable here !!
+ +
-
- -
- - - +
+ + + + + + + + + + + + + +
+ + Remarks + + +
+
+ +
+ + +
@@ -532,6 +532,6 @@

Stock Details

--> - \ No newline at end of file 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 d220137bd..e6660afc0 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 @@ -1,240 +1,126 @@ -import { - Component, - OnInit, - Inject, - Input -} from '@angular/core'; +import { Component,OnInit,Inject,Input } from '@angular/core'; -import { - FormBuilder, - FormGroup, - Validators, - FormArray, FormControl, -} from '@angular/forms'; +import { FormBuilder,FormGroup,Validators,FormArray, FormControl } from '@angular/forms'; import { NotifierService } from 'angular-notifier'; -import { - MatDialog, - MatDialogRef, - MAT_DIALOG_DATA -} from '@angular/material'; +import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material'; + /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; -import {ActivatedRoute, Router} from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { analyzeAndValidateNgModules } from '@angular/compiler'; @Component({ - selector: 'app-stock', - templateUrl: './stock.component.html', - styleUrls: ['./stock.component.scss'] + selector: 'app-stock', + templateUrl: './stock.component.html', + styleUrls: ['./stock.component.scss'] }) + export class StockComponent implements OnInit { - // @Input() pdid: number; - // @Input() form_id: number; - pageTitle: string ="Stock Details"; - pdid: number; - form_id: number; - public stockForms: FormGroup; - private notifier: NotifierService; - public uomData : any = []; - - rawmaterial : 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; + pageTitle: string ="Stock Details"; + pdid: number; + form_id: number; + public stockForms: FormGroup; + private notifier: NotifierService; + public uomData : any = []; + + rawmaterial : any; + + M_rawValueInWords : any; - constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, - private router: Router, - private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - this.pdid = this.pd_all_details.pdmaster_details.pd_id; - this.form_id = 11; - this.notifier = notifier; - } - public viewerOptions: any = { - navbar: false, - toolbar: { - zoomIn: 4, - zoomOut: 4, - oneToOne: 4, - reset: 4, - prev: 4, - play: { - show: 4, - size: 'large', - }, - next: 4, - rotateLeft: 4, - rotateRight: 4, - flipHorizontal: 4, - flipVertical: 4, + 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, + private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.form_id = 11; + this.notifier = notifier; } -}; - ngOnInit() { + public viewerOptions: any = { + navbar: false, + toolbar: { + zoomIn: 4, + zoomOut: 4, + oneToOne: 4, + reset: 4, + prev: 4, + play: { + show: 4, + size: 'large', + }, + next: 4, + rotateLeft: 4, + rotateRight: 4, + flipHorizontal: 4, + flipVertical: 4, + } + }; + ngOnInit() { - // this._pd.stockFormsAccess({pd_id:this.pdid}).subscribe(data => { - // if(data.status == 200){ - // this.initstockForms(data.record.type_of_activity); - // } - // }, err => { - // this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!'); - // }) + // this._pd.stockFormsAccess({pd_id:this.pdid}).subscribe(data => { + // if(data.status == 200){ + // this.initstockForms(data.record.type_of_activity); + // } + // }, err => { + // this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!'); + // }) - //this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe( - this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(data => { + //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', 'Business Type Of Activity Not Available Please Check Business Information.!'); - this.noRecordsFound = false; - }) + 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', 'Business Type Of Activity Not Available Please Check Business Information.!'); + this.noRecordsFound = false; + }) - this.getUOM(); - } + this.getUOM(); + } - public initstockForms(record){ -console.log(record); - let params: any = {}; - params.pd_id = this.pdid; - params.pd_form_id = this.form_id; + public initstockForms(record){ + console.log(record); + let params: any = {}; + params.pd_id = this.pdid; + params.pd_form_id = this.form_id; + + this._pd.retriveForm(params).subscribe(value => { + if (value.status == 200) { + let dataForm = value.records; - this._pd.retriveForm(params).subscribe(value => { - if (value.status == 200) { - let dataForm = value.records; - - if(dataForm !== undefined) { - - this.stockForms = this.fb.group({ - pdid: [this.pdid], - formid: [this.form_id], - stock_remarks: [''], - manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]), - retail_details : this.fb.array([this.retailFormCreation(record)]), - trade_details: this.fb.array([this.tradingFormCreation(record)]), - }); - - 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; - 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]; - }); - } - if(dataForm.manufacturing_traded_goods !==undefined){ - manufacturing_traded_goods = Object.keys(dataForm.manufacturing_traded_goods).map(function (key) { - return dataForm.manufacturing_traded_goods[key]; - }); - } - if(dataForm.retail_finished_goods !==undefined) - { - retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key) - { - return dataForm.retail_finished_goods[key]; - }) - } - //console.log(retail_finished_goods,manufacturing_traded_goods); - let manufacturing_temparr = []; - 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); - 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]; - }); - } - if(dataForm.retail_finished_goods !==undefined) - { - retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key) - { - return dataForm.retail_finished_goods[key]; - }) - } - - let retail_temparr = []; - retail_temparr['retail_traded_goods'] = retail_traded_goods; - retail_temparr['retail_finished_goods'] = retail_finished_goods; - this.initRetailDetails(retail_temparr); - } - let arr2 = record.filter(data => data.type_of_activity_id == 3); - 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]; - }); - } - 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'] = trading_finished_goods; - 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); + if(dataForm !== undefined) { + console.log(dataForm); this.stockForms = this.fb.group({ pdid: [this.pdid], formid: [this.form_id], @@ -243,567 +129,736 @@ console.log(record); 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); - if(arr.length > 0) { - this.initManufacturingDetails(null); - } - 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); - if(arr2.length > 0) { - this.initTradingDetails(null); - } - let arr3 = record.filter(data => data.type_of_activity_id == 4); - if(arr3.length > 0) { - this.serviceProviderForm = true; - } - this.noRecordsFound = true; - } - } - else { - this.stockForms = this.fb.group({ - pdid: [this.pdid], - formid: [this.form_id], - stock_remarks: [''], - manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]), - 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); - if(arr.length > 0) { - this.initManufacturingDetails(null); - } - 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); - if(arr2.length > 0) { - this.initTradingDetails(null); - } - let arr3 = record.filter(data => data.type_of_activity_id == 4); - if(arr3.length > 0) { - this.serviceProviderForm = true; - } - this.noRecordsFound = true; - } - }) - - // this.stockForms = this.fb.group({ - // stock_remarks: ['', Validators.compose([Validators.required])], - // raw_materials: this.fb.array([]), - // finished_goods: this.fb.array([]), - // traded_goods: this.fb.array([]) - // }); - } - - 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([]), - manufacturing_finished_goods: this.fb.array([]), - manufacturing_traded_goods: this.fb.array([]) - }) - // } - } else { - return; - } - } - - retailForm: Boolean = false; - retailFormCreation(val) { - - let arr = val.filter(data => data.type_of_activity_id == 2); - if (arr.length > 0) { - this.retailForm = true; - return this.fb.group({ - retail_finished_goods: this.fb.array([]), - retail_traded_goods: this.fb.array([]) - }) - // } - } else { - return; - } - } - - tradingForm: Boolean = false; - tradingFormCreation(val) { - let arr = val.filter(data => data.type_of_activity_id == 3); - if (arr.length > 0) { - this.tradingForm = true; - return this.fb.group({ - trading_finished_goods: this.fb.array([]), - trading_traded_goods: this.fb.array([]) - }); - } else { - return; - } - } - - //setSku(sku: string, index: number) { - // const faControl = - // (this.stockForms.controls['raw_materials']).at(index); - // faControl['controls'].raw_name.setValue(sku); - // } - - initManufacturingDetails(datas) { - - 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(299,'if'); - // rawMaterial.push(this.createRawmaterial(null)); - // finishedGoods.push(this.createGoods(null)); - // tradedGoods.push(this.createTradedGoods(null)); - - } else { - // 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)); - + let arr = record.filter(data => data.type_of_activity_id == 1); + console.log(133,arr.length); + if(arr.length > 0) { + // 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); + + 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); + //this.initManufacturingDetails(dataForm); + + } + + let arr1 = record.filter(data => data.type_of_activity_id == 2); + 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); + + 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 == 3); + 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); + } + 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); + this.stockForms = this.fb.group({ + pdid: [this.pdid], + formid: [this.form_id], + stock_remarks: [''], + manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]), + 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); + if(arr.length > 0) { + this.initManufacturingDetails(null); + } + 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); + if(arr2.length > 0) { + this.initTradingDetails(null); + } + let arr3 = record.filter(data => data.type_of_activity_id == 4); + if(arr3.length > 0) { + this.serviceProviderForm = true; + } + this.noRecordsFound = true; + } + } + else { + this.stockForms = this.fb.group({ + pdid: [this.pdid], + formid: [this.form_id], + stock_remarks: [''], + manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]), + 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); + if(arr.length > 0) { + this.initManufacturingDetails(null); + } + 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); + if(arr2.length > 0) { + this.initTradingDetails(null); + } + let arr3 = record.filter(data => data.type_of_activity_id == 4); + if(arr3.length > 0) { + this.serviceProviderForm = true; + } + this.noRecordsFound = true; + } + }) + + // this.stockForms = this.fb.group({ + // stock_remarks: ['', Validators.compose([Validators.required])], + // raw_materials: this.fb.array([]), + // finished_goods: this.fb.array([]), + // traded_goods: this.fb.array([]) + // }); + } + + 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([]), + manufacturing_finished_goods: this.fb.array([]), + manufacturing_traded_goods: this.fb.array([]) + }) + // } + } else { + return; + } +} + +retailForm: Boolean = false; +retailFormCreation(val) { + + let arr = val.filter(data => data.type_of_activity_id == 2); + if (arr.length > 0) { + this.retailForm = true; + return this.fb.group({ + retail_finished_goods: this.fb.array([]), + retail_traded_goods: this.fb.array([]) + }) + // } + } else { + return; + } +} + +tradingForm: Boolean = false; +tradingFormCreation(val) { + let arr = val.filter(data => data.type_of_activity_id == 3); + if (arr.length > 0) { + this.tradingForm = true; + return this.fb.group({ + trading_finished_goods: this.fb.array([]), + trading_traded_goods: this.fb.array([]) + }); + } else { + return; + } +} + + //setSku(sku: string, index: number) { + // const faControl = + // (this.stockForms.controls['raw_materials']).at(index); + // faControl['controls'].raw_name.setValue(sku); + // } + + initManufacturingDetails(datas) { + + 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(299,'if'); + rawMaterial.push(this.createRawmaterial(null)); + finishedGoods.push(this.createGoods(null)); + tradedGoods.push(this.createTradedGoods(null)); + + } else { + // console.log(305,'else') + // console.log(377,datas); + // 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); + } + rawMaterial.push(this.createRawmaterial(val)); + } + } + else{ + rawMaterial.push(this.createRawmaterial(null)); + } + if(datas.manufacturing_finished_goods != undefined){ + for (let val of datas.manufacturing_finished_goods) { + // console.log(val); + if(val.goods_value){ + this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); } - 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)); - - } - // console.log(310,rawMaterial); - } + finishedGoods.push(this.createGoods(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); + } + tradedGoods.push(this.createTradedGoods(val)); + + } + } + else{ + tradedGoods.push(this.createTradedGoods(null)); + } + // console.log(310,rawMaterial); + } + } + + createRawmaterial2() { + return this.fb.group({ + raw_name: ['', Validators.compose([Validators.required])], + stock_observed:['', Validators.compose([Validators.required])], + raw_quantity: [''], + raw_uom: [''], + other_uom : [''], + raw_value: [''], + rawmaterial_value: [''], + is_sufficiant_raw: [''], + rawmaterial_remarks:[''] + }); + } + + + createRawmaterial(records) { + // console.log(330,'function in'); + if(records === null) { + // console.log(331,'fif'); + return this.fb.group({ + raw_name: [''], + stock_observed:[''], + raw_quantity: [''], + raw_uom: [''], + other_uom : [''], + raw_value: [''], + rawmaterial_value: [''], + is_sufficiant_raw: [''], + rawmaterial_remarks:[''] + }) + } else { + // console.log(343,'else'); + return this.fb.group({ + manufacturing_raw_material_name: [records.manufacturing_raw_material_name || null], + raw_name: [records.raw_name], + stock_observed:[records.stock_observed], + raw_quantity: [records.raw_quantity], + raw_uom: [records.raw_uom], + other_uom : [records.other_uom], + raw_value: [records.raw_value], + rawmaterial_value: [records.rawmaterial_value], + is_sufficiant_raw: [records.is_sufficiant_raw], + rawmaterial_remarks:[records.rawmaterial_remarks] + }) + } } - createRawmaterial2() { - return this.fb.group({ - raw_name: ['', Validators.compose([Validators.required])], - stock_observed:['', Validators.compose([Validators.required])], - raw_quantity: [''], - raw_uom: [''], - other_uom : [''], - raw_value: [''], - rawmaterial_value: [''], - is_sufficiant_raw: [''], - rawmaterial_remarks:[''] - }); - } + 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)); + tradedGoods.push(this.createTradedGoods(null)); - createRawmaterial(records) { - // console.log(330,'function in'); - if(records === null) { - // console.log(331,'fif'); + } 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); + } + 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); + if(val.estimated_traded_goods_value){ + this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); + } + tradedGoods.push(this.createTradedGoods(val)); + + } + } + else{ + tradedGoods.push(this.createTradedGoods(null)); + } + } + } + + createGoods2() { + return this.fb.group({ + goods_name: ['', Validators.compose([Validators.required])], + goods_observed: ['', Validators.compose([Validators.required])], + goods_quantity: [''], + goods_value: [''], + finished_goods_value: [''], + is_sufficiant_goods: [''], + finishedgoods_remarks:[''] + }); + } + + createGoods(records) { + if(records === null) { return this.fb.group({ - raw_name: [''], - stock_observed:[''], - raw_quantity: [''], - raw_uom: [''], - other_uom : [''], - raw_value: [''], - rawmaterial_value: [''], - is_sufficiant_raw: [''], - rawmaterial_remarks:[''] - }) - } else { - // console.log(343,'else'); - return this.fb.group({ - manufacturing_raw_material_name: [records.manufacturing_raw_material_name || null], - raw_name: [records.raw_name], - stock_observed:[records.stock_observed], - raw_quantity: [records.raw_quantity], - raw_uom: [records.raw_uom], - other_uom : [records.other_uom], - raw_value: [records.raw_value], - rawmaterial_value: [records.rawmaterial_value], - is_sufficiant_raw: [records.is_sufficiant_raw], - rawmaterial_remarks:[records.rawmaterial_remarks] - }) + goods_name: [''], + goods_observed: [''], + goods_quantity: [''], + goods_value: [''], + finished_goods_value: [''], + is_sufficiant_goods: [''], + finishedgoods_remarks:[''] + }); + } + else { + return this.fb.group({ + goods_name: [records.goods_name], + goods_observed: [records.goods_observed], + goods_quantity: [records.goods_quantity], + goods_value: [records.goods_value], + finished_goods_value: [records.finished_goods_value], + is_sufficiant_goods: [records.is_sufficiant_goods], + finishedgoods_remarks:[records.finishedgoods_remarks] + }) + } + } + + + createTradedGoods2() { + return this.fb.group({ + traded_goods_name: ['', Validators.compose([Validators.required])], + traded_goods_observed: ['', Validators.compose([Validators.required])], + traded_goods_quantity: [''], + estimated_traded_goods_value: [''], + traded_goods_value: [''], + is_sufficiant_traded_goods: [''], + traded_goods_remarks:[''] + }); + } + + 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']; + + if(datas === null){ + + finishedGoods.push(this.createGoods(null)); + tradedGoods.push(this.createTradedGoods(null)); + + } 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); + } + 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); + } + tradedGoods.push(this.createTradedGoods(val)); + } + } + else{ + tradedGoods.push(this.createTradedGoods(null)); + } + + } + } + + + createTradedGoods(records) { + if(records === null) { + return this.fb.group({ + traded_goods_name: [''], + traded_goods_observed: [''], + traded_goods_quantity: [''], + estimated_traded_goods_value: [''], + traded_goods_value: [''], + is_sufficiant_traded_goods: [''], + traded_goods_remarks:[''] + }); + } + else { + return this.fb.group({ + traded_goods_name: [records.traded_goods_name], + traded_goods_observed: [records.traded_goods_observed], + traded_goods_quantity: [records.traded_goods_quantity], + estimated_traded_goods_value: [records.estimated_traded_goods_value], + traded_goods_value: [records.traded_goods_value], + is_sufficiant_traded_goods: [records.is_sufficiant_traded_goods], + traded_goods_remarks:[records.traded_goods_remarks] + }) + } + } + + addRawMaterials(flag) { + + if(flag==1){ + const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; + control.push(this.createRawmaterial(null)); + } + } + + + deleteRawMaterials(index,flag) { + if(flag==1){ + const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; + // const control = this.stockForms.controls['raw_materials']; + control.removeAt(index); + } + } + + addGoods(flag) { + //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; + //const control = this.stockForms.controls['finished_goods']; + //control.push(this.createGoods(null)); + switch(flag){ + case 1: { + const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; + control.push(this.createGoods(null)); + 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; + } + default: { + break; } } - - 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)); - tradedGoods.push(this.createTradedGoods(null)); - - } else { - - 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)); - - } - } - } - - createGoods2() { - return this.fb.group({ - goods_name: ['', Validators.compose([Validators.required])], - goods_observed: ['', Validators.compose([Validators.required])], - goods_quantity: [''], - goods_value: [''], - finished_goods_value: [''], - is_sufficiant_goods: [''], - finishedgoods_remarks:[''] - }); - } - - createGoods(records) { - if(records === null) { - return this.fb.group({ - goods_name: [''], - goods_observed: [''], - goods_quantity: [''], - goods_value: [''], - finished_goods_value: [''], - is_sufficiant_goods: [''], - finishedgoods_remarks:[''] - }); - } - else { - return this.fb.group({ - goods_name: [records.goods_name], - goods_observed: [records.goods_observed], - goods_quantity: [records.goods_quantity], - goods_value: [records.goods_value], - finished_goods_value: [records.finished_goods_value], - is_sufficiant_goods: [records.is_sufficiant_goods], - finishedgoods_remarks:[records.finishedgoods_remarks] - }) - } - } - - - createTradedGoods2() { - return this.fb.group({ - traded_goods_name: ['', Validators.compose([Validators.required])], - traded_goods_observed: ['', Validators.compose([Validators.required])], - traded_goods_quantity: [''], - estimated_traded_goods_value: [''], - traded_goods_value: [''], - is_sufficiant_traded_goods: [''], - traded_goods_remarks:[''] - }); - } - - 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']; - - if(datas === null){ - - finishedGoods.push(this.createGoods(null)); - tradedGoods.push(this.createTradedGoods(null)); - - } else { - // for (let val of datas) { - - // finishedGoods.push(this.createGoods(val.trading_finished_goods)); - // tradedGoods.push(this.createTradedGoods(val.trading_traded_goods)); - - // } - - 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)); - - } - - } - } - - - createTradedGoods(records) { - if(records === null) { - return this.fb.group({ - traded_goods_name: [''], - traded_goods_observed: [''], - traded_goods_quantity: [''], - estimated_traded_goods_value: [''], - traded_goods_value: [''], - is_sufficiant_traded_goods: [''], - traded_goods_remarks:[''] - }); - } - else { - return this.fb.group({ - traded_goods_name: [records.traded_goods_name], - traded_goods_observed: [records.traded_goods_observed], - traded_goods_quantity: [records.traded_goods_quantity], - estimated_traded_goods_value: [records.estimated_traded_goods_value], - traded_goods_value: [records.traded_goods_value], - is_sufficiant_traded_goods: [records.is_sufficiant_traded_goods], - traded_goods_remarks:[records.traded_goods_remarks] - }) - } - } - - addRawMaterials(flag) { - - if(flag==1){ - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; - control.push(this.createRawmaterial(null)); - } - } - - - - deleteRawMaterials(index,flag) { - if(flag==1){ - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; - // const control = this.stockForms.controls['raw_materials']; + } + deleteGoods(index,flag) { + switch(flag){ + case 1: { + const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; control.removeAt(index); + 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: { + break; + } + } + //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; + //const control = this.stockForms.controls['finished_goods']; + } - addGoods(flag) { - //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; - //const control = this.stockForms.controls['finished_goods']; - //control.push(this.createGoods(null)); - switch(flag){ + 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_finished_goods']; - control.push(this.createGoods(null)); - break; + 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_finished_goods']; - control.push(this.createGoods(null)); + const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; + control.push(this.createTradedGoods(null)); break; } case 3: { - const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_finished_goods']; - control.push(this.createGoods(null)); - break; + const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; + control.push(this.createTradedGoods(null)); + break; } default: { break; } } - } - deleteGoods(index,flag) { - switch(flag){ - case 1: { - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; - control.removeAt(index); - 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: { - break; - } - - } - //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_finished_goods']; - //const control = this.stockForms.controls['finished_goods']; - } - - 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)); - break; - } - case 3: { - const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; - control.push(this.createTradedGoods(null)); - break; - } - default: { - break; - } - } - } - deleteTradedGoods(index,flag) { - switch(flag){ - case 1: { - const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; - control.removeAt(index); - break; - } - case 2: { - const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; - control.removeAt(index); - break; - } - case 3: { - const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; - control.removeAt(index); - break; - } - default: { - break; - } - } - - //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; - //const control = this.stockForms.controls['traded_goods']; - - } - - - /** To Save/Edited Popup Data */ - submitDetails(e) { - this.submitted = true; - // stop here if form is invalid - // if (this.stockForms.invalid) { - // return; - // } else { - var answerFormValues = this.stockForms.value; - - //To Remove The "Null" With Key also - Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - - this._pd.savePDFormDetailsWithID(answerFormValues).subscribe( - dataresult => { - if (dataresult.status == 200) { - - this.notifier.notify('success', 'Record Saved Successfully.!'); - - } - else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - - } - }, 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); - // } - // }); - // } - - getUOM() { - this._pd.getAllMasterDatas('UOM').subscribe(data => { - - data.records.forEach(val => { - if (val.isactive == 1) { - this.uomData.push(val); - } - }) - }); - } - - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - - /** To Convert Amount into Words */ - inWords(e,flag:number){ - - switch(flag){ - case 1 : - this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value); - break; - case 2 : - this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value); - break; - case 3 : - 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; + } + deleteTradedGoods(index,flag) { + switch(flag){ + case 1: { + const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; + control.removeAt(index); + break; } + case 2: { + const control = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; + control.removeAt(index); + break; + } + case 3: { + const control = this.stockForms.controls['trade_details']['controls'][0].controls['trading_traded_goods']; + control.removeAt(index); + break; + } + default: { + break; + } } + + //const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_traded_goods']; + //const control = this.stockForms.controls['traded_goods']; + + } + + + /** To Save/Edited Popup Data */ + submitDetails(e) { + this.submitted = true; + // stop here if form is invalid + // if (this.stockForms.invalid) { + // return; + // } else { + var answerFormValues = this.stockForms.value; + + //To Remove The "Null" With Key also + Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); + + this._pd.savePDFormDetailsWithID(answerFormValues).subscribe( + dataresult => { + if (dataresult.status == 200) { + + this.notifier.notify('success', 'Record Saved Successfully.!'); + + } + else { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + + } + }, 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); + // } + // }); + // } + + getUOM() { + this._pd.getAllMasterDatas('UOM').subscribe(data => { + + data.records.forEach(val => { + if (val.isactive == 1) { + this.uomData.push(val); + } + }) + }); + } + + /** On Key Press Event For Numbers */ + keyPress(event: any) { + const pattern = /[0-9]/; + + let inputChar = String.fromCharCode(event.charCode); + if (event.keyCode != 8 && !pattern.test(inputChar)) { + event.preventDefault(); + } + } + + /** To Convert Amount into Words */ + inWords(e,flag:number){ + + switch(flag){ + case 1 : + this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 2 : + this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value); + break; + case 3 : + 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; + } + } } \ No newline at end of file