Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/modals/delegar/delegar.page.html

@@ -1,6 +1,5 @@
 <ion-content>
   <div class="main-content d-flex height-100">
-
     <div class="content d-flex flex-column width-100">
       <div class="header-content pb-20">
         <div class="header-title">

src/app/modals/delegar/delegar.page.ts

@@ -97,7 +97,7 @@ export class DelegarPage implements OnInit {
       let body = {
         "SerialNumber": this.task.SerialNumber,
         "DispatchDocId": this.task.DocId,
-        "FolderID": this.task.FolderId,
+        "FolderID": this.task.FolderId || this.task.FolderID,
         "Subject": this.task.Folio,
         "Comment": this.note,
         "DelegatedUserEmail": this.taskParticipants[0].EmailAddress,

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

@@ -339,7 +339,7 @@
 
                   <div *ngFor="let event of events.value" class="EventListBox"   >
 
-                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item hover" (click)="eventClicked(event)">
+                    <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)">
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
                         <div *ngIf="!event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -356,6 +356,32 @@ export class DespachoPage implements OnInit {
 
   }
 
+  async generateDiploma(note:string, documents:any) {
+    let body = { 
+      "serialNumber": this.serialnumber, 
+      "action": "Reencaminhar",
+      "ActionTypeId": 99999839,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    const loader = this.toastService.loading()
+
+    try {
+      await this.processes.CompleteTask(body).toPromise()
+      this.toastService.successMessage()
+      this.close();
+    } catch (error) {
+      this.toastService.badRequest()
+    }   finally {
+      loader.remove()
+    }
+
+  }
+
+
   toDateString(e) {
     return new Date(e).toDateString()
   }
@@ -417,6 +443,9 @@ export class DespachoPage implements OnInit {
         else if (actionName == 'Reexecução') {
           await this.reexecute(res.data.note, docs);
           this.goBack();
+        }  else if(actionName == 'Gerar Diploma') {
+          await this.generateDiploma(res.data.note, docs);
+          this.goBack();
         }
       }
     });
@@ -533,4 +562,5 @@ export class DespachoPage implements OnInit {
     return await popover.present();
   }
 
+
 }

src/app/pipes/participants.pipe.ts

@@ -6,7 +6,7 @@ import { EventPerson } from 'src/app/models/eventperson.model'
 })
 export class ParticipantsPipe implements PipeTransform {
 
-  transform(EventPerson: EventPerson[]): any {
+  transform(EventPerson: EventPerson[] = []): any {
     let taskParticipants = [];
     let taskParticipantsCc = [];
 

src/app/services/toast.service.ts

@@ -14,9 +14,7 @@ export class ToastService {
     private modalController: ModalController,
     ) { }
 
-  ngOnInit() {
+  ngOnInit() {}
-    
-  }
 
   async presentToast(infoMessage: string) {
     const toast = await this.toastController.create({

src/app/shared/agenda/approve-event/approve-event.page.html

@@ -22,7 +22,7 @@
           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-calendar-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11</label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
         </div>
 
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">

src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts

@@ -88,7 +88,8 @@ export class EditEventToApprovePage implements OnInit {
       MDEmail: '',
       MDName: '',
       IsAllDayEvent: false,
-      Message: ''
+      Message: '',
+      Status: ''
     }
   }
 
@@ -295,12 +296,12 @@ export class EditEventToApprovePage implements OnInit {
       MDName: this.eventProcess.workflowInstanceDataFields.MDName,
       MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail,
       IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent,
-      Status: null,
+      Status: this.eventProcess.workflowInstanceDataFields.Status,
       EventType: this.eventProcess.workflowInstanceDataFields.EventType,
       IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring,
       Message: this.eventProcess.workflowInstanceDataFields.Message,
       EventRecurrence: {
-        Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType,
+        Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType || '-1',
         LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence,
       },
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,

src/app/shared/agenda/edit-event/edit-event.page.ts

@@ -302,9 +302,8 @@ export class EditEventPage implements OnInit {
           SerialNumber: '',
         };
 
-        this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{
+        await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise();
-          this.getAttachments(this.postEvent.EventId);
+        this.getAttachments(this.postEvent.EventId);
-        });
 
       } else if(remove) {
         this.attachmentsService.deleteEventAttachmentById(e.Id).subscribe( res=> {})

src/app/shared/agenda/event-list/event-list.page.ts

@@ -56,7 +56,7 @@ export class EventListPage implements OnInit {
   }
 
   ngOnChanges() {
-    //this.LoadToApproveEvents();
+    this.LoadToApproveEvents();
   }
 
   segmentChanged(ev: any) {