Merge branch 'feature/agenda-new-api-eudes' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/agenda-new-api-eudes

src/app/models/permission/agenda-permission.ts

@@ -25,4 +25,16 @@ export class AgendaPermission{
     }
     
   }
+
+  get creatEvent () {
+    return 504
+  }
+
+  get listAprovalEvents () {
+    return 507
+  }
+
+  get contactManager() {
+    return 548
+  }
 }

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html

@@ -8,11 +8,11 @@
   </div>
 
   <div class="buttons">
-    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Enviar para Revisão</button>
-    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
-    <button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
+    <button *ngIf="activityInstanceName == 'Aprovar evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Enviar para Revisão</button>
+    <button *ngIf="activityInstanceName == 'Aprovar evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar2</button>
+    <button *ngIf="activityInstanceName == 'Aprovar evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
     <div class="solid"></div>
-    <button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
-    <button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>
+    <button *ngIf="activityInstanceName != 'Aprovar evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
+    <button *ngIf="activityInstanceName != 'Aprovar evento'" class="btn-delete" shape="round" (click)="rejeitar()">Rejeitar</button>
   </div>
 </ion-content>

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts

@@ -38,6 +38,8 @@ export class EventActionsPopoverPage implements OnInit {
   }
 
   ngOnInit() {
+
+    console.log('Teste tes',this.activityInstanceName)
     window.onresize = (event) => {
       if (window.innerWidth >= 800) {
         this.popoverController.dismiss();

version/git-version.ts

@@ -5,7 +5,7 @@ export let versionData = {
   "lastCommitAuthor": "'Peter Maquiran'",
   "lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'",
   "lastCommitMessage": "add attachments",
-  "lastCommitNumber": "1515",
+  "lastCommitNumber": "1516",
   "change": "",
   "changeStatus": "On branch notification-header/feature\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/profile/profile.page.html\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/header/header.page.html\n\tmodified:   src/app/shared/header/header.page.ts\n\tnew file:   src/app/store/notification-holder.service.spec.ts\n\tnew file:   src/app/store/notification-holder.service.ts\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/modals/document-detail/document-detail.page.ts\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html",
   "changeAuthor": "peter.maquiran"