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

SMC changes

Browse Source
This commit is contained in:
sriram-at-840620226347 2019-11-14 11:13:42 +05:30
parent 66bdaaac17
commit 6cef987a88
21 changed files with 184 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/pd-question/pd-question-address/pd-question-address.html
View File

@ -350,13 +350,13 @@
<mat-form-field style="width: 100%;">
<input matInput placeholder="Specify Comment on Locality" name="other_comment_locality" formControlName="other_comment_locality" autocomplete="off">
</mat-form-field>
</div>
<div *ngIf="lender_short_name != 'CLIX'">
<mat-form-field style="width: 100%">
</div>
<mat-form-field style="width: 100%" *ngIf="pdQuestionAddress.controls['estimated_area']">
<input matInput [placeholder]="placeholderName[i] ? placeholderName[i] : 'Estimated area of the (Address Type)' " formControlName="estimated_area"
type="number">
</mat-form-field>
<mat-form-field style="width: 100%">
<div *ngIf="pdQuestionAddress.controls['uom']">
<mat-form-field style="width: 100%" >
<mat-select placeholder="Unit of Measurement" formControlName="uom" (selectionChange)="setOthers($event.value,'',5)">
<mat-option >Select</mat-option>
<mat-option *ngFor="let uom of uomData" value="{{uom.uom_id}}">{{uom.name}}</mat-option>
@ -367,7 +367,7 @@
<input matInput placeholder="Specify UOM" formControlName="uom_others"
autocomplete="off">
</mat-form-field>
</div>
</div>
<!--

15
src/pages/pd-question/pd-question-address/pd-question-address.ts
View File

@ -91,6 +91,7 @@ export class PdQuestionAddressPage {
alertnativeCityData: any=[];
alertnativePincodeData: any=[];
lender_short_name: any;
product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@ -103,6 +104,7 @@ export class PdQuestionAddressPage {
this.FormId = this.navParams.get('FormId');
this.lender_short_name=this.pdDetails.lender_short_name
this.product_abbr=this.pdDetails.product_abbr
this.users = this.aws.getlocale();
@ -142,9 +144,10 @@ export class PdQuestionAddressPage {
address_form_remark: ['']
});
if(this.lender_short_name == 'CLIX'){
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'BL'){
this.pdQuestionAddress.removeControl('estimated_area')
this.pdQuestionAddress.removeControl('uom')
this.pdQuestionAddress.removeControl('uom_others')
}
//this.loadPD()
@ -722,7 +725,7 @@ else{
records.addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
records.addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
records.addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
if(this.lender_short_name != 'CLIX')
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
{
records.addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
records.addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
@ -752,7 +755,7 @@ else{
records.alternative_addresses[0].locality_mixuse = this.pdQuestionAddress.controls.locality_mixuse.value;
records.alternative_addresses[0].pd_location = this.pdQuestionAddress.controls.pd_location.value;
records.alternative_addresses[0].comment_locality = this.pdQuestionAddress.controls.comment_locality.value;
if(this.lender_short_name != 'CLIX')
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
{
records.alternative_addresses[0].estimated_area = this.pdQuestionAddress.controls.estimated_area.value;
records.alternative_addresses[0].uom = this.pdQuestionAddress.controls.uom.value;
@ -962,7 +965,7 @@ else{
if (datas.locality == 1) {
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
}
if(this.lender_short_name != 'CLIX')
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL')
{
this.setOthers(datas.uom, '', 5);
if (data['records'].uom == 1)
@ -1028,7 +1031,7 @@ else{
if (datas.locality == 1) {
this.pdQuestionAddress.controls.locality_others.setValue(datas.locality_others);
}
if(this.lender_short_name != 'CLIX'){
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL'){
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area);
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
this.setOthers(datas.uom, '', 5);
@ -1247,7 +1250,7 @@ else{
}
}
if(this.lender_short_name != 'CLIX'){
if(this.lender_short_name != 'CLIX' && this.product_abbr != 'BL'){
this.pdQuestionAddress.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '');
this.pdQuestionAddress.controls.uom.setValue(datas.uom);
if (datas.uom) {

11
src/pages/pd-question/pd-question-assests/pd-question-assests.html
View File

@ -140,12 +140,13 @@
autocomplete="off">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<mat-form-field style="width:100%" *ngIf="detail.get('property_type').value != ''">
<mat-form-field style="width:100%" *ngIf="detail.get('property_type').value != '' && (lender_short_name != 'CLIX' && lender_short_name != 'SMC')">
<input matInput placeholder="Description of the Property" formControlName="describe_of_the_property_asset"
autocomplete="off">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput placeholder="Area Covered" formControlName="area_covered_by_this_property"
autocomplete="off" type="number">
@ -344,7 +345,7 @@
</mat-form-field>
</div>-->
<div *ngIf="lender_short_name !== 'CLIX' && (sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3)">
<div *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'SMC' || product_abbr === 'LFMP') && (sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3)">
<mat-form-field style="width:100%">
<!-- <mat-label>Vintage</mat-label> -->
@ -376,7 +377,7 @@
</mat-form-field>-->
<mat-list *ngIf="lender_short_name != 'CLIX'">
<mat-list *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<p>Is there a Loan Existing Against this Assets?</p>
<mat-radio-group formControlName="emi">

2
src/pages/pd-question/pd-question-assests/pd-question-assests.ts
View File

@ -66,6 +66,7 @@ export class PdQuestionAssestsPage {
complete_status: boolean = false;
spinner_access:boolean=false
lender_short_name: any;
product_abbr: any;
// data:Observable <any>;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public aws:AwsServiceProvider,public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
@ -77,6 +78,7 @@ export class PdQuestionAssestsPage {
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
this.product_abbr=this.pdDetails.product_abbr
this.pdid=this.pdDetails.pd_id;
this.users = this.aws.getlocale();
this.applicants = this.pdDetails.applicat_details;

8
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
View File

@ -211,7 +211,7 @@
<!-- <span *ngIf="(sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3) && sup.get('business_ownership_type').value == 'owned'"> -->
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field>
<mat-label>Age of Asset in Years</mat-label>
<input matInput autocomplete="off" placeholder="eg.99" formControlName="business_vintage"
@ -236,7 +236,7 @@
<!-- </div> -->
<span>
<div *ngIf="lender_short_name !== 'CLIX' && (itemrow.get('business_ownership_type').value == 'owned')">
<div *ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'SMC' || product_abbr === 'LFMP') && (itemrow.get('business_ownership_type').value == 'owned')">
<p>Is There a Loan Existing Against This Asset?</p>
<mat-radio-group formControlName="business_emi">
<mat-radio-button value="yes">Yes</mat-radio-button>
@ -422,7 +422,7 @@
</mat-form-field>
<!-- <div *ngIf="sup.get('business_assets_mode').value == 1 || sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3">-->
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field>
<mat-label>Age of Asset in Years</mat-label>
@ -445,7 +445,7 @@
<!--<div *ngIf="sup.get('business_assets_mode').value == 2 || sup.get('business_assets_mode').value == 3 || sup.get('business_assets_mode').value == 4">-->
<div
*ngIf="lender_short_name !== 'CLIX' && (sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
*ngIf="(lender_short_name !== 'CLIX' && lender_short_name !== 'SMC' || product_abbr === 'LFMP') && (sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned'">
<p>Is There a Loan Existing Against This Asset?</p>
<mat-radio-group formControlName="business_emi">

2
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.ts
View File

@ -72,6 +72,7 @@ export class PdQuestionBusinessAssetsPage {
addressList: any=[];
spinner_access;boolean=false;
lender_short_name: any;
product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,
public aws:AwsServiceProvider,public fb:FormBuilder,public qustcat:QuestionCategoryProvider,
@ -81,6 +82,7 @@ export class PdQuestionBusinessAssetsPage {
this.pdDetails=this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
this.product_abbr=this.pdDetails.product_abbr
this.formDetails=this.navParams.get('formDetails');
this.users=this.aws.getlocale();
this.company_id=this.pdDetails.company_id;

5
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
View File

@ -1806,8 +1806,7 @@
</mat-card-content>
</mat-card>
<mat-card
*ngIf="businessForm.controls['applicant_use_mobile_wallets'] || businessForm.controls['applicant_use_pos_machines']">
<mat-card *ngIf="businessForm.controls['applicant_use_mobile_wallets'] || businessForm.controls['applicant_use_pos_machines']">
<mat-card-header>
<mat-card-title>Digital Payments</mat-card-title>
</mat-card-header>
@ -1936,7 +1935,7 @@
<input matInput type="number" placeholder="Permanent"
(change)="checkTotalEmployee(businessForm)" formControlName="employees_permanent" >
</mat-form-field>
<mat-form-field style="width:100%;" *ngIf="lender_short_name != 'CLIX'">
<mat-form-field style="width:100%;" *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<input matInput type="number" placeholder="Temporary"
(change)="checkTotalEmployee(businessForm)" formControlName="employees_temporary" >
</mat-form-field>

8
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
View File

@ -585,7 +585,7 @@ export class PdQuestionBusinessInfoPage {
});
if (selectedRetail.length > 0) {
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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
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 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -666,7 +666,7 @@ export class PdQuestionBusinessInfoPage {
});
if (selectedWholesale.length > 0) {
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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
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 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -748,7 +748,7 @@ export class PdQuestionBusinessInfoPage {
})
if (selectedService.length > 0) {
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.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
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 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines');
@ -1182,7 +1182,7 @@ export class PdQuestionBusinessInfoPage {
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
if(this.lender_short_name != 'CLIX'){
if(!(this.lender_short_name == 'CLIX' && this.product_abbr == 'BL') && !(this.lender_short_name == 'SMC' && this.product_abbr == 'BL')){
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');

27
src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
View File

@ -115,7 +115,7 @@
<input matInput placeholder="Client Name" formControlName="manufacturing_client_name" (change)="setValidationForRemarks($event.target.value,items,i,1)">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -194,6 +194,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,1)">
</mat-form-field>
</div>
</div>
</mat-card-content>
@ -254,7 +261,7 @@
<input matInput placeholder="Client Name" formControlName="trade_client_name">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -337,6 +344,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,2)">
</mat-form-field>
</div>
</div>
</mat-card-content>
@ -398,7 +412,7 @@
<input matInput placeholder="Client Name" formControlName="service_provider_client_name">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -479,6 +493,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,3)">
</mat-form-field>
</div>
</div>
</mat-card-content>

38
src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.ts
View File

@ -446,7 +446,8 @@ console.log("form values",this.clientInfoForm);
person_landline: ['',Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [''],
manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: ['']
manufacturing_credit_days_to: [''],
manufacturing_contribution_total_turnover: [''],
})
} else {
return this.fb.group({
@ -463,7 +464,8 @@ console.log("form values",this.clientInfoForm);
person_landline: [records.person_landline || null,Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || 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],
})
}
}
@ -495,6 +497,7 @@ console.log("form values",this.clientInfoForm);
trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''],
trade_product_contribution_total_turnover: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@ -512,6 +515,7 @@ console.log("form values",this.clientInfoForm);
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_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_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@ -548,6 +552,7 @@ console.log("form values",this.clientInfoForm);
service_provider_product_frequency_of_purchase: [''],
service_provider_product_credit_days_from: [''],
service_provider_product_credit_days_to: [''],
service_provider_contribution_total_turnover: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], //Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@ -565,6 +570,7 @@ console.log("form values",this.clientInfoForm);
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_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_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
@ -1122,5 +1128,33 @@ else{
}
onBlurMethod(v,items,option) {
if(v >= 101){
// alert('Only 100% is limit');
let alert= this.toast.setAlertwithOKButton("Only 100% is limit","")
alert.present();
if(option == 1){
items.controls['manufacturing_contribution_total_turnover'].setValue('');
}
if(option == 2){
items.controls['trade_product_contribution_total_turnover'].setValue('');
}
if(option == 3){
items.controls['service_provider_contribution_total_turnover'].setValue('');
}
// this.toast.setAlertwithOKButton("Only 100% is limit","");
}
// const charCode = (event.which) ? event.which : event.keyCode;
// console.log(charCode);
// if (charCode > 31 && (charCode < 48 || charCode > 57)) {
// return false;
// }
// return true;
}
}

2
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html
View File

@ -357,7 +357,7 @@
</div>
</div> <br/>
<div *ngIf="financialForm.value.is_financial_customer == 'no' && financialForm.controls['kuccha_records_shown'] && lender_short_name !== 'CLIX'">
<div *ngIf="financialForm.value.is_financial_customer == 'no' && financialForm.controls['kuccha_records_shown'] && (lender_short_name !== 'CLIX' && lender_short_name !== 'SMC')">
<div>
<mat-radio-group formControlName="kuccha_records_shown" (change)="kucchaChangeFun()">
<mat-label>Were the Kuccha records shown to the PD officer</mat-label><br/>

21
src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.html
View File

@ -102,7 +102,7 @@
</mat-select>
</mat-form-field>
<span *ngIf="mrm.get('stock_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="raw_quantity" type="number">
@ -196,7 +196,7 @@
</mat-select>
</mat-form-field>
<span *ngIf="mfg.get('goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="goods_quantity" type="number">
@ -290,7 +290,7 @@
</mat-select>
</mat-form-field>
<span *ngIf="item.get('traded_goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity" type="number">
@ -388,7 +388,7 @@
</mat-select>
</mat-form-field>
<span *ngIf="tradetg.get('traded_goods_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="traded_goods_quantity" type="number">
@ -505,7 +505,7 @@
</mat-form-field>
<span *ngIf="serv.get('service_provider_observed').value == 'yes'">
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || product_abbr == 'LFMP'">
<mat-form-field style="width:100%">
<input matInput autocomplete="off" placeholder="Estimated Quantity"
formControlName="service_provider_quantity" type="number">
@ -563,6 +563,7 @@
</div>
</div>
</div>
<div *ngIf="SPCommentCard">
<br>
<mat-form-field style="width:100%">
@ -585,6 +586,16 @@
<mat-card-title><h5>Service Provider Details</h5></mat-card-title>
<div style="text-align: center; margin: 12px;">Service Provider Details Not applicable here !!</div>
</mat-card> -->
<mat-card *ngIf="lender_short_name == 'SMC'">
<ion-buttons slot="end">
<button mini ion-fab color="optblue" float-right slot="fixed" (click)="capture()"><ion-icon name="md-camera" style="font-size: 24px"></ion-icon></button>
</ion-buttons>
<mat-form-field style="width: 100%">
<input matInput placeholder="How was stock Validated?"
formControlName="stock_validated"
autocomplete="off" type="text">
</mat-form-field>
</mat-card>
<mat-card>
<mat-form-field style="width: 100%">
<mat-label>Remarks</mat-label>

5
src/pages/pd-question/pd-question-business-group/pd-question-stock-info/pd-question-stock-info.ts
View File

@ -67,6 +67,7 @@ export class PdQuestionStockInfoPage {
complete_status: boolean = false;
spinner_access:boolean=false;
lender_short_name: any;
product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams, public qustCat: QuestionCategoryProvider,
public aws: AwsServiceProvider, public toast: ToastProvider, public fb: FormBuilder,
@ -76,6 +77,7 @@ export class PdQuestionStockInfoPage {
this.loading.dataLoader();
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
this.product_abbr=this.pdDetails.product_abbr
this.formDetails = this.navParams.get('formDetails');
this.users = this.aws.getlocale();
this.company_id = this.pdDetails.company_id;
@ -226,6 +228,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [dataForm.stock_remarks],
stock_validated: [dataForm.stock_validated || null],
// is_sufficiant_raw:[dataForm.is_sufficiant_raw],
// rawmaterial_remarks:[dataForm.rawmaterial_remarks],
@ -296,6 +299,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [''],
stock_validated: [''],
// is_sufficiant_raw:[''],
// rawmaterial_remarks:[''],
is_sufficiant_finished_and_traded_goods: [''],
@ -354,6 +358,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
company_id: [this.company_id],
fk_createdby: [this.users],
stock_remarks: [''],
stock_validated: [''],
// is_sufficiant_raw:[''],
// rawmaterial_remarks:[''],

27
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.html
View File

@ -112,7 +112,7 @@
<mat-form-field style="width: 100%">
<input matInput placeholder="Supplier Name" formControlName="manufacturing_supplier_name">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -181,6 +181,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,1)">
</mat-form-field>
</div>
</div>
</mat-card-content>
@ -243,7 +250,7 @@
<mat-form-field style="width: 100%">
<input matInput placeholder="Supplier Name" formControlName="trade_supplier_name">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -314,6 +321,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,2)">
</mat-form-field>
</div>
</div>
</mat-card-content>
@ -383,7 +397,7 @@
<mat-form-field style="width: 100%">
<input matInput placeholder="Supplier Name" formControlName="service_provider_supplier_name">
</mat-form-field>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Title" formControlName="person_title_name">
<mat-option>Select</mat-option>
@ -454,6 +468,13 @@
</mat-form-field>
</span>
</div>
<div *ngIf="lender_short_name == 'SMC'">
<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" maxlength="3" (blur)="onBlurMethod($event.target.value,items,3)">
</mat-form-field>
</div>
</div>
</mat-card-content>

32
src/pages/pd-question/pd-question-business-group/pd-question-supplier-info/pd-question-supplier-info.ts
View File

@ -413,6 +413,7 @@ export class PdQuestionSupplierInfoPage {
manufacturing_payment_mode: [''],
manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: [''],
manufacturing_contribution_total_purchase: [''],
manufacturing_frequency_of_purchase: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
@ -434,6 +435,7 @@ export class PdQuestionSupplierInfoPage {
manufacturing_payment_mode: [records.manufacturing_payment_mode],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || 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],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
@ -476,6 +478,7 @@ export class PdQuestionSupplierInfoPage {
trade_product_frequency_of_purchase: [''],
trade_product_credit_days_from: [''],
trade_product_credit_days_to: [''],
trade_product_contribution_total_purchase: [''],
})
} else {
return this.fb.group({
@ -496,6 +499,7 @@ export class PdQuestionSupplierInfoPage {
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_to: [records.trade_product_credit_days_to],
trade_product_contribution_total_purchase: [records.trade_product_contribution_total_purchase || null],
})
}
}
@ -535,6 +539,7 @@ export class PdQuestionSupplierInfoPage {
service_provider_frequency_of_purchase: [''],
service_provider_credit_days_from: [''],
service_provider_credit_days_to: [''],
service_provider_contribution_total_purchase: [],
})
} else {
console.log('else');
@ -553,6 +558,7 @@ export class PdQuestionSupplierInfoPage {
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_to: [records.service_provider_credit_days_to],
service_provider_contribution_total_purchase: [records.service_provider_contribution_total_purchase || null],
})
}
}
@ -1101,4 +1107,30 @@ export class PdQuestionSupplierInfoPage {
}
onBlurMethod(v,items,option) {
// console.log('eeeeeeeee',option);
// alert('Only 100% is limit');
if(v >= 101){
let alert= this.toast.setAlertwithOKButton("Only 100% is limit","")
alert.present();
if(option == 1){
items.controls['manufacturing_contribution_total_purchase'].setValue('');
}
if(option == 2){
items.controls['trade_product_contribution_total_purchase'].setValue('');
}
if(option == 3){
items.controls['service_provider_contribution_total_purchase'].setValue('');
}
}
// const charCode = (event.which) ? event.which : event.keyCode;
// console.log(charCode);
// if (charCode > 31 && (charCode < 48 || charCode > 57)) {
// return false;
// }
// return true;
}
}

4
src/pages/pd-question/pd-question-family/pd-question-family.html
View File

@ -197,7 +197,7 @@
</ion-row>
</ion-buttons>
</mat-card>
<mat-card *ngIf="tech.get('selected_person').value != '' && lender_short_name != 'CLIX'">
<mat-card *ngIf="tech.get('selected_person').value != '' && (lender_short_name != 'CLIX' && lender_short_name != 'SMC') || product_abbr === 'LFMP'">
<div formArrayName="family_members_details" >
<div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index; let last=last" [formGroupName]="ix">
@ -298,7 +298,7 @@
</div>
</mat-card>
<mat-card *ngIf="lender_short_name == 'CLIX'">
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'SMC' && product_abbr !== 'LFMP'">
<mat-card-header appearence="outline">
<mat-card-title><h5>Family Details Of {{FamilyMemberAsLabel[i]}}</h5></mat-card-title>
</mat-card-header>

2
src/pages/pd-question/pd-question-family/pd-question-family.ts
View File

@ -74,6 +74,7 @@ data:any;
complete_status: boolean = false;
spinner_access:boolean=false;
lender_short_name: any;
product_abbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,
@ -85,6 +86,7 @@ data:any;
this.FormId = this.navParams.get('FormId');
this.pdDetails = this.navParams.get('pdDetails');
this.lender_short_name=this.pdDetails.lender_short_name
this.product_abbr=this.pdDetails.product_abbr
this.selected_person=this.pdDetails.pdapplicants_details;
this.selectPerson=this.pdDetails.applicat_details
this.users = this.aws.getlocale();

3
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
View File

@ -205,9 +205,10 @@
</mat-form-field> -->
</mat-card-content>
</mat-card>
<mat-card *ngIf="lender_short_name == 'CLIX' || product_abbr == 'LAEP'">
<mat-card *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'SMC' || product_abbr == 'LAEP'">
<mat-card-content>
<mat-card-subtitle *ngIf="lender_short_name == 'CLIX'">CLIX</mat-card-subtitle>
<mat-card-subtitle *ngIf="lender_short_name == 'SMC'">SMC</mat-card-subtitle>
<!-- <mat-form-field *ngIf="_finalRemarkForm.controls['outlet_location']">
<mat-select placeholder="Comment on Footfall in the market where the B2C outlet is located…" formControlName="outlet_location"
required>

4
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.ts
View File

@ -81,7 +81,7 @@ export class PdQuestionFinalRemarkPage {
})
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'SMC' || this.product_abbr == 'LAEP'){
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('sealing_activity', new FormControl(''));
@ -464,7 +464,7 @@ RecommendationChange(e) {
}
this._finalRemarkForm.controls.final_form_remarks.setValue(data['records'].final_form_remarks);
if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'SMC' || this.product_abbr == 'LAEP'){
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);

6
src/pages/pd-question/pd-question-loans/pd-question-loans.html
View File

@ -110,7 +110,7 @@
<mat-form-field *ngIf="isOtherPurpose" style="width: 100%">
<input matInput placeholder="Specify End Use" formControlName="end_use_other">
</mat-form-field>
<mat-form-field style="width: 100%" *ngIf="lender_short_name == 'CLIX'">
<mat-form-field style="width: 100%" *ngIf="lender_short_name == 'CLIX' || lender_short_name == 'SMC' && productAbbr != 'LFMP'">
<mat-select placeholder="Total fund requirement"
formControlName="is_there_total_fund">
<mat-option>Select</mat-option>
@ -126,7 +126,7 @@
<mat-hint align="end" *ngIf="loanDetailsForm.controls['fund_amt'].value != '' && fundAmtInWords !=''">{{"&#8377;"}} {{fundAmtInWords}} Only</mat-hint>
</mat-form-field>
</span>
<div *ngIf="lender_short_name != 'CLIX'">
<div *ngIf="lender_short_name != 'CLIX' && lender_short_name != 'SMC' || productAbbr == 'LFMP'">
<mat-form-field style="width: 100%">
<mat-select placeholder="Is there a balance transfer ? " (selectionChange)="selectedBalancesTransferChanges($event.value)"
formControlName="is_transfer" >
@ -168,7 +168,7 @@
<input matInput placeholder="Top Up Amt" type="number" formControlName="topup_amount" (keyup)="inWords($event,5)">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
</mat-form-field >
<mat-form-field style="width:100%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && lender_short_name != 'CLIX'" >
<mat-form-field style="width:100%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 && (lender_short_name != 'CLIX' && lender_short_name != 'SMC' || productAbbr == 'LFMP')" >
<mat-select placeholder="What is the End Use of the Top Up?"
formControlName="end_use_topup" >
<mat-option>Select</mat-option>

2
src/pages/pd-question/pd-question-loans/pd-question-loans.ts
View File

@ -951,7 +951,7 @@ export class PdQuestionLoansPage {
// this.loanDetailsForm.controls['value_per_agreement'].setValue(loanDetails.value_per_agreement);
this.loanDetailsForm.controls['loandetails_remarks'].setValue(loanDetails.loandetails_remarks);
} else {
if(this.lender_short_name == 'CLIX'){
if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'SMC'){
this.loanDetailsForm.controls['is_transfer'].setValue("no");
this.selectedBalancesTransferChanges("no")