-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
index cc1911240..209045b4b 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
@@ -31,7 +31,7 @@ export class ClientInfoComponent implements OnInit {
@Input() pdid: number;
- public _supplierQuesFrom: FormGroup;
+ public _clientQuesFrom: FormGroup;
public submitted = false;
public m_paymentModeType= [
{
@@ -88,12 +88,11 @@ export class ClientInfoComponent implements OnInit {
private pdTrigerService: PdTrigerService) { }
ngOnInit() {
-
- this.getPdSupplierFormDetails();
+ this.getClientFormDetails();
}
apiLoadFinish: boolean = false;
- getPdSupplierFormDetails() {
- this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '1').subscribe(
+ getClientFormDetails() {
+ this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '2').subscribe(
data => {
if (data) {
if(data.dataStatus){
@@ -112,21 +111,19 @@ apiLoadFinish: boolean = false;
formLoadData(val) {
if(val !== null) {
let value = val;
- this._supplierQuesFrom = this._formBuilder.group({
+ this._clientQuesFrom = this._formBuilder.group({
pdid: [this.pdid],
- formid: ['1'],
- main_raw_materials: [value.main_raw_materials, Validators.compose([Validators.required])],
- supplier_details: this._formBuilder.array([
+ formid: ['2'],
+ client_details: this._formBuilder.array([
// this.initDetails(),
])
});
- this.addSupplierDetailsWithData(value.supplier_details);
+ this.addClientDetailsWithData(value.client_details);
} else {
- this._supplierQuesFrom = this._formBuilder.group({
+ this._clientQuesFrom = this._formBuilder.group({
pdid: [this.pdid],
- formid: ['1'],
- main_raw_materials: [null, Validators.compose([Validators.required])],
- supplier_details: this._formBuilder.array([
+ formid: ['2'],
+ client_details: this._formBuilder.array([
this.initDetails(),
])
});
@@ -134,12 +131,12 @@ apiLoadFinish: boolean = false;
}
// convenience getter for easy access to form fields
- get f() { return this._supplierQuesFrom.controls; }
+ get f() { return this._clientQuesFrom.controls; }
// Dynamic Form field creation Functionality : START ===>
initDetails() {
return this._formBuilder.group({
- supplier_name: ['', Validators.compose([Validators.required])],
+ client_name: ['', Validators.compose([Validators.required])],
contact_person: ['', Validators.compose([Validators.required])],
mobile_number: ['', Validators.compose([Validators.required])],
payment_mode: ['', Validators.compose([Validators.required])],
@@ -152,7 +149,7 @@ apiLoadFinish: boolean = false;
initDetailsWithdata(data) {
return this._formBuilder.group({
- supplier_name: [data.supplier_name, Validators.compose([Validators.required])],
+ client_name: [data.client_name, Validators.compose([Validators.required])],
contact_person: [data.contact_person, Validators.compose([Validators.required])],
mobile_number: [data.mobile_number, Validators.compose([Validators.required])],
payment_mode: [data.payment_mode, Validators.compose([Validators.required])],
@@ -163,7 +160,7 @@ apiLoadFinish: boolean = false;
});
}
- addSupplierDetailsWithData(supp_data) {
+ addClientDetailsWithData(supp_data) {
var result = Object.keys(supp_data).map(function(key) {
return supp_data[key];
@@ -171,7 +168,7 @@ var result = Object.keys(supp_data).map(function(key) {
if (result.length > 0) {
for (let val of result) {
let vals = {
- supplier_name: val.supplier_name,
+ client_name: val.client_name,
contact_person: val.contact_person,
mobile_number: val.mobile_number,
payment_mode: val.payment_mode,
@@ -180,18 +177,18 @@ var result = Object.keys(supp_data).map(function(key) {
frequency_of_purchase: val.frequency_of_purchase,
freq_purchase_others_text_value: val.freq_purchase_others_text_value
};
- const control =
this._supplierQuesFrom.controls['supplier_details'];
+ const control = this._clientQuesFrom.controls['client_details'];
control.push(this.initDetailsWithdata(vals));
}
}
}
addSupplierDetails(e) {
- const control = this._supplierQuesFrom.controls['supplier_details'];
+ const control = this._clientQuesFrom.controls['client_details'];
control.push(this.initDetails());
}
removeLanguage(i: number) {
- const control = this._supplierQuesFrom.controls['supplier_details'];
+ const control = this._clientQuesFrom.controls['client_details'];
control.removeAt(i);
}
@@ -209,14 +206,14 @@ var result = Object.keys(supp_data).map(function(key) {
onSubmit() {
this.submitted = true;
// stop here if form is invalid
- if (this._supplierQuesFrom.invalid) {
+ if (this._clientQuesFrom.invalid) {
return;
} else {
- var answerFormValues = this._supplierQuesFrom.value;
+ var answerFormValues = this._clientQuesFrom.value;
// To Remove The "Null" With Key also
Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]);
- alert(JSON.stringify(answerFormValues));
+
// Add BRANCH data with help Service File
this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe(
dataresult => {
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 4e2407234..38d3c5061 100644
--- 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
@@ -30,10 +30,10 @@
-
+
-
+