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 + }