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

issues fixes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-28 17:43:13 +05:30
parent 165228342c
commit 35b3664b45
7 changed files with 1602 additions and 1554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
View File

@ -89,7 +89,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 24%"> <mat-form-field style="width: 24%">
<!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> --> <!-- <input matInput placeholder="Loan Amount" formControlName="loan_amount"> -->
<input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" (change)="loanCalc()" required autocomplete="off"> <input matInput placeholder="Loan Amount" formControlName="loan_amount" (keypress)="keyPress($event)" (keyup)="inWords($event,1)" required autocomplete="off">
<mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint> <mat-hint align="end" *ngIf="pdMain.loan_amount.value != ''">{{"&#8377;"}} {{loanAmtInWords}} Only</mat-hint>
<!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> --> <!-- <mat-error *ngIf="pdMain.loan_amount.hasError('required')">Amount Required.</mat-error> -->
<mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error> <mat-error *ngIf="pdMain.loan_amount.hasError('pattern')">Enter valid amount. </mat-error>
@ -142,7 +142,7 @@
</div> </div>
<div fxFlex="30" align="end"> <div fxFlex="30" align="end">
<button *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(this._EditPDtriggerForm.value,pdStatusCheck.DRAFT)" type="button" matTooltip="Save As Draft" matTooltipPosition="above"><mat-icon>insert_drive_file</mat-icon></button> <button *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" (click)="saveDraftPD(this._EditPDtriggerForm.value,pdStatusCheck.DRAFT)" type="button" matTooltip="Save As Draft" matTooltipPosition="above"><mat-icon>insert_drive_file</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="PD Process" matTooltipPosition="above" type="button" (click)="triggerPD(_EditPDtriggerForm.value, pdStatusCheck.TRIGGERED)"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Trigger PD" matTooltipPosition="above" type="button" (click)="triggerPD(_EditPDtriggerForm.value, pdStatusCheck.TRIGGERED)"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>

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

@ -20,6 +20,7 @@
<!-- <mat-card-title>Address Details</mat-card-title> --> <!-- <mat-card-title>Address Details</mat-card-title> -->
<mat-card-content> <mat-card-content>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
@ -28,6 +29,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Address Type" formControlName="address_type" required> <mat-select placeholder="Address Type" formControlName="address_type" required>
@ -36,10 +38,14 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="addressForm.controls['address_type'].value == 12" style="width: 80%;"> </div>
<input matInput placeholder="Address Type Others" formControlName="address_type_others" autocomplete="off">
<div *ngIf="addressForm.controls['address_type'].value == 12" fxFlex="33">
<mat-form-field style="width: 80%;">
<input matInput placeholder="Specify Address Type" formControlName="address_type_others" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Locality" formControlName="locality" required> <mat-select placeholder="Locality" formControlName="locality" required>
@ -48,16 +54,15 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div>
<mat-form-field *ngIf="addressForm.controls.locality.value == 'Others'" style="width: 80%;"> <div *ngIf="addressForm.controls.locality.value == 7" fxFlex="33">
<mat-form-field style="width: 80%;">
<input matInput placeholder="Specify Locality" <input matInput placeholder="Specify Locality"
formControlName="locality_others" autocomplete="off"> formControlName="locality_others" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div>
<div fxLayout="row wrap">
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Approach to PD Location" formControlName="pd_location" required> <mat-select placeholder="Approach to PD Location" formControlName="pd_location" required>
@ -67,6 +72,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Comment on Locality" formControlName="comment_locality" required> <mat-select placeholder="Comment on Locality" formControlName="comment_locality" required>
@ -76,6 +82,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Ownership" formControlName="address_ownership"> <mat-select placeholder="Ownership" formControlName="address_ownership">
@ -85,21 +92,36 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div>
<mat-form-field *ngIf="addressForm.controls['address_ownership'].value == 4 " style="width: 80%;"> <div *ngIf="addressForm.controls['address_ownership'].value == 4 " fxFlex="33">
<input matInput placeholder="Specify Other Ownership" formControlName="other_ownership" autocomplete="off">
<mat-form-field style="width: 80%;">
<input matInput placeholder="Specify Ownership" formControlName="other_ownership" autocomplete="off">
</mat-form-field> </mat-form-field>
</div>
<mat-form-field *ngIf="addressForm.controls['address_ownership'].value == 3 " style="width: 80%;"> <div *ngIf="addressForm.controls['address_ownership'].value == 3 " fxFlex="33">
<mat-form-field style="width: 80%;">
<input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off"> <input matInput placeholder="What is the monthly rent paid?" formControlName="rent_amt" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div fxLayout="row wrap"> <div fxLayout="row wrap">
<div fxFlex="33"> <div fxFlex="100">
<label>How long has business been operated from this premise?</label>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Year(s)" formControlName="business_years">
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Month(s)" formControlName="business_month" (change)="ConvertMonthintoYear($event.target.value)">
</mat-form-field>
</div>
<div fxFlex="100">
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<mat-select placeholder="Is there any business activity is being run?" <mat-select placeholder="Is there any other premises from which business activity is being run?"
formControlName="bussiness_activity" required> formControlName="bussiness_activity" required>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
@ -107,17 +129,8 @@
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<div fxLayout="row wrap" *ngIf="addressForm.controls['bussiness_activity'].value == 'yes'" style="width: 100%">
<div fxFlex="100">
<label>How long has business been operated from this premise?</label>
<mat-form-field>
<input matInput placeholder="Year(s)" formControlName="business_years">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Month(s)" formControlName="business_month" (change)="ConvertMonthintoYear($event.target.value)">
</mat-form-field>
</div>
</div>
<!-- Don't Remove To replace atlast of the PD Completion and creating new form (Customer Behaviour 221118 review doc : s.no 3.e ) <!-- Don't Remove To replace atlast of the PD Completion and creating new form (Customer Behaviour 221118 review doc : s.no 3.e )
@ -151,9 +164,17 @@
</div> </div>
</div> </div>
<mat-form-field *ngIf="PremisesOtherFlag == true" style="width: 40%"> <!-- <mat-form-field *ngIf="PremisesOtherFlag == true" style="width: 40%">
<input matInput placeholder="Specify Other Premises Type" formControlName="bussiness_address_type_others" (change)="otherValueset()" autocomplete="off"> <input matInput placeholder="Specify Premises Type" formControlName="bussiness_address_type_others" (change)="otherValueset()" autocomplete="off">
</mat-form-field> -->
<span *ngIf="PremisesOtherFlag == true">
<br>
<mat-form-field style="width: 40%">
<input matInput placeholder="Specify Premises Type" formControlName="bussiness_address_type_others" (change)="otherValueset()" autocomplete="off">
</mat-form-field> </mat-form-field>
</span>
<span formArrayName="additional_premises"> <span formArrayName="additional_premises">
<div <div
*ngFor="let item of addressForm.controls.additional_premises['controls']; let i = index;" [formGroupName]="i"> *ngFor="let item of addressForm.controls.additional_premises['controls']; let i = index;" [formGroupName]="i">
@ -184,7 +205,7 @@
<!-- <mat-form-field *ngIf="addressForm.controls['premises_ownership'].value == 4 "> --> <!-- <mat-form-field *ngIf="addressForm.controls['premises_ownership'].value == 4 "> -->
<mat-form-field *ngIf="item.get('premises_ownership').value == 4" style="width: 40%;"> <mat-form-field *ngIf="item.get('premises_ownership').value == 4" style="width: 40%;">
<input matInput placeholder="Specify Other Ownership" formControlName="premises_ownership_others" autocomplete="off"> <input matInput placeholder="Specify Ownership" formControlName="premises_ownership_others" autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('premises_ownership').value == 3" style="width: 40%;"> <mat-form-field *ngIf="item.get('premises_ownership').value == 3" style="width: 40%;">
<input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off"> <input matInput placeholder="What is the monthly rent paid?" formControlName="premises_rent_amt" autocomplete="off">
@ -384,9 +405,3 @@
</form> </form>
<notifier-container></notifier-container> <notifier-container></notifier-container>

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

@ -125,61 +125,15 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); this.addressForm.controls.comment_locality.setValue(data.records.comment_locality);
// this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); // this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour);
this.addressForm.controls.locality.setValue(data.records.locality); this.addressForm.controls.locality.setValue(data.records.locality);
if(data.records.locality == 7 ){
this.addressForm.controls.locality_others.setValue(data.records.locality_others);
}
this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark); this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark);
this.addressForm.controls.address_ownership.setValue(data.records.address_ownership); this.addressForm.controls.address_ownership.setValue(data.records.address_ownership);
this.addressForm.controls.other_ownership.setValue(data.records.other_ownership); this.addressForm.controls.other_ownership.setValue(data.records.other_ownership);
this.addressForm.controls.rent_amt.setValue(data.records.rent_amt); this.addressForm.controls.rent_amt.setValue(data.records.rent_amt);
this.addressForm.controls.bussiness_activity.setValue(data.records.bussiness_activity); this.addressForm.controls.bussiness_activity.setValue(data.records.bussiness_activity);
// if(data.records.bussiness_activity == 'yes') {
// this.bussiness_address_type = [];
// this.bussiness_address_type = (Object.keys(data.records.bussiness_address_type).map(function(key)
// {
// return data.records.bussiness_address_type[key].premises_types;
// }))
// // console.log(bussiness_address_type);
// let selectedPremisesDBData = Object.keys(data.records.bussiness_address_type).map(function (key) {
// return data.records.bussiness_address_type[key];
// });
// let enduse: any = [];
// let existPremises: any =[];
// selectedPremisesDBData.forEach(val => {
// enduse.push(val.premises_types);
// existPremises.push(val);
// });
// this.formPremisesArray = existPremises;
// this.addressForm.controls.bussiness_address_type.setValue(enduse);
// var additionalPremisesResult = Object.keys(data.records.additional_premises).map(function (key) {
// return data.records.additional_premises[key];
// });
// this.additional_premises = additionalPremisesResult;
// if (additionalPremisesResult.length == 0) {
// additionalPremisesControl.push(this.createPremises());
// } else {
// additionalPremisesResult.forEach(datas => {
// additionalPremisesControl.push(this.createPremises());
// });
// }
// if(data.records.bussiness_address_type == 12) {
// this.addressForm.controls.bussiness_address_type_others.setValue(data.records.bussiness_address_type_others);
// }
// }
if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) { if(data.records.bussiness_activity == 'yes' && data.records.bussiness_address_type !=null) {
this.addressForm.controls.business_years.setValue(data.records.business_years); this.addressForm.controls.business_years.setValue(data.records.business_years);
this.addressForm.controls.business_month.setValue(data.records.business_month); this.addressForm.controls.business_month.setValue(data.records.business_month);
@ -198,8 +152,6 @@ export class AddressComponent implements OnInit {
}) })
} }
// console.log(this.bussiness_address_type);
// console.log(this.additional_premises);
this.selectedValue(this.bussiness_address_type,this.additional_premises); this.selectedValue(this.bussiness_address_type,this.additional_premises);
if (data.records.locality_others) { if (data.records.locality_others) {
@ -333,8 +285,9 @@ export class AddressComponent implements OnInit {
control.removeAt(index); control.removeAt(index);
}*/ }*/
onSubmit() { onSubmit() {
//console.log('form data', this.addressForm.value);
if (!this.addressForm.valid) { if (!this.addressForm.valid) {
return; return;
} }
@ -345,7 +298,7 @@ export class AddressComponent implements OnInit {
records.address_type_others = this.addressForm.controls.address_type_others.value; records.address_type_others = this.addressForm.controls.address_type_others.value;
} }
records.locality = this.locality.value; records.locality = this.locality.value;
if (this.locality.value == 'Others') { if (this.locality.value == 7) {
records.locality_others = this.addressForm.controls.locality_others.value; records.locality_others = this.addressForm.controls.locality_others.value;
} }
records.pd_location = this.pdLocation.value; records.pd_location = this.pdLocation.value;
@ -369,16 +322,16 @@ export class AddressComponent implements OnInit {
records.bussiness_address_type_others = this.addressForm.controls.bussiness_address_type_others.value; records.bussiness_address_type_others = this.addressForm.controls.bussiness_address_type_others.value;
} }
} }
console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value);
this.addressForm.controls.additional_premises.value.forEach((val,index)=> this.addressForm.controls.additional_premises.value.forEach((val,index)=>
{ {
//console.log(val);
if(val.premises_city != ''){ console.log('val.premises_city',val.premises_city);
if(val.premises_city != '' && val.premises_city != null){
this.formPremisesCityArray = []; this.formPremisesCityArray = [];
val.premises_city.forEach(option => { val.premises_city.forEach(option => {
this.formPremisesCityArray.push({additional_premises_city: option}); this.formPremisesCityArray.push({additional_premises_city: option});
this.addressForm.controls.additional_premises.value[index].premises_city = this.formPremisesCityArray; this.addressForm.controls.additional_premises.value[index].premises_city = this.formPremisesCityArray;
// console.log(val);
}); });
} }
else{ else{
@ -390,15 +343,14 @@ export class AddressComponent implements OnInit {
}); });
records.additional_premises = this.addressForm.controls.additional_premises.value; records.additional_premises = this.addressForm.controls.additional_premises.value;
// console.log(this.formPremisesCityArray);
// console.log(this.addressForm.controls.premises.value);
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '5'; records.formid = '5';
// records.fk_createdby = '250'; // records.fk_createdby = '250';
console.log('params', records);
this._pd.saveForm(records).subscribe(data => { this._pd.saveForm(records).subscribe(data => {
//console.log('data', data);
this.notifier.notify('success', 'Saved Successfully.'); this.notifier.notify('success', 'Saved Successfully.');
}, error => { }, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
@ -414,22 +366,22 @@ export class AddressComponent implements OnInit {
SelectedPremises($event){ SelectedPremises($event){
let premisesData = $event.source.value; let premisesData = $event.source.value;
//console.log(premisesData);
if($event.checked === true ){ if($event.checked === true ){
//this.formPremisesArray.push({member: $event.source.value}); //this.formPremisesArray.push({member: $event.source.value});
//this.selectedSegmentDatas.push(CustomerSegmentName.name); //this.selectedSegmentDatas.push(CustomerSegmentName.name);
//console.log('true',premisesData);
//console.log(this.formPremisesArray);
this.formPremisesArray.push({premises_types: $event.source.value}); this.formPremisesArray.push({premises_types: $event.source.value});
//console.log(this.formPremisesArray);
const control = <FormArray>this.addressForm.controls['additional_premises']; const control = <FormArray>this.addressForm.controls['additional_premises'];
let array = this.addressData.filter(data => data.address_type_id == premisesData)[0]; let array = this.addressData.filter(data => data.address_type_id == premisesData)[0];
//console.log(array);
if(premisesData == 12){ if(premisesData == 12){
this.PremisesOtherFlag = true; this.PremisesOtherFlag = true;
// this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value; // this.PremisesLabel[this.z] = this.pdQuestionAddress.get('bussiness_address_type_others').value;
@ -455,7 +407,7 @@ export class AddressComponent implements OnInit {
if(premisesData == 12){ if(premisesData == 12){
this.PremisesOtherFlag = false; this.PremisesOtherFlag = false;
} }
//console.log(this.formPremisesArray);
let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value); let index = this.formPremisesArray.findIndex(form=>form.premises_types== $event.source.value);
//console.log(index); //console.log(index);
const control = <FormArray>this.addressForm.controls['additional_premises']; const control = <FormArray>this.addressForm.controls['additional_premises'];
@ -481,78 +433,9 @@ export class AddressComponent implements OnInit {
let z = this.z; let z = this.z;
this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value; this.PremisesLabel[z-1] = this.addressForm.get('bussiness_address_type_others').value;
} }
// checkaddress(value)
// {
// // console.log(value);
// if(value=="OTHERS")
// {
// this.addressRemarksAccess = true;
// }else
// {
// this.addressRemarksAccess = false;
// }
// }
// SelectedPremises($event){
// console.log('event',$event);
// let premisesData = $event.source.value;
// if($event.source._selected === true ){
// //this.formPremisesArray.push({member: $event.source.value});
// //this.selectedSegmentDatas.push(CustomerSegmentName.name);
// //console.log('true',premisesData);
// //console.log(this.formPremisesArray);
// this.formPremisesArray.push({premises_types: $event.source.value});
// //console.log(this.formPremisesArray);
// let array = this.addressData.filter(data => data.address_type_id == premisesData);
// if(premisesData == 12){
// this.PremisesOtherFlag = true;
// this.PremisesLabel[this.z] = this.addressForm.get('bussiness_address_type_others').value;
// }
// else{
// this.PremisesLabel[this.z] = array[0].address_type;
// }
// this.z++;
// const control = <FormArray>this.addressForm.controls['additional_premises'];
// control.push(this.createPremises());
// }
// else if($event.source._selected === false ){
// console.log('false',premisesData);
// if(premisesData == 12){
// this.PremisesOtherFlag = false;
// }
// const control = <FormArray>this.addressForm.controls['additional_premises'];
// control.removeAt(this.z);
// this.z--;
// //let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
// //this.selectedSegmentDatas.splice(index,1);
// }
// }
selectedValue(e,data) selectedValue(e,data)
{ {
// console.log('501 function',);
// console.log('inside function in bussiness_address_type,',e);
// console.log('inside function in this.additional_premises,',data);
let premisesData = e ; let premisesData = e ;
this.tempArr = []; this.tempArr = [];
@ -562,12 +445,12 @@ export class AddressComponent implements OnInit {
that.addressData[key].status = 0; that.addressData[key].status = 0;
return that.addressData[key]; return that.addressData[key];
}) })
//console.log(this.addressData);
premisesData.forEach((val,index)=> premisesData.forEach((val,index)=>
{ {
//console.log(val);
this.z++; this.z++;
// console.log(this.addressTypes);
this.formPremisesArray.push({premises_types: val}); this.formPremisesArray.push({premises_types: val});
this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]); this.tempArr.push(this.addressData.filter(add=>add.address_type_id==val)[0]);
@ -579,6 +462,7 @@ export class AddressComponent implements OnInit {
{ {
return data[index].premises_city[key].additional_premises_city; return data[index].premises_city[key].additional_premises_city;
}); });
//data[index].premises_city = data[index].premises_city.additional_premises_city;
} }
this.addressData.forEach(data=> this.addressData.forEach(data=>
{ {
@ -621,7 +505,5 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year)); this.addressForm.controls.business_years.setValue(+business_year + +Math.floor(converted_year));
this.addressForm.controls.business_month.setValue(Math.floor(converted_month)); this.addressForm.controls.business_month.setValue(Math.floor(converted_month));
} }
} }

35
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
View File

@ -90,6 +90,10 @@
<input matInput placeholder="Top Up Amount" (keypress)="keyPress($event)" formControlName="topup_amount" (keyup)="inWords($event,5)" autocomplete="off"> <input matInput placeholder="Top Up Amount" (keypress)="keyPress($event)" formControlName="topup_amount" (keyup)="inWords($event,5)" autocomplete="off">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint> <mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['is_topup'].value == 'yes' && loanDetailsForm.controls['is_topup'].value != '' " style="width: 30%">
<input matInput placeholder="End Use of Top Up" formControlName="end_use_topup" autocomplete="off">
</mat-form-field>
</div> </div>
<div *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' "> <div *ngIf="loanDetailsForm.controls['is_transfer'].value != 'yes' && loanDetailsForm.controls['is_transfer'].value != '' ">
@ -99,27 +103,39 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 30%"> <mat-form-field style="width: 30%">
<mat-select placeholder="Source" formControlName="source" required> <mat-select (selectionChange)="sourceChange($event.value)" placeholder="Source of Own Contribution" formControlName="source" required multiple>
<mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option> <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field>
<!--<mat-select placeholder="Source" <mat-form-field *ngIf="isPLSource" style="width: 30%">
<input matInput placeholder="Specify Personal Loan" formControlName="personal_loan_source" autocomplete="off">
</mat-form-field>
<mat-form-field *ngIf="isOtherSource" style="width: 30%">
<input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off">
</mat-form-field>
<!--<mat-form-field>
<mat-select placeholder="Source"
formControlName="source"> formControlName="source">
<mat-option value="borrowed">Borrowed from Relatives & Friends</mat-option> <mat-option value="borrowed">Borrowed from Relatives & Friends</mat-option>
<mat-option value="own_money">Own money</mat-option> <mat-option value="own_money">Own money</mat-option>
<mat-option value="other">Loan from another lender</mat-option> <mat-option value="other">Loan from another lender</mat-option>
</mat-select>--> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['source'].value =='other'" style="width: 35%"> <mat-form-field *ngIf="loanDetailsForm.controls['source'].value =='other'" style="width: 35%">
<input matInput placeholder="Specify Lender Name and Type" formControlName="lender_name_type" autocomplete="off"> <input matInput placeholder="Specify Lender Name and Type" formControlName="lender_name_type" autocomplete="off">
</mat-form-field> </mat-form-field>-->
</div> </div>
<mat-form-field style="width: 30%"> <mat-form-field style="width: 60%">
<input matInput placeholder="EMI Comfort Level" formControlName="emi_level" (keypress)="keyPress($event)" required autocomplete="off"> <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" (keypress)="keyPress($event)" (keyup)="inWords($event,6)" required autocomplete="off">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{emiAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> --> <!-- <div *ngIf="productAbbr === 'HL' || productAbbr === 'LL' || productAbbr === 'LAP' "> -->
<mat-card *ngIf="mortageCardAccess"> <mat-card *ngIf="mortageCardAccess">
@ -165,7 +181,7 @@
<mat-form-field> <mat-form-field>
<mat-select placeholder="Status of Construction" formControlName="construction_status" required> <mat-select placeholder="Status of Construction" formControlName="construction_status" required>
<mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }} {{status.id}}</mat-option> <mat-option *ngFor="let status of m_statusofCunstruction" [value]="status.id">{{ status.name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -183,7 +199,8 @@
<mat-form-field> <mat-form-field>
<input matInput placeholder="Estimate Market Value as Per Customer" <input matInput placeholder="Estimate Market Value as Per Customer"
formControlName="emv_per_customer" (keypress)="keyPress($event)" required autocomplete="off"> formControlName="emv_per_customer" (keypress)="keyPress($event)" (keyup)="inWords($event,7)" required autocomplete="off">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['emv_per_customer'].value != ''">{{"&#8377;"}} {{emvAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Value as Per Agreement" <input matInput placeholder="Value as Per Agreement"

126
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
View File

@ -42,11 +42,13 @@ export class LoanDetailsComponent implements OnInit {
subProductName: any; subProductName: any;
isOtherPurpose: boolean = false; isOtherPurpose: boolean = false;
isSource: boolean = false; isOtherSource: boolean = false;
isPLSource: boolean = false;
mortageCheck : boolean = true; mortageCheck : boolean = true;
OtherOwnerFlag : boolean; OtherOwnerFlag : boolean;
endUserList: any = []; endUserList: any = [];
sourceList : any = [];
ownerNames: any = []; ownerNames: any = [];
m_endUseofLoad = []; m_endUseofLoad = [];
m_sourceofamount = []; m_sourceofamount = [];
@ -59,6 +61,8 @@ export class LoanDetailsComponent implements OnInit {
valAsPerAgmtInWords : any; valAsPerAgmtInWords : any;
ownContributionInWords : any; ownContributionInWords : any;
topUpAmtInWords: any; topUpAmtInWords: any;
emiAmtInWords : any;
emvAmtInWords : any;
pageTitle: string ="Loan Details"; pageTitle: string ="Loan Details";
mortageCardAccess: boolean; mortageCardAccess: boolean;
@ -159,6 +163,9 @@ export class LoanDetailsComponent implements OnInit {
this.loanDetailsForm.controls['topup_amount'].setValue(value.records.topup_amount); this.loanDetailsForm.controls['topup_amount'].setValue(value.records.topup_amount);
this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount); this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount);
} }
this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup);
if (value.records.lender) { if (value.records.lender) {
this.loanDetailsForm.controls['lender'].setValue(value.records.lender); this.loanDetailsForm.controls['lender'].setValue(value.records.lender);
} }
@ -166,17 +173,46 @@ export class LoanDetailsComponent implements OnInit {
this.loanDetailsForm.controls['other_bt_lender'].setValue(value.records.other_bt_lender); this.loanDetailsForm.controls['other_bt_lender'].setValue(value.records.other_bt_lender);
} }
if(value.records.is_transfer != 'yes'){ if(value.records.is_transfer != 'yes'){
let source = Object.keys(value.records.source_group).map(function(key) {
return value.records.source_group[key];
});
console.log(source);
let dbsourcelist : any = [];
source.forEach(val => {
dbsourcelist.push(val.sources);
});
console.log('sources',dbsourcelist);
this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution); this.loanDetailsForm.controls['own_contribution'].setValue(value.records.own_contribution);
if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); } if(value.records.own_contribution){ this.ownContributionInWords = this._pd.convertNumberToWords(value.records.own_contribution); }
this.loanDetailsForm.controls['source'].setValue(value.records.source); this.loanDetailsForm.controls['source'].setValue(dbsourcelist);
this.sourceChange(dbsourcelist);
if(value.records.other_source) {
// this.isOtherSource = true;
this.loanDetailsForm.controls['other_source'].setValue(value.records.other_source);
} }
if (value.records.lender_name_type) { if(value.records.personal_loan_source) {
this.loanDetailsForm.controls['lender_name_type'].setValue(value.records.lender_name_type); // this.isPLSource = true;
this.loanDetailsForm.controls['personal_loan_source'].setValue(value.records.personal_loan_source);
}
} }
// if (value.records.lender_name_type) {
// this.loanDetailsForm.controls['lender_name_type'].setValue(value.records.lender_name_type);
// }
if(value.records.emi_level){
this.loanDetailsForm.controls['emi_level'].setValue(value.records.emi_level); this.loanDetailsForm.controls['emi_level'].setValue(value.records.emi_level);
this.emiAmtInWords = this._pd.convertNumberToWords(value.records.emi_level);
}
this.loanDetailsForm.controls['property_type'].setValue(value.records.property_type); this.loanDetailsForm.controls['property_type'].setValue(value.records.property_type);
this.propertyType = value.records.property_type; this.propertyType = value.records.property_type;
//console.log(value.records.property_type); //console.log(value.records.property_type);
@ -193,7 +229,11 @@ export class LoanDetailsComponent implements OnInit {
else{ else{
this.loanDetailsForm.controls['percentage_of_construction'].setValue(''); this.loanDetailsForm.controls['percentage_of_construction'].setValue('');
} }
if(value.records.emv_per_customer != ''){
this.loanDetailsForm.controls['emv_per_customer'].setValue(value.records.emv_per_customer); this.loanDetailsForm.controls['emv_per_customer'].setValue(value.records.emv_per_customer);
this.emvAmtInWords = this._pd.convertNumberToWords(value.records.emv_per_customer);
}
// this.loanDetailsForm.controls['value_per_agreement'].setValue(value.records.value_per_agreement); // this.loanDetailsForm.controls['value_per_agreement'].setValue(value.records.value_per_agreement);
// if(value.records.value_per_agreement){ this.valAsPerAgmtInWords = this._pd.convertNumberToWords(value.records.value_per_agreement); } // if(value.records.value_per_agreement){ this.valAsPerAgmtInWords = this._pd.convertNumberToWords(value.records.value_per_agreement); }
this.loanDetailsForm.controls['loandetails_remarks'].setValue(value.records.loandetails_remarks); this.loanDetailsForm.controls['loandetails_remarks'].setValue(value.records.loandetails_remarks);
@ -314,11 +354,14 @@ getM_sourceofamount() {
is_topup: [''], is_topup: [''],
balance_transfer_amount: [''], balance_transfer_amount: [''],
topup_amount: [''], topup_amount: [''],
end_use_topup:[''],
lender: [''], lender: [''],
other_bt_lender : [''], other_bt_lender : [''],
own_contribution: [''], own_contribution: [''],
source: [''], source: [''],
lender_name_type: [''], other_source:[''],
personal_loan_source:[''],
//lender_name_type: [''],
emi_level: ['', Validators.compose([Validators.required])], emi_level: ['', Validators.compose([Validators.required])],
property_type: ['', Validators.compose([Validators.required])], property_type: ['', Validators.compose([Validators.required])],
property_type_others:[''], property_type_others:[''],
@ -343,24 +386,48 @@ getM_sourceofamount() {
endUserChange(event) { endUserChange(event) {
this.endUserList = []; this.endUserList = [];
let OthersAvaliable;
event.forEach(option => { event.forEach(option => {
let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0]; let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
othersData = othersData.name.substr(0,6).toLowerCase(); OthersAvaliable = othersData.name.substr(0,6).toLowerCase();
console.log('other',othersData);
console.log('',OthersAvaliable);
this.endUserList.push({ end_use: option }); this.endUserList.push({ end_use: option });
if (othersData == 'others') {
});
if (OthersAvaliable == 'others') {
this.isOtherPurpose = true; this.isOtherPurpose = true;
return ;
}else }else
{ {
this.isOtherPurpose = false; this.isOtherPurpose = false;
} }
console.log('e',event);
//this.isOtherPurpose = event.some(e => e == 'others') // this return true or false Only;
}
sourceChange(evt) {
// console.log('source Changed Values',evt);
// this.isOtherSource = (evt.some(e => e == 4) == true) ? true : false ;
// this.isPLSource = (evt.some(e => e == 3) == true) ? true : false ;
this.isOtherSource = evt.some(e => e == 4) // this return true or false Only;
this.isPLSource = evt.some(e => e == 3) // this return true or false Only;
this.sourceList = [];
evt.forEach(option => {
this.sourceList.push({source: option});
}); });
} }
ownerNameChange(event) { ownerNameChange(event) {
let EventValue; let EventValue;
event.value.forEach(option => { event.value.forEach(option => {
EventValue = option; EventValue = option;
if(EventValue == 'Others'){ if(EventValue == 'Others'){
@ -397,7 +464,7 @@ getM_sourceofamount() {
if (this.isOtherPurpose) { if (this.isOtherPurpose) {
records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value; records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value;
} }else{ records.end_use_other = '' ;}
records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value; records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value;
records.is_topup = this.loanDetailsForm.controls['is_topup'].value; records.is_topup = this.loanDetailsForm.controls['is_topup'].value;
if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
@ -405,14 +472,27 @@ getM_sourceofamount() {
} }
else if(this.loanDetailsForm.controls['is_transfer'].value == 'no') { else if(this.loanDetailsForm.controls['is_transfer'].value == 'no') {
records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value; records.own_contribution = this.loanDetailsForm.controls['own_contribution'].value;
records.source = this.loanDetailsForm.controls['source'].value; // records.source = this.loanDetailsForm.controls['source'].value;
if (this.loanDetailsForm.controls['source'].value == 'other') { // if (this.loanDetailsForm.controls['source'].value == 'other') {
records.lender_name_type = this.loanDetailsForm.controls['lender_name_type'].value; // records.lender_name_type = this.loanDetailsForm.controls['lender_name_type'].value;
} // }
// if (this.loanDetailsForm.controls['source'].value == 4) {
// records.other_source = this.loanDetailsForm.controls['other_source'].value;
// }
let dataSource_list = [];
this.loanDetailsForm.controls['source'].value.forEach(element => {
dataSource_list.push({sources: element})
});
records.source_group = dataSource_list;
} }
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.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') { if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
records.lender = this.loanDetailsForm.controls['lender'].value; records.lender = this.loanDetailsForm.controls['lender'].value;
} }
@ -430,7 +510,19 @@ getM_sourceofamount() {
dataOwner_name.push({owner_name: element}) dataOwner_name.push({owner_name: element})
}); });
records.owner_name_group = dataOwner_name; records.owner_name_group = dataOwner_name;
if(this.OtherOwnerFlag){
records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value; records.other_owners_name = this.loanDetailsForm.controls['other_owners_name'].value;
}else{ records.other_owners_name = ''; }
if(this.isOtherSource){
records.other_source = this.loanDetailsForm.controls['other_source'].value;
}else{ records.other_source = ''; }
if(this.isPLSource){
records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value;
}else{ records.personal_loan_source = ''; }
records.construction_status = this.loanDetailsForm.controls['construction_status'].value; records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value; records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value; records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
@ -510,6 +602,12 @@ getM_sourceofamount() {
case 5 : case 5 :
this.topUpAmtInWords = this._pd.convertNumberToWords(e.target.value); this.topUpAmtInWords = this._pd.convertNumberToWords(e.target.value);
break; break;
case 6 :
this.emiAmtInWords = this._pd.convertNumberToWords(e.target.value);
break;
case 7:
this.emvAmtInWords = this._pd.convertNumberToWords(e.target.value);
break;
default: default:
break; break;
} }

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

@ -1,24 +1,11 @@
import { import { Component,OnInit,Inject,Input } from '@angular/core';
Component,
OnInit,
Inject,
Input
} from '@angular/core';
import { import { FormBuilder,FormGroup,Validators,FormArray, FormControl } from '@angular/forms';
FormBuilder,
FormGroup,
Validators,
FormArray, FormControl,
} from '@angular/forms';
import { NotifierService } from 'angular-notifier'; import { NotifierService } from 'angular-notifier';
import { import { MatDialog,MatDialogRef,MAT_DIALOG_DATA } from '@angular/material';
MatDialog,
MatDialogRef,
MAT_DIALOG_DATA
} from '@angular/material';
/** Service */ /** Service */
import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { PdTrigerService } from '../../../../../pd-service/pd-triger.service';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
@ -29,9 +16,9 @@ import { analyzeAndValidateNgModules } from '@angular/compiler';
templateUrl: './stock.component.html', templateUrl: './stock.component.html',
styleUrls: ['./stock.component.scss'] styleUrls: ['./stock.component.scss']
}) })
export class StockComponent implements OnInit { export class StockComponent implements OnInit {
// @Input() pdid: number;
// @Input() form_id: number;
pageTitle: string ="Stock Details"; pageTitle: string ="Stock Details";
pdid: number; pdid: number;
form_id: number; form_id: number;
@ -142,13 +129,10 @@ console.log(record);
trade_details: this.fb.array([this.tradingFormCreation(record)]), trade_details: this.fb.array([this.tradingFormCreation(record)]),
}); });
let arr0 = Object.keys(record).map(function (key) {
return record[key];
});
let arr = record.filter(data => data.type_of_activity_id == 1); let arr = record.filter(data => data.type_of_activity_id == 1);
console.log(133,arr.length);
if(arr.length > 0) { if(arr.length > 0) {
let retail_finished_goods; //let retail_finished_goods;
let manufacturing_raw_materials; let manufacturing_raw_materials;
let manufacturing_finished_goods; let manufacturing_finished_goods;
let manufacturing_traded_goods; let manufacturing_traded_goods;
@ -162,23 +146,28 @@ console.log(record);
return dataForm.manufacturing_finished_goods[key]; return dataForm.manufacturing_finished_goods[key];
}); });
} }
// else{
// manufacturing_finished_goods = null;
// }
if(dataForm.manufacturing_traded_goods !==undefined){ if(dataForm.manufacturing_traded_goods !==undefined){
manufacturing_traded_goods = Object.keys(dataForm.manufacturing_traded_goods).map(function (key) { manufacturing_traded_goods = Object.keys(dataForm.manufacturing_traded_goods).map(function (key) {
return dataForm.manufacturing_traded_goods[key]; return dataForm.manufacturing_traded_goods[key];
}); });
} }
if(dataForm.retail_finished_goods !==undefined) // else{
{ // manufacturing_traded_goods = null;
retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key) // }
{
return dataForm.retail_finished_goods[key];
})
}
//console.log(retail_finished_goods,manufacturing_traded_goods); //console.log(retail_finished_goods,manufacturing_traded_goods);
let manufacturing_temparr = []; let manufacturing_temparr = [];
manufacturing_temparr['manufacturing_traded_goods'] = manufacturing_traded_goods;manufacturing_temparr['manufacturing_finished_goods'] = manufacturing_finished_goods;manufacturing_temparr['manufacturing_raw_materials'] = manufacturing_raw_materials; manufacturing_temparr['manufacturing_raw_materials'] = manufacturing_raw_materials;
manufacturing_temparr['manufacturing_finished_goods'] = manufacturing_finished_goods;
manufacturing_temparr['manufacturing_traded_goods'] = manufacturing_traded_goods;
this.initManufacturingDetails(manufacturing_temparr); 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) { if(arr1.length > 0) {
let retail_finished_goods; let retail_finished_goods;
@ -190,6 +179,9 @@ console.log(record);
return dataForm.retail_traded_goods[key]; return dataForm.retail_traded_goods[key];
}); });
} }
// else{
// retail_traded_goods = null;
// }
if(dataForm.retail_finished_goods !==undefined) if(dataForm.retail_finished_goods !==undefined)
{ {
retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key) retail_finished_goods = Object.keys(dataForm.retail_finished_goods).map(function(key)
@ -197,12 +189,17 @@ console.log(record);
return dataForm.retail_finished_goods[key]; return dataForm.retail_finished_goods[key];
}) })
} }
// else{
// retail_finished_goods = null;
// }
let retail_temparr = []; let retail_temparr = [];
retail_temparr['retail_traded_goods'] = retail_traded_goods; retail_temparr['retail_traded_goods'] = retail_traded_goods;
retail_temparr['retail_finished_goods'] = retail_finished_goods; retail_temparr['retail_finished_goods'] = retail_finished_goods;
this.initRetailDetails(retail_temparr); this.initRetailDetails(retail_temparr);
//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) { if(arr2.length > 0) {
let trading_finished_goods; let trading_finished_goods;
@ -214,6 +211,11 @@ console.log(record);
return dataForm.trading_finished_goods[key]; return dataForm.trading_finished_goods[key];
}); });
} }
// else{
// trading_finished_goods = null;
// }
if(dataForm.trading_traded_goods !==undefined) if(dataForm.trading_traded_goods !==undefined)
{ {
trading_traded_goods = Object.keys(dataForm.trading_traded_goods).map(function(key) trading_traded_goods = Object.keys(dataForm.trading_traded_goods).map(function(key)
@ -363,21 +365,26 @@ console.log(record);
if(datas === null){ if(datas === null){
// console.log(299,'if'); // console.log(299,'if');
// rawMaterial.push(this.createRawmaterial(null)); rawMaterial.push(this.createRawmaterial(null));
// finishedGoods.push(this.createGoods(null)); finishedGoods.push(this.createGoods(null));
// tradedGoods.push(this.createTradedGoods(null)); tradedGoods.push(this.createTradedGoods(null));
} else { } else {
// console.log(305,'else') // console.log(305,'else')
console.log(datas.manufacturing_raw_materials);
if(datas.manufacturing_raw_materials != undefined){
for (let val of datas.manufacturing_raw_materials) { for (let val of datas.manufacturing_raw_materials) {
// console.log(val); // console.log(val);
if(val.raw_value){ if(val.raw_value){
this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value); this.M_rawValueInWords = this._pd.convertNumberToWords(val.raw_value);
} }
rawMaterial.push(this.createRawmaterial(val)); rawMaterial.push(this.createRawmaterial(val));
} }
}
else{
rawMaterial.push(this.createRawmaterial(null));
}
if(datas.manufacturing_finished_goods != undefined){
for (let val of datas.manufacturing_finished_goods) { for (let val of datas.manufacturing_finished_goods) {
// console.log(val); // console.log(val);
if(val.goods_value){ if(val.goods_value){
@ -386,6 +393,11 @@ console.log(record);
finishedGoods.push(this.createGoods(val)); finishedGoods.push(this.createGoods(val));
} }
}
else{
finishedGoods.push(this.createGoods(null));
}
if(datas.manufacturing_traded_goods !== undefined){
for (let val of datas.manufacturing_traded_goods) { for (let val of datas.manufacturing_traded_goods) {
// console.log(val); // console.log(val);
if(val.estimated_traded_goods_value){ if(val.estimated_traded_goods_value){
@ -394,6 +406,10 @@ console.log(record);
tradedGoods.push(this.createTradedGoods(val)); tradedGoods.push(this.createTradedGoods(val));
} }
}
else{
tradedGoods.push(this.createTradedGoods(null));
}
// console.log(310,rawMaterial); // console.log(310,rawMaterial);
} }
} }
@ -457,6 +473,7 @@ console.log(record);
} else { } else {
if(datas.retail_finished_goods != undefined){
for (let val of datas.retail_finished_goods) { for (let val of datas.retail_finished_goods) {
// console.log(val); // console.log(val);
@ -466,6 +483,12 @@ console.log(record);
finishedGoods.push(this.createGoods(val)); finishedGoods.push(this.createGoods(val));
} }
}
else{
finishedGoods.push(this.createGoods(null));
}
if(datas.retail_traded_goods !== undefined){
for (let val of datas.retail_traded_goods) { for (let val of datas.retail_traded_goods) {
// console.log(val); // console.log(val);
if(val.estimated_traded_goods_value){ if(val.estimated_traded_goods_value){
@ -475,6 +498,10 @@ console.log(record);
} }
} }
else{
tradedGoods.push(this.createTradedGoods(null));
}
}
} }
createGoods2() { createGoods2() {
@ -544,7 +571,8 @@ console.log(record);
// tradedGoods.push(this.createTradedGoods(val.trading_traded_goods)); // tradedGoods.push(this.createTradedGoods(val.trading_traded_goods));
// } // }
if(datas.trading_finished_goods !==undefined)
{
for (let val of datas.trading_finished_goods) { for (let val of datas.trading_finished_goods) {
// console.log(val); // console.log(val);
if(val.goods_value){ if(val.goods_value){
@ -553,13 +581,22 @@ console.log(record);
finishedGoods.push(this.createGoods(val)); finishedGoods.push(this.createGoods(val));
} }
}
else{
finishedGoods.push(this.createGoods(null));
}
if(datas.trading_traded_goods !==undefined)
{
for (let val of datas.trading_traded_goods) { for (let val of datas.trading_traded_goods) {
// console.log(val); // console.log(val);
if(val.estimated_traded_goods_value){ if(val.estimated_traded_goods_value){
this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value); this.T_tradedGoodsValueInWords = this._pd.convertNumberToWords(val.estimated_traded_goods_value);
} }
tradedGoods.push(this.createTradedGoods(val)); tradedGoods.push(this.createTradedGoods(val));
}
}
else{
tradedGoods.push(this.createTradedGoods(null));
} }
} }
@ -600,7 +637,6 @@ console.log(record);
} }
deleteRawMaterials(index,flag) { deleteRawMaterials(index,flag) {
if(flag==1){ if(flag==1){
const control = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials']; const control = <FormArray>this.stockForms.controls['manufacturing_details']['controls'][0].controls['manufacturing_raw_materials'];