diff --git a/ng6-seed/SE_PROD_020519FN.zip b/ng6-seed/SE_PROD_020519FN.zip deleted file mode 100644 index 54225da90..000000000 Binary files a/ng6-seed/SE_PROD_020519FN.zip and /dev/null differ diff --git a/ng6-seed/SE_PROD_030519.zip b/ng6-seed/SE_PROD_030519.zip deleted file mode 100644 index b0176b990..000000000 Binary files a/ng6-seed/SE_PROD_030519.zip and /dev/null differ diff --git a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts index e801c9c0b..0feb41992 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -11,10 +11,13 @@ export class RoleMenuItemsPipe implements PipeTransform { switch(localStorage.getItem('user_role')){ case '1': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '2': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + case '3': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '4': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); case '5': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); case '6': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); + case '8': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + case '9': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '10': return value; // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); } @@ -24,10 +27,13 @@ export class RoleMenuItemsPipe implements PipeTransform { switch(localStorage.getItem('user_role')){ case '1': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '2': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + case '3': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '4': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); case '5': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); case '6': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); + case '8': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + case '9': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); case '10': return value; // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index e9069d829..61f75454f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -1613,8 +1613,9 @@ Documents Sighted +
- Yes No @@ -1622,8 +1623,17 @@ Shop and Est Act Cert Required +
+
+ +

Shop and Est Act Cert Image

+ +
+
+
+
- Yes No @@ -1631,8 +1641,16 @@ GST Regn Cert Required +
+
+ +

GST Regn Cert Image

+
+
+
+
- Yes No @@ -1640,16 +1658,33 @@ Export / Import cert Required +
+
+ +

Export / Import cert Image

+
+
+
+
- + Yes No Not Applicable Factory Cert Required +
+
+ +

Factory cert Image

+ +
+
+
+
- Yes No @@ -1657,23 +1692,47 @@ Cert of Practice Required +
+
+ +

Cert of Practice Image

+ +
+
+
+
- + Yes No Not Applicable PF Regn Required +
+
+ +

PF Regn Image

+ +
+
+
+
- + Yes No Not Applicable ESIC Regn Required - +
+
+ +

ESIC Regn Image

+
+
+
@@ -1724,6 +1783,7 @@
{{doc.document_name}}
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index e75a29073..5bfdf8fdd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -589,7 +589,14 @@ export class BusinessInfoComponent implements OnInit { } } // this.businessForm.setValue(businessVal); - this.businessForm.patchValue(businessVal); + if(data.records.gst_Regn_cert =='yes'){ this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('gst_Regn_cert_pic');} + if(data.records.factory_cert =='yes'){ this.businessForm.addControl('factory_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('factory_cert_pic');} + if(data.records.practice_cert_cert =='yes'){ this.businessForm.addControl('practice_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('practice_cert_pic');} + if(data.records.shop_eat_act_cert =='yes'){ alert('if control'); this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('shop_eat_act_cert_pic');} + if(data.records.pf_regn =='yes'){ this.businessForm.addControl('pf_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('pf_regn_pic');} + if(data.records.esic_regn =='yes'){ this.businessForm.addControl('esic_regn_pic', new FormControl('')); }else{ this.businessForm.removeControl('esic_regn_pic');} + if(data.records.export_import_cert =='yes'){ this.businessForm.addControl('export_import_cert_pic', new FormControl('')); }else{ this.businessForm.removeControl('export_import_cert_pic');} + this.businessForm.patchValue(businessVal); } else { //Desgn.push(this.createDesignation()); Partnr.push(this.createPartners()); @@ -1950,4 +1957,14 @@ export class BusinessInfoComponent implements OnInit { }); } } + + radioChange(event,Flag){ + if(Flag == 1) {event.value =='yes' ? this.businessForm.addControl('shop_eat_act_cert_pic', new FormControl('')) : this.businessForm.removeControl('shop_eat_act_cert_pic');} + if(Flag == 2) {event.value =='yes' ? this.businessForm.addControl('gst_Regn_cert_pic', new FormControl('')) : this.businessForm.removeControl('gst_Regn_cert_pic'); } + if(Flag == 4) {event.value =='yes' ? this.businessForm.addControl('factory_cert_pic', new FormControl('')) : this.businessForm.removeControl('factory_cert_pic');} + if(Flag == 5) {event.value =='yes' ? this.businessForm.addControl('practice_cert_pic', new FormControl('')) : this.businessForm.removeControl('practice_cert_pic');} + if(Flag == 6) {event.value =='yes' ? this.businessForm.addControl('pf_regn_pic', new FormControl('')) : this.businessForm.removeControl('pf_regn_pic');} + if(Flag == 7) {event.value =='yes' ? this.businessForm.addControl('esic_regn_pic', new FormControl('')) : this.businessForm.removeControl('esic_regn_pic');} + if(Flag == 3) {event.value =='yes' ? this.businessForm.addControl('export_import_cert_pic', new FormControl('')) : this.businessForm.removeControl('export_import_cert_pic');} + } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 294f8f8d6..42f0d1ddf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -512,7 +512,7 @@ *ngFor="let entityType of financialForm.controls.select_working_capital_facilities_availed['controls']; let e = index;" [formGroupName]="e"> {{entityType.controls.name.value}} + (click)="changeWorkingCapitalFacilities(entityType)">{{entityType.controls.name.value}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 36a0a56c1..087631f37 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -162,29 +162,29 @@ export class FinancialInfoComponent implements OnInit { if (check_exist_av.length > 0) { check_exist_av.forEach(val => { - workingCptlControl.push(this.createEntityType(val)); + workingCptlControl.push(this.workingCptl(val)); if (val.exist_status == 1 && val.id == 2) { - this.financialForm.addControl('bank_guarantee', new FormControl('', Validators.required)); + this.financialForm.addControl('bank_guarantee', new FormControl('')); } if (val.exist_status == 1 && val.id == 3) { - this.financialForm.addControl('cash_credit_limit', new FormControl('', Validators.required)); + this.financialForm.addControl('cash_credit_limit', new FormControl('')); } if (val.exist_status == 1 && val.id == 4) { - this.financialForm.addControl('factoring', new FormControl('', Validators.required)); + this.financialForm.addControl('factoring', new FormControl('')); } if (val.exist_status == 1 && val.id == 5) { - this.financialForm.addControl('forfaiting', new FormControl('', Validators.required)); + this.financialForm.addControl('forfaiting', new FormControl('')); } if (val.exist_status == 1 && val.id == 6) { - this.financialForm.addControl('letter_of_credit', new FormControl('', Validators.required)); + this.financialForm.addControl('letter_of_credit', new FormControl('')); } if (val.exist_status == 1 && val.id == 7) { - this.financialForm.addControl('od_limit', new FormControl('', Validators.required)); + this.financialForm.addControl('od_limit', new FormControl('')); } if (val.exist_status == 1 && val.id == 1) { - this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('', Validators.required)); - this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('', Validators.required)); + this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('')); + this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('')); } console.log(val); }); @@ -275,7 +275,7 @@ export class FinancialInfoComponent implements OnInit { if (check_exist_av.length > 0) { check_exist_av.forEach(val => { - workingCptlControl.push(this.createEntityType(val)); + workingCptlControl.push(this.workingCptl(val)); }); } //financial_date.push(this.createDate()); @@ -304,7 +304,7 @@ export class FinancialInfoComponent implements OnInit { }); } - createEntityType(details: any): FormGroup { + workingCptl(details: any): FormGroup { return this.fb.group({ id: [details.id, Validators.compose([Validators.required])], name: [details.name, Validators.compose([Validators.required])], @@ -388,45 +388,45 @@ export class FinancialInfoComponent implements OnInit { } else if (event.value.exist_status == false && event.value.id == 2) { console.log('event.value.exist_status == true && event.value.id == 2',event.value.exist_status,event.value.id) - this.financialForm.addControl('bank_guarantee', new FormControl('', Validators.required)); + this.financialForm.addControl('bank_guarantee', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 3) { this.financialForm.removeControl('cash_credit_limit'); } else if (event.value.exist_status == false && event.value.id == 3) { - this.financialForm.addControl('cash_credit_limit', new FormControl('', Validators.required)); + this.financialForm.addControl('cash_credit_limit', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 4) { this.financialForm.removeControl('factoring'); } else if (event.value.exist_status == false && event.value.id == 4) { - this.financialForm.addControl('factoring', new FormControl('', Validators.required)); + this.financialForm.addControl('factoring', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 5) { this.financialForm.removeControl('forfaiting'); } else if (event.value.exist_status == false && event.value.id == 5) { - this.financialForm.addControl('forfaiting', new FormControl('', Validators.required)); + this.financialForm.addControl('forfaiting', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 6) { this.financialForm.removeControl('letter_of_credit'); } else if (event.value.exist_status == false && event.value.id == 6) { - this.financialForm.addControl('letter_of_credit', new FormControl('', Validators.required)); + this.financialForm.addControl('letter_of_credit', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 7) { this.financialForm.removeControl('od_limit'); } else if (event.value.exist_status == false && event.value.id == 7) { - this.financialForm.addControl('od_limit', new FormControl('', Validators.required)); + this.financialForm.addControl('od_limit', new FormControl('')); } if (event.value.exist_status == true && event.value.id == 1) { this.financialForm.removeControl('other_reason_for_working_capital_facilities_availed'); this.financialForm.removeControl('reason_for_working_capital_facilities_availed'); } else if (event.value.exist_status == false && event.value.id == 1) { - this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('', Validators.required)); - this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('', Validators.required)); + this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('')); + this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('')); } // if(event.value.exist_status==true && event.value.id==1){ @@ -1901,10 +1901,11 @@ export class FinancialInfoComponent implements OnInit { this.financialForm.value.date_per_financial['financial_margin_of_loss'].updateValueAndValidity(); } - if (!this.financialForm.valid) { - this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); - return; - } + // if (!this.financialForm.valid) { + // this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); + // return; + // } + console.log('this.financialForm.value',this.financialForm.value); let records = this.financialForm.value; records.select_working_capital_facilities_availed = records.select_working_capital_facilities_availed.filter(value => value.exist_status == 1); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 4d62e2ca0..0c32a3d04 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -405,7 +405,8 @@
-
{{doc.document_name}}
+
{{doc.document_name}} +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index 26a0d9561..d5453ac2e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -353,6 +353,8 @@ export class GeneralInfoComponent implements OnInit { applicant_name: [elementValue.applicant_name], is_applicant: [elementValue.is_applicant], is_person_met: [elementValue.is_person_met], + is_person_met_pic :[elementValue.is_person_met_pic], + is_person_met_id_proof : [elementValue.is_person_met_id_proof], is_new: [elementValue.is_new], is_main_applicant: [elementValue.is_main_applicant], is_active: [elementValue.is_active],