From 9ff7b9365764868db25252e9cfd9f7feef743ca7 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Mon, 13 Jan 2020 19:02:15 +0530 Subject: [PATCH] applicant changes done --- ng6-seed/src/app/dashboard/dashboard.component.ts | 4 ++-- ng6-seed/src/app/layouts/admin/admin-layout.component.ts | 4 ++-- ng6-seed/src/app/layouts/role-menu-items.pipe.ts | 4 ++-- .../other-applicant-details.component.ts | 7 +++++-- .../start-pd/forms/general-info/general-info.component.ts | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts index 39a41f6c2..65ea7a4b2 100755 --- a/ng6-seed/src/app/dashboard/dashboard.component.ts +++ b/ng6-seed/src/app/dashboard/dashboard.component.ts @@ -16,7 +16,7 @@ import { BaseChartDirective } from 'ng2-charts/ng2-charts'; export class DashboardComponent { dashboardTitle : any = 'PD Status'; - access : boolean; + access : boolean = true; /** Declaration Part Of Doughnut Chart */ doughnutChartLabels: string[] = ['Triggered','Allocated','Scheduled','InProgress','Completed','QC Completed']; @@ -46,7 +46,7 @@ export class DashboardComponent { ngOnInit(){ // console.clear(); // this.access = this.userRoleID == 3 || this.userRoleID == 4 || this.userRoleID == 6 ? false : true; - this.access = this.userRoleID == 4 || this.userRoleID == 6 ? false : true; + // this.access = this.userRoleID == 4 || this.userRoleID == 6 ? false : true; this.getDoughnutChartData(); } diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts index 05883422f..b2c6f805c 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts @@ -55,7 +55,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { alertMsgAllocateType : any[]; alertCount: any; userRoleType: String; - permissionDeined : boolean; + permissionDeined : boolean = true; alertTAT: any; countTAT: number; @@ -115,7 +115,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy { ngOnInit(): void { this.userRoleType=localStorage.getItem('user_role'); - this.permissionDeined = this.userRoleType == '4' || this.userRoleType == '6' ? false : true; + // this.permissionDeined = this.userRoleType == '4' || this.userRoleType == '6' ? false : true; // console.clear(); const elemSidebar = document.querySelector('.sidebar-container '); 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 28d68c4a0..c3de8c320 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -12,9 +12,9 @@ export class RoleMenuItemsPipe implements PipeTransform { case '1': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); case '2': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); case '3': return value.filter(val=>val.state!="settings"); - case '4': return; + case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports"); case '5': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports"); - case '6': return; + case '6': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports"); case '7': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports"); case '8': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); case '9': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts index 8cac3dc77..084d54ce4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts @@ -16,6 +16,7 @@ export class OtherApplicantDetailsComponent implements OnInit { titleList: any = []; qualificationList: any = []; individuals_order_id: any; + role_id: string; //EditGeneralFormData: any=[]; //EditFlag: boolean = false; @@ -34,7 +35,9 @@ export class OtherApplicantDetailsComponent implements OnInit { else{ this.pageTitle="Add Name of Person(s) Met and Individual Loan Applicant(s) " } - } + this.role_id=localStorage.getItem('user_role') + console.log('User Role',this.role_id); + } ngOnInit() { if(this.data.edit_data){ @@ -82,7 +85,7 @@ export class OtherApplicantDetailsComponent implements OnInit { return this._fb.group({ pd_co_applicant_id: [elementValue.pd_co_applicant_id], applicant_title_name: [elementValue.applicant_title_name, Validators.required], - applicant_name: [{value:elementValue.applicant_name, disabled : elementValue.individuals_order_id == 1 ? true : false} || '', Validators.required], + applicant_name: [{value:elementValue.applicant_name, disabled : elementValue.individuals_order_id == 1 && this.role_id != '10' && this.role_id != '3' && this.role_id != '7' && this.role_id != '6' ? true : false} || '', Validators.required], is_applicant: [elementValue.is_applicant || false], is_person_met: [elementValue.is_person_met || false], age: [elementValue.age || ''], 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 0652066ba..69755025b 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 @@ -109,6 +109,7 @@ export class GeneralInfoComponent implements OnInit { } this.disableAfterSubmit = false; this.role_id=localStorage.getItem('user_role') + console.log('User Role',this.role_id); this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''} } /********************** Constructor Section Ends Here ****************/