changed xcalendario to agenda

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -2,11 +2,11 @@
   <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas para assinar</ion-label></div>
-    <!-- <div class="theicon">
+    <div class="theicon">
       <button title="Atualizar" class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
       </button>
-    </div> -->
+    </div>
   </div>
 </ion-header>
 <ion-content>
@@ -38,7 +38,7 @@
           <div class="item width-100">
             <div class="exp-top-detail">
               <div class="subject">
-                <ion-label>{{ task.Folio }}</ion-label>
+                <ion-label>{{ task.Folio || task.workflowInstanceDataFields.Subject }}</ion-label>
               </div>
               <div class="exp-icon">
                 <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -71,9 +71,8 @@ export class DiplomasAssinarPage implements OnInit {
 
     let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
 
-    diplomasAssinar.forEach(element => {
-      let task: customTask = this.customTaskPipe.transform(element)
-      this.diplomasList.push(task);
+    this.diplomasList = diplomasAssinar.map(element => {
+      return this.customTaskPipe.transform(element)
     });
 
     this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -66,29 +66,23 @@ export class DiplomasPage implements OnInit {
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
     this.diplomasList = [];
-    let diplomasList = [];
 
     // let diplomasReview = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
 
-    diplomas.forEach(element => {
-
-      let task = this.pipeTask(element)
-      diplomasList.push(task);
+    let diplomasList = diplomas.map(element => {
+      return this.pipeTask(element)
     });
 
-    diplomasList = diplomasList.filter(data => data.activityInstanceName != "Tarefa de Despacho");
+    diplomasList = diplomasList.filter(data => data.activityInstanceName == "Revisar Diploma");
 
     this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate')
     
     this.deplomasStore.resetDiplomasReview(this.diplomasList)
 
-    let diplomasAssinadoList = []
     let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
 
-    diplomasAssinados.forEach(async element => {
-
-      let task = this.pipeTask(element)
-      diplomasAssinadoList.push(task);
+    let diplomasAssinadoList = diplomasAssinados.map(element => {
+      return this.pipeTask(element)
     });
 
     this.diplomasAssinadoList =  this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -10,10 +10,12 @@
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
         <ion-segment-button value="MDGPR">
-          Meu Calendário
+          Minha agenda
         </ion-segment-button>
-        <ion-segment-button value="PR">
-          Calendário Partilhado
+        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry" value="PR">
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.FullName}} </div>
         </ion-segment-button>
       </ion-segment>
     </ion-toolbar>

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -10,6 +10,8 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic
 import { SortService } from 'src/app/services/functions/sort.service';
 import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
+import { EventsService } from 'src/app/services/events.service';
+
 
 @Component({
   selector: 'app-events-to-approve',
@@ -35,7 +37,8 @@ export class EventsToApprovePage implements OnInit {
     private router: Router,
     private userAuth: AuthService,
     private sortService: SortService,
-    private storage: Storage
+    private storage: Storage,
+    public eventService: EventsService,
     )
     {
       this.loggeduser = SessionStore.user;