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

MONEYWISE added in all form

Browse Source
This commit is contained in:
sriram-at-840620226347 2019-11-08 16:45:43 +05:30
parent 0079f760af
commit 3b71c3f3d0
17 changed files with 123 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,7 +179,7 @@ export class AddressComponent implements OnInit {
} }
} }
if(this.lender_short_name != 'CLIX') { if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') {
this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '') this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '')
this.addressForm.controls.uom.setValue(datas.uom); this.addressForm.controls.uom.setValue(datas.uom);
@ -222,7 +222,7 @@ export class AddressComponent implements OnInit {
// was_the_company_name_board_sighted:['', Validators.compose([Validators.required])], // was_the_company_name_board_sighted:['', Validators.compose([Validators.required])],
address_form_remark: [''] address_form_remark: ['']
}); });
if(this.lender_short_name == 'CLIX'){ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE'){
this.addressForm.removeControl('estimated_area'); this.addressForm.removeControl('estimated_area');
this.addressForm.removeControl('uom'); this.addressForm.removeControl('uom');
} }
@ -532,7 +532,7 @@ export class AddressComponent implements OnInit {
records.addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value; records.addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value;
records.addresses[0].pd_location = this.addressForm.controls.pd_location.value; records.addresses[0].pd_location = this.addressForm.controls.pd_location.value;
records.addresses[0].comment_locality = this.addressForm.controls.comment_locality.value; records.addresses[0].comment_locality = this.addressForm.controls.comment_locality.value;
if(this.lender_short_name != 'CLIX') { if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') {
records.addresses[0].estimated_area = this.addressForm.controls.estimated_area.value records.addresses[0].estimated_area = this.addressForm.controls.estimated_area.value
records.addresses[0].uom = this.addressForm.controls.uom.value; records.addresses[0].uom = this.addressForm.controls.uom.value;
if (this.addressForm.controls.uom.value == 1) { if (this.addressForm.controls.uom.value == 1) {
@ -557,7 +557,7 @@ export class AddressComponent implements OnInit {
records.alternative_addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value; records.alternative_addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value;
records.alternative_addresses[0].pd_location = this.addressForm.controls.pd_location.value; records.alternative_addresses[0].pd_location = this.addressForm.controls.pd_location.value;
records.alternative_addresses[0].comment_locality = this.addressForm.controls.comment_locality.value; records.alternative_addresses[0].comment_locality = this.addressForm.controls.comment_locality.value;
if(this.lender_short_name != 'CLIX') { if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') {
records.alternative_addresses[0].estimated_area = this.addressForm.controls.estimated_area.value records.alternative_addresses[0].estimated_area = this.addressForm.controls.estimated_area.value
records.alternative_addresses[0].uom = this.addressForm.controls.uom.value; records.alternative_addresses[0].uom = this.addressForm.controls.uom.value;
if (this.addressForm.controls.uom.value == 1) { if (this.addressForm.controls.uom.value == 1) {
@ -735,7 +735,7 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.locality_others.setValue(datas.locality_others); this.addressForm.controls.locality_others.setValue(datas.locality_others);
} }
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '') this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '')
this.addressForm.controls.uom.setValue(datas.uom) this.addressForm.controls.uom.setValue(datas.uom)
this.setOthers(datas.uom, '', 5); this.setOthers(datas.uom, '', 5);
@ -806,7 +806,7 @@ export class AddressComponent implements OnInit {
this.addressForm.controls.locality_others.setValue(datas.locality_others); this.addressForm.controls.locality_others.setValue(datas.locality_others);
} }
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
this.addressForm.controls.estimated_area.setValue(datas.estimated_area); this.addressForm.controls.estimated_area.setValue(datas.estimated_area);
this.addressForm.controls.uom.setValue(datas.uom); this.addressForm.controls.uom.setValue(datas.uom);
this.setOthers(datas.uom, '', 5); this.setOthers(datas.uom, '', 5);

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html
View File

@ -74,13 +74,13 @@
<input matInput placeholder="Address of the Property" formControlName="address_of_the_property" <input matInput placeholder="Address of the Property" formControlName="address_of_the_property"
autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="detail.get('property_type').value != '' && lender_short_name != 'CLIX'"> <mat-form-field style="width:45%" *ngIf="detail.get('property_type').value != '' && (lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE')">
<input matInput placeholder="Description of the Property" formControlName="describe_of_the_property_asset" <input matInput placeholder="Description of the Property" formControlName="describe_of_the_property_asset"
autocomplete="off"> autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
<input matInput placeholder="Area Covered" formControlName="area_covered_by_this_property" OnlyNumber type="text" <input matInput placeholder="Area Covered" formControlName="area_covered_by_this_property" OnlyNumber type="text"
autocomplete="off"> autocomplete="off">
@ -358,7 +358,7 @@
</mat-form-field> --> </mat-form-field> -->
</div> </div>
<span *ngIf="lender_short_name !== 'CLIX' && sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 1 "> <span *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'MONEYWISE') && sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 1 ">
<mat-form-field style="width:45%"> <mat-form-field style="width:45%">
@ -386,7 +386,7 @@
</mat-form-field> </mat-form-field>
</span> </span>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:95%"> <mat-form-field *ngIf="sup.get('assets_mode').value != ''" style="width:95%">
<mat-select placeholder="Is There a Loan Existing Against This Asset?" <mat-select placeholder="Is There a Loan Existing Against This Asset?"

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html
View File

@ -156,7 +156,7 @@
Owned by Required</mat-error> Owned by Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="lender_short_name != 'CLIX'"> <mat-form-field style="width:45%" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-label>Age of Asset in Years</mat-label> <mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage" <input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
minlength="1" maxlength="2" OnlyNumber type="text" minlength="1" maxlength="2" OnlyNumber type="text"
@ -182,7 +182,7 @@
</div> </div>
<span *ngIf="lender_short_name != 'CLIX'"> <span *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:95%" <mat-form-field style="width:95%"
*ngIf="(itemrow.get('business_ownership_type').value == 'owned')"> *ngIf="(itemrow.get('business_ownership_type').value == 'owned')">
@ -416,7 +416,7 @@
Owned by is Required</mat-error> Owned by is Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="lender_short_name != 'CLIX'"> <mat-form-field style="width:45%" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-label>Age of Asset in Years</mat-label> <mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" placeholder="eg.99" <input matInput autocomplete="off" placeholder="eg.99"
formControlName="business_vintage" minlength="1" maxlength="2" OnlyNumber formControlName="business_vintage" minlength="1" maxlength="2" OnlyNumber
@ -441,7 +441,7 @@
</div> </div>
<span <span
*ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && lender_short_name != 'CLIX'"> *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && (lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE')">
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<mat-form-field style="width:95%"> <mat-form-field style="width:95%">
<mat-select placeholder="Is There a Loan Existing Against This Asset?" <mat-select placeholder="Is There a Loan Existing Against This Asset?"

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html
View File

@ -1577,7 +1577,7 @@
type="number" formControlName="employees_permanent" required> type="number" formControlName="employees_permanent" required>
<mat-error *ngIf="businessForm.controls['employees_permanent'].hasError('required')">Permanent Required</mat-error> <mat-error *ngIf="businessForm.controls['employees_permanent'].hasError('required')">Permanent Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="lender_short_name != 'CLIX'"> <mat-form-field *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<input matInput placeholder="Temporary" (change)="checkTotalEmployee(businessForm)" <input matInput placeholder="Temporary" (change)="checkTotalEmployee(businessForm)"
type="number" formControlName="employees_temporary" > type="number" formControlName="employees_temporary" >
<mat-error *ngIf="businessForm.controls['employees_temporary'].hasError('required')">Temporary Required</mat-error> <mat-error *ngIf="businessForm.controls['employees_temporary'].hasError('required')">Temporary Required</mat-error>

14
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
View File

@ -258,7 +258,7 @@ export class BusinessInfoComponent implements OnInit {
//businessVal.designation = DesgnArray; //businessVal.designation = DesgnArray;
businessVal.partners = PartnrArray; businessVal.partners = PartnrArray;
businessVal.documents = DocArray; businessVal.documents = DocArray;
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
if (data.records.persons_with_relationships) { if (data.records.persons_with_relationships) {
let selectedFamilyMember = Object.keys(data.records.persons_with_relationships).map(function (key) { let selectedFamilyMember = Object.keys(data.records.persons_with_relationships).map(function (key) {
return data.records.persons_with_relationships[key]; return data.records.persons_with_relationships[key];
@ -394,7 +394,7 @@ export class BusinessInfoComponent implements OnInit {
}); });
if (selectedRetail.length > 0) { if (selectedRetail.length > 0) {
selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -461,7 +461,7 @@ export class BusinessInfoComponent implements OnInit {
}); });
if (selectedWholesale.length > 0) { if (selectedWholesale.length > 0) {
selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert');
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -530,7 +530,7 @@ export class BusinessInfoComponent implements OnInit {
}); });
if (selectedService.length > 0) { if (selectedService.length > 0) {
selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert'); selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert');
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets');
selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines');
selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -657,7 +657,7 @@ export class BusinessInfoComponent implements OnInit {
this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc'); this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc');
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
// change relation with businees update dat sorce table // change relation with businees update dat sorce table
this.businessForm.controls['persons_with_relationships'].valueChanges.subscribe(val => { this.businessForm.controls['persons_with_relationships'].valueChanges.subscribe(val => {
let relationControl = <FormArray>this.businessForm.controls['persons_with_relationships']; let relationControl = <FormArray>this.businessForm.controls['persons_with_relationships'];
@ -719,7 +719,7 @@ export class BusinessInfoComponent implements OnInit {
service_provider_activity_details: this.fb.array([]), service_provider_activity_details: this.fb.array([]),
// others_activity_details: this.fb.array([]), // others_activity_details: this.fb.array([]),
}); });
if(this.lender_short_name == 'CLIX'){ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE'){
this.businessForm.removeControl('persons_with_relationships'); this.businessForm.removeControl('persons_with_relationships');
} }
} }
@ -800,7 +800,7 @@ export class BusinessInfoComponent implements OnInit {
this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert'); this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert');
// check activity for extra question make dynamic // check activity for extra question make dynamic
if(this.lender_short_name != 'CLIX'){ if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets'); this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets');
this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines'); this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines');
if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) { if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) {

33
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
View File

@ -56,7 +56,7 @@
<input matInput placeholder="Client Name" formControlName="manufacturing_client_name"> <input matInput placeholder="Client Name" formControlName="manufacturing_client_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name"> <mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
@ -104,7 +104,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
@ -140,6 +140,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Turnover in %"
formControlName="manufacturing_contribution_total_turnover"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>
<div align="end"> <div align="end">
@ -196,7 +203,7 @@
<input matInput placeholder="Client Name" formControlName="trade_client_name"> <input matInput placeholder="Client Name" formControlName="trade_client_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<mat-select placeholder="Title" formControlName="person_title_name"> <mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
@ -242,7 +249,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<!-- <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="trade_product_payment_type">
@ -280,6 +287,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Turnover in %"
formControlName="trade_product_contribution_total_turnover"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>
<div align="end"> <div align="end">
@ -333,7 +347,7 @@
<input matInput placeholder="Client Name" formControlName="service_provider_client_name"> <input matInput placeholder="Client Name" formControlName="service_provider_client_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<!--<mat-form-field style="width: 100%"> <!--<mat-form-field style="width: 100%">
<input matInput placeholder="Trade Product Name" formControlName="trade_product_name"> <input matInput placeholder="Trade Product Name" formControlName="trade_product_name">
</mat-form-field>--> </mat-form-field>-->
@ -382,7 +396,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<!-- <mat-select placeholder="Payment Type" formControlName="service_provider_product_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="service_provider_product_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
@ -419,6 +433,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Turnover in %"
formControlName="service_provider_contribution_total_turnover"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>
<div align="end"> <div align="end">

10
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts
View File

@ -436,7 +436,8 @@ export class ClientInfoComponent implements OnInit {
person_landline: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], person_landline: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])],
other_person_designation: [''], other_person_designation: [''],
manufacturing_credit_days_from: [''], manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: [''] manufacturing_credit_days_to: [''],
manufacturing_contribution_total_turnover :['']
}) })
} else { } else {
return this._formBuilder.group({ return this._formBuilder.group({
@ -453,7 +454,8 @@ export class ClientInfoComponent implements OnInit {
person_landline: [records.person_landline || null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], person_landline: [records.person_landline || null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || null], other_person_designation: [records.other_person_designation || null],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null], manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null] manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null],
manufacturing_contribution_total_turnover: [records.manufacturing_contribution_total_turnover || null]
}) })
} }
} }
@ -485,6 +487,7 @@ export class ClientInfoComponent implements OnInit {
trade_product_frequency_of_purchase: [''], trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''], trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''], trade_product_credit_days_to: [''],
trade_product_contribution_total_turnover: [''],
person_title_name: [''], person_title_name: [''],
person_designation: [''], person_designation: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],
@ -502,6 +505,7 @@ export class ClientInfoComponent implements OnInit {
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase], trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
trade_product_credit_days_from: [records.trade_product_credit_days_from], trade_product_credit_days_from: [records.trade_product_credit_days_from],
trade_product_credit_days_to: [records.trade_product_credit_days_to], trade_product_credit_days_to: [records.trade_product_credit_days_to],
trade_product_contribution_total_turnover: [records.trade_product_contribution_total_turnover || null],
person_title_name: [records.person_title_name || null], person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null], person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],
@ -538,6 +542,7 @@ export class ClientInfoComponent implements OnInit {
service_provider_product_frequency_of_purchase: [''], service_provider_product_frequency_of_purchase: [''],
service_provider_product_credit_days_from: [''], service_provider_product_credit_days_from: [''],
service_provider_product_credit_days_to: [''], service_provider_product_credit_days_to: [''],
service_provider_contribution_total_turnover: [''],
person_title_name: [''], person_title_name: [''],
person_designation: [''], person_designation: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],
@ -555,6 +560,7 @@ export class ClientInfoComponent implements OnInit {
service_provider_product_frequency_of_purchase: [records.service_provider_product_frequency_of_purchase], service_provider_product_frequency_of_purchase: [records.service_provider_product_frequency_of_purchase],
service_provider_product_credit_days_from: [records.service_provider_product_credit_days_from], service_provider_product_credit_days_from: [records.service_provider_product_credit_days_from],
service_provider_product_credit_days_to: [records.service_provider_product_credit_days_to], service_provider_product_credit_days_to: [records.service_provider_product_credit_days_to],
service_provider_contribution_total_turnover: [records.service_provider_contribution_total_turnover || null],
person_title_name: [records.person_title_name || null], person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null], person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],

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

@ -134,7 +134,7 @@
</mat-form-field> </mat-form-field>
</div> --> </div> -->
<div *ngIf="lender_short_name !== 'CLIX'"> <div *ngIf="lender_short_name !== 'CLIX' && lender_short_name !== 'MONEYWISE'">
<div formArrayName="family_members_details"> <div formArrayName="family_members_details">
<div *ngFor="let item of sup.controls.family_members_details['controls']; let i=index; let last=last " <div *ngFor="let item of sup.controls.family_members_details['controls']; let i=index; let last=last "
[formGroupName]="i"> [formGroupName]="i">
@ -273,7 +273,7 @@
</mat-card-actions> </mat-card-actions>
</div> </div>
<div *ngIf="lender_short_name === 'CLIX'"> <div *ngIf="lender_short_name === 'CLIX' || lender_short_name === 'MONEYWISE'">
<mat-card> <mat-card>
<mat-card-header> <mat-card-header>
<mat-card-title> <mat-card-title>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -147,9 +147,10 @@
<mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Specify the Mode of Transport Used to Visit the PD address Required</mat-error> <mat-error *ngIf="_finalRemarkForm.controls['mode_of_transport_during_visit'].hasError('required')">Specify the Mode of Transport Used to Visit the PD address Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-card *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'"> <mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MONEYWISE' || product_abbr == 'LAEP'">
<mat-card-content> <mat-card-content>
<mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle> <mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
<mat-card-subtitle *ngIf="lender_short_name == 'MONEYWISE'">MONEYWISE</mat-card-subtitle>
<mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && product_abbr == 'LAEP'"> <mat-form-field style="width:94%;" *ngIf="_finalRemarkForm.controls['outlet_location'] && product_abbr == 'LAEP'">
<mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location" <mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
required> required>

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
View File

@ -100,7 +100,7 @@ export class FinalRemarksComponent implements OnInit {
final_form_remarks: [''] final_form_remarks: ['']
}); });
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){
this.product_abbr == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location'); this.product_abbr == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location');
this._finalRemarkForm.addControl('is_competition', new FormControl('')); this._finalRemarkForm.addControl('is_competition', new FormControl(''));
this._finalRemarkForm.addControl('sealing_activity', new FormControl('')); this._finalRemarkForm.addControl('sealing_activity', new FormControl(''));
@ -239,7 +239,7 @@ export class FinalRemarksComponent implements OnInit {
this._finalRemarkForm.controls.market_intelligence.setValue(data.records.market_intelligence || ''); this._finalRemarkForm.controls.market_intelligence.setValue(data.records.market_intelligence || '');
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){
if(this.product_abbr == 'LAEP') {this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data.records.outlet_location : ''); } if(this.product_abbr == 'LAEP') {this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data.records.outlet_location : ''); }
this._finalRemarkForm.controls.is_competition.setValue(data.records.is_competition); this._finalRemarkForm.controls.is_competition.setValue(data.records.is_competition);

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html
View File

@ -397,7 +397,7 @@
{{AV_netProfitAmtInwords[i]}} Only </mat-hint> --> {{AV_netProfitAmtInwords[i]}} Only </mat-hint> -->
</mat-form-field> </mat-form-field>
<mat-form-field style="width:54%" *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'"> <mat-form-field style="width:54%" *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'MONEYWISE' || product_abbr == 'LAEP'">
<input matInput placeholder="Annual Sales through Credit Card / POS machines" <input matInput placeholder="Annual Sales through Credit Card / POS machines"
formControlName="estimate_posmachine_or_cc_annual_sales"> formControlName="estimate_posmachine_or_cc_annual_sales">
<mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"&#8377;"}} <mat-hint align="start" style="font-size:90%" *ngIf="details.get('estimate_posmachine_or_cc_annual_sales').value != ''">{{"&#8377;"}}
@ -486,7 +486,7 @@
</mat-card-content> </mat-card-content>
</div> </div>
</div> </div>
<div style="margin-left: 25px;" *ngIf="financialForm.value.is_financial_customer == 'no' && financialForm.controls['kuccha_records_shown'] && customer_segment_abbr == 'SE-DI' && lender_short_name != 'CLIX'"> <div style="margin-left: 25px;" *ngIf="financialForm.value.is_financial_customer == 'no' && financialForm.controls['kuccha_records_shown'] && (customer_segment_abbr == 'SE-DI' && lender_short_name != 'CLIX') && (lender_short_name != 'MONEYWISE')">
<!-- <mat-form-field style="width: 100%"> --> <!-- <mat-form-field style="width: 100%"> -->
<!-- <mat-select placeholder="Were the Kuccha records shown to the PD officer"--> <!-- <mat-select placeholder="Were the Kuccha records shown to the PD officer"-->
<div style="width:auto"> <div style="width:auto">

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

@ -58,7 +58,7 @@
<mat-error *ngIf="loanDetailsForm.controls['end_use_other'].hasError('required')">End Use Required</mat-error> <mat-error *ngIf="loanDetailsForm.controls['end_use_other'].hasError('required')">End Use Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 28%" *ngIf="lenderShortName == 'CLIX'"> <mat-form-field style="width: 28%" *ngIf="lenderShortName == 'CLIX' || lenderShortName == 'MONEYWISE'">
<mat-select placeholder="Total fund requirement" <mat-select placeholder="Total fund requirement"
formControlName="is_there_total_fund"> formControlName="is_there_total_fund">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
@ -76,7 +76,7 @@
</mat-form-field> </mat-form-field>
</span> </span>
<div *ngIf="lenderShortName != 'CLIX'"> <div *ngIf="lenderShortName != 'CLIX' && lenderShortName != 'MONEYWISE'">
<mat-form-field style="width: 64%"> <mat-form-field style="width: 64%">
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event.value)" <mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event.value)"
formControlName="is_transfer"> formControlName="is_transfer">
@ -119,7 +119,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width:64%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && lenderShortName != 'CLIX'"> <mat-form-field style="width:64%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && (lenderShortName != 'CLIX' && lenderShortName != 'MONEYWISE')">
<mat-select placeholder="What is the End Use of the Top Up?" <mat-select placeholder="What is the End Use of the Top Up?"
formControlName="end_use_topup"> formControlName="end_use_topup">
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
@ -166,7 +166,7 @@
</span> </span>
<mat-form-field style="width: 64%" *ngIf="lenderShortName != 'CLIX'"> <mat-form-field style="width: 64%" *ngIf="lenderShortName != 'CLIX' && lenderShortName != 'MONEYWISE'">
<input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level" <input matInput placeholder="EMI Amount Comfortable Paying" formControlName="emi_level"
OnlyNumber type="text" autocomplete="off"> OnlyNumber type="text" autocomplete="off">
<mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{ loanDetailsForm.controls['emi_level'].value | numberToWords }} Only</mat-hint> <mat-hint align="start" style="font-size:90%" *ngIf="loanDetailsForm.controls['emi_level'].value != ''">{{"&#8377;"}} {{ loanDetailsForm.controls['emi_level'].value | numberToWords }} Only</mat-hint>

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

@ -335,7 +335,7 @@ export class LoanDetailsComponent implements OnInit {
if (this.pd_all_details.pdmaster_details.fk_subproduct_id) { if (this.pd_all_details.pdmaster_details.fk_subproduct_id) {
this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id); this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id);
} }
if(this.lenderShortName == 'CLIX'){ if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){
// console.log(this.lenderShortName); // console.log(this.lenderShortName);
this.loanDetailsForm.controls['is_transfer'].setValue("no"); this.loanDetailsForm.controls['is_transfer'].setValue("no");
this.selectedBalancesTransferChanges("no") this.selectedBalancesTransferChanges("no")
@ -838,7 +838,7 @@ export class LoanDetailsComponent implements OnInit {
} }
} }
} }
if(this.lenderShortName == 'CLIX'){ if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){
this.loanDetailsForm.controls['own_contribution'].setValue(''); this.loanDetailsForm.controls['own_contribution'].setValue('');
this.loanDetailsForm.controls['own_contribution'].clearValidators(); this.loanDetailsForm.controls['own_contribution'].clearValidators();
this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity();
@ -892,7 +892,7 @@ export class LoanDetailsComponent implements OnInit {
records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
} }
else if (this.loanDetailsForm.controls['is_transfer'].value == 'no') { else if (this.loanDetailsForm.controls['is_transfer'].value == 'no') {
if (this.isContribution || this.lenderShortName == 'CLIX') { if (this.isContribution || this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE') {
records.own_contribution = ''; records.own_contribution = '';
records.source_group = ''; records.source_group = '';
records.other_source = ''; records.other_source = '';

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

@ -12,7 +12,7 @@
</h2> </h2>
<div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;"> <div *ngIf="noRecordsFound" style="max-width: 100vw !important;width: 100% !important;height: 95% !important;">
<form [formGroup]="stockForms" (submit)="submitDetails($event.value); "> <form [formGroup]="stockForms" (submit)="submitDetails($event.value); ">
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;"> <mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group> <mat-tab-group>
<mat-tab label="Questions"> <mat-tab label="Questions">
@ -46,7 +46,7 @@
<mat-error *ngIf="mrm.controls['stock_observed'].hasError('required')">Stock Required</mat-error> <mat-error *ngIf="mrm.controls['stock_observed'].hasError('required')">Stock Required</mat-error>
</mat-form-field> </mat-form-field>
<span *ngIf="mrm.get('stock_observed').value == 'yes'"> <span *ngIf="mrm.get('stock_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'"> <div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="raw_quantity" OnlyNumber type="text"> formControlName="raw_quantity" OnlyNumber type="text">
@ -141,7 +141,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="mfg.get('goods_observed').value == 'yes'"> <span *ngIf="mfg.get('goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'"> <div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="goods_quantity" OnlyNumber formControlName="goods_quantity" OnlyNumber
@ -227,7 +227,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="item.get('traded_goods_observed').value == 'yes'"> <span *ngIf="item.get('traded_goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'"> <div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity" formControlName="traded_goods_quantity"
@ -316,7 +316,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'"> <span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'"> <div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity" formControlName="traded_goods_quantity"
@ -376,7 +376,7 @@
</div> </div>
</div> </div>
</mat-card> </mat-card>
<div *ngIf="TGCommentCard"> <div *ngIf="TGCommentCard">
<br> <br>
@ -430,7 +430,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="sp.get('service_provider_observed').value == 'yes'"> <span *ngIf="sp.get('service_provider_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'"> <div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width:30%"> <mat-form-field style="width:30%">
<input matInput autocomplete="off" placeholder="Estimated Quantity" <input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="service_provider_quantity" formControlName="service_provider_quantity"
@ -485,6 +485,13 @@
</div> </div>
</mat-card> </mat-card>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="How was stock Validated?"
formControlName="stock_validated"
autocomplete="off" type="text">
</mat-form-field>
</div>
<div *ngIf="SPCommentCard"> <div *ngIf="SPCommentCard">
<br> <br>

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

@ -176,6 +176,7 @@ export class StockComponent implements OnInit {
trade_details: this.fb.array([this.tradingFormCreation(type4length)]), trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [dataForm.is_sufficiant_finished_and_traded_goods], is_sufficiant_finished_and_traded_goods: [dataForm.is_sufficiant_finished_and_traded_goods],
stock_validated: [dataForm.stock_validated || null],
finished_and_traded_goods_remarks: [dataForm.finished_and_traded_goods_remarks], finished_and_traded_goods_remarks: [dataForm.finished_and_traded_goods_remarks],
is_sufficiant_service_goods: [dataForm.hasOwnProperty('is_sufficiant_service_goods') ? dataForm.is_sufficiant_service_goods : ''], is_sufficiant_service_goods: [dataForm.hasOwnProperty('is_sufficiant_service_goods') ? dataForm.is_sufficiant_service_goods : ''],
service_goods_remarks: [dataForm.hasOwnProperty('service_goods_remarks') ? dataForm.service_goods_remarks : '' ] service_goods_remarks: [dataForm.hasOwnProperty('service_goods_remarks') ? dataForm.service_goods_remarks : '' ]
@ -240,6 +241,7 @@ export class StockComponent implements OnInit {
trade_details: this.fb.array([this.tradingFormCreation(type4length)]), trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [''], is_sufficiant_finished_and_traded_goods: [''],
stock_validated: [''],
finished_and_traded_goods_remarks: [''], finished_and_traded_goods_remarks: [''],
is_sufficiant_service_goods: [''], is_sufficiant_service_goods: [''],
service_goods_remarks: [''] service_goods_remarks: ['']
@ -294,6 +296,7 @@ export class StockComponent implements OnInit {
trade_details: this.fb.array([this.tradingFormCreation(type4length)]), trade_details: this.fb.array([this.tradingFormCreation(type4length)]),
servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]),
is_sufficiant_finished_and_traded_goods: [''], is_sufficiant_finished_and_traded_goods: [''],
stock_validated: [''],
finished_and_traded_goods_remarks: [''], finished_and_traded_goods_remarks: [''],
is_sufficiant_service_goods: [''], is_sufficiant_service_goods: [''],
service_goods_remarks: [''] service_goods_remarks: ['']

33
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html
View File

@ -50,7 +50,7 @@
formControlName="manufacturing_supplier_name"> formControlName="manufacturing_supplier_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<mat-select placeholder="Title" <mat-select placeholder="Title"
formControlName="person_title_name"> formControlName="person_title_name">
@ -108,7 +108,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<!-- //(selectionChange)="selectedPM($event)" --> <!-- //(selectionChange)="selectedPM($event)" -->
<!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type"> <!-- <mat-select placeholder="Payment Type" formControlName="manufacturing_payment_type">
@ -157,6 +157,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Purchase in %"
formControlName="manufacturing_contribution_total_purchase"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>
@ -221,7 +228,7 @@
formControlName="trade_supplier_name"> formControlName="trade_supplier_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<mat-select placeholder="Title" <mat-select placeholder="Title"
formControlName="person_title_name"> formControlName="person_title_name">
@ -281,7 +288,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<!-- <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="trade_product_payment_type"> <!-- <mat-select (selectionChange)="selectedPM($event)" placeholder="Payment Type" formControlName="trade_product_payment_type">
<mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option> <mat-option *ngFor="let pm of m_paymentModeType" [value]="pm.id">{{ pm.name }}</mat-option>
@ -330,6 +337,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Purchase in %"
formControlName="trade_product_contribution_total_purchase"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>
@ -399,7 +413,7 @@
formControlName="service_provider_supplier_name"> formControlName="service_provider_supplier_name">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 15%"> <mat-form-field style="width: 15%">
<mat-select placeholder="Title" <mat-select placeholder="Title"
formControlName="person_title_name"> formControlName="person_title_name">
@ -459,7 +473,7 @@
<mat-error>Enter Valid LandLine Number.</mat-error> <mat-error>Enter Valid LandLine Number.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX'"> <div fxLayout="row nowrap" fxLayoutGap="2px" fxLayoutAlign="start none" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE'">
<mat-form-field style="width: 45%"> <mat-form-field style="width: 45%">
<mat-select placeholder="Payment Terms" <mat-select placeholder="Payment Terms"
@ -506,6 +520,13 @@
type="number"> type="number">
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="row" *ngIf="lender_short_name == 'MONEYWISE'">
<mat-form-field style="width: 100%">
<input matInput placeholder="Contribution to Total Purchase in %"
formControlName="service_provider_contribution_total_purchase"
type="number" autocomplete="off" OnlyNumber type="text">
</mat-form-field>
</div>

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts
View File

@ -53,6 +53,7 @@ export class SupplierInfoComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef<SupplierInfoComponent>) { @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef<SupplierInfoComponent>) {
this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id
this.lender_short_name=this.pd_all_details.pdmaster_details.lender_short_name this.lender_short_name=this.pd_all_details.pdmaster_details.lender_short_name
console.log(this.lender_short_name);
this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id;
this.form_id = 1; this.form_id = 1;
this.company_id = this.pd_all_details.company_id this.company_id = this.pd_all_details.company_id
@ -382,6 +383,7 @@ export class SupplierInfoComponent implements OnInit {
manufacturing_payment_mode: [''], manufacturing_payment_mode: [''],
manufacturing_credit_days_from: [''], manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: [''], manufacturing_credit_days_to: [''],
manufacturing_contribution_total_purchase: [''],
manufacturing_frequency_of_purchase: [''], manufacturing_frequency_of_purchase: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: ['', Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],
person_landline: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], person_landline: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])],
@ -400,6 +402,7 @@ export class SupplierInfoComponent implements OnInit {
manufacturing_payment_mode: [records.manufacturing_payment_mode], manufacturing_payment_mode: [records.manufacturing_payment_mode],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null], manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null], manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null],
manufacturing_contribution_total_purchase: [records.manufacturing_contribution_total_purchase || null],
manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null], manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], person_landline: [records.person_landline || null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])],
@ -437,6 +440,7 @@ export class SupplierInfoComponent implements OnInit {
trade_product_frequency_of_purchase: [''], trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''], trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''], trade_product_credit_days_to: [''],
trade_product_contribution_total_purchase: [''],
}) })
} else { } else {
return this._formBuilder.group({ return this._formBuilder.group({
@ -454,6 +458,7 @@ export class SupplierInfoComponent implements OnInit {
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase], trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
trade_product_credit_days_from: [records.trade_product_credit_days_from], trade_product_credit_days_from: [records.trade_product_credit_days_from],
trade_product_credit_days_to: [records.trade_product_credit_days_to], trade_product_credit_days_to: [records.trade_product_credit_days_to],
trade_product_contribution_total_purchase: [records.trade_product_contribution_total_purchase || null],
}) })
} }
} }
@ -489,6 +494,7 @@ export class SupplierInfoComponent implements OnInit {
service_provider_frequency_of_purchase: [''], service_provider_frequency_of_purchase: [''],
service_provider_credit_days_from: [''], service_provider_credit_days_from: [''],
service_provider_credit_days_to: [''], service_provider_credit_days_to: [''],
service_provider_contribution_total_purchase: [''],
}) })
} else { } else {
return this._formBuilder.group({ return this._formBuilder.group({
@ -506,6 +512,7 @@ export class SupplierInfoComponent implements OnInit {
service_provider_frequency_of_purchase: [records.service_provider_frequency_of_purchase], service_provider_frequency_of_purchase: [records.service_provider_frequency_of_purchase],
service_provider_credit_days_from: [records.service_provider_credit_days_from], service_provider_credit_days_from: [records.service_provider_credit_days_from],
service_provider_credit_days_to: [records.service_provider_credit_days_to], service_provider_credit_days_to: [records.service_provider_credit_days_to],
service_provider_contribution_total_purchase: [records.service_provider_contribution_total_purchase || null],
}) })
} }
} }