diff --git a/src/app/models/permission/actions.permission.ts b/src/app/models/permission/actions.permission.ts index 8dcbc9a83..bf4d4af1a 100644 --- a/src/app/models/permission/actions.permission.ts +++ b/src/app/models/permission/actions.permission.ts @@ -4,6 +4,6 @@ export class ActionsPermission{ remove = 536; edit = 537; createPost = 538; - removePost = 539; + deletePost = 539; editPost = 540; } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html index ea16990a6..d778e071d 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/publication-detail/publication-detail.page.html @@ -56,12 +56,12 @@ - + - + diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 17681b2cc..84b8746e0 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -10,6 +10,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-publication-detail', @@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit { private RouteService: RouteService, private sqliteservice: SqliteService, private backgroundservice: BackgroundService, - public ThemeService: ThemeService ) { + public ThemeService: ThemeService, + public p:PermissionService ) { this.publicationId = this.navParams.get('publicationId'); /* this.folderId = this.navParams.get('folderIdId'); */ diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 3abc2e9ec..622dd150e 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -25,7 +25,7 @@ Acções Presidenciais
- @@ -92,14 +92,14 @@
- + - + diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 77f1df29a..4baeee66c 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -15,6 +15,7 @@ import { SqliteService } from 'src/app/services/sqlite.service'; import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { Storage } from '@ionic/storage'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ @@ -68,7 +69,8 @@ export class PublicationsPage implements OnInit { private backgroundservice: BackgroundService, private platform: Platform, public ThemeService: ThemeService, - private storage: Storage + private storage: Storage, + public p: PermissionService, ) { this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html index dd6e0bbb6..7b06bd70d 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html @@ -61,12 +61,12 @@ - + - + diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 15afbe6e2..9929de9ef 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -10,6 +10,7 @@ import { Location } from '@angular/common'; import { ThemeService } from 'src/app/services/theme.service' import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; import { RouteService } from 'src/app/services/route.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-publication-detail', @@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, private RouteService: RouteService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public p:PermissionService, ) { this.activatedRoute.paramMap.subscribe(params => { diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html index 847b460c5..4d5632618 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -15,7 +15,7 @@

{{item.Detail}}

-
+
@@ -57,10 +57,10 @@ *ngFor="let publication of getpublication" (click)="goToPublicationDetail(publication.DocumentId)" > - +
- +
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index b8c63dfb3..5a7bb8264 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -12,6 +12,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { forkJoin } from 'rxjs'; import { ToastService } from 'src/app/services/toast.service'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-view-publications', @@ -42,7 +43,8 @@ export class ViewPublicationsPage implements OnInit { private sqliteservice: SqliteService, private backgroundservice: BackgroundService, public ThemeService: ThemeService, - private toastService: ToastService,) { + private toastService: ToastService, + public p: PermissionService,) { this.item = new PublicationFolder(); this.activatedRoute.paramMap.subscribe(params => { @@ -259,7 +261,7 @@ export class ViewPublicationsPage implements OnInit { publicationArray.push(publicationlis); }); - + this.publicationList = publicationArray; }) } diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts index a02dd401a..b0ebcf48f 100644 --- a/src/app/services/permission.service.ts +++ b/src/app/services/permission.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { PermissionList } from '../models/permission/permissionList'; import { SessionStore } from '../store/session.service'; @Injectable({ @@ -6,6 +7,7 @@ import { SessionStore } from '../store/session.service'; }) export class PermissionService { + permissionList = new PermissionList(); SessionStore = SessionStore constructor() { } diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html index 42a9de4f1..25b3c03a0 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html @@ -56,12 +56,12 @@ - + - + diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index f9e8f9f19..798297717 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -9,6 +9,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ThemeService } from 'src/app/services/theme.service' import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-publication-detail-shared', @@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit { private publications:PublicationsService, private animationController: AnimationController, private toastService: ToastService, - public ThemeService: ThemeService + public ThemeService: ThemeService, + public p:PermissionService, ) { /* this.folderId = this.navParams.get('folderIdId'); */ diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 81573e3ce..872da291d 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -11,11 +11,11 @@
- -
- + diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 8fa8d4e7c..2879749f1 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -11,6 +11,7 @@ import { ThemeService } from 'src/app/services/theme.service' import { ToastService } from 'src/app/services/toast.service'; import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-action.page'; import { Storage } from '@ionic/storage'; +import { PermissionService } from 'src/app/services/permission.service'; @Component({ selector: 'app-view-publications', @@ -43,7 +44,8 @@ export class ViewPublicationsPage implements OnInit { private publications: PublicationsService, public ThemeService: ThemeService, private toastService: ToastService, - private storage: Storage + private storage: Storage, + public p:PermissionService, ) { this.item = new PublicationFolder(); } @@ -69,7 +71,7 @@ export class ViewPublicationsPage implements OnInit { //setTimeout(()=>{ this.getPublicationDetail(); this.getPublicationsIds(); - + //}, 100)