Fix merge

src/app/home/home-routing.module.ts

@@ -102,6 +102,24 @@ const routes: Routes = [
             path: 'view-event',
             loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
           },
+          {
+            path:'event-list',
+            children: [
+              {
+                path:'',
+                loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
+              },
+              {
+                path:'approve-event',
+                children : [
+                  {
+                    path:':serialNumber/:caller',
+                    loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
+                  },
+                ]
+              }
+            ]
+          },
         ]
       },
       {
@@ -144,9 +162,14 @@ const routes: Routes = [
                 loadChildren: ()=> import('../pages/gabinete-digital/event-list/event-list.module').then(m => m.EventListPageModule)
               },
               {
-                path:':serialNumber',
+                path:'approve-event',
-                loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
+                children : [
-              },
+                  {
+                    path:':serialNumber/:caller',
+                    loadChildren: ()=> import('../pages/gabinete-digital/event-list/approve-event/approve-event.module').then(m => m.ApproveEventPageModule)
+                  },
+                ]
+              }
             ]
           },
           {

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

@@ -192,7 +192,7 @@ export class CreateProcessPage implements OnInit {
 
                 try {
                   await this.processes.postDespatcho(this.postData).toPromise();
-                  this.FinalizarDespacho();
+                  this.FinalizarDespacho('Despacho criado');
                 } catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
                 }
@@ -211,8 +211,7 @@ export class CreateProcessPage implements OnInit {
       
                 try {
                   await this.processes.postParecer(this.postData).toPromise();
-                  
+                  this.FinalizarParecer('Pedido de Parecer enviado');
-                  this.FinalizarParecer('Pedido de Parecer criado');
                 } 
                 catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
@@ -232,7 +231,7 @@ export class CreateProcessPage implements OnInit {
               
                 try {
                   await this.processes.postDeferimento(this.postData).toPromise();
-                  this.executado('Pedido de Deferimento criado');
+                  this.FinalizarDeferimento('Pedido de deferimento enviado');
                 } 
                 catch (error) {
                   this.toastService.badRequest('Processo não efectuado');
@@ -348,17 +347,18 @@ export class CreateProcessPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage('');
+      this.toastService.successMessage(message);
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado');
     }
   }
 
-  async FinalizarDespacho() {
+  async FinalizarDespacho(message?) {
     
     let body;
 
-    if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho') {
+    if(this.task.activityInstanceName =='Tarefa de Despacho' || 
+    this.task.activityInstanceName =='Reexecutar Despacho') {
   
       body = {
         "serialNumber": this.task.serialNumber, 
@@ -370,7 +370,11 @@ export class CreateProcessPage implements OnInit {
         "AttachmentList" :null,
       } 
     }
-    else if(this.task.activityInstanceName =='Concluir Despacho' || this.task.activityInstanceName == 'Concluir Parecer') {
+    else if(this.task.activityInstanceName =='Concluir Despacho' || 
+    this.task.activityInstanceName == 'Concluir Parecer' || 
+    this.task.activityInstanceName =='Concluir Deferimento' ||
+    this.task.activityInstanceName =='Reapreciar Deferimento'
+    ) {
       
       body = {
         "serialNumber": this.task.serialNumber, 
@@ -381,12 +385,12 @@ export class CreateProcessPage implements OnInit {
         },
         "AttachmentList" :null,
       } 
-
     }
+    console.log(body);
     
     try {
       await this.processes.CompleteTask(body).toPromise();
-      this.toastService.successMessage('');
+      this.toastService.successMessage(message);
     } catch (error) {
       this.toastService.badRequest('Processo não efectuado');
     }
@@ -394,16 +398,32 @@ export class CreateProcessPage implements OnInit {
   }
 
   async FinalizarParecer(message?) {
-    let body = { 
+    let body;
-      "serialNumber": this.task.serialNumber, 
-      "action": "Parecer",
-      "ActionTypeId": 96,
-      "dataFields": {
-        "ReviewUserComment": '',
-      },
-      "AttachmentList" :null,
-    } 
 
+    if(this.task.activityInstanceName =='Concluir Deferimento' ||
+    this.task.activityInstanceName =='Reapreciar Deferimento'
+    ){
+      body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 92,
+        "dataFields": {
+          "ReviewUserComment": message,
+        },
+        "AttachmentList" :null,
+      }
+    }
+    else{
+      body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 96,
+        "dataFields": {
+          "ReviewUserComment": message,
+        },
+        "AttachmentList" :null,
+      }
+    }
 
     try {
       await this.processes.CompleteTask(body).toPromise();
@@ -414,6 +434,26 @@ export class CreateProcessPage implements OnInit {
 
   }
 
+  async FinalizarDeferimento(message?){
+    if(this.task.activityInstanceName =='Reapreciar Deferimento'){
+      let body = { 
+        "serialNumber": this.task.serialNumber, 
+        "action": "Parecer",
+        "ActionTypeId": 92,
+        "dataFields": {
+          "ReviewUserComment": '',
+        },
+        "AttachmentList" :null,
+      }
+      try {
+        await this.processes.CompleteTask(body).toPromise();
+        this.toastService.successMessage(message)
+      } catch (e) {
+        this.toastService.badRequest()
+      }
+    }
+  }
+ 
   async addParticipants() {
     
     this.adding = "intervenient";

src/app/models/event.model.ts

@@ -32,7 +32,7 @@ export class EventToApproveEdit {
     "StartDate": "2021-05-12T10:30:00"
     "EndDate": "2021-05-12T11:30:00"
     "Private": false
-    "ReviewUserComments": ""
+    "ReviewUserComment": ""
     "MDName": "Paulo Pinto"
     "MDEmail": "paulo.pinto@gabinetedigital.local"
     "Agenda": "Oficial" | "Pessoal"

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

@@ -1175,17 +1175,8 @@ export class AgendaPage implements OnInit {
   async viewEventsToApprove(){
     await this.cloneAllmobileComponent()
 
-    if( window.innerWidth <= 1024){
+    if( window.innerWidth <= 801){
-      const modal = await this.modalCtrl.create({
+      this.router.navigate(['/home/agenda/event-list']);
-        component: EventListPage,
-        componentProps:{
-          profile: this.profile,
-        },
-        cssClass: 'modal  modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss();
     } else {
       // hide all components
       this.cloneAllmobileComponent();

src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts

@@ -70,7 +70,7 @@ export class EventActionsPopoverPage implements OnInit {
   }
 
   async emendarTask() {
-    console.log('Mobile');
+    this.closePopover();
     
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
@@ -122,8 +122,7 @@ export class EventActionsPopoverPage implements OnInit {
   }
 
   async editTask() {
-    console.log(this.serialNumber);
+    this.closePopover();
-    console.log(this.instanceId);
     const modal = await this.modalController.create({
       component: EditEventToApproveComponent,
       componentProps: {

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

@@ -55,7 +55,7 @@
               </div>
               <div class="schedule-details">
                 <div class="location">{{event.Location}}</div>
-                <div class="description">{{event.Subject}}</div>
+                <div class="description">{{event.Subject.substring(0,maxSubjectLength)}}</div>
               </div>
             </div>
             </ion-item>

src/app/pages/events/events.page.ts

@@ -44,6 +44,7 @@ export class EventsPage implements OnInit {
   currentEvent: any;
 
   eventsList: Event[];
+  maxSubjectLength = 140;
   officialeventsList: Event[];
   personaleventsList: Event[];
 

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

@@ -1,41 +1,6 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Menu</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="openExpedientActionsModal('0',fulltask)">
-        <ion-icon name="documents" slot="start"></ion-icon>
-        <ion-label>Efectuar Despacho</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('1',fulltask)">
-        <ion-icon name="arrow-undo" slot="start"></ion-icon>
-        <ion-label>Pedido de Parecer</ion-label>
-      </ion-item>
-      <ion-item (click)="openExpedientActionsModal('2',fulltask)">
-        <ion-icon name="arrow-redo" slot="start"></ion-icon>
-        <ion-label>Pedido de Deferimento</ion-label>
-      </ion-item>
-      <ion-item (click)="openBookMeetingModal(task)">
-        <ion-icon name="calendar" slot="start"></ion-icon>
-        <ion-label>Marcar reunião</ion-label>
-      </ion-item>
-      <ion-item hidden disabled>
-        <ion-icon name="paper-plane" slot="start"></ion-icon>
-        <ion-label>Enviar para pendentes</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
-<div class="ion-page d-none" id="main-content">
-  <ion-menu-button></ion-menu-button>
-</div>
-
 <ion-content>
   <div class="main-content d-flex height-100">
     <div class="content d-flex flex-column" *ngIf="task">

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

@@ -6,10 +6,10 @@
   <div class="main-header">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
     <div class="thetitle">
-      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais !!</ion-label>
+      <ion-label *ngIf="loggeduser.Profile =='MDGPR'" >Despachos Presidenciais</ion-label>
       <ion-label *ngIf="loggeduser.Profile =='PR'" >Despachos</ion-label>
     </div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>

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

@@ -162,10 +162,7 @@ export class DespachosPrPage implements OnInit {
     
   doRefresh(event) {
     this.LoadList();
-  
+    event.target.complete();
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
   }
   
   async viewExpedientDetail(serialNumber:any) {

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

@@ -7,17 +7,14 @@
     <div class="content d-flex flex-column" *ngIf="task">
       <div class="main-header">
         <div class="title-content d-flex justify-space-between align-center">
-          <div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
+          <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-menu-button autoHide="false">
+            <ion-icon src="assets/images/icons-menu.svg"></ion-icon>
-                <ion-icon name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
           </div>
         </div>
       </div>

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

@@ -17,73 +17,31 @@
   font-size: 18px !important;
 }
 .main-header{
+  display: flex;
   font-family: Roboto;
-  border-top-left-radius: 25px;
-  border-top-right-radius: 25px;
   background-color: #fff;
-  overflow:auto;
   color:#000;
   transform: translate3d(0, 1px, 0);
-    .header-top{
+  .title-content{
-      margin: 0px auto;
+    display: flex;
+    justify-content: start !important;
+    align-items: flex-start !important;
+    border-radius: 0 !important;
+    }
+    .title{
+      width: fit-content;
+      height: auto;
+      font-size: 25px;
       overflow: auto;
-      padding: 0 !important;
+      float: left;
-      background: #fff;
+      padding-left: 5px;
-      .middle{
+    }
-        padding: 0!important;
+    .div-icon{
-        float: left;
+      width: 40px !important;
-        width: 280px;
+      font-size: 35px !important;
-        margin: 2.5px 0 0 5px;
+      text-align: start !important;
-        display: flex;
+      padding: 1px;
-        align-items: center;
+    }
-            
-        }
-        .right{
-          padding: 0!important;
-          float: right;
-          font-size: 25px;
-          color: #0782c9;
-          margin: 5px 0 0 0;
-        }
-      }
-      .header-bottom{
-         width: 310px;
-        overflow: auto;
-        margin: 0 auto;
-
-        .header-bottom-icon{
-          width: 30px;
-          font-size: 25px;
-          float: left;
-          padding: 2px;
-        }
-        .header-bottom-contacts{
-          width: 275px;
-          font-size: 15px;
-          color: #797979;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          float: left;
-            padding: 5px;
-          margin: 1px;
-        }
-      }
-    
-        .title{
-          font-size: 25px;
-          overflow: auto;
-          float: left;
-          padding-top: 4px;
-          padding-left: 5px;
-        }
-        .div-icon{
-          width: 40px;
-          float: right;
-          font-size: 35px;
-          overflow: auto;
-          padding: 1px;
-        }
 }
 ion-item-group{
     margin: 15px;
@@ -94,11 +52,10 @@ ion-button{
     margin: 20px auto;
 }
 
-
 .upper-content{
   font-family: Roboto;
+  margin-top: 15px;
   margin-left: 41px;
-  overflow: auto;
   font-size: 18px;
 
   .label{

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

@@ -88,8 +88,6 @@ export class DespachoPage implements OnInit {
   }
 
   goBack() {
-    // window.history.back()
-
     if (window.innerWidth <= 800) {
       this.router.navigate(['/home/gabinete-digital/despachos']);
     } else {
@@ -100,7 +98,6 @@ export class DespachoPage implements OnInit {
       }
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-
   }
 
 
@@ -140,12 +137,16 @@ export class DespachoPage implements OnInit {
         console.log(users);
         
       });
+      console.log(this.task.FolderId);
+      
       this.getDocumentDetails(this.task.FolderId, '361');
 
     });
   }
 
   getDocumentDetails(forlderId:string, applicationId:string) {
+    console.log(forlderId);
+    
     this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
       this.attachments = res.Documents;
       console.log(res['Documents']);

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

@@ -8,7 +8,7 @@
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
 
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>

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

@@ -80,12 +80,15 @@ export class DespachosPage implements OnInit {
   }
 
   async LoadList() {
+    console.log('HERE');
     
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
     
     console.log(result);
+    console.log('OI');
+    
 
     await result.forEach( (element, index) => {
       
@@ -101,7 +104,7 @@ export class DespachosPage implements OnInit {
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocId,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
         }
@@ -110,9 +113,14 @@ export class DespachosPage implements OnInit {
       
     });
 
+    console.log(this.despachoList);
+    
+
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 

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

@@ -6,8 +6,8 @@
 <ion-header class="ion-no-border header-2">
   <div class="title">
     <div class="thetitle"><ion-label >Diplomas</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
-      <button class="btn-no-color" (click)="doRefresh()">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -18,7 +18,7 @@
 
   <div class="main-content">
           
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"

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

@@ -43,10 +43,10 @@ export class DiplomasAssinarPage implements OnInit {
    this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
  }
  
- doRefresh() {
+ doRefresh(event) {
    this.LoadList();
    setTimeout(() => {
-     //event.target.complete();
+     event.target.complete();
    }, 2000);
  }
  

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

@@ -7,7 +7,7 @@
   <div class="title">
     <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
     <div class="thetitle"><ion-label >Diplomas</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>

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

@@ -199,7 +199,7 @@ constructor(
   doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
-      //event.target.complete();
+      event.target.complete();
     }, 2000);
   }
 

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

@@ -31,6 +31,7 @@ export class ApproveEventPage implements OnInit {
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
   serialNumber:string;
+  caller:string;
   @Input() InstanceId:string;
 
   @Output() approveEventDismiss = new EventEmitter<any>();
@@ -51,27 +52,33 @@ export class ApproveEventPage implements OnInit {
     private toastService: ToastService,
   ) { 
 
-    this.activatedRoute.queryParams.subscribe(params => {
+    this.activatedRoute.paramMap.subscribe(params => {
-      if(params["serialNumber"]) {
+      console.log(params["params"]);
-        this.serialNumber = params["serialNumber"];
+      
-        console.log(params["serialNumber"]);
+      if(params["params"].serialNumber) {
+        this.serialNumber = params["params"].serialNumber;
+      }
+      if(params["params"].caller){
+        this.caller = params["params"].caller;
       }
     });
   }
 
   ngOnInit() {
+    console.log(this.serialNumber);
+    console.log(this.caller);
+    
     this.getTask();
   }
 
   goBack() {
-
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "eventos": true,
       }
     };
     if( window.innerWidth < 801) {
-      this.router.navigate(['/home/gabinete-digital/event-list']);
+      this.router.navigate(['/home',this.caller, 'event-list']);
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }

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

@@ -2,7 +2,7 @@
   <app-header></app-header>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
@@ -31,8 +31,7 @@
     </div>
 
     <ion-list *ngSwitchCase="'MDGPR'">
-      <div *ngIf="eventsMDGPRList">
+      <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
-        <ion-list>
           <ion-item-sliding>
             <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -50,11 +49,10 @@
               </div>
             </ion-item>
           </ion-item-sliding>
-        </ion-list>
       </div>
     </ion-list>
     <ion-list *ngSwitchCase="'PR'">
-      <div *ngIf="eventsPRList">
+      <div *ngIf="eventsPRList" class="overflow-y-auto height-100">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
               *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">

src/app/pages/gabinete-digital/event-list/event-list.page.scss

@@ -29,7 +29,7 @@
   float: left;
 }
 ion-item-sliding{
-  margin-top: 5px;
+  margin-top: 10px;
 }
 .Rectangle {
   //width: 360px;

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
 import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
-import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-event-list',
@@ -28,6 +28,7 @@ export class EventListPage implements OnInit {
     private processes:ProcessesService,
     private modalController: ModalController,
     private router: Router,
+    private activatedRoute: ActivatedRoute,
   ) { }
 
   ngOnInit() {
@@ -76,25 +77,40 @@ export class EventListPage implements OnInit {
   }
 
   goToEventToApproveDetail(serialNumber:string){
-    let navigationExtras: NavigationExtras = {
+    console.log(serialNumber);
+    
+    /* let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
       }
-    };
+    }; */
-    this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
+
+    if(this.router.url == '/home/agenda/event-list'){
+      this.router.navigate(['/home/agenda/event-list/approve-event',serialNumber, 'agenda'])
+    }
+    else if(this.router.url == '/home/gabinete-digital/event-list'){
+      this.router.navigate(['/home/gabinete-digital/event-list/approve-event',serialNumber, 'gabinete-digital'])
+    }
+
+    //this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadToApproveEvents();
-    console.log('refresh');
     setTimeout(() => {
+      event.target.complete();
      }, 2000);
   }
   close(){
     this.modalController.dismiss(null);
   }
   goBack(){
-    this.router.navigate(['/home/gabinete-digital']);
+    if(this.router.url == '/home/agenda/event-list'){
+      this.router.navigate(['/home/agenda']);
+    }
+    else if(this.router.url == '/home/gabinete-digital/event-list'){
+      this.router.navigate(['/home/gabinete-digital']);
+    }
   }
 
 

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

@@ -141,13 +141,15 @@ export class BookMeetingModalPage implements OnInit {
       HasAttachments: true,
     }
     console.log(this.postData);
+    console.log(this.task);
+    
 
     if(this.task.FsId == '8') {
 
       try {
         switch (this.loggeduser.Profile) {
           case 'MDGPR':
-            await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
+            //await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "md",this.task.SerialNumber, this.task.FsId).toPromise();
             break;
         
           case 'PR':

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

@@ -248,7 +248,7 @@ export class ExpedientTaskModalPage implements OnInit {
                     }
                   }
                   this.taskResult = await this.processes.postParecer(this.postData).toPromise();
-                  await this.toastService.successMessage('Processo efetuado');
+                  await this.toastService.successMessage('Pedido enviado');
                   this.modalController.dismiss(action_parecer);
                   
                 } catch (error) {

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

@@ -35,14 +35,6 @@
 
       <div class="overflow-y-auto">
         <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">
@@ -99,7 +91,7 @@
       </div>
     </div>
 
-    <div class="aside-right flex-column height-100">
+    <div *ngIf="task" class="aside-right flex-column height-100">
       <div class="buttons">
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
@@ -114,48 +106,6 @@
       </div>
     </div>
 
-    <div *ngIf="!task">
-      <ion-list>
-        <ion-list-header>
-          <ion-label>
-            <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-          </ion-label>
-        </ion-list-header>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          </ion-label>
-        </ion-item>
-        <ion-item>
-          <ion-label>
-            <h3>
-              <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-            </h3>
-            <p>
-              <ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
-            </p>
-          </ion-label>
-        </ion-item>
-        <ion-button color="medium" shape="round" expand="block">
-          <!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
-          <ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
-        </ion-button>
-      </ion-list>
-    </div>
-
   </div>
 </ion-content>
 

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

@@ -135,7 +135,7 @@ export class ExpedienteDetailPage implements OnInit {
   async LoadTaskDetail(serial: string) {
 
     this.processes.GetTask(serial).subscribe(res => {
-      //console.log(res);
+      /* console.log(res); */
       
       this.task = {
         "SerialNumber": res.serialNumber,
@@ -204,11 +204,6 @@ export class ExpedienteDetailPage implements OnInit {
     });
   }
 
-  openMenu() {
-    this.menu.open();
-    this.modalController.dismiss();
-  }
-
   async openExpedientActionsModal(taskAction: any, task: any) {
     //this.modalController.dismiss();
     let classs;

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

@@ -27,7 +27,7 @@
       <div class="upper-content" style="overflow: unset !important;">
         <div class="content-details">
           <ion-label>
-            <p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
+            <p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
           </ion-label>
         </div>
       </div>

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

@@ -132,6 +132,7 @@ export class ExpedientePrPage implements OnInit {
         "FsId": res.workflowInstanceDataFields.FsId,
         "DocId": res.workflowInstanceDataFields.DocIdD,
         "WorkflowName": res.workflowDisplayName,
+        "activityInstanceName": res.activityInstanceName,
       }
 
       console.log('task', this.task);
@@ -200,8 +201,10 @@ export class ExpedientePrPage implements OnInit {
       "AttachmentList" :documents,
     }
 
+    console.log(body);
+    
     try {
-      await this.processes.CompleteTask(body).toPromise()
+      await this.processes.CompleteTask(body).toPromise();
       this.close();
       this.toastService.successMessage('Processo aprovado')
     } catch(error) {

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

@@ -8,8 +8,8 @@
 
   <div class="title">
     <div class="thetitle"><ion-label >Expediente</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
-      <button class="btn-no-color" (click)="doRefresh()">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -19,7 +19,7 @@
 
   <div class="main-content">
           
-    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-refresher-content>
       </ion-refresher-content>

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

@@ -116,9 +116,10 @@ export class ExpedientesPrPage implements OnInit {
     }
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
+      event.target.complete();
     }, 2000);
   }
 

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

@@ -279,6 +279,8 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   doRefresh(event) {
+    console.log(event);
+    
     this.closeAllDesktopComponents();
     switch(this.loggeduser.Profile){
       case 'MDGPR':
@@ -294,7 +296,15 @@ export class GabineteDigitalPage implements OnInit {
     this.LoadCounts();
     //this.refreshExpedientes();
 
-    event.target.complete();
+    if(event){
+      setTimeout(() => {
+        event.target.complete();
+      }, 2000);
+    }
+    else{
+      console.log('null');
+      
+    }
   }
 
   notImplemented(){

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

@@ -283,7 +283,7 @@ export class PedidoPage implements OnInit {
     const modal = await this.modalController.create({
       component: BookMeetingModalPage,
       componentProps: {
-        task: this.task,
+        task: task,
       },
       cssClass: classs,
       backdropDismiss: false

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

@@ -6,8 +6,8 @@
   <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
-      <button class="btn-no-color" (click)="doRefresh()">
+      <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -27,7 +27,7 @@
 <ion-content>
 
   <div class="main-content">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"

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

@@ -168,9 +168,10 @@ export class PedidosPage implements OnInit {
     console.log(this.taskType); 
   }
 
-  doRefresh() {
+  doRefresh(event) {
     this.LoadList();
     setTimeout(() => {
+      event.target.complete();
     }, 2000);
   }
 

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

@@ -7,7 +7,7 @@
   <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
-    <div class="theicon">
+    <div class="theicon btn-refresh">
       <button class="btn-no-color" (click)="doRefresh($event)">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>

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

@@ -133,7 +133,7 @@ export class PendentesPage implements OnInit {
     this.LoadList();
  
     setTimeout(() => {
-      //event.target.complete();
+      event.target.complete();
     }, 2000);
   }
  

src/app/services/events.service.ts

@@ -438,15 +438,42 @@ export class EventsService {
   createTaskEvent(folderId:any, body:any, sharedagenda:string, serialNumber:any, applicationID:any){
     const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente')+'/dispatch';
     let params = new HttpParams();
+    let options;
 
     params = params.set("FolderId", folderId);
     params = params.set("SerialNumber", serialNumber);
     params = params.set("applicationID", applicationID);
 
-    let options = { 
+    switch (this.loggeduser.Profile) {
-      headers: this.headers,
+      case 'MDGPR':
-      params: params 
+        if(body.CalendarName == 'Pessoal'){
-    };
+          options = { 
+            headers: this.headersMdPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersMdOficial,
+            params: params 
+          };
+        }
+        break;
+      case 'PR':
+        if(body.CalendarName == 'Pessoal'){
+          options = { 
+            headers: this.headersPrPessoal,
+            params: params 
+          };
+        }
+        else if(body.CalendarName == 'Oficial'){
+          options = { 
+            headers: this.headersPrOficial,
+            params: params 
+          };
+        }
+        break;
+      }
     return this.http.post<any>(`${geturl}`, body, options)
   }
 

src/app/services/processes.service.ts

@@ -244,11 +244,13 @@ export class ProcessesService {
   }
 
   GetDocumentDetails(DocId:string, FsId:string){
+    console.log(DocId);
+    
     const geturl = environment.apiURL + 'search/documents';
     let params = new HttpParams();
 
     params = params.set("docId", DocId);
-    params = params.set("applicationid", FsId);
+    params = params.set("applicationId", FsId);
     
     let options = { 
       headers: this.headers, 

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

@@ -100,9 +100,6 @@
 <ion-footer class="display-none-{{showAside}} ion-no-border">
     <div class="buttons">
       <button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
-      <ion-menu-button  (click)="openMenu()" autoHide="false">
-        <ion-icon  name="ellipsis-vertical-outline"></ion-icon>
-      </ion-menu-button>
       <button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
       <button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
     </div>

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

@@ -106,18 +106,7 @@ export class ApproveEventPage implements OnInit {
     }); */
   }
 
-  async emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
-    this.menu.close();
   
-    try {
-      await this.openEmendMessageModal(serialNumber);
-      this.modalController.dismiss(null);
-    } catch (error) {
-      this.toastService.badRequest()
-    }
-
-  }
 
   async rejectTask(serialNumber:string) {
   
@@ -159,22 +148,21 @@ export class ApproveEventPage implements OnInit {
     return await popover.present();
   }
 
-  openMenu() {
+  async emendTask(serialNumber:string){
-    this.menu.open();
+    console.log('Desktop');
-  }
 
-  async openEmendMessageModal(serialNumber:string) {
     const modal = await this.modalController.create({
       component: EmendMessageModalPage,
       componentProps:{
       },
       cssClass: 'emend-message-modal',
       backdropDismiss: false
-    });-
+    });
 
     await modal.present();
 
-    modal.onDidDismiss().then( async (res) => {
+    modal.onDidDismiss()
+    .then( async (res) => {
       console.log(res.data);
       
       if(res.data !== ''){
@@ -184,24 +172,23 @@ export class ApproveEventPage implements OnInit {
             "ReviewUserComment": res.data,
           }
         }
-      console.log(body);
+        console.log(body);
-
-      try {     
-        await  this.processes.PostTaskAction(body).toPromise()
-        //this.router.navigate(['/home/gabinete-digital/event-list']);
-        this.goToEventsToApprove();
-        this.toastService.successMessage()
-      } catch (error) {
-        this.toastService.badRequest()
-      }
-
-      
 
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.toastService.successMessage('Pedido enviado');
+          this.close();
+        } catch (error) {
+          this.toastService.badRequest();
+        }
       }
       else{
         //this.alertService.presentAlert('Operação cancelada!');
       }
     });
+    
+    //this.openEmendMessageModal(serialNumber);
+    //this.goBack();
   }
 
   goToEventsToApprove(){
@@ -237,5 +224,4 @@ export class ApproveEventPage implements OnInit {
   } 
 
 
-
 }

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

@@ -22,8 +22,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="main-content width-100">
+  <div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
-    <div *ngIf="despachoList">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -57,10 +56,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
   
     <ion-list>
       <ion-item>

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

@@ -1,5 +1,5 @@
 @import '~src/function.scss';
-.main-content{
+.main-container{
     padding: 30px 20px 0 20px !important;
     margin: 0;
     color:#000;

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

@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }

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

@@ -18,9 +18,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
+  <div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
-    <div *ngIf="despachoList">
+      <ion-list part="divo">
-      <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
             *ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="despachoList?.length < 1">
+  <div *ngIf="despachoList.length < 1">
   
     <ion-list>
       <ion-item>

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

@@ -1,9 +1,10 @@
 @import '~src/function.scss';
 /* CONTENT */
 :host{
-    padding: 30px 20px 0 20px !important;
+  padding: 30px 20px 0 20px !important;
-    margin: 0;
+  margin: 0;
 }
+
 .title{
     font-family: Roboto;
     font-size: 25px;

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

@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
  }
 
   async LoadList(){
+    console.log('HERE DESK');
+    
 
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
         "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
         "Remetente": element.workflowInstanceDataFields.Remetente,
         "DocumentsQty": 0,
-        "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+        "DocId": element.workflowInstanceDataFields.DispatchDocId,
+        "FolderID": element.workflowInstanceDataFields.FolderID,
         "WorkflowName": element.workflowDisplayName,
         "activityInstanceName": element.activityInstanceName,
       }
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
     this.despachoList.forEach( (element, index) => {
+      console.log(element['FolderID']);
+      
       // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
       let FolderID = element['FolderID'];
 

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

@@ -19,8 +19,8 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
+  <div class="width-100 overflow-y-auto height-100">
-    <div *ngIf="diplomasList">
+    <div *ngIf="diplomasList.length >= 1">
       <ion-list >
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->

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

@@ -81,7 +81,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }
@@ -100,7 +101,8 @@ serialNumber:string;
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Sender,
           "DocumentsQty": 0,
-          "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+          "DocId": element.workflowInstanceDataFields.DispatchDocID,
+          "FolderID": element.workflowInstanceDataFields.FolderID,
           "WorkflowName": element.workflowDisplayName,
           "activityInstanceName": element.activityInstanceName,
       }

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

@@ -28,7 +28,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment">
+  <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">
         <ion-item 

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

@@ -84,7 +84,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -103,7 +104,8 @@ constructor(
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.DispatchDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -136,7 +138,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }
@@ -156,7 +159,8 @@ constructor(
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+              "DocId": element.workflowInstanceDataFields.DispatchDocID,
+              "FolderID": element.workflowInstanceDataFields.FolderID,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
             }

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

@@ -196,9 +196,11 @@ export class EditEventToApproveComponent implements OnInit {
       Message: this.eventProcess.workflowInstanceDataFields.Message,
       ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
       Private: false,
-      ReviewUserComments: ''
+      ReviewUserComment: ''
     }
 
+    console.log(event);
+    
     this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
       this.toastService.successMessage('Evento editado');
     }, error =>{

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

@@ -1,4 +1,4 @@
-<ion-content>
+<ion-header>
   <div class="title width-100">
     <div class="title-container d-flex justify-space-between">
       <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -17,12 +17,14 @@
       </ion-segment>
     </ion-toolbar>
    </div>
+</ion-header>
+<ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
     <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
+  <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> --> 

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -59,39 +59,15 @@ export class EventsToApprovePage implements OnInit {
     this.eventsPRList = prEvents;
     console.log(this.eventsPRList);
     
-    /* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsPRList = res;
-
-      console.log('this.eventsPRList', this.eventsPRList)
-    }); */
     let mdEvents =  await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
     this.eventsMDGPRList = mdEvents;
     console.log(this.eventsMDGPRList);
-    /* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
-      this.showLoader = false;
-      this.eventsMDGPRList = res;
     
-      console.log('this.eventsMDGPRList', this.eventsMDGPRList)
-    }); */
     this.showLoader = false;
   }
 
-  goToEventDetail(eventToAprove){
+  goToEventDetail(event){
-    let InstanceId;
+    this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
-
-    if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
-      InstanceId = ''
-    } else {
-      InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
-    }
-
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "serialNumber": eventToAprove.serialNumber,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
   /* async openApproveModal(eventToAprove) {

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

@@ -15,7 +15,7 @@
     </ion-refresher-content>
   </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  

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

@@ -18,7 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" *ngIf="taskslist">
+  <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
     <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  

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

@@ -29,7 +29,7 @@
     </ion-refresher>
   
   <div class="width-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList">
+    <div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'parecer'">
         <!-- *ngFor = "let task of parecerList; let i = index"
         (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
       </ion-list>
 
     </div>
-    <div *ngIf="deferimentoList">
+    <div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
       <ion-list *ngSwitchCase="'deferimento'">
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  

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

@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "DocId": element.workflowInstanceDataFields.ParecerDocID,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
             "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
             "WorkflowName": element.workflowDisplayName,
             "activityInstanceName": element.activityInstanceName,
         }

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

@@ -18,8 +18,7 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100">
+  <div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
-    <div *ngIf="pendentesList">
       <ion-list>
         <ion-item 
             class="expediente ion-no-padding cursor-pointer"  
@@ -49,10 +48,8 @@
               </div>
             </ion-item>
       </ion-list>
-
-    </div>
   </div>
-  <div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
+  <div *ngIf="pendentesList.length < 1">
   
     <ion-list>
       <ion-item>

src/app/shared/popover/deploma-options/deploma-options.page.ts

@@ -42,6 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
 
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -109,6 +110,7 @@ export class DeplomaOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -152,6 +154,8 @@ export class DeplomaOptionsPage implements OnInit {
   }
 
   
-  close(){}
+  close(){
+    this.popoverController.dismiss();
+  }
 
 }

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

@@ -70,7 +70,7 @@ export class DespachosOptionsPage implements OnInit {
 
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -107,6 +107,7 @@ export class DespachosOptionsPage implements OnInit {
   }
   
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -133,6 +134,7 @@ export class DespachosOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -192,6 +194,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'

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

@@ -65,7 +65,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -102,6 +102,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
   
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -128,6 +129,7 @@ export class DespachosPrOptionsPage implements OnInit {
 
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -147,6 +149,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
   
   async openDelegarModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -187,6 +190,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'

src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts

@@ -68,6 +68,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -131,6 +132,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async distartExpedientModal(body:any) {
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -214,7 +216,7 @@ export class OptsExpedientePrPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -243,13 +245,13 @@ export class OptsExpedientePrPage implements OnInit {
       }
       else{
         console.log('Not open');
-        
       }
 
     });
   }
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -290,23 +292,4 @@ export class OptsExpedientePrPage implements OnInit {
 
   }
   
-
-
-
-  async badRequest(message?: string, callback?) {
-    const modal = await this.modalController.create({
-      component: BadRequestPage,
-       componentProps: {
-        message: 'hello',
-      },
-      cssClass: 'modal modal-desktop'
-    });
-
-    modal.present()
-    
-    setTimeout(()=>{
-      modal.dismiss()
-    },1000)
-  }
-  
 }

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

@@ -80,7 +80,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+    this.close();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -110,7 +110,7 @@ export class OptsExpedientePage implements OnInit {
   }
 
   async distartExpedientModal(){
-    console.log(this.fulltask);
+    this.close();
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
        componentProps: {

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

@@ -77,6 +77,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openBookMeetingModal(task: any) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -96,6 +97,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
+    this.popoverController.dismiss();
     //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800) {
@@ -126,6 +128,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async distartExpedientModal(){
+    this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -172,6 +175,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openAddNoteModal(actionName:string) {
+    this.popoverController.dismiss();
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -239,6 +243,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDarParecer(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;
@@ -261,6 +266,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openDelegarModal(task: any) {
+    this.popoverController.dismiss();
     // console.log(task);
     
     let classs;

src/global.scss

@@ -693,6 +693,11 @@ app-header-no-search  .ion-toolbar{
     margin: 0px auto;
 }
 
+/* .main-content{
+    height: 100% !important;
+    overflow-y: auto !important;
+} */
+
 
 body, .blue-background{ background: #0782C9 !important;}
 

src/style/main.scss

@@ -420,6 +420,8 @@
     border-bottom-right-radius: 25px;
 }
 
+
+
 // system spacing
 
 

src/theme/variables.scss

@@ -559,6 +559,12 @@ $app-theme: mat-light-theme((
 }
 }
 
+/* .main-content{
+  width: 100%;
+  height: 100% !important;
+  overflow-y: auto;
+} */
+
 
 
 /* Importing Bootstrap SCSS file. */