address, assets , banking , family form remarks fields added : kdk

This commit is contained in:
dineshkumarkannan 2018-11-09 11:53:54 +05:30
parent 2c15ad0cb5
commit 783b037277
10 changed files with 68 additions and 10 deletions

View File

@ -101,6 +101,15 @@
</div> </div>
</div> </div>
</mat-card> </mat-card>
<div fxLayout="row">
<div fxFlex="60" class="pb-0 text-sm-left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="address_form_remark"></textarea>
</mat-form-field>
</div>
</div>
<button mat-raised-button type="submit" class="button" (click)="onSubmit()">Submit <button mat-raised-button type="submit" class="button" (click)="onSubmit()">Submit
</button> </button>
</form> </form>

View File

@ -72,6 +72,7 @@ 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);
this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark);
if (data.records.locality_others) { if (data.records.locality_others) {
this.addressForm.controls.locality_others.setValue(data.records.locality_others); this.addressForm.controls.locality_others.setValue(data.records.locality_others);
} }
@ -98,7 +99,8 @@ export class AddressComponent implements OnInit {
pd_location: ['', Validators.compose([Validators.required])], pd_location: ['', Validators.compose([Validators.required])],
comment_locality: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])],
customer_behaviour: ['', Validators.compose([Validators.required])], customer_behaviour: ['', Validators.compose([Validators.required])],
neighbourhood: this.fb.array([]) neighbourhood: this.fb.array([]),
address_form_remark:['']
}); });
this.address = this.addressForm.controls['address']; this.address = this.addressForm.controls['address'];
this.addressType = this.addressForm.controls['address_type']; this.addressType = this.addressForm.controls['address_type'];
@ -175,6 +177,7 @@ export class AddressComponent implements OnInit {
records.comment_locality = this.commentlocality.value; records.comment_locality = this.commentlocality.value;
records.customer_behaviour = this.commentlocality.value; records.customer_behaviour = this.commentlocality.value;
records.neighbourhood = this.addressForm.controls.neighbourhood.value; records.neighbourhood = this.addressForm.controls.neighbourhood.value;
records.address_form_remark = this.addressForm.controls.address_form_remark.value;
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '5'; records.formid = '5';
// records.fk_createdby = '250'; // records.fk_createdby = '250';

View File

@ -194,20 +194,19 @@
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<div fxFlex="33"> <div fxFlex="33">
<mat-checkbox formControlName="emi" [ngModel]="sup.get('emi').value === '1' ? true : false" <mat-checkbox formControlName="emi" [ngModel]="sup.get('emi').value === '1' ? true : false" (ngModelChange)="sup.get('emi').value = $event ? '1' : '0'">EMI</mat-checkbox>
(ngModelChange)="sup.get('emi').value = $event ? '1' : '0'">EMI</mat-checkbox>
</div> </div>
<div *ngIf="sup.get('emi').value === '1'" fxFlex="33"> <div *ngIf="sup.get('emi').value === '1'" fxFlex="33">
<mat-form-field class="ml-xs example-full-width"> <mat-form-field class="ml-xs example-full-width">
<input matInput placeholder="EMI Paid" formControlName="emi_paid"> <input matInput placeholder="EMI Paid" formControlName="emi_paid">
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="sup.get('emi').value === '1'" fxFlex="33"> <div *ngIf="sup.get('emi').value === '1'" fxFlex="33">
<mat-form-field class="ml-xs example-full-width"> <mat-form-field class="ml-xs example-full-width">
<input matInput placeholder="Elapsed Tenure" formControlName="elapsed_tenure"> <input matInput placeholder="Elapsed Tenure" formControlName="elapsed_tenure">
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="sup.get('emi').value === '1'" fxFlex="33"> <div *ngIf="sup.get('emi').value === '1'" fxFlex="33">
<mat-form-field class="ml-xs example-full-width"> <mat-form-field class="ml-xs example-full-width">
<input matInput placeholder="Balance Tenure" formControlName="balance_tenure"> <input matInput placeholder="Balance Tenure" formControlName="balance_tenure">
</mat-form-field> </mat-form-field>
@ -227,6 +226,14 @@
class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button> class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false"><mat-icon>add</mat-icon></button>
</div> </div>
</div> </div>
<!--<div fxLayout="row">
<div fxFlex="60" class="pb-0 text-sm-left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="assets_form_remark"></textarea>
</mat-form-field>
</div>
</div>-->
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" (click)="onReset(); false"><mat-icon>settings_backup_restore</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>

View File

@ -189,7 +189,8 @@ export class AssetsInfoComponent implements OnInit {
formid: ['4'], formid: ['4'],
assets_details: this._formBuilder.array([ assets_details: this._formBuilder.array([
// this.initDetails(), // this.initDetails(),
]) ]),
// assets_form_remark:[value.assets_form_remark || 'check']
}); });
this.addAssetsDetailsWithData(value.assets_details); this.addAssetsDetailsWithData(value.assets_details);
} else { } else {
@ -198,7 +199,8 @@ export class AssetsInfoComponent implements OnInit {
formid: ['4'], formid: ['4'],
assets_details: this._formBuilder.array([ assets_details: this._formBuilder.array([
this.initDetails(), this.initDetails(),
]) ]),
// assets_form_remark:['']
}); });
} }
this.loadDetails = true; this.loadDetails = true;

View File

@ -59,6 +59,14 @@
</mat-expansion-panel> </mat-expansion-panel>
</mat-accordion> </mat-accordion>
</div>
<div fxLayout="row">
<div fxFlex="60" class="pb-0 text-sm-left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="banking_form_remark"></textarea>
</mat-form-field>
</div>
</div> </div>
<button mat-raised-button class="button" (click)="bankSubmit()">Submit <button mat-raised-button class="button" (click)="bankSubmit()">Submit
</button> </button>

View File

@ -49,6 +49,9 @@ export class BankingDetailsComponent implements OnInit {
console.log('data', data); console.log('data', data);
const control = <FormArray>this.bankingForm.controls['itemRows']; const control = <FormArray>this.bankingForm.controls['itemRows'];
if( data.status == 200) { if( data.status == 200) {
this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark);
var result = Object.keys(data.records.banking_details).map(function (key) { var result = Object.keys(data.records.banking_details).map(function (key) {
return data.records.banking_details[key]; return data.records.banking_details[key];
}); });
@ -67,6 +70,7 @@ export class BankingDetailsComponent implements OnInit {
} }
public initBankingForm(): void { public initBankingForm(): void {
this.bankingForm = this.fb.group({ this.bankingForm = this.fb.group({
banking_form_remark: [''],
itemRows: this.fb.array([]) itemRows: this.fb.array([])
}); });
} }
@ -99,6 +103,7 @@ export class BankingDetailsComponent implements OnInit {
let records: any = {}; let records: any = {};
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '7'; records.formid = '7';
records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value;
// records.fk_createdby = '252'; // records.fk_createdby = '252';
records.banking_details = this.bankingForm.controls['itemRows'].value; records.banking_details = this.bankingForm.controls['itemRows'].value;
console.log('data', records); console.log('data', records);

View File

@ -130,6 +130,14 @@
</mat-form-field> </mat-form-field>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<div fxLayout="row">
<div fxFlex="60" class="pb-0 text-sm-left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="family_details_form_remark"></textarea>
</mat-form-field>
</div>
</div>
<button mat-raised-button class="button" (click)="submitFamily()">Submit</button> <button mat-raised-button class="button" (click)="submitFamily()">Submit</button>
</form> </form>
<notifier-container></notifier-container> <notifier-container></notifier-container>

View File

@ -83,6 +83,8 @@ export class FamilyDetailsComponent implements OnInit {
this.familyForm.controls.members.setValue(data.records.family_members); this.familyForm.controls.members.setValue(data.records.family_members);
this.familyForm.controls.years.setValue(data.records.no_of_years); this.familyForm.controls.years.setValue(data.records.no_of_years);
this.familyForm.controls.ownership.setValue(data.records.ownership); this.familyForm.controls.ownership.setValue(data.records.ownership);
this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark);
if (data.records.ownership_others) { if (data.records.ownership_others) {
this.familyForm.controls.ownershipOther.setValue(data.records.ownership_others); this.familyForm.controls.ownershipOther.setValue(data.records.ownership_others);
} }
@ -121,7 +123,8 @@ export class FamilyDetailsComponent implements OnInit {
ownershipOther: [''], ownershipOther: [''],
rent: [''], rent: [''],
earningMembers: this.fb.array([]), earningMembers: this.fb.array([]),
nonEarningMembers: this.fb.array([]) nonEarningMembers: this.fb.array([]),
family_details_form_remark: ['']
}); });
this.person = this.familyForm.controls['person']; this.person = this.familyForm.controls['person'];
this.personOther = this.familyForm.controls['personOther']; this.personOther = this.familyForm.controls['personOther'];
@ -211,6 +214,7 @@ export class FamilyDetailsComponent implements OnInit {
records.family_members = this.members.value; records.family_members = this.members.value;
records.earning_members = this.familyForm.controls['earningMembers'].value; records.earning_members = this.familyForm.controls['earningMembers'].value;
records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value; records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value;
records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value;
records.pdid = this.pdid; records.pdid = this.pdid;
records.formid = '6'; records.formid = '6';
// records.fk_createdby = '251'; // records.fk_createdby = '251';

View File

@ -112,6 +112,15 @@
</div> </div>
</div> </div>
<div fxLayout="row">
<div fxFlex="60" class="pb-0 text-sm-left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="personal_info_form_remark"></textarea>
</mat-form-field>
</div>
</div>
<!-- end co applicant form details --> <!-- end co applicant form details -->
</mat-card-content> </mat-card-content>

View File

@ -123,6 +123,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) {
form_id:null, form_id:null,
mainItem: mainApplicantGroup, mainItem: mainApplicantGroup,
coItem: coApplicantGroup, coItem: coApplicantGroup,
personal_info_form_remark: [data.personal_info_form_remark]
}); });
//console.log(this._personalForm); //console.log(this._personalForm);
this.loadDataStatus = true; this.loadDataStatus = true;
@ -178,6 +179,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) {
form_id:null, form_id:null,
mainItem: mainApplicantGroup, mainItem: mainApplicantGroup,
coItem: coApplicantGroup, coItem: coApplicantGroup,
personal_info_form_remark:null
}); });
//console.log(this._personalForm); //console.log(this._personalForm);
this.loadDataStatus = true; this.loadDataStatus = true;
@ -236,7 +238,8 @@ submitPersonalForm(formData:any) {
"pdid": this.pdid, "pdid": this.pdid,
"formid": this.form_id, "formid": this.form_id,
"main_applicant_details":main_applicantDetails, "main_applicant_details":main_applicantDetails,
"co_applicant_details":co_applicantDetails "co_applicant_details":co_applicantDetails,
"personal_info_form_remark": this._personalForm.get('personal_info_form_remark').value
}; };
this._pd.savePDFormDetailsWithID(save_details).subscribe(result => { this._pd.savePDFormDetailsWithID(save_details).subscribe(result => {
if (result.status == 200) { if (result.status == 200) {