Improve

src/app/Rules/despacho-md.service.ts

@@ -31,6 +31,7 @@ export class DespachoMdService {
       },
       "AttachmentList" :documents,
     }
+    
     return this.processes.CompleteTask(body)
   }
 
@@ -64,7 +65,6 @@ export class DespachoMdService {
     return this.processes.CompleteTask(body)
   }
 
-
   sendExpedienteToPending(serialnumber) {
 
     return this.processes.SetTaskToPending(serialnumber)

src/app/models/CallMeeting.ts

@@ -1,9 +1,50 @@
 export class CallMeeting {
-    Message: string;
-    Attachment: {
-        Source: number,
-        SourceId: string,
-        SourceName: string,
-        ApplicationId: number
-    }
+  "EventProcess": {
+    "SerialNumber": "sample string 1",
+    "Body": "sample string 2",
+    "Location": "sample string 3",
+    "Subject": "sample string 4",
+    "StartDate": "2021-07-28T13:22:55.031857+01:00",
+    "EndDate": "2021-07-28T13:22:55.031857+01:00",
+    "ReviewUserComment": "sample string 7",
+    "MDName": "sample string 8",
+    "MDEmail": "sample string 9",
+    "IsAllDayEvent": true,
+    "Status": "sample string 11",
+    "EventType": "sample string 12",
+    "IsRecurring": true,
+    "ParticipantsList": [
+      {
+        "Id": 1,
+        "EmailAddress": "sample string 2",
+        "Name": "sample string 3",
+        "IsRequired": true
+      },
+      {
+        "Id": 1,
+        "EmailAddress": "sample string 2",
+        "Name": "sample string 3",
+        "IsRequired": true
+      }
+    ],
+    "Message": "sample string 14",
+    "EventRecurrence": {
+      "Type": 0,
+      "Day": 1,
+      "DayOfWeek": 0,
+      "Month": 1,
+      "LastOccurrence": "2021-07-28T13:22:55.031857+01:00"
+    },
+    "Participants": "sample string 15",
+    "CC": "sample string 16"
+  }
+
+  "Attachment": {
+    "Id": 1,
+    "ParentId": "sample string 2",
+    "Source": 0,
+    "SourceId": "sample string 3",
+    "SourceName": "sample string 4",
+    "ApplicationId": 1
+  }
 }

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

@@ -193,7 +193,7 @@ export class AgendaPage implements OnInit {
 
       this.updateEventListBox()
 
-    }, 1000)
+    }, 2000)
  
   }
 
@@ -214,8 +214,9 @@ export class AgendaPage implements OnInit {
         }
         if ( realoadCounter != 0) {
 
-          this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-          
+          setTimeout(()=>{
+            this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+          }, 1000)
         }
         realoadCounter++;
       }

src/app/pages/agenda/view-event/view-event.page.ts

@@ -111,14 +111,16 @@ export class ViewEventPage implements OnInit {
     if(this.isModal) {
       this.close()
     } else {
-      this.activatedRoute.paramMap.subscribe(params => {
-        if(params["params"].caller == 'expediente'){
-          window.history.back();
-        }
-        else{
-          this.router.navigate(['/home',params["params"].caller]);
-        }
-      });
+        // this.activatedRoute.paramMap.subscribe(params => {
+        //   if(params["params"].caller == 'expediente'){
+        //     window.history.back();
+        //   }
+        //   else{
+        //     this.router.navigate(['/home',params["params"].caller]);
+        //   }
+        // });
+
+      this.location.back();
     }
 
   }

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -270,7 +270,7 @@ export class ExpedienteDetailPage implements OnInit {
           const loader = this.toastService.loading()
 
           try {
-            await this.processes.CompleteTask(otherbody).toPromise()
+            await this.processes.CompleteTask(otherbody)
             this.toastService.successMessage('Processo descartado');
             this.goBack();
           } catch (error) {

src/app/services/processes.service.ts

@@ -252,7 +252,7 @@ export class ProcessesService {
     return this.http.get<any>(`${geturl}`, options);
   }
 
-  GetSubjectType(){
+  GetSubjectType() {
     const geturl = environment.apiURL + 'ecm/SubjectType';
     let options = {
       headers: this.headers,

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

@@ -20,7 +20,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} </label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}}  123</label>
         </div>
 
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">

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

@@ -135,7 +135,6 @@ export class ApproveEventPage implements OnInit {
 
     try {
       await this.processes.PostTaskAction(body).toPromise()
-      this.router.navigate(['/home/gabinete-digital/event-list']);
       this.toastService.successMessage('Evento rejeitado')
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado')
@@ -218,12 +217,17 @@ export class ApproveEventPage implements OnInit {
   }
 
   goToEventsToApprove() {
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
+    if(window.location.pathname.startsWith('/home/agenda')) {
+      this.close()
+    } else {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
           "eventos": true,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        }
+      };
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
+
   }