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 f6d4f072f..d60358ae6 100644 --- a/ng6-seed/src/app/layouts/role-menu-items.pipe.ts +++ b/ng6-seed/src/app/layouts/role-menu-items.pipe.ts @@ -7,32 +7,33 @@ export class RoleMenuItemsPipe implements PipeTransform { transform(value: any, type: any): any { //this is for horizontal menu filter - if(type=="1"){ - if(localStorage.getItem('user_role')=="10"){ - return value - } - else if(localStorage.getItem('user_role')=="6" || localStorage.getItem('user_role')=="7"){ - return value.filter(val=>val.state!="setting" && val.state!="personal_discussion") - } - else{ - return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion") - } - } + // if(type=="1"){ + // if(localStorage.getItem('user_role')=="10"){ + // return value + // } + // else if(localStorage.getItem('user_role')=="6" || localStorage.getItem('user_role')=="7"){ + // return value.filter(val=>val.state!="setting" && val.state!="personal_discussion") + // } + // else{ + // return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion") + // } + // } //this is for vertical menu filter - else if(type=="2"){ - if(localStorage.getItem('user_role')=="10"){ - return value - } - else if(localStorage.getItem('user_role')=="6" || localStorage.getItem('user_role')=="7"){ - return value.filter(val=>val.state!='' && val.state!="personal_discussion") - } - else{ - return value.filter(val=>val.state!='' && val.state!="quality_check_discussion") - } - } - else{ - return []; - } + // else if(type=="2"){ + // if(localStorage.getItem('user_role')=="10"){ + // return value + // } + // else if(localStorage.getItem('user_role')=="6" || localStorage.getItem('user_role')=="7"){ + // return value.filter(val=>val.state!='' && val.state!="personal_discussion") + // } + // else{ + // return value.filter(val=>val.state!='' && val.state!="quality_check_discussion") + // } + // } + // else{ + // return []; + // } + return value; } diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 42b76087b..43027f8ee 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -626,11 +626,12 @@ export class PdTrigerService { //set role access getRoleAccessDetails() { let setValues:any={}; - setValues.trigger=false; - setValues.allocate=false; - setValues.schedule=false; - setValues.discussions=false; - setValues.reports=false; + + setValues.trigger=true; + setValues.allocate=true; + setValues.schedule=true; + setValues.discussions=true; + setValues.reports=true; function roleResult(value){ switch (value) { //central manager @@ -672,8 +673,9 @@ export class PdTrigerService { } } - let result = roleResult(localStorage.getItem('user_role')); - return result; + // let result = roleResult(localStorage.getItem('user_role')); + //return result ; + return setValues; }