-
+
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 765b9f2ea..78a36ac59 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
@@ -102,19 +102,25 @@
-
-
+
-
+
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 99fa55fac..140440a93 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
@@ -14,7 +14,307 @@
Type of Premises
+
+
+ {{at.address_type}}
+
+ {
- enduse.push(val.premises_types);
- existPremises.push(val);
- });
+ // // console.log(bussiness_address_type);
+
- this.formPremisesArray = existPremises;
+ // let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) {
+ // return data.records.bussiness_address_type[key];
+ // });
- 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];
- });
+ // let enduse: any = [];
+ // let existPremises: any =[];
- // let cityenduse: any = [];
- // let existcity: any =[];
+ // selectedPremisesDBData.forEach(val => {
+ // enduse.push(val.premises_types);
+ // existPremises.push(val);
+ // });
- // additionalPremisesResult.forEach(val => {
- // cityenduse.push(val.premises_types);
- // existcity.push(val);
- // });
-
- // this.formPremisesCityArray = existcity;
-
- additionalPremisesResult.forEach((val,index)=>
- {
- console.log(val);
- let cityenduse: any = [];
- let existcity: any =[];
-
- if(val.premises_city != ''){
- this.formPremisesCityArray = [];
- val.premises_city.forEach(option => {
- // cityenduse.push(option);
- // existcity.push(val);
- //this.formPremisesCityArray.push({additional_premises_city: option});
- //this.addressForm.controls.additional_premises.value[index].premises_city = cityenduse;
- console.log(option);
- });
- //console.log(cityenduse);
- //this.formPremisesCityArray = existcity;
- }
-
-
- });
-
-
- if (additionalPremisesResult.length == 0) {
- additionalPremisesControl.push(this.createPremises());
- } else {
- let cityenduse: any = [];
- let existcity: any =[];
-
- additionalPremisesResult.forEach(datas => {
- if(datas.premises_city != ''){
- cityenduse.push(datas.additional_premises_city);
- existcity.push(datas);
- }
- additionalPremisesControl.push(this.createPremises());
- });
-
- this.formPremisesCityArray = existcity;
- console.log(cityenduse);
- console.log(existcity);
-
- this.addressForm.controls['additional_premises'].setValue(additionalPremisesResult);
+ // 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_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) {
+ let that = this;
+ 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;
+ }))
+
+ this.additional_premises = Object.keys(data.records.additional_premises).map(function(key)
+ {
+ return data.records.additional_premises[key];
+ })
+
}
+ 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) {
this.addressForm.controls.locality_others.setValue(data.records.locality_others);
}
+
// if (result.length == 0) {
// control.push(this.createNeighbour());
// } else {
@@ -221,6 +212,7 @@ export class AddressComponent implements OnInit {
}
});
}
+
public initAddressForm(): void {
this.addressForm = this.fb.group({
address: ['', Validators.compose([Validators.required])],
@@ -376,8 +368,12 @@ export class AddressComponent implements OnInit {
// console.log(val);
});
}
-
-
+ else{
+ this.formPremisesCityArray = [];
+
+ this.addressForm.controls.additional_premises.value[index].premises_city = null;
+
+ }
});
records.additional_premises = this.addressForm.controls.additional_premises.value;
@@ -402,59 +398,194 @@ export class AddressComponent implements OnInit {
// this.formPremisesCityArray.push({city: option});
// });
// }
-
SelectedPremises($event){
- console.log('event',$event);
let premisesData = $event.source.value;
-
-
- if($event.source._selected === true ){
-
+ 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);
-
- let array = this.addressData.filter(data => data.address_type_id == premisesData);
-
+
+ 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.addressForm.get('bussiness_address_type_others').value;
+ // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value;
+ control.push(this.createPremises());
+
}
else{
- this.PremisesLabel[this.z] = array[0].address_type;
- }
- this.z++;
-
-
- const control = this.addressForm.controls['additional_premises'];
+ this.PremisesLabel[this.z] = array.address_type;
control.push(this.createPremises());
-
-
+
+ }
+ console.log(this.PremisesLabel);
+ this.z++;
+
+
+
+
+
}
- else if($event.source._selected === false ){
-
- console.log('false',premisesData);
-
+ else if($event.checked === false ){
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'];
- control.removeAt(this.z);
+ control.removeAt(index);
+ this.PremisesLabel.splice(index,1);
+ console.log(this.z);
this.z--;
- //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
- //this.selectedSegmentDatas.splice(index,1);
}
+
+ }
+
+ getCity(e)
+ {
+ this.cityData = [];
+ e.forEach(val=>
+ {
+ this.cityData.push({additional_premises_city:val});
+ });
+ console.log(this.cityData);
+ }
+ otherValueset()
+ {
+ 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 = [];
+ let that = this;
+ this.addressData = Object.keys(this.addressData).map(function(key)
+ {
+ 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]);
+
+ this.PremisesLabel[index] = this.tempArr[index].address_type;
+
+ if(data[index] !==undefined && data[index].premises_ownership < 2 ){
+ data[index].premises_city = Object.keys(data[index].premises_city).map(function(key)
+ {
+ return data[index].premises_city[key].additional_premises_city;
+ });
+ }
+ this.addressData.forEach(data=>
+ {
+ if(data.address_type_id == val)
+ {
+ data.status = 1;
+ }
+ });
+
+ });
+
+ const control = this.addressForm.controls['additional_premises'] as FormArray;
+
+ // control.removeAt(0);
+ this.tempArr.forEach((item,index)=>
+ {
+ control.push(this.createPremises());
+ });
+
+ this.addressForm.controls['additional_premises'].setValue(data);
}
validateAllFormFields(formGroup: FormGroup) {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
index 9800a1c2e..206bbfe1e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html
@@ -280,6 +280,7 @@
+
-
+
+
@@ -369,7 +370,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ asset.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ prop.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ freqn.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ ins_type.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+ NAN
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Yes
+ No
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -233,11 +533,37 @@
-
-
+
+
+
+
+
+ {{owner.applicant_name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{relations.name}}
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ prop.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ freqn.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ ins_type.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
- NAN
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
-
+
-
+
+
+
-
-
+
+
-
+ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Yes
- No
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -281,7 +282,8 @@
@@ -478,7 +479,7 @@
@@ -196,7 +197,8 @@
@@ -217,7 +218,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nivi SKM
-
-
-
-
@@ -449,7 +339,8 @@
@@ -228,7 +229,8 @@
@@ -141,7 +142,7 @@
@@ -273,6 +274,7 @@
@@ -182,7 +183,8 @@
@@ -299,7 +300,7 @@
@@ -293,7 +294,8 @@
-
+
@@ -26,39 +26,50 @@
-
+
-
+
+ formControlName="stock_observed" required
+ (selectionChange)="RawMaterialValidation($event)">
Yes
No
-
+ Please comment on the stock level observed?
+
+
+
+
@@ -222,7 +316,7 @@
- Please comment on the stock level observed?
+ Remarks
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 6b9cb444a..619b4856b 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
@@ -38,8 +38,15 @@ export class StockComponent implements OnInit {
public stockForm: FormGroup;
private notifier: NotifierService;
public uomData : any = [];
- rawmaterial : any;
+ rawmaterial : any;
+ goodsValueInWords : any;
+ rawValueInWords : any;
+ tradedGoodsValueInWords : any;
+ rawMaterialAccess: boolean;
+ finishedGoodsAccess: boolean;
+ tradeConcernAccess: boolean;
+
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router,
private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
@@ -69,90 +76,185 @@ export class StockComponent implements OnInit {
ngOnInit() {
this.initstockForm();
this.getUOM();
- this.setSku('data',0);
+ //this.setSku('data',0);
let params: any = {};
+ let activityArray : any = [];
params.pd_id = this.pdid;
params.pd_form_id = this.form_id;
+ this._pd.stockFormAccess({pd_id:this.pdid}).subscribe(value => {
+ console.log(value);
+ const rawMaterial = this.stockForm.controls['raw_materials'];
+ const finishedGoods = this.stockForm.controls['finished_goods'];
+ const tradedGoods = this.stockForm.controls['traded_goods'];
+
+ if (value.status == 200) {
+ console.log('value.records',value.records);
+ value.records.type_of_activity.forEach(val => {
+ //console.log(val);
+ //console.log(val.type_of_activity_id);
+ this.rawMaterialAccess = true;
+ this.finishedGoodsAccess = true;
+ this.tradeConcernAccess = true;
+ if(val.type_of_activity_id == 1){
+ rawMaterial.push(this.createRawmaterial());
+ finishedGoods.push(this.createGoods());
+ tradedGoods.push(this.createTradedGoods());
+ }
+ else if(val.type_of_activity_id == 2){
+ rawMaterial.push(this.createRawmaterial());
+ finishedGoods.push(this.createGoods());
+ }
+ else if(val.type_of_activity_id == 3){
+ rawMaterial.push(this.createRawmaterial());
+ finishedGoods.push(this.createGoods());
+ }
+ // else if(val.type_of_activity_id == 4){
+ // }
+
+ });
+
this._pd.retriveForm({pd_id:this.pdid,pd_form_id:'1'}).subscribe(value => {
- console.log('Raw material Name',value.records.main_raw_materials);
-
-
+ //console.log('Raw material Name',value.records.main_raw_materials);
+
// const faControl = (this.stockForm.controls['raw_materials']).at(1);
- const control = (this.stockForm.controls['raw_materials']).at(0);
- console.log(control);
+ //const control = (this.stockForm.controls['raw_materials']).at(0);
+ //console.log(control);
// this.stockForm.controls['raw_materials'].setValue(value.records.main_raw_materials);
- if (value.status == 200) {
- this.rawmaterial = value.records.main_raw_materials;
- }else{ this.rawmaterial = ''; }
+ // if (value.status == 200) {
+ // this.rawmaterial = value.records.main_raw_materials;
+ // }else{ this.rawmaterial = ''; }
})
+
this._pd.retriveForm(params).subscribe(value => {
- console.log('value', value);
- const rawMaterial = this.stockForm.controls['raw_materials'];
- const finishedGoods = this.stockForm.controls['finished_goods'];
+ //console.log('value', value);
+
if (value.status == 200) {
- let result = Object.keys(value.records.raw_materials).map(function(key) {
- return value.records.raw_materials[key];
- });
- let result_Goods = Object.keys(value.records.finished_goods).map(function(key) {
- return value.records.finished_goods[key];
- });
+ console.log('data',value);
+ // Raw Material Access is True means., Data have to load,
+ if(this.rawMaterialAccess == true){
+
+ let result = Object.keys(value.records.raw_materials).map(function(key) {
+ return value.records.raw_materials[key];
+ });
+
+ if (result.length > 0) {
+
+ result.forEach(val => {
+
+ //this.RawMaterialValidation(val.stock_observed);
+ rawMaterial.push(this.createRawmaterial());
+ if(val.raw_value != '' && val.raw_value != null ){ this.rawValueInWords = this._pd.convertNumberToWords(val.raw_value); }
+ });
+ this.stockForm.controls['raw_materials'].setValue(result);
+ } else {
+ rawMaterial.push(this.createRawmaterial());
+ }
+ }
+
+ // Finished Goods Access is TRUE Means., data have to load.,
+ if(this.finishedGoodsAccess == true){
+ let result_Goods = Object.keys(value.records.finished_goods).map(function(key) {
+ return value.records.finished_goods[key];
+ });
+
+ if (result_Goods.length > 0) {
+
+ result_Goods.forEach(val => {
+
+ //this.GoodsValidation(val.goods_observed);
+ finishedGoods.push(this.createGoods());
+ if(val.goods_value != '' && val.goods_value != null ){ this.goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); }
+ });
+ this.stockForm.controls['finished_goods'].setValue(result_Goods);
+ } else {
+ finishedGoods.push(this.createGoods());
+ }
+ }
+
+ //TradeConcern Access is TRUE Means., data have to load.,
+ if(this.tradeConcernAccess == true){
+ let result_Traded_Goods = Object.keys(value.records.finished_goods).map(function(key) {
+ return value.records.traded_goods[key];
+ });
+
+ if (result_Traded_Goods.length > 0) {
+
+ result_Traded_Goods.forEach(val => {
+
+
+ tradedGoods.push(this.createTradedGoods());
+ if(val.traded_goods_value != '' && val.traded_goods_value != null )
+ { this.tradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); }
+ });
+ this.stockForm.controls['traded_goods'].setValue(result_Traded_Goods);
+ } else {
+ tradedGoods.push(this.createTradedGoods());
+ }
+ }
+
+
this.stockForm.controls['stock_remarks'].setValue(value.records.stock_remarks);
- if (result.length > 0) {
- result.forEach(val => {
- rawMaterial.push(this.createRawmaterial());
- });
- this.stockForm.controls['raw_materials'].setValue(result);
- } else {
- rawMaterial.push(this.createRawmaterial());
- }
- if (result_Goods.length > 0) {
- result_Goods.forEach(val => {
- finishedGoods.push(this.createGoods());
- });
- this.stockForm.controls['finished_goods'].setValue(result_Goods);
- } else {
- finishedGoods.push(this.createGoods());
- }
+
} else {
- rawMaterial.push(this.createRawmaterial());
- finishedGoods.push(this.createGoods());
+ // rawMaterial.push(this.createRawmaterial());
+ // finishedGoods.push(this.createGoods());
+ // tradedGoods.push(this.createTradedGoods());
}
})
}
+});
+}
+
public initstockForm(): void {
this.stockForm = this.fb.group({
stock_remarks: ['', Validators.compose([Validators.required])],
raw_materials: this.fb.array([]),
- finished_goods: this.fb.array([])
+ finished_goods: this.fb.array([]),
+ traded_goods: this.fb.array([])
});
}
- setSku(sku: string, index: number) {
+ //setSku(sku: string, index: number) {
// const faControl =
// (this.stockForm.controls['raw_materials']).at(index);
// faControl['controls'].raw_name.setValue(sku);
- }
+ // }
createRawmaterial() {
return this.fb.group({
raw_name: ['', Validators.compose([Validators.required])],
stock_observed:['', Validators.compose([Validators.required])],
- raw_quantity: ['', Validators.compose([Validators.required])],
- raw_uom: ['', Validators.compose([Validators.required])],
+ raw_quantity: [''],
+ raw_uom: [''],
other_uom : [''],
- raw_value: ['', Validators.compose([Validators.required])],
- rawmaterial_value: ['', Validators.compose([Validators.required])],
- is_sufficiant_raw: ['', Validators.compose([Validators.required])],
+ raw_value: [''],
+ rawmaterial_value: [''],
+ is_sufficiant_raw: [''],
+ rawmaterial_remarks:['']
});
}
createGoods() {
return this.fb.group({
goods_name: ['', Validators.compose([Validators.required])],
- goods_quantity: ['', Validators.compose([Validators.required])],
- goods_value: ['', Validators.compose([Validators.required])],
- finished_goods_value: ['', Validators.compose([Validators.required])],
- is_sufficiant_goods: ['', Validators.compose([Validators.required])],
+ goods_observed: ['', Validators.compose([Validators.required])],
+ goods_quantity: [''],
+ goods_value: [''],
+ finished_goods_value: [''],
+ is_sufficiant_goods: [''],
+ finishedgoods_remarks:['']
+ });
+ }
+
+ createTradedGoods() {
+ 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:['']
});
}
addRawMaterials() {
@@ -171,6 +273,15 @@ export class StockComponent implements OnInit {
const control = this.stockForm.controls['finished_goods'];
control.removeAt(index);
}
+ addTradedGoods() {
+ const control = this.stockForm.controls['traded_goods'];
+ control.push(this.createTradedGoods());
+ }
+ deleteTradedGoods(index) {
+ const control = this.stockForm.controls['traded_goods'];
+ control.removeAt(index);
+ }
+
submitDetails() {
if (!this.stockForm.valid) {
return;
@@ -179,12 +290,16 @@ export class StockComponent implements OnInit {
records.pdid = this.pdid;
records.formid = this.form_id;
records.fk_createdby = this.pdid;
- records.raw_materials = this.stockForm.controls['raw_materials'].value;
+ if(this.rawMaterialAccess == true){
+ records.raw_materials = this.stockForm.controls['raw_materials'].value; }
+ if(this.finishedGoodsAccess == true){
+ records.finished_goods = this.stockForm.controls['finished_goods'].value;}
+ if(this.tradeConcernAccess == true){
+ records.traded_goods = this.stockForm.controls['traded_goods'].value; }
records.stock_remarks = this.stockForm.controls['stock_remarks'].value;
- records.finished_goods = this.stockForm.controls['finished_goods'].value;
- console.log('data', records);
+ //console.log('data', records);
this._pd.saveForm(records).subscribe(data => {
- console.log('data', data);
+ //console.log('data', data);
this.notifier.notify('success', 'Saved Successfully.');
}, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
@@ -220,4 +335,151 @@ export class StockComponent implements OnInit {
event.preventDefault();
}
}
+
+ /** To Convert Amount into Words */
+ inWords(e,flag:number){
+ switch(flag){
+ case 1 :
+ this.rawValueInWords = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 2 :
+ this.goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ break;
+ case 3 :
+ this.tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ break;
+ default:
+ break;
+ }
+ }
+
+ // Validation Dynamically Add And Remove
+ GoodsValidation(event: any){
+ // console.log('First Time',event);
+ // console.log('First Time Value',event.value);
+
+ const control = this.stockForm.controls['finished_goods'];
+
+ if(event.value == 'no') {
+
+ control.controls[0].get('goods_quantity').setValidators([Validators.required]);
+ control.controls[0].get('goods_quantity').updateValueAndValidity();
+
+ control.controls[0].get('goods_value').setValidators([Validators.required]);
+ control.controls[0].get('goods_value').updateValueAndValidity();
+
+ control.controls[0].get('finished_goods_value').setValidators([Validators.required]);
+ control.controls[0].get('finished_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_goods').setValidators([Validators.required]);
+ control.controls[0].get('is_sufficiant_goods').updateValueAndValidity();
+
+
+ }
+ else
+ if(event.value == 'yes') {
+
+ control.controls[0].get('goods_quantity').clearValidators();
+ control.controls[0].get('goods_quantity').updateValueAndValidity();
+
+ control.controls[0].get('goods_value').clearValidators();
+ control.controls[0].get('goods_value').updateValueAndValidity();
+
+ control.controls[0].get('finished_goods_value').clearValidators();
+ control.controls[0].get('finished_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_goods').clearValidators();
+ control.controls[0].get('is_sufficiant_goods').updateValueAndValidity();
+
+
+
+ }
+
+ }
+
+ RawMaterialValidation(event: any){
+ // console.log('First Time',event);
+ // console.log('First Time Value',event.value);
+
+ const control = this.stockForm.controls['raw_materials'];
+
+ if(event.value == 'no') {
+
+ control.controls[0].get('raw_quantity').setValidators([Validators.required]);
+ control.controls[0].get('raw_quantity').updateValueAndValidity();
+
+ control.controls[0].get('raw_uom').setValidators([Validators.required]);
+ control.controls[0].get('raw_uom').updateValueAndValidity();
+
+ control.controls[0].get('raw_value').setValidators([Validators.required]);
+ control.controls[0].get('raw_value').updateValueAndValidity();
+
+ control.controls[0].get('rawmaterial_value').setValidators([Validators.required]);
+ control.controls[0].get('rawmaterial_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_raw').setValidators([Validators.required]);
+ control.controls[0].get('is_sufficiant_raw').updateValueAndValidity();
+
+
+ }
+ else
+ if(event.value == 'yes') {
+
+ control.controls[0].get('raw_quantity').clearValidators();
+ control.controls[0].get('raw_quantity').updateValueAndValidity();
+
+ control.controls[0].get('raw_uom').clearValidators();
+ control.controls[0].get('raw_uom').updateValueAndValidity();
+
+ control.controls[0].get('raw_value').clearValidators();
+ control.controls[0].get('raw_value').updateValueAndValidity();
+
+ control.controls[0].get('rawmaterial_value').clearValidators();
+ control.controls[0].get('rawmaterial_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_raw').clearValidators();
+ control.controls[0].get('is_sufficiant_raw').updateValueAndValidity();
+ }
+
+ }
+
+ TradedGoodsValidation(event: any){
+ console.log('First Time',event);
+ console.log('First Time Value',event.value);
+
+ const control = this.stockForm.controls['tradeded_goods'];
+
+ if(event.value == 'no') {
+
+ control.controls[0].get('traded_goods_quantity').setValidators([Validators.required]);
+ control.controls[0].get('traded_goods_quantity').updateValueAndValidity();
+
+ control.controls[0].get('estimated_traded_goods_value').setValidators([Validators.required]);
+ control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('traded_goods_value').setValidators([Validators.required]);
+ control.controls[0].get('traded_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_traded_goods').setValidators([Validators.required]);
+ control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity();
+ }
+ else
+ if(event.value == 'yes') {
+
+ control.controls[0].get('traded_goods_quantity').clearValidators();
+ control.controls[0].get('traded_goods_quantity').updateValueAndValidity();
+
+ control.controls[0].get('estimated_traded_goods_value').clearValidators();
+ control.controls[0].get('estimated_traded_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('traded_goods_value').clearValidators();
+ control.controls[0].get('traded_goods_value').updateValueAndValidity();
+
+ control.controls[0].get('is_sufficiant_traded_goods').clearValidators();
+ control.controls[0].get('is_sufficiant_traded_goods').updateValueAndValidity();
+
+ }
+
+ }
+
}
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 9f45d2ea7..e348d136a 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
@@ -417,6 +417,13 @@ convertNumberToWords(amount) {
)
}
+ stockFormAccess(pdid: any): Observable {
+
+ return this._http.post(this.apiUrl+"getTypeOfActivetyFromBusinessForm",{"records":pdid})
+ .pipe(
+ catchError(this.handleError('operation', []))
+ )
+ }
// private handleError(operation = 'operation', result?: T) {
// return (error: any): Observable => {
// return of(result as T);
Raw Materials
-
+
+
-
+
{{uom.name}}
-
+
-
-
+
+
+ {{"₹"}} {{rawValueInWords}} Only
-
-
+
+
+
+ Yes
+ No
+
-
+