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 429099f1f..fb7e5ee9a 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 @@ -40,7 +40,7 @@ -
+
@@ -56,7 +56,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -173,23 +173,23 @@
-
-

Additional Unit #{{i+1}}

 +
+

Additional Unit #{{i+1}}

 - + {{m_addressType.address_type}} - - + + - + - + @@ -212,24 +212,22 @@ {{"₹"}} {{premisesRentAmtInwords[i]}} Only --> - + + formControlName="premises_remarks" autocomplete="off"> + + + + + - - - - -
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index aedb2ec08..4c6af9b66 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -134,19 +134,19 @@ export class AddressComponent implements OnInit { let selectedAddressType = this.addressData.filter(element =>element.address_type_id == data.records.address_type); this.selectedAddressType(selectedAddressType); - if(data.records.address_type == 12) { + if(data.records.address_type == 1) { this.addressForm.controls.address_type_others.setValue(data.records.address_type_others); this.selectedAddressType(data.records.address_type_others); } this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); - if(data.records.comment_locality == 10){ + if(data.records.comment_locality == 1){ this.addressForm.controls.other_comment_locality.setValue(data.records.other_comment_locality); } // this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); this.addressForm.controls.locality.setValue(data.records.locality); - if(data.records.locality == 7 ){ + if(data.records.locality == 1 ){ this.addressForm.controls.locality_others.setValue(data.records.locality_others); } this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark); @@ -349,20 +349,21 @@ export class AddressComponent implements OnInit { this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } - if(this.address.value.other_premises_bussiness_activity != ''){ - if(this.address.value.bussiness_activity_remark != ''){ + // console.log(this.addressForm.controls.bussiness_activity_remark.value); + // console.log(this.address.value.bussiness_activity_remark); + if(this.address.value.bussiness_activity_remark == ''){ this.notifier.notify('warning', 'Fill Remark!'); return; - }} + } let records: any = {}; records.address = this.address.value; records.address_type = this.addressType.value; - if (this.addressType.value == 12) { + if (this.addressType.value == 1) { records.address_type_others = this.addressForm.controls.address_type_others.value; } records.locality = this.locality.value; - if (this.locality.value == 7) { + if (this.locality.value == 1) { records.locality_others = this.addressForm.controls.locality_others.value; } records.pd_location = this.pdLocation.value; @@ -394,7 +395,9 @@ export class AddressComponent implements OnInit { this._pd.saveForm(records).subscribe(data => { if(data.status == 200) { this.notifier.notify('success', 'Saved Successfully.'); - this.dialogRef.close(); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); } else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 633287a26..93a016b6c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -536,6 +536,7 @@ export class GeneralInfoComponent implements OnInit { if (this._generalForm.invalid) { // console.log('if',this._generalForm.value); this.validateAllFormFields(this._generalForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } // else if(formData.applicant_relation.length==0){ @@ -556,7 +557,7 @@ export class GeneralInfoComponent implements OnInit { this._pd.savePDFormDetailsWithID(saveRecords).subscribe( dataresult => { if (dataresult.status == 200) { - this.notifier.notify('success', 'General Information Updated.!'); + this.notifier.notify('success', 'Saved Successfully.'); setTimeout(() =>{ this.dialogRef.close(); },3000); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html index e1e868f49..bc1bc7bb3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.html @@ -164,4 +164,5 @@
- \ No newline at end of file + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts index 6ff4bfdc8..d430fefb1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/lender-representative/lender-representative.component.ts @@ -27,6 +27,7 @@ export class LenderRepresentativeComponent implements OnInit { private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, + private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 15; @@ -107,6 +108,7 @@ export class LenderRepresentativeComponent implements OnInit { submitLRForm() { if (!this.representativeForm.valid) { this.validateAllFormFields(this.representativeForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } let records: any = {}; @@ -119,7 +121,15 @@ export class LenderRepresentativeComponent implements OnInit { records.lender_representative_details = this.representativeForm.controls['lender_representative_details'].value; } this._pd.saveForm(records).subscribe(data => { - this.notifier.notify('success', 'Saved Successfully.'); + if(data.status == 200) { + this.notifier.notify('success', 'Saved Successfully.'); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); + } + else { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 51c117ff8..f9fe2e3f1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -19,96 +19,78 @@ -
- - - {{"₹"}} {{loanAmtInWords}} Only - - - - {{ enduse.enduse_of_loan}} - - - - - - -
- -
-
- - - Yes - No - - -
- -
- - -
- + + + + {{"₹"}} {{loanAmtInWords}} Only + + + + {{ enduse.enduse_of_loan}} + + + + + Yes + No + + + + + + + + + {{"₹"}} {{balTxrfAmtInWords}} Only - + Yes No - + {{ btLen.lender_name }} - + - + {{"₹"}} {{topUpAmtInWords}} Only - + -
-
+ + - + {{"₹"}} {{ownContributionInWords}} Only - + {{ sour.name }} - + - + @@ -126,10 +108,10 @@ --> -
+ - + {{"₹"}} {{emiAmtInWords}} Only @@ -161,21 +143,29 @@ Vacant Land Others --> - + {{CompanyApplicantGroupList | json}} - {{owner.applicant_name}} - Others (Please Specify) + formControlName="owner_name"> + + {{owner.name}} + + - + @@ -195,7 +185,7 @@ Vacant Land --> - + {{"₹"}} {{emvAmtInWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 2187bdc8a..0d322ade2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -56,6 +56,9 @@ export class LoanDetailsComponent implements OnInit { m_mortageTypeProperty = []; m_statusofCunstruction = []; m_btLenderList = []; + // existCompanyList: any =[]; + CompanyApplicantGroupList: any=[]; + CompanyApplicantGroupList2: any=[]; loanAmtInWords : any; balTxrfAmtInWords : any; @@ -70,14 +73,35 @@ export class LoanDetailsComponent implements OnInit { mortageAccess: boolean = false; propertyType : any; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, + private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.applicants = this.pd_all_details.pdapplicants_detials; + + console.log(this.applicants); + let CompanyList : any=[]; + let ApplicantList : any=[]; + + this.applicants.forEach(val => { + if(val.applicant_type == 0){ + this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) + } + if(val.applicant_type == 1){ + this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) + } + if(val.applicant_type == 2){ + this.CompanyApplicantGroupList.push({groupName:'COMPANIES',groupValues:{id:val.pd_co_applicant_id.toString(),name:val.applicant_name,group_id:1}}) + } + }); + + console.log(this.CompanyApplicantGroupList); + this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr; this.productID = this.pd_all_details.pdmaster_details.fk_product_id; this.subProductName = this.pd_all_details.pdmaster_details.subproduct_name; @@ -107,7 +131,7 @@ export class LoanDetailsComponent implements OnInit { } }; ngOnInit() { - console.clear(); + // console.clear(); this.initloanDetailsForm(); this.getM_EndUseofLoad(); this.getM_EndUseForLoan(this.pdid); @@ -115,6 +139,32 @@ export class LoanDetailsComponent implements OnInit { this.getM_MortageTypeProperty(); this.getM_StatusofCunstruction(); this.getM_BTLenderList(); + + // this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + // if(data.dataStatus){ + // this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); + // } + + // let modifyCompanyList : any=[]; + // if(this.existCompanyList.length>0){ + // modifyCompanyList = this.existCompanyList.map(element => { + // return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + // }); + // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + // } + // let modifyApplicantList: any=[]; + // if(this.applicants.length > 0){ + // modifyApplicantList = this.applicants.map(element => { + // return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + // }); + // this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + // this.mergeCompanyApplicant.splice(this.mergeCompanyApplicant.indexOf(languague), 1); + // // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1); + + // } + // }) + + let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = this.form_id; @@ -227,7 +277,7 @@ export class LoanDetailsComponent implements OnInit { if(this.mortageCardAccess == true){ this.loanDetailsForm.controls['property_type_others'].setValue(value.records.property_type_others); this.loanDetailsForm.controls['owner_name'].setValue(ownername); - this.loanDetailsForm.controls['other_owners_name'].setValue(value.records.other_owners_name); + // this.loanDetailsForm.controls['other_owners_name'].setValue(value.records.other_owners_name); this.loanDetailsForm.controls['construction_status'].setValue(value.records.construction_status); // if(value.records.construction_status == 4 ){ @@ -358,9 +408,37 @@ getM_sourceofamount() { this._pd.getAllMasterDatas('BTLENDERLIST').subscribe( data => { this.m_btLenderList = data.records.filter(data => data.isactive == 1); + // this.m_btLenderList = this.m_btLenderList.sort((a, b) => { + // if (a.lender_name > b.lender_name) { + // return 1; + // } + // if (a.lender_name < b.lender_name) { + // return -1; + // } + // return 0; + // }); }) } +// compare objects for merge two master table details + compareObjects(o1: any, o2: any) { + if(o1.id == o2.id && o1.group_id == o2.group_id) + return true; + else return false + } + +// check others + checkOthers(values){ + if(values!=null) { + return values.id==0 ? true : false; + } + else { + return false; + } + + } + + // ================== public initloanDetailsForm(): void { @@ -386,7 +464,7 @@ getM_sourceofamount() { property_type: [''], property_type_others:[''], owner_name: [''], - other_owners_name :[''], + // other_owners_name :[''], construction_status: [''], //percentage_of_construction : [''], emv_per_customer: [''], @@ -462,7 +540,7 @@ getM_sourceofamount() { } submitLoanDetails() { // if (!this.loanDetailsForm.valid) { - // //this.notifier.notify('warning', 'Form Invaild Check all requried Field .!'); + // this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); // return; // } let records: any = {}; @@ -506,9 +584,9 @@ getM_sourceofamount() { } - if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { + // if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value; - } + // } records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value; if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') { @@ -529,27 +607,19 @@ getM_sourceofamount() { dataOwner_name.push({owner_name: element}) }); records.owner_name_group = dataOwner_name; - if(this.OtherOwnerFlag){ - records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value; - }else{ records.other_owners_name = ''; } + // if(this.OtherOwnerFlag){ + // records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value; + // }else{ records.other_owners_name = ''; } records.construction_status = this.loanDetailsForm.controls['construction_status'].value; records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value; }else{ records.property_type = null; records.property_type_others = null; records.owner_name_group = null; - records.other_owners_name = null; + // records.other_owners_name = null; records.construction_status = null; records.emv_per_customer = null; } - - - - - - - - if(this.isOtherSource){ records.other_source = this.loanDetailsForm.controls['other_source'].value; }else{ records.other_source = ''; } @@ -564,11 +634,21 @@ getM_sourceofamount() { //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value; records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value; this._pd.saveForm(records).subscribe(data => { - this.notifier.notify('success', 'Saved Successfully.'); + if(data.status == 200) { + this.notifier.notify('success', 'Saved Successfully.'); + // this.dialogRef.close(); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); + } + else{ + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }) } + validateAllFormFields(formGroup: FormGroup) { Object.keys(formGroup.controls).forEach(field => { const control = formGroup.get(field); @@ -667,16 +747,24 @@ getM_sourceofamount() { */ loanCalc() { - let BtAmount = this.loanDetailsForm.value.balance_transfer_amount; - let loanAmount = this.loanDetailsForm.value.loan_amount; + let BtAmount : number = +this.loanDetailsForm.value.balance_transfer_amount; + let loanAmount : number = +this.loanDetailsForm.value.loan_amount; let topupAmt ; - if(BtAmount !=null && BtAmount !='' && loanAmount !=null && loanAmount!='') - { + if(BtAmount !=null && loanAmount !=null) + { + if(loanAmount >= BtAmount){ topupAmt = loanAmount - BtAmount; - //topUpAmtInWords + this.loanDetailsForm.controls['topup_amount'].setValue(topupAmt); + this.topUpAmtInWords = this._pd.convertNumberToWords(topupAmt); + } + else{ + this.notifier.notify('warning', 'Balances Transfer Amount is greater than Loan Amount Please check.!'); + this.loanDetailsForm.controls['balance_transfer_amount'].setValue(''); + this.balTxrfAmtInWords = ''; + this.loanDetailsForm.controls['topup_amount'].setValue(''); + this.topUpAmtInWords = ''; + } } - this.loanDetailsForm.controls['topup_amount'].setValue(topupAmt); - this.topUpAmtInWords = this._pd.convertNumberToWords(topupAmt); } } \ No newline at end of file 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 866d610e5..65fcef0c4 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 @@ -24,7 +24,7 @@
-
+
Raw Material #{{a+1}} @@ -48,17 +48,17 @@ {{uom.name}} - - + + - + {{"₹"}} {{M_rawValueInWords[a]}} Only - + Yes @@ -70,21 +70,23 @@ - - - + + + + +
-
+
Finished Goods #{{b+1}} @@ -93,7 +95,7 @@ - + Add Stock Details No Stock Observed @@ -102,14 +104,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{M_goodsValueInWords[b]}} Only - + Yes @@ -122,22 +133,32 @@ - + --> + + + +
-
+
Traded Goods #{{c+1}} @@ -154,14 +175,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{M_tradedGoodsValueInWords[c]}} Only - + @@ -175,16 +205,26 @@ - + --> + + + +
@@ -202,7 +242,7 @@
-
+
Finished Goods #{{d+1}} @@ -219,14 +259,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{R_goodsValueInWords[d]}} Only - + @@ -240,7 +289,7 @@ - @@ -248,14 +297,24 @@ + --> + + + +
-
+
Traded Goods #{{e+1}} @@ -272,14 +331,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{R_tradedGoodsValueInWords[e]}} Only - + @@ -293,16 +361,26 @@ - + --> + + + +
@@ -321,7 +399,7 @@
-
+
Finished Goods #{{f+1}} @@ -338,14 +416,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{T_goodsValueInWords[f]}} Only - + @@ -360,23 +447,33 @@ - + --> + + + +
-
+
Traded Goods #{{g+1}} @@ -393,14 +490,23 @@ - + + + {{uom.name}} + + + + + + {{"₹"}} {{T_tradedGoodsValueInWords[g]}} Only - + @@ -414,16 +520,26 @@ - + --> + + + +
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 f6e7da0a2..fcffdb83f 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 @@ -30,23 +30,23 @@ export class StockComponent implements OnInit { rawmaterial : any; M_rawValueInWords : any = []; - M_financialRawValueInWords : any = []; + // M_financialRawValueInWords : any = []; M_goodsValueInWords : any = []; R_goodsValueInWords : any = []; T_goodsValueInWords : any = []; - M_financialGoodsValueInWords : any = []; - R_financialGoodsValueInWords : any = []; - T_financialGoodsValueInWords : any = []; + // M_financialGoodsValueInWords : any = []; + // R_financialGoodsValueInWords : any = []; + // T_financialGoodsValueInWords : any = []; M_tradedGoodsValueInWords : any = []; R_tradedGoodsValueInWords : any = []; T_tradedGoodsValueInWords : any = []; - M_financialTradedGoodsValueInWords : any = []; - R_financialTradedGoodsValueInWords : any = []; - T_financialTradedGoodsValueInWords : any = []; + // M_financialTradedGoodsValueInWords : any = []; + // R_financialTradedGoodsValueInWords : any = []; + // T_financialTradedGoodsValueInWords : any = []; rawMaterialAccess: boolean; finishedGoodsAccess: boolean; @@ -58,6 +58,7 @@ export class StockComponent implements OnInit { constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, + private dialogRef: MatDialogRef, private _pd: PdTrigerService,@Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.form_id = 11; @@ -423,7 +424,6 @@ tradingFormCreation(val) { 'raw_uom': '', 'other_uom': '', 'raw_value': '', - 'rawmaterial_value': '', 'is_sufficiant_raw': '', 'rawmaterial_remarks':''}; rawMaterial.push(this.createRawmaterial(Ref_RawMaterials)); @@ -443,7 +443,7 @@ tradingFormCreation(val) { // console.log(val); if(val.raw_value){ this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value); - this.M_financialRawValueInWords = this._pd.convertNumberToWords(val.rawmaterial_value); + // this.M_financialRawValueInWords = this._pd.convertNumberToWords(val.rawmaterial_value); } rawMaterial.push(this.createRawmaterial(val)); } @@ -456,7 +456,7 @@ tradingFormCreation(val) { // console.log(val); if(val.goods_value){ this.M_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); - this.M_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value); + // this.M_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value); } finishedGoods.push(this.createGoods(val)); @@ -470,7 +470,7 @@ tradingFormCreation(val) { // console.log(val); if(val.estimated_traded_goods_value){ this.M_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); - this.M_financialTradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); + // this.M_financialTradedGoodsValueInWords = this._pd.convertNumberToWords(val.traded_goods_value); } tradedGoods.push(this.createTradedGoods(val)); @@ -494,7 +494,7 @@ tradingFormCreation(val) { raw_uom: [''], other_uom : [''], raw_value: [''], - rawmaterial_value: [''], + // rawmaterial_value: [''], is_sufficiant_raw: [''], rawmaterial_remarks:[''] }) @@ -508,7 +508,7 @@ tradingFormCreation(val) { raw_uom: [records.raw_uom], other_uom : [records.other_uom], raw_value: [records.raw_value], - rawmaterial_value: [records.rawmaterial_value], + // rawmaterial_value: [records.rawmaterial_value], is_sufficiant_raw: [records.is_sufficiant_raw], rawmaterial_remarks:[records.rawmaterial_remarks] }) @@ -533,7 +533,7 @@ tradingFormCreation(val) { if(val.goods_value){ this.R_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); - this.R_financialGoodsValueInWords =this._pd.convertNumberToWords(val.finished_goods_value); + // this.R_financialGoodsValueInWords =this._pd.convertNumberToWords(val.finished_goods_value); } finishedGoods.push(this.createGoods(val)); @@ -549,7 +549,7 @@ tradingFormCreation(val) { // console.log(val); if(val.estimated_traded_goods_value){ this.R_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); - this.R_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value); + // this.R_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value); } tradedGoods.push(this.createTradedGoods(val)); @@ -579,8 +579,10 @@ tradingFormCreation(val) { goods_name: [''], goods_observed: [''], goods_quantity: [''], + goods_uom: [''], + goods_other_uom: [''], goods_value: [''], - finished_goods_value: [''], + // finished_goods_value: [''], is_sufficiant_goods: [''], finishedgoods_remarks:[''] }); @@ -590,8 +592,10 @@ tradingFormCreation(val) { goods_name: [records.goods_name], goods_observed: [records.goods_observed], goods_quantity: [records.goods_quantity], + goods_uom: [records.goods_uom], + goods_other_uom: [records.goods_other_uom], goods_value: [records.goods_value], - finished_goods_value: [records.finished_goods_value], + // finished_goods_value: [records.finished_goods_value], is_sufficiant_goods: [records.is_sufficiant_goods], finishedgoods_remarks:[records.finishedgoods_remarks] }) @@ -604,8 +608,10 @@ tradingFormCreation(val) { traded_goods_name: [''], traded_goods_observed: [''], traded_goods_quantity: [''], + traded_goods_uom: [''], + traded_goods_other_uom: [''], estimated_traded_goods_value: [''], - traded_goods_value: [''], + // traded_goods_value: [''], is_sufficiant_traded_goods: [''], traded_goods_remarks:[''] }); @@ -634,7 +640,7 @@ tradingFormCreation(val) { // console.log(val); if(val.goods_value){ this.T_goodsValueInWords = this._pd.convertNumberToWords(val.goods_value); - this.T_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value); + // this.T_financialGoodsValueInWords = this._pd.convertNumberToWords(val.finished_goods_value); } finishedGoods.push(this.createGoods(val)); @@ -649,7 +655,7 @@ tradingFormCreation(val) { // console.log(val); if(val.estimated_traded_goods_value){ this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); - this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value); + // this.T_financialTradedGoodsValueInWords =this._pd.convertNumberToWords(val.traded_goods_value); } tradedGoods.push(this.createTradedGoods(val)); } @@ -668,8 +674,10 @@ tradingFormCreation(val) { traded_goods_name: [''], traded_goods_observed: [''], traded_goods_quantity: [''], + traded_goods_uom: [''], + traded_goods_other_uom: [''], estimated_traded_goods_value: [''], - traded_goods_value: [''], + // traded_goods_value: [''], is_sufficiant_traded_goods: [''], traded_goods_remarks:[''] }); @@ -679,8 +687,10 @@ tradingFormCreation(val) { traded_goods_name: [records.traded_goods_name], traded_goods_observed: [records.traded_goods_observed], traded_goods_quantity: [records.traded_goods_quantity], + traded_goods_uom: [records.traded_goods_uom], + traded_goods_other_uom: [records.traded_goods_other_uom], estimated_traded_goods_value: [records.estimated_traded_goods_value], - traded_goods_value: [records.traded_goods_value], + // traded_goods_value: [records.traded_goods_value], is_sufficiant_traded_goods: [records.is_sufficiant_traded_goods], traded_goods_remarks:[records.traded_goods_remarks] }) @@ -814,6 +824,7 @@ tradingFormCreation(val) { this.submitted = true; // stop here if form is invalid // if (this.stockForms.invalid) { + // this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); // return; // } else { var answerFormValues = this.stockForms.value; @@ -823,15 +834,16 @@ tradingFormCreation(val) { this._pd.savePDFormDetailsWithID(answerFormValues).subscribe( dataresult => { - if (dataresult.status == 200) { - - this.notifier.notify('success', 'Record Saved Successfully.!'); - - } - else { - this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - - } + if(dataresult.status == 200) { + this.notifier.notify('success', 'Saved Successfully.'); + // this.dialogRef.close(); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); + } + else{ + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); @@ -897,27 +909,27 @@ tradingFormCreation(val) { case 7 : this.T_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); break; - case 8 : - this.M_financialRawValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 9 : - this.M_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 10 : - this.M_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 11 : - this.R_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 12 : - this.R_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 13 : - this.T_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; - case 14 : - this.T_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); - break; + // case 8 : + // this.M_financialRawValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 9 : + // this.M_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 10 : + // this.M_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 11 : + // this.R_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 12 : + // this.R_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 13 : + // this.T_financialGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; + // case 14 : + // this.T_financialTradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e.target.value); + // break; default: break; }