+
+
+
+ Select
+ Yes
+ No
+
+
+
Approximate No of similar outlets / stores seen by PD officer during the visit to that location Required
-
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 61c143fc6..55d3bce73 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
@@ -43,17 +43,19 @@ export class StockComponent implements OnInit {
company_id: string;
RMCommentCard: boolean = false;
- TGCommentCard: boolean = false
+ TGCommentCard: boolean = false;
+ SPCommentCard: boolean = false;
- serviceProviderForm: Boolean = false;
+ // serviceProviderForm: Boolean = false;
suppliers_raw_materials: any = [];
suppliers_retail_trade_details: any = [];
suppliers_wholesale_trade_details: any = [];
suppliers_finished_goods: any = [];
- // suppliers_service_product : any = [];
+ suppliers_service_providers : any = [];
public RMsufficientList: any = [{value:"yes",isdisplayvalue:"Yes",disabled:false},{value:"no",isdisplayvalue:"No",disabled:false},{value:"not applicable",isdisplayvalue:"Stock not required to be maintained",disabled:false}];
public TGsufficientList: any = [{value:"yes",isdisplayvalue:"Yes",isdisabled:false},{value:"no",isdisplayvalue:"No",isdisabled:false},{value:"not applicable",isdisplayvalue:"Stock not required to be maintained",isdisabled:false}];
+ public SPsufficientList: any = [{value:"yes",isdisplayvalue:"Yes",isdisabled:false},{value:"no",isdisplayvalue:"No",isdisabled:false},{value:"not applicable",isdisplayvalue:"Stock not required to be maintained",isdisabled:false}];
/** Constructor */
constructor(notifier: NotifierService,
@@ -134,7 +136,7 @@ export class StockComponent implements OnInit {
let api = Object.keys(record.from_business).map(function (key) {
return record.from_business[key];
});
-
+
let type2 = record.from_business.filter(data => data.type_of_activity_id == 2);
let type2length = type2[0].hasOwnProperty("products") ? type2[0].products.length : 0;
@@ -142,7 +144,9 @@ export class StockComponent implements OnInit {
let type3length = type3[0].hasOwnProperty("products") ? type3[0].products.length : 0;
let type4 = record.from_business.filter(data => data.type_of_activity_id == 4);
let type4length = type4[0].hasOwnProperty("products") ? type4[0].products.length : 0;
-
+ let type5 = record.from_business.filter(data => data.type_of_activity_id == 5);
+ let type5length = type5[0].hasOwnProperty("products") ? type5[0].products.length : 0;
+
let rm_api = record.from_supplier.hasOwnProperty("raw_material") ? record.from_supplier.raw_material : [];
let params: any = {};
@@ -163,8 +167,11 @@ export class StockComponent implements OnInit {
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details: this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
+ servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [dataForm.is_sufficiant_finished_and_traded_goods],
- finished_and_traded_goods_remarks: [dataForm.finished_and_traded_goods_remarks]
+ finished_and_traded_goods_remarks: [dataForm.finished_and_traded_goods_remarks],
+ is_sufficiant_service_goods: [dataForm.hasOwnProperty('is_sufficiant_service_goods') ? dataForm.is_sufficiant_service_goods : ''],
+ service_goods_remarks: [dataForm.hasOwnProperty('service_goods_remarks') ? dataForm.service_goods_remarks : '' ]
});
if (api.length > 0) {
api.forEach(val => {
@@ -196,7 +203,16 @@ export class StockComponent implements OnInit {
}
if (val.type_of_activity_id == 5) {
if (val.products) {
- this.serviceProviderForm = true;
+ // this.serviceProviderForm = true;
+ let servicing_temparr = [];
+ if(dataForm.hasOwnProperty('service_provider')){
+ servicing_temparr['service_provider'] = dataForm.servicing_details[0].service_provider;
+ this.initServicingDetails(servicing_temparr);
+ }
+ else{
+ this.suppliers_service_providers = val.products;
+ this.initServicingDetails(null);
+ }
}
}
});
@@ -215,8 +231,11 @@ export class StockComponent implements OnInit {
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details: this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
+ servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [''],
- finished_and_traded_goods_remarks: ['']
+ finished_and_traded_goods_remarks: [''],
+ is_sufficiant_service_goods: [''],
+ service_goods_remarks: ['']
});
if (api.length > 0) {
@@ -244,8 +263,9 @@ export class StockComponent implements OnInit {
}
if (val.type_of_activity_id == 5) {
if (val.products) {
- // this.suppliers_service_product = val.products;
- this.serviceProviderForm = true;
+ this.suppliers_service_providers = val.products;
+ this.initServicingDetails(null);
+ // this.serviceProviderForm = true;
}
}
@@ -265,8 +285,11 @@ export class StockComponent implements OnInit {
manufacturing_details: this.fb.array([this.manufacturingFormCreation(record)]),
retail_details: this.fb.array([this.retailFormCreation(type3length)]),
trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
+ servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [''],
- finished_and_traded_goods_remarks: ['']
+ finished_and_traded_goods_remarks: [''],
+ is_sufficiant_service_goods: [''],
+ service_goods_remarks: ['']
});
if (api.length > 0) {
api.forEach(val => {
@@ -293,8 +316,8 @@ export class StockComponent implements OnInit {
}
if (val.type_of_activity_id == 5) {
if (val.products) {
- // this.suppliers_service_product = val.products;
- this.serviceProviderForm = true;
+ this.suppliers_service_providers = val.products;
+ this.initServicingDetails(null);
}
}
});
@@ -352,6 +375,19 @@ export class StockComponent implements OnInit {
}
}
+ servicingForm: Boolean = false;
+ servicingFormCreation(val) {
+
+ // let arr = val.filter(data => data.type_of_activity_id == 4);
+ if (val > 0) {
+ this.servicingForm = true;
+ return this.fb.group({
+ service_provider: this.fb.array([])
+ });
+ } else {
+ return;
+ }
+ }
initManufacturingDetails(datas) {
@@ -608,6 +644,75 @@ export class StockComponent implements OnInit {
}
}
+
+ initServicingDetails(datas) {
+
+ const service =
+
+
+
+ Select
+ Yes
+ No
+
+
+
-
- Specify The Demolition Activity Comment Required
+
+ Comment on any demolition activity observed is Required
-
+
+
+
+
+
+
-
-
-
+ -->
Demolition Activity Image
-
+
+
+
+ Select
+ Yes
+ No
+
+
-
- Specify The Sealing Activity Comment Required
+
+ Comment on any sealing activity observed in area is Required
-
+
- Sealing Activity Image
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index c6bc0d410..662f0ab2e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -236,10 +236,10 @@ export class FinalRemarksComponent implements OnInit { this.clixChange(data.records.sealing_activity,2); this.clixChange(data.records.demolition_activity,3); - if(data.records.is_competition ==true){ this._finalRemarkForm.controls.appx_outlet_or_stores.setValue(data.records.appx_outlet_or_stores);} - if(data.records.sealing_activity ==true){ this._finalRemarkForm.controls.comment_of_demolition_activity.setValue(data.records.comment_of_demolition_activity); + if(data.records.is_competition =='yes'){ this._finalRemarkForm.controls.appx_outlet_or_stores.setValue(data.records.appx_outlet_or_stores);} + if(data.records.sealing_activity =='yes'){ this._finalRemarkForm.controls.comment_of_demolition_activity.setValue(data.records.comment_of_demolition_activity); this._finalRemarkForm.controls.demolition_activity_pic.setValue(data.records.demolition_activity_pic); } - if(data.records.demolition_activity ==true) {this._finalRemarkForm.controls.comment_of_sealing_activity.setValue(data.records.comment_of_sealing_activity); + if(data.records.demolition_activity =='yes') {this._finalRemarkForm.controls.comment_of_sealing_activity.setValue(data.records.comment_of_sealing_activity); this._finalRemarkForm.controls.sealing_activity_pic.setValue(data.records.sealing_activity_pic); } } @@ -618,16 +618,17 @@ export class FinalRemarksComponent implements OnInit { } clixChange(e,flag){ + console.log(e,flag); if(flag == 1){ - e==true ? this._finalRemarkForm.addControl('appx_outlet_or_stores', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('appx_outlet_or_stores'); + e == 'yes' ? this._finalRemarkForm.addControl('appx_outlet_or_stores', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('appx_outlet_or_stores'); } if(flag == 2){ - e==true ? this._finalRemarkForm.addControl('comment_of_demolition_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_demolition_activity'); - e==true ? this._finalRemarkForm.addControl('demolition_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('demolition_activity_pic'); + e== 'yes' ? this._finalRemarkForm.addControl('comment_of_demolition_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_demolition_activity'); + e== 'yes' ? this._finalRemarkForm.addControl('demolition_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('demolition_activity_pic'); } if(flag == 3){ - e==true ? this._finalRemarkForm.addControl('comment_of_sealing_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_sealing_activity'); - e==true ? this._finalRemarkForm.addControl('sealing_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('sealing_activity_pic'); + e== 'yes' ? this._finalRemarkForm.addControl('comment_of_sealing_activity', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('comment_of_sealing_activity'); + e== 'yes' ? this._finalRemarkForm.addControl('sealing_activity_pic', new FormControl('')) : this._finalRemarkForm.removeControl('sealing_activity_pic'); } } 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 124f7de79..375f701df 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 @@ -371,17 +371,119 @@Service Provider Details
+ +
+
+
+
+
+
+
+
+
+
+ Service Provider {{g+1}}
+
+
+
+
+
+
+
+ Select
+ Add Stock Details
+ No stock observed
+
+
+
+
+
+
+
+
+
+ Select
+ {{uom.name}}
+
+
+
+
+ UOM Required
+
+
+
+ {{"₹"}}
+ {{sp.get('estimated_service_provider_value').value
+ | numberToWords}} Only
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Select
+
+ {{val.isdisplayvalue}}
+
+
+
+
+ Is the stock of finished / goods observed, sufficient considering the size of operations Required
+
+
+ Please comment on the stock level observed?
+
+
+
+
+
+ --
+
Service Provider
Service Provider Details Not
applicable here !!
-