From 938aec7a633beb0fbecf1dc8ffdb420bae064e31 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 26 Apr 2019 14:04:14 +0530 Subject: [PATCH] css issues fixes : ps --- ng6-seed/src/app/layouts/role-menu-items.pipe.ts | 16 ++++++++++++---- .../manage-pd/list-pd/list-pd.component.ts | 2 +- .../business-info/business-info.component.html | 2 +- .../list-pd/view-pd/view-pd.component.scss | 8 +------- .../list-pd/view-pd/view-pd.component.ts | 2 +- .../qc-list/qc-view/qc-view.component.html | 2 +- .../qc-list/qc-view/qc-view.component.ts | 2 +- 7 files changed, 18 insertions(+), 16 deletions(-) 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 692d7d88d..5ff451ac1 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -9,8 +9,12 @@ export class RoleMenuItemsPipe implements PipeTransform { // this is for horizontal menu filter if(type=="1"){ switch(localStorage.getItem('user_role')){ - case '4': case '5': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); - case '6': case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); + 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 '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 '10': return value; default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); } @@ -18,8 +22,12 @@ export class RoleMenuItemsPipe implements PipeTransform { // this is for vertical menu filter else if(type=="2"){ switch(localStorage.getItem('user_role')){ - case '4': case '5': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports"); - case '6': case '7': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports"); + 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 '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 '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/list-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts index 4ac69c234..a5a0d1c7a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/list-pd.component.ts @@ -38,7 +38,7 @@ export class ListPdComponent implements OnInit, OnDestroy { // roles checks for enables events roleAccessDetails:any - public userRoleID = localStorage.getItem('user_role') ; + public userRoleID = +localStorage.getItem('user_role') ; constructor( notifier: NotifierService, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService) { this.notifier = notifier; 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 e8d71c328..d2c629c24 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 @@ -868,7 +868,7 @@ [formGroupName]="s"> - {{SL.state_name}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss index bee808464..62f3666a2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.scss @@ -13,9 +13,7 @@ .metaDataStyle{ height:89px !important; } -// .mat-list .mat-list-item{ -// height: 0px !important; -// } + // .headerdesign{ // border-radius: 5px !important; // // border-bottom-left-radius: 5px !important; @@ -23,10 +21,6 @@ // box-shadow: 0 5px 11px 0 rgba(0,0,0,.18), 0 4px 15px 0 rgba(0,0,0,.15) !important; // } -.mat-list .mat-list-item{ - height: 0px !important; -} - :host { margin-left: -5px; margin-right: -5px; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index f3ef2cc7e..59b0612d6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -28,7 +28,7 @@ import Swal from 'sweetalert2'; export class ViewPdComponent implements OnInit, OnDestroy { pipe = new DatePipe('en-US'); private notifier: NotifierService; - public userRoleID = localStorage.getItem('user_role'); + public userRoleID = +localStorage.getItem('user_role'); errorMessage: any; pdMasterData: any = []; pdAddressesData: any = []; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index fccc33b41..8a92f15a9 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -108,7 +108,7 @@
- +
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index 59d9b86cc..9a77dcbbc 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -37,7 +37,7 @@ export class QcViewComponent implements OnInit, OnDestroy { currentPDStatus:string; pdAdditionalReqData: any=[]; enableStartPD: boolean; - public userRoleID = localStorage.getItem('user_role'); + public userRoleID = +localStorage.getItem('user_role'); // create values for status check pdStatusCheck :any={ "DRAFT" :'DRAFT',