From b18dde6d7bd7066afa786381c3f7889362f1a617 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 22 Jun 2021 15:39:28 +0100
Subject: [PATCH] save

---
 src/app/services/events.service.ts            | 35 ++++++++++++++++---
 .../request-options/request-options.page.ts   |  5 +++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 8159936c8..52cc00153 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -438,15 +438,42 @@ export class EventsService {
   createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
     const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/dispatch';
     let params = new HttpParams();
+    let options;
 
     params = params.set("FolderId", folderId);
     params = params.set("SerialNumber", serialNumber);
     params = params.set("applicationID", applicationID);
 
-    let options = { 
-      headers: this.headers,
-      params: params 
-    };
+    switch (this.loggeduser.Profile) {
+      case 'MDGPR':
+        if(body.CalendarName == 'Pessoal'){
+          options = { 
+            headers: this.headersMdPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersMdOficial,
+            params: params 
+          };
+        }
+        break;
+      case 'PR':
+        if(body.CalendarName == 'Pessoal'){
+          options = { 
+            headers: this.headersPrPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersPrOficial,
+            params: params 
+          };
+        }
+        break;
+      }
     return this.http.post<any>(`${geturl}`, body, options)
   }
 
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index 22fa70a3e..e695f712a 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -77,6 +77,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -126,6 +127,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -172,6 +174,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -239,6 +242,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDarParecer(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;
@@ -261,6 +265,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDelegarModal(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;