From 18bff756f1164fecff6f711d11f01880719b0b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 7 Apr 2022 16:25:29 +0100 Subject: [PATCH 1/2] bug fix on hide navigation bar for user with only one permission --- src/app/home/home.page.html | 2 +- src/app/services/permission.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 13403de01..e98262be2 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,6 +1,6 @@ - + diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts index cbd725923..629fd099d 100644 --- a/src/app/services/permission.service.ts +++ b/src/app/services/permission.service.ts @@ -42,7 +42,7 @@ export class PermissionService { let count = 0 - for(let permission of (this.SessionStore.user.UserPermissions || [])) { + for(let permission of this.SessionStore.user.UserPermissions ) { if (args.includes(permission)) { count++; } From 871ac764f8be01a8e5f5a6a2574cce2ddddb78f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 7 Apr 2022 17:47:45 +0100 Subject: [PATCH 2/2] hide navigation bar if user dosent have own calendare --- src/app/home/home.page.html | 2 +- src/app/home/home.page.ts | 8 +++++++- src/app/pages/events/events.page.ts | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index e98262be2..6a1a14f6e 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -2,7 +2,7 @@ - + diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 04b9a5291..cdf65323c 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -32,6 +32,9 @@ import { v4 as uuidv4 } from 'uuid' import { NativeNotificationService } from 'src/app/services/native-notification.service'; import { UserSession } from '../models/user.model'; import { PermissionList } from '../models/permission/permissionList'; +import { LoginUserRespose } from 'src/app/models/user.model'; +import { AuthService } from 'src/app/services/auth.service'; + @Component({ selector: 'app-home', @@ -83,6 +86,8 @@ export class HomePage implements OnInit { audioName: string = ""; public user: UserSession; permissionList = new PermissionList(); + loggeduser: LoginUserRespose; + constructor( private router: Router, @@ -107,8 +112,9 @@ export class HomePage implements OnInit { public RouteService: RouteService, private WsChatService: WsChatService, private NativeNotificationService: NativeNotificationService, + private authService: AuthService, ) { - + this.loggeduser = authService.ValidatedUser; if (SessionStore.exist) { this.user = SessionStore.user; } diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 752a14fe0..198635280 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -248,6 +248,21 @@ export class EventsPage implements OnInit { this.totalEvent = list.length; this.showLoader = false; + } else { + + if(this.loggeduser.OwnerCalendars.length >= 1) { + console.log('OWN caledare') + let onwEvent:any = await this.eventService.getAllOwnEvents(start, end) + this.listToPresent = onwEvent; + this.totalEvent = onwEvent.length; + this.showLoader = false; + } else { + console.log('ELSE') + } + + //if need share calendare + //this.eventService.genericGetAllSharedEvents + }