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

.gitignore

@@ -40,4 +40,5 @@ npm-debug.log*
 
 src/app/architect/
 src/environments/environment.e2e.ts
-.env
+.env
+platforms_

src/app/Rules/despacho.service.ts

@@ -68,28 +68,32 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
-  solicitarParecer(task) {
-    // let body = {
-    //   "serialNumber": serialnumber,
-    //   "action": "Conhecimento",
-    //   "ActionTypeId": 92,
-    //   "dataFields": {
-    //     "ReviewUserComment": note,
-    //   },
-    //   "AttachmentList" :documents,
-    // }
+  solicitarParecer({note ='', documents = [], serialnumber}) {
+    let body = {
+      "serialNumber": serialnumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 92,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+      "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
   }
 
-  EfectuarDespacho(task) {
-    // let body = {
-    //   "serialNumber": serialnumber,
-    //   "action": "Conhecimento",
-    //   "ActionTypeId": 94,
-    //   "dataFields": {
-    //     "ReviewUserComment": note,
-    //   },
-    //   "AttachmentList" :documents,
-    // }
+  EfectuarDespacho({note = '', documents = [], serialnumber}) {
+    let body = {
+      "serialNumber": serialnumber,
+      "action": "Conhecimento",
+      "ActionTypeId": 94,
+      "dataFields": {
+        "ReviewUserComment": note,
+      },
+       "AttachmentList" :documents,
+    }
+
+    return this.processes.CompleteTask(body)
   }
 
   rexecucao({note, documents, serialnumber}) {
@@ -106,6 +110,9 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+  /**
+   * @description efetuar despacho
+   */
   CompleteTask({serialNumber}) {
 
     const body = {
@@ -121,6 +128,7 @@ export class DespachoService {
     return this.processes.CompleteTask(body)
   }
 
+
   // Finalizar({serialNumber}) {
   //   const body = {
   //     "serialNumber": serialNumber,
@@ -150,4 +158,13 @@ export class DespachoService {
     }
   }
 
+
+  createParecer(body: any) {
+    if(this.p.userRole(['PR'])) {
+      return this.processes.postParecerPr(body)
+    } else {
+      return this.processes.postParecer(body)
+    }
+  }
+
 }

src/app/Rules/pedido.service.ts

@@ -46,7 +46,7 @@ export class PedidoService {
 
     const body = {
       "serialNumber": serialNumber,
-      "action": "Parecer",
+      "action": "Deferimento",
       "ActionTypeId": 93, // Pedido de deferimento
       "dataFields": {
         "ReviewUserComment": '',

src/app/modals/add-note/add-note.page.html

@@ -37,7 +37,7 @@
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
           </p>
-          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

src/app/modals/create-process/create-process.page.html

@@ -138,7 +138,7 @@
             </div> 
           </ion-label>
         </div>
-  
+
         <div class="list "  *ngFor="let document of documents; let i = index" > 
           <ion-list>
             <ion-item>
@@ -150,7 +150,7 @@
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p> 
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>

src/app/modals/create-process/create-process.page.ts

@@ -265,6 +265,7 @@ export class CreateProcessPage implements OnInit {
             try {
               await this.processes.postDespatcho(this.postData).toPromise();
               await this.FinalizarDespacho(loader, 'Despacho criado');
+              this.modalController.dismiss();
             } catch (error) {
               this.toastService.badRequest('Processo não efectuado');
               loader.remove()
@@ -283,8 +284,14 @@ export class CreateProcessPage implements OnInit {
             console.log(this.postData);
 
             try {
-              await this.pedidoService.createParecer(this.postData).toPromise();
-              await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
+                await this.despachoService.createParecer(this.postData).toPromise();
+                await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber}).toPromise();
+              } else  {
+                await this.pedidoService.createParecer(this.postData).toPromise();
+                await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+              }
+              
               this.modalController.dismiss();
               this.toastService.successMessage('Pedido de Parecer enviado');
             }
@@ -339,6 +346,7 @@ export class CreateProcessPage implements OnInit {
               try {
                 await this.despachoService.createDespacho(this.postData).toPromise();
                 await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise();
+                
                 this.modalController.dismiss();
                 this.toastService.successMessage('Despacho criado');
               } catch (error) {
@@ -360,8 +368,15 @@ export class CreateProcessPage implements OnInit {
               console.log(this.postData);
 
               try {
-                await this.pedidoService.createParecer(this.postData).toPromise();
-                await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+
+                if(this.task.activityInstanceName == 'Tarefa de Despacho' || this.task.activityInstanceName == 'Reexecutar Despacho') {
+                  await this.despachoService.createParecer(this.postData).toPromise();
+                  await this.despachoService.solicitarParecer({ serialnumber: this.task.serialNumber}).toPromise();
+                } else  {
+                  await this.pedidoService.createParecer(this.postData).toPromise();
+                  await this.pedidoService.taskCompleteParecer({serialNumber:this.task.serialNumber}).toPromise();
+                }
+
                 this.modalController.dismiss();
                 this.toastService.successMessage('Pedido de Parecer criado');
               }
@@ -386,6 +401,7 @@ export class CreateProcessPage implements OnInit {
                 try {
                   await this.pedidoService.createDeferimento(this.postData).toPromise();
                   await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise();
+
                   this.modalController.dismiss();
                   this.toastService.successMessage('Pedido de Deferimento criado');
                 }

src/app/modals/dar-parecer/dar-parecer.page.html

@@ -42,7 +42,7 @@
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p>
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -336,7 +336,7 @@
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p>
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>

src/app/modals/eliminate-event/eliminate-event.page.html

@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="header-body width-100">
-    <p>Nota: Ao efectuar esta operação, o tratamento deste expediente não poderá ser realizado a partir da caixa de correspondência</p>
+    <p>Nota: Ao Efetuar esta operação, o tratamento deste expediente não poderá ser realizado a partir da caixa de correspondência</p>
    </div>
 </ion-content>
 <ion-footer>

src/app/modals/profile/profile.page.ts

@@ -5,9 +5,6 @@ import { Router,NavigationExtras } from '@angular/router';
 import { AnimationController, ModalController } from '@ionic/angular';
 import { User } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
-import { ToastService } from 'src/app/services/toast.service';
-import { FingerprintPage } from 'src/app/shared/fingerprint/fingerprint.page';
-import { PinPage } from 'src/app/shared/pin/pin.page';
 import { LocalstoreService } from 'src/app/store/localstore.service';
 import { EditProfilePage } from './edit-profile/edit-profile.page';
 import { JsonStore } from '../../services/jsonStore.service';
@@ -131,15 +128,12 @@ export class ProfilePage implements OnInit {
   }
 
   logout() {
-    //const loader = this.toastService.loading();
-    // clear local storage
     window.localStorage.clear();
 
-    setTimeout(() => {
-      window.location.pathname = '/'
-      location.reload();
-    }, 1000)
-
+    setTimeout(()=> {
+      this.router.navigateByUrl('/', { replaceUrl: true });
+    },100)
+  
   }
 
   checkState() {

src/app/pages/agenda/edit-event/edit-event.page.html

@@ -272,7 +272,7 @@
                   <span class="app-name span-left" *ngIf="document.ApplicationId == 386"> Acções Presidenciais </span>
                   <span class="app-name span-left" *ngIf="document.ApplicationId == 361 "> Arquivo Despacho Electrónico </span>
 
-                  <!-- <span class="span-right" *ngIf="document.CreateDate"> {{document.CreateDate | date: 'dd-MM-yy'}} </span> -->
+                  <!-- <span class="span-right" *ngIf="document.CreateDate"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span> -->
                 </p>
               </ion-label>
             </ion-item>

src/app/pages/agenda/new-event/new-event.page.html

@@ -281,7 +281,7 @@
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
           </p>
-          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

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

@@ -28,7 +28,7 @@
       </div>
 
       <div class="overflow-y-auto">
-        <div class="upper-content">
+        <div class="upper-content ml-45">
           <div class="content-location">
             <p><span class="date">{{loadedEvent.Location}}</span><span class="label">{{loadedEvent.CalendarName}}</span></p>
           </div>
@@ -73,7 +73,7 @@
                 </p>
     
                 <div class="d-flex pr-10">
-                  <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
+                  <span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span>
                 </div>
     
                 <div (click)="docIndex(i);openTaskOptions()" class="cursor-pointer" style="width: 35px; height: 41px;" autoHide="false">

src/app/pages/events/events.page.html

@@ -98,7 +98,7 @@
             (click)="goToExpediente(task.serialNumber)">
             <div class="item-exp d-flex">
               <div class="schedule-date">
-                <div class="time-end">{{task.taskStartDate | date: 'dd-MM-yy'}}</div>
+                <div class="time-end">{{task.taskStartDate | date: 'dd-MM-yyyy HH:mm'}}</div>
                 <div class="time-start">{{task.taskStartDate | date: 'HH:mm'}}</div>
               </div>
               <div class="schedule-details pointer">

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -84,7 +84,7 @@
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <!-- <div class="solid"></div> -->
         <div class="option-desc">Outras opções</div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -57,7 +57,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>

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

@@ -71,7 +71,7 @@
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
@@ -81,7 +81,7 @@
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>
@@ -90,7 +90,7 @@
       <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
         <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
         <div class="solid"></div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <div class="solid"></div>

src/app/pages/gabinete-digital/despachos/despachos.page.html

@@ -57,7 +57,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -62,7 +62,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>

src/app/pages/gabinete-digital/diplomas/diplomas.page.html

@@ -44,7 +44,7 @@
                 <div class="item width-100">
                   <div class="exp-top-detail">
                     <div class="exp-date">
-                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                     </div>
                     <div class="exp-remetente">
                       <ion-label>{{task.Remetente}}</ion-label>
@@ -75,7 +75,7 @@
             <div class="item width-100">
               <div class="exp-top-detail">
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
                 <div class="exp-remetente">
                   <ion-label>{{task.Remetente}}</ion-label>

src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html

@@ -8,7 +8,7 @@
     </div>
   </div>
   <div class="header-body width-100">
-     <p>Nota: Ao efectuar esta operação, o tratamento deste expediente não poderá ser realizado a partir da caixa de correspondência</p>
+     <p>Nota: Ao Efetuar esta operação, o tratamento deste expediente não poderá ser realizado a partir da caixa de correspondência</p>
    </div>
 </ion-content>
 <ion-footer>

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html

@@ -90,7 +90,7 @@
             <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
             <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
           </p> 
-          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
     </ion-list>

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html

@@ -81,7 +81,7 @@
             (click)="viewDocument(attach.SourceId)">
             <ion-label>
               <p class="attach-title-item d-block">{{attach.SourceName}}</p>
-              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
+              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
             </ion-label>
           </ion-item>
           </ion-list>

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -336,7 +336,7 @@
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p>
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -192,7 +192,7 @@
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p>
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>

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

@@ -7,7 +7,7 @@
 </div>
 
 <ion-content>
-  <div class="main-content d-flex height-100">
+  <div class="main-content d-flex height-100 overflow-hidden">
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header" style="overflow: unset !important;">
         <div class="title-content width-100 d-flex justify-between">
@@ -67,10 +67,7 @@
           <ion-list>
             <div class="content-items width-100" *ngIf="eventsList">
               <ion-list>
-                <ion-item class=" ion-no-padding width-100 cursor-pointer"
-                lines="none" *ngFor="let event of eventsList"
-                (click)="goToEvent(event.EventId)"
-                >
+                <ion-item class=" ion-no-padding width-100 cursor-pointer" lines="none" *ngFor="let event of eventsList" (click)="goToEvent(event.EventId)">
                 <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
                   <div class="schedule-time">
                     <div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
@@ -82,7 +79,6 @@
                   </div>
                 </div>
                 </ion-item>
-
               </ion-list>
             </div>
           </ion-list>
@@ -90,14 +86,14 @@
       </div>
     </div>
 
-    <div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100">
+    <div *ngIf="task && !p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
       <div class="buttons">
         <div class="option-desc"> <div>Enviar para o PR</div> </div>
         <button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
         <div class="option-desc"> <div>Solicitar revisão</div> </div>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <div class="option-desc"> <div>Outras opções</div> </div>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -108,7 +104,7 @@
       </div>
     </div>
 
-    <div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100">
+    <div *ngIf="task && p.userRole(['PR'])" class="aside-right flex-column height-100 overflow-y-auto">
 
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0', fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>

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

@@ -159,8 +159,9 @@ ion-button{
   font-size: 13px;
   }
 }
-.aside-right{
-  padding: 30px 20px 0 20px !important;
+.aside-right {
+  padding: 0px 20px;
+  margin: 20px 0px;
 
   .arrow-right{
     display: flex;

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -57,7 +57,7 @@
               <span class="label">{{task.activityInstanceName}}</span>
             </div>
             <div class="exp-date">
-              <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+              <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
             </div>
           </div>
         </div>

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html

@@ -60,22 +60,16 @@
             </ion-item>
           </div>
         </div>
-        <div class="bottom-content width-100">
-          <h5>Documentos Anexados</h5>
 
+        <div class="bottom-content width-100">
           <ion-list>
-            <ion-item *ngFor="let attachment of attachments; let i = index"
-              class="ion-no-margin ion-no-padding cursor-pointer">
-            <ion-label
-            (click)="viewDocument()">
-              <p class="attach-title-item">{{attachment.Description}}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
-              <p>
-                <span class="span-left">{{attachment.Stakeholders}}</span>
-                <span *ngIf="!attachment.Stakeholders" class="span-left">Rementente indefinido</span>
-                <span class="span-right">{{ attachment.CreateDate  | date: 'dd/MM/yy' }}</span>
-              </p>
-            </ion-label>
-          </ion-item>
+            <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>
 

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -72,7 +72,6 @@ export class ExpedientePrPage implements OnInit {
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log(this.serialnumber);
 
     this.activatedRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
@@ -80,8 +79,6 @@ export class ExpedientePrPage implements OnInit {
       }
       this.LoadTaskDetail(this.serialnumber);
     });
-    this.LoadTaskDetail(this.serialnumber);
-    this.getAttachments(this.serialnumber);
 
   }
 

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -53,7 +53,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -77,7 +77,7 @@
                         <span class="label">{{task.activityInstanceName}}</span>
                       </div>
                       <div class="item-date">
-                        <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                        <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                       </div>
                     </div>
                   </div>
@@ -114,6 +114,15 @@
               <p class="text-center exp-card-content">{{expedientegbstore.count}} <span class="title1">Documentos</span></p>
             </div>
 
+            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openExpedientesPrPage(); selectedElement = 'Expediente Presidente'" [class.active]="selectedElement == 'Expediente Presidente'" class="exp-card d-md-flex flex-column justify-center white-background">
+              <div class="d-flex justify-center">
+                <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
+              </div>
+              <p class="exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Expediente Presidente</p>
+              <p class="exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Expediente</p>
+              <p class="text-center exp-card-content"><span class="number">{{expedienteprstore.count}} </span> <span class="title1">Documentos</span></p>
+            </div>
+
             <!-- <div  [class.active]="selectedElement == 'Pending'" (click)="openPendentesPage(); selectedElement='Pending'" class="exp-card d-flex flex-column justify-center" > -->
             <div  [class.active]="selectedElementF('Pending')" (click)="openPendentesPage(); selectedElement='Pending'" class="exp-card d-flex flex-column justify-center"  >
               <div class="d-flex justify-center">
@@ -124,6 +133,15 @@
               <p class="text-center exp-card-content"><span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
             </div>
 
+            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="exp-card d-md-flex flex-column justify-center" >
+              <div class="d-flex justify-center">
+                <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
+              </div>
+              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p>
+              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p>
+              <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
+            </div>
+
             <div [class.active]="selectedElement == 'Dispatches'" class="exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'" *ngIf="loggeduser.Profile == 'MDGPR'">
               <div class="d-flex justify-center">
                 <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
@@ -149,23 +167,6 @@
               <p class="text-center exp-card-content">{{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
             </div>
 
-            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openExpedientesPrPage(); selectedElement = 'Expediente Presidente'" [class.active]="selectedElement == 'Expediente Presidente'" class="exp-card d-md-flex flex-column justify-center white-background">
-              <div class="d-flex justify-center">
-                <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
-              </div>
-              <p class="exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Expediente Presidente</p>
-              <p class="exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Expediente</p>
-              <p class="text-center exp-card-content"><span class="number">{{expedienteprstore.count}} </span> <span class="title1">Documentos</span></p>
-            </div>
-
-            <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="exp-card d-md-flex flex-column justify-center" >
-              <div class="d-flex justify-center">
-                <ion-icon  src="assets/images/icons-despachos-presidente.svg"></ion-icon>
-              </div>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Despacho do Presidente da República</p>
-              <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Despachos criados por mim</p>
-              <p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
-            </div>
 
             <!-- <div *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100 white-background">
               <div class="center-div">

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html

@@ -81,7 +81,7 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -91,7 +91,7 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -101,7 +101,7 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
           <div class="solid"></div>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
@@ -118,7 +118,7 @@
         </div>
         <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
-          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+          <button *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
           <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
           <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -356,6 +356,7 @@ export class PedidoPage implements OnInit {
       }
     });
   }
+  
   async distartExpedientModal(){
     console.log(this.fulltask);
     const modal = await this.modalController.create({

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -69,7 +69,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -98,7 +98,7 @@
               </div>
               <div class="exp-bottom-detail">
                 <div class="exp-remetente">
-                  <ion-label>{{task.Senders}}</ion-label>
+                  <ion-label>{{task.Senders}} sender</ion-label>
                 </div>
               </div>
               <div class="exp-middle-detail">
@@ -106,7 +106,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>

src/app/pages/gabinete-digital/pedidos/pedidos.page.ts

@@ -101,10 +101,10 @@ export class PedidosPage implements OnInit {
     this.openExpedientDetail.emit(data);
   }
 
-  async LoadList(){
+  async LoadList() {
     this.skeletonLoader = true
 
-    if(this.segment == 'parecer'){
+    if(this.segment == 'parecer') {
       this.taskType = "Pedido de Parecer";
 
       let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
@@ -125,7 +125,7 @@ export class PedidosPage implements OnInit {
         let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
-            "Senders": element.originator.email,
+            "Senders": element.workflowInstanceDataFields.Sender,
             "CreateDate": taskDate,
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,

src/app/pages/gabinete-digital/pendentes/pendentes.page.html

@@ -59,7 +59,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>

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

@@ -96,7 +96,7 @@
             (click)="viewDocument(attach.SourceId)">
             <ion-label>
               <p class="attach-title-item d-block">{{attach.SourceName}}</p>
-              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
+              <p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
             </ion-label>
           </ion-item>
           </ion-list>

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

@@ -310,7 +310,7 @@
                       <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                     </span>
                   </p>
-                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
                 </ion-label>
               </ion-item>
             </ion-list>

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

@@ -304,7 +304,7 @@
             </span>
 
           </p>
-          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+          <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

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

@@ -328,7 +328,7 @@
               <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
             </span>
           </p>
-          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
+          <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
         </ion-label>
       </ion-item>
       </ion-list>

src/app/shared/gabinete-digital/all-processes/all-processes.page.html

@@ -66,7 +66,7 @@
                     <span class="label">{{task.activityInstanceName}}</span>
                   </div>
                   <div class="item-date">
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                   </div>
                 </div>
               </div>

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html

@@ -55,7 +55,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/despachos/despachos.page.html

@@ -51,7 +51,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -55,7 +55,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -50,7 +50,7 @@
                   <span class="label">{{task.activityInstanceName}}</span>
                 </div>
                 <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
                 </div>
               </div>
             </div>
@@ -85,7 +85,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html

@@ -304,7 +304,7 @@
                       <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                     </span>
                   </p>
-                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
+                  <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yyyy HH:mm'}} </span></p>
                 </ion-label>
               </ion-item>
             </ion-list>

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -38,7 +38,7 @@
               <span class="label">{{task.activityInstanceName}}</span>
             </div>
             <div class="exp-date">
-              <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+              <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
             </div>
           </div>
         </div>

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -47,7 +47,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -61,10 +61,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-
-                {{ task.CreateDate }}
-
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>
@@ -101,7 +98,7 @@
                 <span class="label">{{task.activityInstanceName}}</span>
               </div>
               <div class="exp-date">
-                <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
               </div>
             </div>
           </div>

src/app/shared/gabinete-digital/pendentes/pendentes.page.html

@@ -47,7 +47,7 @@
               <span class="label">{{task.activityInstanceName}}</span>
             </div>
             <div class="exp-date">
-              <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+              <ion-label>{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
             </div>
           </div>
         </div>

src/app/shared/gabinete-digital/pendentes/pendentes.page.ts

@@ -125,7 +125,7 @@ export class PendentesPage implements OnInit {
     if(workflowName == 'Despacho') {
       this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
     }
-    else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
+    else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento' || workflowName == 'Pedido de Parecer do Presidente') {
       this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
     }
     else if(workflowName == 'Expediente') {
@@ -141,7 +141,7 @@ export class PendentesPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
     }
     else  {
-      console.log('cant find page for this task', task)
+      console.log('cant find page for this task', task, workflowName)
     }
 
   }

src/app/shared/header/header.page.html

@@ -3,9 +3,9 @@
 
   <div class="mobile d-flex  div-top-header justify-space-between">
     <div *ngIf="!hideSearchBtn" class="div-search">
-      <button class="btn-no-color" (click)="openSearch()">
+      <div (click)="openSearch()">
         <ion-icon class="font-45" src='assets/images/icons-search.svg'></ion-icon>
-      </button>
+      </div>
     </div>
     <div class="div-logo height-fit-content">
       <img src='assets/images/logo-no-bg.png' alt='logo'>
@@ -53,9 +53,9 @@
 
       <div class="header-btns d-flex">
         <div *ngIf="!hideSearchBtn" class="mr-10 d-flex align-center cursor-pointer">
-          <button (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="btn-no-color">
+          <div style="padding-top: 5px;" (click)="openSearch();showSearch=true" *ngIf="!showSearch" >
             <ion-icon class="font-45"   src='assets/images/icons-search.svg'></ion-icon>
-          </button>
+          </div>
           <button class="btn-no-color" (click)="closeSearch();showSearch=false;searchSubject=''" *ngIf="showSearch" >
             <ion-icon class="font-40" name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
           </button>

src/app/shared/headers/header-no-search/profile/profile.page.ts

@@ -116,10 +116,9 @@ export class ProfileComponent implements OnInit {
     // clear local storage
     window.localStorage.clear();
 
-    setTimeout(()=>{
-      window.location.pathname = '/'
-      location.reload();
-    }, 1000)
+    setTimeout(()=> {
+      this.router.navigateByUrl('/', { replaceUrl: true });
+    },100)
 
 
   }

src/app/shared/popover/despachos-options/despachos-options.page.html

@@ -9,7 +9,7 @@
     <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
     <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
     <div class="solid"></div>
-    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <div class="solid"></div>
@@ -19,7 +19,7 @@
     <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
     <button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
     <div class="solid"></div>
-    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <div class="solid"></div>
@@ -28,7 +28,7 @@
   <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Despacho'">
     <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
     <div class="solid"></div>
-    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="openTaskProcessModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
     <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <div class="solid"></div>

src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html

@@ -10,7 +10,7 @@
     <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
     <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma </button>
     <div class="solid"></div>
-    <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+    <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
     <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
     <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
     <div class="solid"></div>

src/app/shared/popover/opts-expediente/opts-expediente.page.html

@@ -12,7 +12,7 @@
         <button class="btn-cancel desk" shape="round"> Solicitar revisão </button>
         <button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
         <button class="btn-cancel desk" shape="round">Outras opções </button>
-        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+        <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       </div>
       <div class="flex-grow-1">
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>

src/app/shared/popover/request-options/request-options.page.html

@@ -10,7 +10,7 @@
       <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
       <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
       <div class="solid"></div>
-      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
       <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -20,7 +20,7 @@
       <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
       <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
       <div class="solid"></div>
-      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
       <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
@@ -30,7 +30,7 @@
       <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
       <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
       <div class="solid"></div>
-      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
       <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
@@ -47,7 +47,7 @@
     </div>
     <div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Parecer'">
       <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
-      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
+      <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
       <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>