Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-28 19:36:58 +05:30
parent 3fed3a0791
commit aea25f84b4
2 changed files with 87 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
View File

@ -18,13 +18,13 @@
<div fxFlex="100">
<mat-card *ngIf="manufacturingForm">
<mat-card-header>
<p> Manufacturing Details</p>
<mat-card-title><p> Manufacturing Details</p></mat-card-title>
</mat-card-header>
<div formArrayName="manufacturing_details">
<div *ngFor="let md of stockForms.controls.manufacturing_details['controls']; let i=index" [formGroupName]="i">
<div formArrayName="manufacturing_raw_materials">
<div *ngFor="let mrm of md.controls.manufacturing_raw_materials['controls']; let a=index" [formGroupName]="a">
<mat-card-title> <p>{{a+1}} . Raw Material </p> </mat-card-title>
<mat-card-subtitle> <p>{{a+1}} . Raw Material </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="raw_name" >
@ -80,7 +80,7 @@
<div formArrayName="manufacturing_finished_goods">
<div *ngFor="let mfg of md.controls.manufacturing_finished_goods['controls']; let b=index" [formGroupName]="b">
<mat-card-title> <p> {{b+1}} Finished Goods </p> </mat-card-title>
<mat-card-subtitle> <p> {{b+1}} Finished Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@ -128,7 +128,7 @@
<div formArrayName="manufacturing_traded_goods">
<div *ngFor="let mtg of md.controls.manufacturing_traded_goods['controls']; let c=index" [formGroupName]="c">
<mat-card-title> <p>{{c+1}} Traded Goods </p> </mat-card-title>
<mat-card-subtitle> <p>{{c+1}} Traded Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
@ -180,7 +180,7 @@
<mat-card *ngIf="retailForm">
<mat-card-header>
<p>Retail Details</p>
<mat-card-title><p>Retail Details</p></mat-card-title>
</mat-card-header>
<div formArrayName="retail_details">
@ -188,7 +188,7 @@
<div formArrayName="retail_finished_goods">
<div *ngFor="let retailfg of rd.controls.retail_finished_goods['controls']; let d=index" [formGroupName]="d">
<mat-card-title> <p>{{d+1}} Finished Goods </p> </mat-card-title>
<mat-card-subtitle> <p>{{d+1}} Finished Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@ -237,7 +237,7 @@
<div formArrayName="retail_traded_goods">
<div *ngFor="let item of rd.controls.retail_traded_goods['controls']; let e=index" [formGroupName]="e">
<mat-card-title> <p>{{e+1}} Traded Goods </p> </mat-card-title>
<mat-card-subtitle> <p>{{e+1}} Traded Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >
@ -291,14 +291,14 @@
<mat-card *ngIf="tradingForm">
<mat-card-header>
<p>Trading Details</p>
<mat-card-title><p>Trading Details</p></mat-card-title>
</mat-card-header>
<div formArrayName="trade_details">
<div *ngFor="let td of stockForms.controls.trade_details['controls']; let k=index" [formGroupName]="k">
<div formArrayName="trading_finished_goods">
<div *ngFor="let tradesubdetail of td.controls.trading_finished_goods['controls']; let f=index" [formGroupName]="f">
<mat-card-title> <p>{{f+1}} Finished Goods </p> </mat-card-title>
<mat-card-subtitle> <p>{{f+1}} Finished Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="goods_name" >
@ -348,7 +348,7 @@
<div formArrayName="trading_traded_goods">
<div *ngFor="let tradetg of td.controls.trading_traded_goods['controls']; let g=index" [formGroupName]="g">
<mat-card-title> <p>{{g+1}} Traded Goods </p> </mat-card-title>
<mat-card-subtitle> <p>{{g+1}} Traded Goods </p> </mat-card-subtitle>
<mat-card-content class="matcard">
<mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Name" formControlName="traded_goods_name" >

135
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts
View File

@ -117,9 +117,10 @@ export class StockComponent implements OnInit {
this._pd.retriveForm(params).subscribe(value => {
if (value.status == 200) {
let dataForm = value.records;
if(dataForm !== undefined) {
console.log(dataForm);
this.stockForms = this.fb.group({
pdid: [this.pdid],
formid: [this.form_id],
@ -132,102 +133,118 @@ export class StockComponent implements OnInit {
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];
});
}
// 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];
});
}
// 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'] = manufacturing_raw_materials;
manufacturing_temparr['manufacturing_finished_goods'] = manufacturing_finished_goods;
manufacturing_temparr['manufacturing_traded_goods'] = manufacturing_traded_goods;
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;
// 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_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];
})
}
// 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'] = retail_traded_goods;
retail_temparr['retail_finished_goods'] = retail_finished_goods;
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;
// let trading_finished_goods;
// let trading_traded_goods;
if(dataForm.trading_finished_goods !==undefined){
// if(dataForm.trading_finished_goods !==undefined){
trading_finished_goods = Object.keys(dataForm.trading_finished_goods).map(function (key) {
return dataForm.trading_finished_goods[key];
});
}
// 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];
})
}
// 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);
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(dataForm);
}
let arr3 = record.filter(data => data.type_of_activity_id == 4);
if(arr3.length > 0) {
@ -371,7 +388,8 @@ tradingFormCreation(val) {
} else {
// console.log(305,'else')
console.log(datas.manufacturing_raw_materials);
// 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);
@ -472,7 +490,7 @@ tradingFormCreation(val) {
tradedGoods.push(this.createTradedGoods(null));
} 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);
@ -488,6 +506,7 @@ tradingFormCreation(val) {
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);