diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 072a06dbd..5616d6190 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -62,6 +62,7 @@ export class EventsPage implements OnInit { taskslist:DailyWorkTask[] = []; expedientList:any; + hideSearchBtn: boolean=false; // shared data toDayEventStorage = ToDayEventStorage @@ -109,6 +110,13 @@ export class EventsPage implements OnInit { this.LoadList(); } }); + this.hideSearch(); + } + + hideSearch(){ + if(this.router.url == '/home/events'){ + this.hideSearchBtn = true; + } } doRefresh(event) { diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index cdb91520e..a13a3d3c1 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -10,7 +10,7 @@ -
+
{{loggeduser.Profile}}
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 502ae26cb..430ea5abd 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -17,6 +17,7 @@ export class HeaderPage implements OnInit { searchSubject: string = ''; showSearch=false; loggeduser: User; + hideSearchBtn:boolean = false; constructor( private router: Router, @@ -32,6 +33,13 @@ export class HeaderPage implements OnInit { } ngOnInit() { + this.hideSearch(); + } + + hideSearch(){ + if(this.router.url == '/home/events'){ + this.hideSearchBtn = true; + } } locationPathname(): string { diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.scss b/src/app/shared/headers/header-no-search/header-no-search.page.scss index 054b768c5..5f8417188 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.page.scss +++ b/src/app/shared/headers/header-no-search/header-no-search.page.scss @@ -58,6 +58,8 @@ .tab{ height: 65px; + cursor: pointer; + user-select: none; } .active{