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 0571707b9..5bc8d63e2 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
@@ -146,11 +146,11 @@
-
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 4304d3314..827c39105 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -31,6 +31,7 @@ export class AssetsInfoComponent implements OnInit {
pageTitle: string ="Assets Details";
//@Input() pdid: number;
pdid:string;
+ businessProfessionName :string;
public _assetsQuesFrom: FormGroup;
public submitted = false;
@@ -198,7 +199,8 @@ public m_investmentType = [];
ngOnInit() {
this.getPdSupplierFormDetails();
-
+ this.getOwnerName();
+
this.getM_Assets_Type();
this.getM_PropertyType();
this.getM_InvestmentType();
@@ -208,6 +210,11 @@ public m_investmentType = [];
}
// ======================
+getOwnerName(){
+ this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {
+ this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ;
+ });
+}
getM_Assets_Type() {
this.pdTrigerService.getAllMasterDatas('ASSETTYPE').subscribe(
@@ -361,7 +368,7 @@ public m_investmentType = [];
business_assets_mode: ['', Validators.compose([Validators.required])],
business_details: this._formBuilder.array([]),
business_approximate_market_value: ['', Validators.compose([])],
- business_name_of_the_owner: ['', Validators.compose([])],
+ business_name_of_the_owner: [this.businessProfessionName, Validators.compose([])],
// other_owner:[''],
// relation:[''],
// purchase_year: ['', Validators.compose([])],
@@ -556,7 +563,7 @@ public m_investmentType = [];
loadInvestDescriptionWithData(data) {
return this._formBuilder.group({
investments_type: [data.investments_type, Validators.compose([Validators.required])],
- other_investment_type : [data.other_investment_type],
+ other_investments_type : [data.other_investments_type],
amount_of_invest: [data.amount_of_invest, Validators.compose([Validators.required])],
bank_name: [data.bank_name, Validators.compose([Validators.required])]
});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
index 6f215861d..b4154fdeb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html
@@ -46,7 +46,7 @@
{{freq.name}}
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
index 8a35d1bfc..d3a9f368e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts
@@ -103,7 +103,8 @@ export class CurrentLoanComponent implements OnInit {
}
}
} else {
- control.push(this.createLoanDetail());
+ // console.log('overall else');
+ // control.push(this.createLoanDetail());
}
})
}
@@ -116,10 +117,13 @@ export class CurrentLoanComponent implements OnInit {
}
selectedLoanChanges(e): void {
+ console.log(e);
if (e.value == 'Yes') {
+ // console.log('if()');
const control = this.currentLoanForm.controls['loan_details'];
control.push(this.createLoanDetail());
} else if (e.value == 'No') {
+ // console.log('else()');
const arr = this.currentLoanForm.controls.loan_details;
arr.removeAt(0);
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
index 6ee1a4bb7..0b90adbee 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
@@ -135,7 +135,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index ea0fce859..397353269 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -50,7 +50,7 @@
-
+ {{"₹"}} {{M_rawValueInWords}} Only (keyup)="inWords($event,1)"
@@ -97,7 +97,7 @@
-
+ {{"₹"}} {{M_goodsValueInWords}} Only (keyup)="inWords($event,2)"
@@ -145,7 +145,7 @@
-
+ {{"₹"}} {{M_tradedGoodsValueInWords}} Only(keyup)="inWords($event,3)"
@@ -205,7 +205,7 @@
-
+ {{"₹"}} {{R_goodsValueInWords}} Only(keyup)="inWords($event,4)"
@@ -254,7 +254,7 @@
-
+ {{"₹"}} {{R_tradedGoodsValueInWords}} Only(keyup)="inWords($event,5)"
@@ -315,7 +315,7 @@
-
+ {{"₹"}} {{T_goodsValueInWords}} Only(keyup)="inWords($event,6)"
@@ -365,7 +365,7 @@
-
+ {{"₹"}} {{T_tradedGoodsValueInWords}} Only (keyup)="inWords($event,7)"
@@ -399,6 +399,13 @@
+
+
+
+ Service Provider
+
+ Service Provider Details Not applicable here !!
+
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 9eff1689c..6c83ae348 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
@@ -40,14 +40,23 @@ export class StockComponent implements OnInit {
public uomData : any = [];
rawmaterial : any;
- goodsValueInWords : any;
- rawValueInWords : any;
- tradedGoodsValueInWords : 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;
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router,
@@ -85,37 +94,27 @@ export class StockComponent implements OnInit {
// this.notifier.notify('warning', 'There is No Type Of Activity Please Check Bussiness Information.!');
// })
- this._pd.getTypeofActivityForSuppliedInfoForm(this.pdid).subscribe(data => {
- // if(data.dataStatus === undefined){
- let datas = {
- "profession_name": "Others",
- "type_of_activity": [
- {
- "type_of_activity_id": 1,
- "name": "Manufacturing Details"
- },
- {
- "type_of_activity_id": 2,
- "name": "Retail trading"
- },
- {
- "type_of_activity_id": 3,
- "name": "Trading Concern"
- },
- {
- "type_of_activity_id": 4,
- "name": "Service Provider"
- }
- ]
- };
- this.initstockForms(datas.type_of_activity);
- // }else {
- // this.notifier.notify('warning', 'No Category Records Found.!');
- // this.noRecordsFound = false;
- // }
+ //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', 'There is No Type Of Activity Please Check Bussiness Information.!');
+ this.notifier.notify('warning', 'Business Type Of Activity Not Available Please Check Business Information.!');
this.noRecordsFound = false;
})
@@ -133,7 +132,7 @@ export class StockComponent implements OnInit {
let dataForm = value.records;
if(dataForm !== undefined) {
- console.log('dtaForm',dataForm);
+
this.stockForms = this.fb.group({
pdid: [this.pdid],
formid: [this.form_id],
@@ -142,7 +141,12 @@ export class StockComponent implements OnInit {
retail_details : this.fb.array([this.retailFormCreation(record)]),
trade_details: this.fb.array([this.tradingFormCreation(record)]),
});
- let arr = record.filter(data => data.type_of_activity_id === 1);
+
+ let 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;
@@ -175,7 +179,7 @@ export class StockComponent implements OnInit {
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);
+ let arr1 = record.filter(data => data.type_of_activity_id == 2);
if(arr1.length > 0) {
let retail_finished_goods;
let retail_traded_goods;
@@ -199,7 +203,7 @@ export class StockComponent implements OnInit {
retail_temparr['retail_finished_goods'] = retail_finished_goods;
this.initRetailDetails(retail_temparr);
}
- let arr2 = record.filter(data => data.type_of_activity_id === 3);
+ let arr2 = record.filter(data => data.type_of_activity_id == 3);
if(arr2.length > 0) {
let trading_finished_goods;
let trading_traded_goods;
@@ -223,10 +227,14 @@ export class StockComponent implements OnInit {
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);
+ // console.log('dataForm',dataForm);
this.stockForms = this.fb.group({
pdid: [this.pdid],
formid: [this.form_id],
@@ -235,21 +243,21 @@ export class StockComponent implements OnInit {
retail_details : this.fb.array([this.retailFormCreation(record)]),
trade_details: this.fb.array([this.tradingFormCreation(record)]),
});
- let arr = record.filter(data => data.type_of_activity_id === 1);
+ let arr = record.filter(data => data.type_of_activity_id == 1);
if(arr.length > 0) {
this.initManufacturingDetails(null);
}
- let arr1 = record.filter(data => data.type_of_activity_id === 2);
+ 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);
+ 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);
+ let arr3 = record.filter(data => data.type_of_activity_id == 4);
if(arr3.length > 0) {
- //this.serviceProviderForm = true;
+ this.serviceProviderForm = true;
}
this.noRecordsFound = true;
}
@@ -263,21 +271,21 @@ export class StockComponent implements OnInit {
retail_details : this.fb.array([this.retailFormCreation(record)]),
trade_details: this.fb.array([this.tradingFormCreation(record)]),
});
- let arr = record.filter(data => data.type_of_activity_id === 1);
+ let arr = record.filter(data => data.type_of_activity_id == 1);
if(arr.length > 0) {
this.initManufacturingDetails(null);
}
- let arr1 = record.filter(data => data.type_of_activity_id === 2);
+ 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);
+ 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);
+ let arr3 = record.filter(data => data.type_of_activity_id == 4);
if(arr3.length > 0) {
- //this.serviceProviderForm = true;
+ this.serviceProviderForm = true;
}
this.noRecordsFound = true;
}
@@ -292,8 +300,8 @@ export class StockComponent implements OnInit {
}
manufacturingForm: Boolean = false;
- manufacturingFormCreation(val) {
- let arr = val.filter(data => data.type_of_activity_id === 1);
+ manufacturingFormCreation(record) {
+ let arr = record.filter(data => data.type_of_activity_id == 1);
if (arr.length > 0) {
this.manufacturingForm = true;
return this.fb.group({
@@ -309,7 +317,8 @@ export class StockComponent implements OnInit {
retailForm: Boolean = false;
retailFormCreation(val) {
- let arr = val.filter(data => data.type_of_activity_id === 2);
+
+ let arr = val.filter(data => data.type_of_activity_id == 2);
if (arr.length > 0) {
this.retailForm = true;
return this.fb.group({
@@ -324,7 +333,7 @@ export class StockComponent implements OnInit {
tradingForm: Boolean = false;
tradingFormCreation(val) {
- let arr = val.filter(data => data.type_of_activity_id === 3);
+ let arr = val.filter(data => data.type_of_activity_id == 3);
if (arr.length > 0) {
this.tradingForm = true;
return this.fb.group({
@@ -350,32 +359,32 @@ export class StockComponent implements OnInit {
const control = this.stockForms.controls['manufacturing_details']['controls'][0].controls['main_raw_materials'];
if(datas === null){
- console.log(299,'if');
+ // 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(305,'else')
for (let val of datas.manufacturing_raw_materials) {
- console.log(val);
+ // console.log(val);
rawMaterial.push(this.createRawmaterial(val));
}
for (let val of datas.manufacturing_finished_goods) {
- console.log(val);
+ // console.log(val);
finishedGoods.push(this.createGoods(val));
}
for (let val of datas.manufacturing_traded_goods) {
- console.log(val);
+ // console.log(val);
tradedGoods.push(this.createTradedGoods(val));
}
- console.log(310,rawMaterial);
+ // console.log(310,rawMaterial);
}
}
@@ -439,13 +448,13 @@ export class StockComponent implements OnInit {
} else {
for (let val of datas.retail_finished_goods) {
- console.log(val);
+ // console.log(val);
finishedGoods.push(this.createGoods(val));
}
for (let val of datas.retail_traded_goods) {
- console.log(val);
+ // console.log(val);
tradedGoods.push(this.createTradedGoods(val));
}
@@ -521,13 +530,13 @@ export class StockComponent implements OnInit {
// }
for (let val of datas.trading_finished_goods) {
- console.log(val);
+ // console.log(val);
finishedGoods.push(this.createGoods(val));
}
for (let val of datas.trading_traded_goods) {
- console.log(val);
+ // console.log(val);
tradedGoods.push(this.createTradedGoods(val));
}
@@ -751,13 +760,25 @@ export class StockComponent implements OnInit {
inWords(e,flag:number){
switch(flag){
case 1 :
- this.rawValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.M_rawValueInWords = this._pd.convertNumberToWords(e.target.value);
break;
case 2 :
- this.goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ this.M_goodsValueInWords = this._pd.convertNumberToWords(e.target.value);
break;
case 3 :
- this.tradedGoodsValueInWords = this._pd.convertNumberToWords(e.target.value);
+ 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;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 8697b5004..f690e1625 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -82,10 +82,18 @@
-
- {{applicant.applicant_name}}
-
- {{applicant.mobile_no}}
Main Applicant
+
+ {{applicant.applicant_name}}
+
+
+
+ {{applicant.mobile_no}}
+
+
+
+ {{applicant.landline}}
+
+
Main Applicant
{{applicant.relation_name}}