diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts index a712a50e1..64fad8b0b 100644 --- a/src/app/guards/inactivity.guard.ts +++ b/src/app/guards/inactivity.guard.ts @@ -4,7 +4,7 @@ import { Observable } from 'rxjs'; import { SessionStore } from '../store/session.service'; import { AlertController, Platform } from '@ionic/angular'; import { PermissionService } from '../services/permission.service'; -import { PermissionList } from '../models/permissionList'; +import { PermissionList } from '../models/permission/permissionList'; @Injectable({ providedIn: 'root' @@ -24,13 +24,14 @@ export class InactivityGuard implements CanActivate { state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){ + console.log(this.permissionList); + if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){ this.router.navigate(['/home/events']); } - else if(this.permissionService.userPermission(this.permissionList.Chat)){ + else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){ this.router.navigate(['/home/chat']); } - else if(this.permissionService.userPermission(this.permissionList.Actions)){ + else if(this.permissionService.userPermission(this.permissionList.Actions.access)){ this.router.navigate(['/home/publications']); } return false @@ -40,13 +41,13 @@ export class InactivityGuard implements CanActivate { return true }//Mobile or Tablet without session else { - if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){ + if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){ this.router.navigate(['/home/events']); } - else if(this.permissionService.userPermission(this.permissionList.Chat)){ + else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){ this.router.navigate(['/home/chat']); } - else if(this.permissionService.userPermission(this.permissionList.Actions)){ + else if(this.permissionService.userPermission(this.permissionList.Actions.access)){ this.router.navigate(['/home/publications']); } return false diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 80c3b0444..d730cc84d 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -2,7 +2,7 @@ - + @@ -10,14 +10,14 @@ Início - + Agenda - + @@ -26,13 +26,13 @@ Gabinete - + Ações - + Chat diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 6e7d3c71a..04b9a5291 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -31,7 +31,7 @@ import { environment } from 'src/environments/environment'; 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/permissionList'; +import { PermissionList } from '../models/permission/permissionList'; @Component({ selector: 'app-home', @@ -180,6 +180,7 @@ export class HomePage implements OnInit { myWorker.postMessage('ali'); */ this.clearTabButtonSelection(); + } clearTabButtonSelection(){ diff --git a/src/app/models/permission/actions.permission.ts b/src/app/models/permission/actions.permission.ts new file mode 100644 index 000000000..8dcbc9a83 --- /dev/null +++ b/src/app/models/permission/actions.permission.ts @@ -0,0 +1,9 @@ +export class ActionsPermission{ + access = 534; + create = 535; + remove = 536; + edit = 537; + createPost = 538; + removePost = 539; + editPost = 540; +} diff --git a/src/app/models/permission/agenda-permission.ts b/src/app/models/permission/agenda-permission.ts new file mode 100644 index 000000000..bb3afb868 --- /dev/null +++ b/src/app/models/permission/agenda-permission.ts @@ -0,0 +1,3 @@ +export class AgendaPermission{ + access = 530 +} diff --git a/src/app/models/permission/chat-permission.ts b/src/app/models/permission/chat-permission.ts new file mode 100644 index 000000000..4f780e33c --- /dev/null +++ b/src/app/models/permission/chat-permission.ts @@ -0,0 +1,3 @@ +export class ChatPermission{ + access = 541; +} diff --git a/src/app/models/permission/gabinete-permission.ts b/src/app/models/permission/gabinete-permission.ts new file mode 100644 index 000000000..be9fa5c45 --- /dev/null +++ b/src/app/models/permission/gabinete-permission.ts @@ -0,0 +1,5 @@ +export class GabinetePermission{ + access = 531; + pr_tasks = 532; + md_tasks = 533; +} diff --git a/src/app/models/permission/permissionList.ts b/src/app/models/permission/permissionList.ts new file mode 100644 index 000000000..43a3fd3b8 --- /dev/null +++ b/src/app/models/permission/permissionList.ts @@ -0,0 +1,11 @@ +import { ActionsPermission } from "./actions.permission"; +import { AgendaPermission } from "./agenda-permission"; +import { ChatPermission } from "./chat-permission"; +import { GabinetePermission } from "./gabinete-permission"; + +export class PermissionList{ + Agenda = new AgendaPermission(); + Gabinete = new GabinetePermission(); + Actions = new ActionsPermission(); + Chat = new ChatPermission(); +} diff --git a/src/app/models/permissionList.ts b/src/app/models/permissionList.ts deleted file mode 100644 index cfaf80f57..000000000 --- a/src/app/models/permissionList.ts +++ /dev/null @@ -1,6 +0,0 @@ -export class PermissionList{ - Agenda = 530; - Gabinete = 531; - Actions = 534; - Chat = 541; -} diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 168f4252c..730a225d3 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -26,7 +26,7 @@
-
+
@@ -94,7 +94,7 @@
-
+
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index e4055a9a8..752a14fe0 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -22,6 +22,8 @@ import { BackgroundService } from 'src/app/services/background.service'; import { momentG } from 'src/plugin/momentG'; import { ThemeService } from 'src/app/services/theme.service' import { Storage } from '@ionic/storage'; +import { PermissionList } from 'src/app/models/permission/permissionList'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-events', templateUrl: './events.page.html', @@ -81,6 +83,8 @@ export class EventsPage implements OnInit { /* existingScreenOrientation: string; */ + permissionList = new PermissionList(); + constructor( private eventService: EventsService, private router: Router, @@ -97,7 +101,8 @@ export class EventsPage implements OnInit { private networkconnection: NetworkConnectionService, private backgroundservice: BackgroundService, public ThemeService: ThemeService, - private storage: Storage + private storage: Storage, + public p: PermissionService, ) { /* this.existingScreenOrientation = this.screenOrientation.type; console.log(this.existingScreenOrientation); */ @@ -213,7 +218,7 @@ export class EventsPage implements OnInit { let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); const list = mdOficialEvents.concat(mdPessoalEvents); - + this.addEventToDb(list); this.listToPresent = list diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 9072eb405..a915cdc21 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -13,7 +13,7 @@ import { ThemeService } from 'src/app/services/theme.service'; import { StorageService } from 'src/app/services/storage.service'; import { ChatService } from 'src/app/services/chat.service'; import { PermissionService } from 'src/app/services/permission.service'; -import { PermissionList } from 'src/app/models/permissionList'; +import { PermissionList } from 'src/app/models/permission/permissionList'; @Component({ selector: 'app-login', @@ -148,13 +148,14 @@ export class LoginPage implements OnInit { if(pathName) { this.router.navigate([pathName]); } else { - if(this.permissionService.userPermission(this.permissionList.Agenda) || this.permissionService.userPermission(this.permissionList.Gabinete)){ + if(this.permissionService.userPermission(this.permissionList.Agenda.access) || this.permissionService.userPermission(this.permissionList.Gabinete.access)){ this.router.navigate(['/home/events']); } - else if(this.permissionService.userPermission(this.permissionList.Chat)){ + else if(this.permissionService.userPermission(this.permissionList.Chat.access) && this.permissionService.userPermission(this.permissionList.Actions.access)){ this.router.navigate(['/home/chat']); } - else if(this.permissionService.userPermission(this.permissionList.Actions)){ + else if(this.permissionService.userPermission(this.permissionList.Actions.access)){ + alert('here') this.router.navigate(['/home/publications']); } } diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index d361bc732..06d76d173 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -66,7 +66,7 @@
-
@@ -78,7 +78,7 @@ -
@@ -89,7 +89,7 @@ -
@@ -100,7 +100,7 @@ -
@@ -110,7 +110,7 @@ -
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 36a61ad9c..b91aa2d7a 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -11,7 +11,7 @@ import { EventTrigger } from '../../services/eventTrigger.service'; import { ThemeService } from '../../services/theme.service'; import { interval } from 'rxjs'; import { RouteService } from 'src/app/services/route.service'; -import { PermissionList } from 'src/app/models/permissionList'; +import { PermissionList } from 'src/app/models/permission/permissionList'; import { PermissionService } from 'src/app/services/permission.service'; @Component({