From 3000f712c11e89146ac2d25309527b3cdfa9e215 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 20 Aug 2021 15:43:37 +0100
Subject: [PATCH 1/6] Fix

---
 src/app/Rules/pedido.service.ts               | 13 ++++
 src/app/modals/delegar/delegar.page.ts        |  9 ++-
 src/app/models/modal.ts                       |  4 ++
 .../pedidos/pedido/pedido.page.ts             | 62 ++++++++----------
 src/app/services/modal.service.ts             |  4 +-
 .../request-options/request-options.page.ts   | 65 +++++++------------
 6 files changed, 77 insertions(+), 80 deletions(-)
 create mode 100644 src/app/models/modal.ts

diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts
index deeb7042c..ec71d9af3 100644
--- a/src/app/Rules/pedido.service.ts
+++ b/src/app/Rules/pedido.service.ts
@@ -56,6 +56,19 @@ export class PedidoService {
     return this.processes.CompleteTask(body)
   }
 
+  arquivar({note = "", serialNumber, documents= [] }) {
+    let body = { 
+      "serialNumber": serialNumber, 
+      "action": "Arquivo",
+      "ActionTypeId": 95,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
+  }
 
 
 }
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts
index 613ec1ed7..c9ce5ab44 100644
--- a/src/app/modals/delegar/delegar.page.ts
+++ b/src/app/modals/delegar/delegar.page.ts
@@ -76,7 +76,7 @@ export class DelegarPage implements OnInit {
   }
 
   close() {
-    this.modalController.dismiss(null);
+    this.modalController.dismiss('close');
   }
 
   cancelTask() {
@@ -100,13 +100,20 @@ export class DelegarPage implements OnInit {
         "DelegatedUserEmail": this.taskParticipants[0].EmailAddress,
       }
       console.log(body);
+
+      const loader = this.toastService.loading()
+
       this.processes.DelegateTask(body).subscribe(res=>{
+        
         console.log(res); 
         this.toastService.successMessage('Processo delegado')
         this.close();
       },
       (error)=>{
         this.toastService.badRequest("Processo não delegado")
+      },
+      ()=>{
+        loader.remove()
       });
     }
   }
diff --git a/src/app/models/modal.ts b/src/app/models/modal.ts
new file mode 100644
index 000000000..9fb5d0f3e
--- /dev/null
+++ b/src/app/models/modal.ts
@@ -0,0 +1,4 @@
+interface BookMeetingModalPagecomponentProps {
+    task: any
+}
+interface BookMeetingModalPageReturn {}
\ No newline at end of file
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 2f93dc340..51b2e95f8 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -4,12 +4,9 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { formatDate } from '@angular/common';
 import { Event } from '../../../../models/event.model';
 import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
-import { momentG }  from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
@@ -23,6 +20,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ForwardPage } from 'src/app/modals/forward/forward.page';
 import { PermissionService } from 'src/app/OtherService/permission.service';
 import { Location } from '@angular/common';
+import { PedidoService } from 'src/app/Rules/pedido.service';
 
 
 @Component({
@@ -50,8 +48,6 @@ export class PedidoPage implements OnInit {
   constructor(private activatedRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
-    private attachmentsService: AttachmentsService,
-    private events: EventsService,
     private menu: MenuController,
     private router: Router,
     private modalController: ModalController,
@@ -61,7 +57,8 @@ export class PedidoPage implements OnInit {
     private animationController: AnimationController,
     private toastService: ToastService,
     public p: PermissionService,
-    private location: Location
+    private location: Location,
+    private pedidoService: PedidoService
     ) {
       this.loggeduser = authService.ValidatedUser;
 
@@ -218,6 +215,8 @@ export class PedidoPage implements OnInit {
         this.goBack()       
       }
 
+      alert(JSON.stringify(res)+' nada')
+
     }))
   }
 
@@ -247,25 +246,20 @@ export class PedidoPage implements OnInit {
   }
 
   async arquivar(note:string, documents:any) {
-    let body = {
-      "serialNumber": this.serialnumber,
-      "action": "Arquivo",
-      "ActionTypeId": 95,
-      "dataFields": {
-        "ReviewUserComment": note,
-      },
-      "AttachmentList" :documents,
-    }
 
     const loader = this.toastService.loading()
 
     try {
-      await this.processes.CompleteTask(body).toPromise()
+      await this.pedidoService.arquivar({serialNumber: this.serialnumber,
+        documents,
+        note
+      }).toPromise()
+
       this.toastService.successMessage('Processo arquivado')
       this.close();
     } catch (error) {
       this.toastService.badRequest()
-    }    finally {
+    } finally {
       loader.remove()
     }
 
@@ -348,22 +342,22 @@ export class PedidoPage implements OnInit {
     modal.onDidDismiss();
   }
 
-  async viewEventDetail(eventId: any) {
+  // async viewEventDetail(eventId: any) {
 
-    const modal = await this.modalController.create({
-      component: ViewEventPage,
-      componentProps: {
-        eventId: eventId,
-      },
-      cssClass: 'modal modal-desktop',
-      backdropDismiss: false
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res) => {
-      if (res) {
-      }
-    });
-  }
+  //   const modal = await this.modalController.create({
+  //     component: ViewEventPage,
+  //     componentProps: {
+  //       eventId: eventId,
+  //     },
+  //     cssClass: 'modal modal-desktop',
+  //     backdropDismiss: false
+  //   });
+  //   await modal.present();
+  //   modal.onDidDismiss().then((res) => {
+  //     if (res) {
+  //     }
+  //   });
+  // }
   
   async distartExpedientModal(){
     console.log(this.fulltask);
@@ -491,11 +485,11 @@ export class PedidoPage implements OnInit {
           await this.repreciar(res.data.note, docs);
           this.goBack();
         }
-        else if(actionName == 'Arquivar'){
+        else if(actionName == 'Arquivar') {
           await this.arquivar(res.data.note, docs);
           this.goBack();
         }
-        else if(actionName == 'Assignar'){
+        else if(actionName == 'Assignar') {
           await this.assignar(res.data.note, docs);
         }
       }
diff --git a/src/app/services/modal.service.ts b/src/app/services/modal.service.ts
index 81efae7b0..a4869a7e3 100644
--- a/src/app/services/modal.service.ts
+++ b/src/app/services/modal.service.ts
@@ -13,11 +13,11 @@ export class ModalService {
   ) { }
 
 
-  BookMeetingModalPage(task, { classs, backdropDismiss = false }) {
+  BookMeetingModalPage(e:BookMeetingModalPagecomponentProps, { classs, backdropDismiss = false }) {
     return this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
-        task: task,
+        task: e.task,
       },
       cssClass: classs,
       backdropDismiss
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 126421194..ff2211654 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/src/app/shared/popover/request-options/request-options.page.ts
@@ -6,11 +6,11 @@ import { CreateProcessPage } from 'src/app/modals/create-process/create-process.
 import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { PermissionService } from 'src/app/OtherService/permission.service';
-import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
-import { Location } from '@angular/common';
+import { PedidoService } from 'src/app/Rules/pedido.service';
+
 
 @Component({
   selector: 'app-request-options',
@@ -35,7 +35,7 @@ export class RequestOptionsPage implements OnInit {
     private toastService: ToastService,
     private router: Router,
     public p: PermissionService,
-    private location: Location
+    private pedidoService: PedidoService
   ) {
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
@@ -137,7 +137,6 @@ export class RequestOptionsPage implements OnInit {
       if(res['data']=='openDiscart') {
         console.log('open discart');
         
-        this.distartExpedientModal();
       } else {
         this.popoverController.dismiss('close')
       }
@@ -145,29 +144,6 @@ export class RequestOptionsPage implements OnInit {
     });
   }
 
-  async distartExpedientModal() {
-    this.popoverController.dismiss();
-    console.log(this.fulltask);
-    const modal = await this.modalController.create({
-      component: DiscartExpedientModalPage,
-       componentProps: {
-        serialNumber: this.fulltask.serialNumber,
-        folderId: this.fulltask.workflowInstanceDataFields.FolderID,
-        action: 'complete',
-      },
-      cssClass: 'discart-expedient-modal',
-      backdropDismiss: false
-    });
-    
-    await modal.present();
-    modal.onDidDismiss().then(res=>{
-      if(res['data']=='close') {
-        this.close();
-      } else {}
-      
-    });
-  }
-
   async repreciar(note:string, documents:any) {
     let body = { 
       "serialNumber": this.serialNumber, 
@@ -195,7 +171,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
-    this.popoverController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -229,7 +205,7 @@ export class RequestOptionsPage implements OnInit {
       }
 
 
-      if(res.data){
+      if(res.data) {
         if(actionName == 'Solicitar Reapreciação') {
 
           await this.repreciar(res.data.note, docs);
@@ -237,29 +213,27 @@ export class RequestOptionsPage implements OnInit {
         else if(actionName == 'Arquivar') {
           await this.arquivar(res.data.note, docs);
           this.popoverController.dismiss('close')
-          this.modalController.dismiss('close');
-          alert('close')
         }
       }
+
     });
   }
 
   async arquivar(note:string, documents:any) {
-    let body = { 
-      "serialNumber": this.serialNumber, 
-      "action": "Arquivo",
-      "ActionTypeId": 95,
-      "dataFields": {
-        "ReviewUserComment": note,
-      },
-      "AttachmentList" :documents,
-    }
+
+    const loader = this.toastService.loading()
 
     try {    
-      await this.processes.CompleteTask(body).toPromise()
+      await this.pedidoService.arquivar({serialNumber: this.serialNumber,
+        documents,
+        note
+      }).toPromise()
+
       this.toastService.successMessage('Processo arquivado')
     } catch (error) {
       this.toastService.badRequest('Processo não arquivado')
+    } finally {
+      loader.remove()
     }
 
   }
@@ -290,7 +264,6 @@ export class RequestOptionsPage implements OnInit {
 
   async openDelegarModal(task: any) {
 
-    this.popoverController.dismiss();
     
     let classs;
     if( window.innerWidth <= 800){
@@ -307,7 +280,13 @@ export class RequestOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then( async (res)=> {
+      
+      if(res['data']=='close') {
+        this.popoverController.dismiss('close');
+      }
+
+    })
   }
 
 

From 84d24dbbaf479280f82e07bdf24391f79783dd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Fri, 20 Aug 2021 16:43:17 +0100
Subject: [PATCH 2/6] Profile notification layout add desc fild

---
 src/app/modals/profile/profile.page.html      | 17 ++++---
 src/app/modals/profile/profile.page.scss      | 27 ++++++++++-
 src/app/modals/profile/profile.page.ts        | 30 ++++++++----
 src/app/services/notifications.service.ts     |  4 +-
 src/app/services/storage.service.ts           |  6 ++-
 src/assets/images/icons-nav-accoes-active.svg | 36 +++++++++++++++
 src/assets/images/icons-nav-agenda-active.svg | 46 +++++++++++++++++++
 7 files changed, 146 insertions(+), 20 deletions(-)
 create mode 100644 src/assets/images/icons-nav-accoes-active.svg
 create mode 100644 src/assets/images/icons-nav-agenda-active.svg

diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index bebdb558f..37dd1e50f 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -40,17 +40,22 @@
             <div class="notification-item">
               <img class="notification-icon" slot="end" *ngIf = "item.Service == 'agenda'"  src="assets/images/icons-default-agenda.svg" >
               <img class="notification-icon" slot="end" *ngIf = "item.Service == 'gabinete-digital'"  src="assets/images/icons-correspondencias.svg" >
-              <img class="notification-icon" slot="end" *ngIf = "item.Service == 'accoes'"  src="assets/images/icons-nav-actions.svg" >
+              <img class="notification-icon" slot="end" *ngIf = "item.Service == 'accoes'"  src="assets/images/icons-nav-accoes-active.svg" >
+              <img class="notification-icon" slot="end" *ngIf = "item.Service == 'chat'"  src="assets/images/icons-nav-agenda-active.svg" >
             </div>
             <div class="approve-event-time">
-              <p>{{item.dateInit}}</p>
-              <p>{{item.dateEnd}}</p>
+              <p *ngIf = "item.Service == 'agenda'">{{item.dateInit}}</p>
+              <p *ngIf = "item.Service == 'agenda'">{{item.dateEnd}}</p>
             </div>
             <div class="approve-event-detail">
-              <p>{{item.Location}}</p>
-              <h3>{{item.alert}}</h3>
+              <p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
+              <h3 id="profile-title">{{item.alert}}</h3>
+              <p *ngIf = "item.Service != 'agenda'">{{item.desc}}</p>
             </div>
-            <div class="notification-label"></div>
+            <div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'"   ></div>
+            <div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'"   ></div>
+            <div class="notification-label-PR-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000014'"   ></div>
+            <div class="notification-label-PR-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000014'"   ></div>
           </div>
         </div>
 
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index c64fbe321..00bbc3115 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -96,14 +96,39 @@ ion-list{
     .approve-event-detail{
       width: calc(100% - 115px) !important;
       float: left;
+      #profile-title{
+        width: 250px;
+      }
     }
-    .notification-label{
+    .notification-label-MD-official{
       float: right;
       width: 5px;
       height: 100%;
       border-radius: 0% 100% 100% 0%;
       background-color: #ffb703;
     }
+    .notification-label-MD-pessoal{
+      float: right;
+      width: 5px;
+      height: 100%;
+      border-radius: 0% 100% 100% 0%;
+      background-color: #ff0303;
+    }
+
+    .notification-label-PR-official{
+      float: right;
+      width: 5px;
+      height: 100%;
+      border-radius: 0% 100% 100% 0%;
+      background-color: #03d838;
+    }
+    .notification-label-PR-pessoal{
+      float: right;
+      width: 5px;
+      height: 100%;
+      border-radius: 0% 100% 100% 0%;
+      background-color: #8b0ae0;
+    }
   }
 
 }
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index 192dccbc4..285353b74 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -72,10 +72,11 @@ export class ProfilePage implements OnInit {
             IdObject: payload.IdObject,
             FolderId: payload.FolderId,
             desc: payload.desc,
-            dateInit: payload.dateInit,
-            dateEnd: payload.dateEnd,
+            dateInit: this.getFormatedTime(payload.dateInit),
+            dateEnd: this.getFormatedTime(payload.dateEnd),
             Location: payload.Location,
             TypeAgenda: payload.TypeAgenda,
+            Role: payload.Role,
             Status: payload.Status
           }
         } else {
@@ -87,10 +88,11 @@ export class ProfilePage implements OnInit {
             IdObject: element.IdObject,
             FolderId: element.FolderId,
             desc: element.desc,
-            dateInit: element.dateInit,
-            dateEnd: element.dateEnd,
+            dateInit: this.getFormatedTime(element.dateInit),
+            dateEnd: this.getFormatedTime(element.dateEnd),
             Location: element.Location,
             TypeAgenda: element.TypeAgenda,
+            Role: element.Role,
             Status: element.Status
           }
         }
@@ -107,7 +109,18 @@ export class ProfilePage implements OnInit {
     console.log('Timer badge count')
   }
 
+  getFormatedTime(dateString){
+    var date = new Date(dateString);
+    var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
+    var am_pm = date.getHours() >= 12 ? "pm" : "am";
+    var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+    let time = hours + ":" + minutes /* + " " + am_pm */;
+    console.log('Formate',time)
+    return time;
+ }
+
   notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
+    this.deleteNotification(index);
     if (Service === "agenda") {
       this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
     }
@@ -115,7 +128,8 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital']));
     }
     else if (Service === "gabinete-digital" && Object === "event-list") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event', IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'gabinete-digital']));
+      
     } else if (Service === "gabinete-digital" && Object === "despachos") {
 
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true }));
@@ -153,7 +167,7 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
     }
 
-    this.deleteNotification(index);
+   
 
 
   }
@@ -162,10 +176,6 @@ export class ProfilePage implements OnInit {
     console.log("Delete notification first stata", this.notificationdata)
     this.notificationdata = this.notificationdata.filter(item=>item.index !=index );
     
-    if(typeof(this.notificationdata) != 'object' ) {
-      console.log('=_+_+_+_+_+_+_+_+_+_++_+_+_+_+_+_+_+_+_+_+_+_ not an object')
-    }
-
     this.storageservice.store("Notifications",JSON.stringify(this.notificationdata)).then(() =>{
       this.storageservice.get("Notifications").then((value) =>{
         console.log("notfication state", value, )
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 906b4cc32..6ae9b2db6 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -231,8 +231,8 @@ export class NotificationsService {
     else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente',data.IdObject,'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "event-list") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital']));
+    else if (data.Service === "agenda" && data.Object === "event-list") {
+      this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event',data.IdObject, 'agenda']));
     }else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
 
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital'],{replaceUrl: true}));
diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts
index 95ba38c25..7bfd08526 100644
--- a/src/app/services/storage.service.ts
+++ b/src/app/services/storage.service.ts
@@ -16,7 +16,11 @@ const { Storage } = Plugins; */
   // Get the value
   async get(key: string) {
     const ret = await this.storage.get(key).then((val) => { return val; });
-    return JSON.parse(unescape(atob(ret)));
+    try {
+      return JSON.parse(unescape(atob(ret)));
+    } catch (error) {
+      return unescape(atob(ret))
+    }
   }
 
   async remove(key: string){
diff --git a/src/assets/images/icons-nav-accoes-active.svg b/src/assets/images/icons-nav-accoes-active.svg
new file mode 100644
index 000000000..2d12457f3
--- /dev/null
+++ b/src/assets/images/icons-nav-accoes-active.svg
@@ -0,0 +1,36 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="35" height="35" viewBox="0 0 35 35">
+    <defs>
+        <linearGradient id="gv1uuzmwcc" x1="50%" x2="50%" y1="0%" y2="100%">
+            <stop offset=".038%" stop-color="#4C4C4C"/>
+            <stop offset="100%"/>
+        </linearGradient>
+        <linearGradient id="tequ404qjd" x1="0%" x2="100%" y1="50%" y2="50%">
+            <stop offset="0%" stop-color="#D30A0A"/>
+            <stop offset="100%" stop-color="#B50202"/>
+        </linearGradient>
+        <filter id="u0si8dlg0a" width="120%" height="114.5%" x="-10%" y="-3.6%" filterUnits="objectBoundingBox">
+            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
+            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
+        </filter>
+        <path id="7mpmpqfmwb" d="M10 0c3.314 0 6 2.686 6 6 0 2.348-1.348 4.38-3.313 5.366C16.905 12.54 20 16.408 20 21c0 5.523-4.977 6.5-10.5 6.5S0 26.523 0 21c0-4.592 3.095-8.461 7.314-9.635C5.348 10.381 4 8.348 4 6c0-3.314 2.686-6 6-6z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <g>
+                <g>
+                    <g>
+                        <g>
+                            <g transform="translate(-30 -648) translate(20 635) translate(10 10) translate(0 3) translate(7 4)">
+                                <use fill="#000" filter="url(#u0si8dlg0a)" xlink:href="#7mpmpqfmwb"/>
+                                <path fill="url(#gv1uuzmwcc)" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M10 .5c1.519 0 2.894.616 3.89 1.61.994.996 1.61 2.371 1.61 3.89 0 1.058-.299 2.046-.816 2.885-.536.867-1.306 1.575-2.221 2.034-.742.372-1.556.57-2.378.585.825.005 1.655.118 2.468.344 2.027.563 3.78 1.782 5.019 3.414C18.782 16.856 19.5 18.844 19.5 21c0 2.232-.876 3.662-2.313 4.552C15.281 26.732 12.467 27 9.5 27c-2.889 0-5.351-.249-6.983-1.366C1.219 24.746.5 23.288.5 21c0-2.156.718-4.144 1.928-5.738 1.239-1.632 2.993-2.851 5.02-3.415h0l1.25-.348-1.16-.581c-.916-.459-1.686-1.166-2.221-2.033C4.799 8.046 4.5 7.058 4.5 6c0-1.519.616-2.894 1.61-3.89C7.107 1.117 8.482.5 10 .5z"/>
+                            </g>
+                            <path fill="url(#tequ404qjd)" d="M2.593 26.288L18.5 16c-.066-.31-.233-.644-.5-1s-.6-.69-1-1L.737 24.437c.154.302.426.65.816 1.045.39.394.736.663 1.04.806z" transform="translate(-30 -648) translate(20 635) translate(10 10) translate(0 3) translate(7 4)"/>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/assets/images/icons-nav-agenda-active.svg b/src/assets/images/icons-nav-agenda-active.svg
new file mode 100644
index 000000000..c1a5e00b6
--- /dev/null
+++ b/src/assets/images/icons-nav-agenda-active.svg
@@ -0,0 +1,46 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="35" height="35" viewBox="0 0 35 35">
+    <defs>
+        <linearGradient id="3fz9vpdwbc" x1="50%" x2="50%" y1="0%" y2="100%">
+            <stop offset="0%" stop-color="#80C2FF"/>
+            <stop offset="99.962%" stop-color="#0085FF"/>
+        </linearGradient>
+        <linearGradient id="ytz5rxohcf" x1="50%" x2="50%" y1="0%" y2="100%">
+            <stop offset="0%" stop-color="#FFEFBB"/>
+            <stop offset="100%" stop-color="#FFC200"/>
+        </linearGradient>
+        <filter id="3idfuqbbja" width="117.4%" height="120%" x="-8.7%" y="-5%" filterUnits="objectBoundingBox">
+            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
+            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
+        </filter>
+        <filter id="uv9cnvernd" width="125%" height="128.6%" x="-12.5%" y="-7.1%" filterUnits="objectBoundingBox">
+            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
+            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
+            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"/>
+            <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.187390734 0"/>
+        </filter>
+        <path id="a49fg2bilb" d="M14.5 19.1c1.404 0 2.75-.208 3.993-.59.666-.206 4.252 1.758 4.853 1.459.607-.302-1.77-2.867-1.243-3.253C24.493 14.966 26 12.404 26 9.55 26 4.276 20.851 0 14.5 0S3 4.276 3 9.55c0 5.275 5.149 9.55 11.5 9.55z"/>
+        <path id="6npze5akpe" d="M8 25.37c.977 0 1.913-.146 2.778-.414.463-.143 2.958 1.232 3.376 1.022.422-.21-1.232-2.006-.865-2.277C14.951 22.476 16 20.683 16 18.685c0-1.552-.633-2.98-1.695-4.115C12.841 13.006 10.561 12 8 12c-4.418 0-8 2.993-8 6.685 0 1.037.282 2.018.786 2.894C2.077 23.822 4.822 25.37 8 25.37z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd">
+        <g>
+            <g>
+                <g>
+                    <g>
+                        <g>
+                            <g transform="translate(-30 -508) translate(20 495) translate(10 10) translate(0 3) translate(5 5)">
+                                <use fill="#000" filter="url(#3idfuqbbja)" xlink:href="#a49fg2bilb"/>
+                                <path fill="url(#3fz9vpdwbc)" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M14.5.5c3.05 0 5.813 1.022 7.812 2.682C24.275 4.812 25.5 7.06 25.5 9.55c0 2.698-1.437 5.111-3.692 6.763-.066 1.374.22 1.842.51 2.307.17.273.342.545.467.782-.413.145-1.28-.44-1.758-.634-1.178-.478-2.317-.848-2.68-.737-1.199.369-2.495.57-3.847.57-3.05 0-5.813-1.022-7.812-2.682C4.725 14.289 3.5 12.04 3.5 9.55c0-2.49 1.225-4.738 3.188-6.368C8.688 1.522 11.45.5 14.5.5z"/>
+                            </g>
+                            <g transform="translate(-30 -508) translate(20 495) translate(10 10) translate(0 3) translate(5 5) matrix(-1 0 0 1 16 0)">
+                                <use fill="#000" filter="url(#uv9cnvernd)" xlink:href="#6npze5akpe"/>
+                                <path fill="url(#ytz5rxohcf)" stroke="#EBEBEB" stroke-linejoin="square" stroke-opacity=".194" d="M8 12.5c2.41 0 4.56.938 5.94 2.412.974 1.04 1.56 2.349 1.56 3.773 0 1.842-.979 3.487-2.508 4.614-.152 1.023.008 1.308.19 1.608.14.225.26.421.355.587-.296-.022-.819-.446-.939-.495-.868-.355-1.702-.602-1.968-.52-.82.253-1.705.392-2.63.392-1.477 0-2.856-.353-4.02-.965-1.186-.623-2.15-1.515-2.76-2.576-.46-.8-.72-1.697-.72-2.645 0-1.7.834-3.232 2.164-4.343C4.029 13.2 5.917 12.5 8 12.5z"/>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

From 5b02e052fe0b5fa5369bbd4604e859a6cdf8413d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 20 Aug 2021 16:43:42 +0100
Subject: [PATCH 3/6] Fix colors

---
 .../agenda/view-event/view-event.page.html    | 17 +++-
 .../despachos/despacho/despacho.page.html     | 86 ++++++++++++++++---
 2 files changed, 92 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index f70c7b561..ea082327f 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -29,9 +29,24 @@
 
       <div class="overflow-y-auto">
         <div class="upper-content ml-45">
+          
           <div class="content-location">
-            <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
+            <span class="date">{{loadedEvent.Location}}</span>
+            
+            <div *ngIf="loadedEvent.Organizer">
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Presidente da República' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' " style="background-color: #99e47b;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #958bfc;">{{loadedEvent.CalendarName}}</span>
+              </div>
+      
+              <div *ngIf="loadedEvent.Organizer.Name == 'Agenda do Ministro e Director do Gabinete do PR' ">
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Oficial' "  style="background-color: #ffb703;">{{loadedEvent.CalendarName}}</span>
+                <span class="label" *ngIf="loadedEvent.CalendarName == 'Pessoal' " style="background-color: #f05d5e;">{{loadedEvent.CalendarName}}</span>
+              </div>
+            </div>
+    
           </div>
+
           <div class="content-details">
             <ion-label>
               <p>{{customDate}}</p>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index 01448d1c9..540433382 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -4,17 +4,84 @@
 
 <ion-content>
   <div class="main-content d-flex height-100">
+    <div class="content d-flex flex-column" *ngIf="task">
+      <div class="main-header">
+        <div class="title-content width-100 d-flex justify-space-between align-center">
+          <div class=" btn-dismiss font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+            <ion-icon  slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          </div>
+          <div class="middle d-flex align-center flex-grow-1">
+            <ion-label class="title">{{ task.Folio}}</ion-label>
+          </div>
+          <div class="div-icon" (click)="openOptions()">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
+          </div>
+        </div>
+      </div>
+      <div class="upper-content">
+        <div class="content-details">
+          <ion-label>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
+            <p><span class="color-red">{{ task.DeadlineType }}</span></p>
+          </ion-label>
+        </div>
+      </div>
+      <div class="line"></div>
+      
+      <div class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
+        <div class="middle-content">
+          <h5 *ngIf="intervenientes">Intervenientes</h5>
+          <ion-item class="ion-no-margin ion-no-padding">
+            <ion-label>
+              <div *ngFor="let interveniente of intervenientes">
+                <p>{{interveniente.Name}}</p>
+              </div>
+            </ion-label>
+          </ion-item>
+          <div *ngIf="cc.length > 0">
+            <h5>Com conhecimento</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+              <ion-label>
+                <div *ngFor="let c of cc">
+                  <p>{{c.Name}}</p>
+                </div>
+              </ion-label>
+            </ion-item>
+          </div>
+          <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
+            <h5>Detalhes</h5>
+            <ion-item class="ion-no-margin ion-no-padding">
+                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            </ion-item>
+          </div>
+        </div>
+        <div class="bottom-content width-100">
+          <ion-list>
+            <h5>Documentos Anexados</h5>
+            <ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
+              <ion-label class="d-block" (click)="viewDocument(Document.DocId)">
+                <p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
+                <p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
+              </ion-label>
+            </ion-item>
+          </ion-list>
+        </div>
+      </div>
+
+    </div>
 
     <app-task-details class="content d-flex flex-column"
-      [task]="task"
-      [intervenientes]="intervenientes"
-      [cc]="cc"
-      [customDate]="customDate"
-      [fulltask]="fulltask"
-      (openOptions)="openOptions($event)"
-      (goBack)="goBack()"
-      (viewDocument)="viewDocument($event)"
-    ></app-task-details>
+    [task]="task"
+    [intervenientes]="intervenientes"
+    [cc]="cc"
+    [customDate]="customDate"
+    [fulltask]="fulltask"
+    (openOptions)="openOptions($event)"
+    (goBack)="goBack()"
+    (viewDocument)="viewDocument($event)"
+  >
+
+
 
     <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
@@ -48,7 +115,6 @@
         <button (click)="openAddNoteModal('Reexecução')" class="btn-cancel" shape="round" >Enviar para Reexecução</button>
       </div>
     </div>
-    
   </div>
 </ion-content>
 

From e9fee75c585595928773caebf28da06b4d10cf72 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 20 Aug 2021 16:49:28 +0100
Subject: [PATCH 4/6] Improve

---
 src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 51b2e95f8..e0d039108 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -1,7 +1,5 @@
 import { Component, OnInit } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AttachmentsService } from 'src/app/services/attachments.service';
-import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { Event } from '../../../../models/event.model';
@@ -43,7 +41,6 @@ export class PedidoPage implements OnInit {
   intervenientes: any;
   cc: any = [];
   loggeduser: User;
-  fromPeddingList = false
 
   constructor(private activatedRoute: ActivatedRoute,
     private processes: ProcessesService,

From 629df73966e7ce41fe7ef6b8f3046dd68b410f97 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 20 Aug 2021 16:57:40 +0100
Subject: [PATCH 5/6] Improve types

---
 src/app/models/modal.ts           |  9 ++++++++-
 src/app/services/modal.service.ts | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/app/models/modal.ts b/src/app/models/modal.ts
index 9fb5d0f3e..30d16091e 100644
--- a/src/app/models/modal.ts
+++ b/src/app/models/modal.ts
@@ -1,4 +1,11 @@
 interface BookMeetingModalPagecomponentProps {
     task: any
 }
-interface BookMeetingModalPageReturn {}
\ No newline at end of file
+interface BookMeetingModalPageReturn {}
+
+interface ExpedientTaskModalPageComponentProps {
+    taskAction: any
+    task: any
+    profile: any
+}
+interface ExpedientTaskModalPageReturn {}
\ No newline at end of file
diff --git a/src/app/services/modal.service.ts b/src/app/services/modal.service.ts
index a4869a7e3..332676716 100644
--- a/src/app/services/modal.service.ts
+++ b/src/app/services/modal.service.ts
@@ -12,19 +12,28 @@ export class ModalService {
     private modalController: ModalController,
   ) { }
 
-
-  BookMeetingModalPage(e:BookMeetingModalPagecomponentProps, { classs, backdropDismiss = false }) {
+  BookMeetingModalPage(e:BookMeetingModalPagecomponentProps, { cssClass='', backdropDismiss = false }) {
     return this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
         task: e.task,
       },
-      cssClass: classs,
+      cssClass,
       backdropDismiss
     });
   }
 
-  ExpedientTaskModalPage(task, { classs, backdropDismiss = false }) {
+  ExpedientTaskModalPage(e:ExpedientTaskModalPageComponentProps, { cssClass ="", backdropDismiss = false }) {
+    
+    return this.modalController.create({
+      component: ExpedientTaskModalPage,
+      componentProps: {
+        taskAction: e.taskAction,
+        task: e.task,
+        profile: e.profile,
+      },
+      cssClass,
+    });
 
   }
   

From 629a02a13ecbe75ac2bae3c66d98c36d9a41d117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Fri, 20 Aug 2021 16:59:44 +0100
Subject: [PATCH 6/6] Profile get old notification bug resolved

---
 src/app/modals/profile/profile.page.ts    | 6 +++---
 src/app/services/notifications.service.ts | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index 285353b74..51a96b6c2 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -53,7 +53,7 @@ export class ProfilePage implements OnInit {
   notImplemented() { }
 
   async getNotificationData(){
-
+    this.notificationservice.tempClearArray();
     this.storageservice.get("Notifications").then((value) => {
       console.log("Init get store", value)
 
@@ -120,7 +120,7 @@ export class ProfilePage implements OnInit {
  }
 
   notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
-    this.deleteNotification(index);
+    
     if (Service === "agenda") {
       this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
     }
@@ -167,7 +167,7 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
     }
 
-   
+    this.deleteNotification(index);
 
 
   }
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 6ae9b2db6..1a3a32dda 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -175,6 +175,10 @@ export class NotificationsService {
     }
   }
 
+  tempClearArray(){
+    this.DataArray = [];
+  }
+
   async onReceviNotification() {
 
     if(window['WLAuthorizationManager']) {