From 034bb1c16a3e6da04938ec49c088712c3ed0ff23 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 31 Jan 2020 18:48:53 +0530 Subject: [PATCH] Fairoj : Sales PD Icon is visible for role 10 & 3 --- .../layouts/admin/admin-layout.component.html | 4 +-- .../src/app/layouts/role-menu-items.pipe.ts | 36 +++++++++---------- .../menu-items/horizontal-menu-items.ts | 2 +- .../src/app/shared/menu-items/menu-items.ts | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index 6c7660de2..ffbfd6e50 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -131,9 +131,9 @@ - + - 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 c3de8c320..aa3fe14cf 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -9,36 +9,36 @@ export class RoleMenuItemsPipe implements PipeTransform { // this is for horizontal menu filter if(type=="1"){ switch(localStorage.getItem('user_role')){ - 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 '1': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); + case '2': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); case '3': return value.filter(val=>val.state!="settings"); - 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 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"); + case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '5': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '6': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '7': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '8': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); + case '9': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); case '10': return value; // case '3': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); // case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports"); // case '6': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports"); - // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + // default: return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); } } // this is for vertical menu filter else if(type=="2"){ 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 '1': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); + case '2': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); case '3': return value.filter(val=>val.state!="settings"); - 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 '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '5': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '6': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '7': return value.filter(val=>val.state!="settings" && val.state!="personal_discussion" && val.state!="reports" && val.state!="sales-pd-list"); + case '8': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); + case '9': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="sales-pd-list"); case '10': return value; - // default: return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion"); + // default: return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion"); } } else{ diff --git a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts index d8a6cc3b8..421cc9f87 100755 --- a/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/horizontal-menu-items.ts @@ -39,7 +39,7 @@ const HORIZONTALMENUITEMS = [ ] }, { - state:'setting', + state:'settings', name:'Manage', type:'multi', icon:'settings', diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index 6f444c110..7e38621a9 100755 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -72,7 +72,7 @@ const MENUITEMS : Menu[] = [ // }, { - state:'setting', + state:'settings', name:'Manage', type:'multi', icon:'settings',