diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 13403de01..6a1a14f6e 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -1,8 +1,8 @@
- = 2" class="bottoms" slot="bottom">
+ = 2 || p.userPermission([permissionList.Agenda.access]) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
-
+ = 1 || p.userPermission([permissionList.Gabinete.access])" tab="events" [class.active]="pathname === '/home/events'">
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
+
}
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++;
}