save

src/app/pages/agenda/agenda.page.html

@@ -3,13 +3,13 @@
   <ion-toolbar>
     <ion-buttons slot="end">
       <!-- customized TOGGLE button -->
-      <div class="toggleBox">
+      <!-- <div class="toggleBox">
         <div (click)="changeProfile()" class="toggle">
           <input type="checkbox">
           <label for="" class="onbtn">PR</label>
           <label for="" class="ofbtn">MDGPR</label>
         </div> 
-      </div>
+      </div> -->
     </ion-buttons>
     <ion-title>Agenda</ion-title>
   </ion-toolbar>

src/app/pages/agenda/agenda.page.ts

@@ -61,7 +61,7 @@ export class AgendaPage implements OnInit {
     ) {}
 
   ngOnInit() {
-    this.profile = "mdgpr";
+    this.profile = "pr";
     //Inicializar segment
    /*  localStorage.setItem('test', this.eventSelectedDate.toString()); */
 
@@ -153,7 +153,7 @@ export class AgendaPage implements OnInit {
       case "Combinada":
         //Inicializa o array eventSource
         this.eventSource=[];
-        if(this.profile == "mdgpr"){
+        if(this.profile == "pr"){
           this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
             response => {
               this.eventsList = response;

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -49,7 +49,8 @@
       <ion-label>
         <p>{{customDate}}</p>
         <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
-        <p>(Não se repete)</p>
+        <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
+        <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
       </ion-label>
     </div>
   </div>
@@ -68,13 +69,13 @@
     </ion-item>
   </div>
 
-  <div class="bottom-content">
+  <div *ngIf="loadedAttachments" class="bottom-content">
     <ion-list>
       <h3>Documentos Anexados</h3>
       <ion-item>
       <ion-label>
         <p class="attach-title-item">Receita por Natureza</p>
-        <p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
+        <p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
       </ion-label>
     </ion-item>
     </ion-list>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -3,6 +3,7 @@ import { Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { AlertService } from 'src/app/services/alert.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
 import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page';
@@ -15,6 +16,7 @@ import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-
 export class ApproveEventModalPage implements OnInit {
   event: Event;
   loadedEvent:any;
+  loadedAttachments:any;
   serialNumber:string;
   customDate:any;
   today:any;
@@ -28,6 +30,7 @@ export class ApproveEventModalPage implements OnInit {
     private modalController: ModalController,
     private navParams: NavParams,
     private processes:ProcessesService,
+    private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
@@ -37,7 +40,8 @@ export class ApproveEventModalPage implements OnInit {
      }
 
   ngOnInit() {
-    this.getTask(); 
+    this.getTask();
+    this.getAttachments();
   }
 
   notImplemented(){
@@ -69,7 +73,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
-    console.log('Emendar');
+    /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.modalController.dismiss(null);
@@ -84,6 +88,12 @@ export class ApproveEventModalPage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/event-list']);
     this.modalController.dismiss(null);
   }
+  getAttachments(){
+    this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      this.loadedAttachments = res;
+      console.log(res);
+    });
+  }
 
   async openOptions(ev:any) {
     const popover = await this.popoverController.create({