Fix merge

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){
-      const modal = await this.modalCtrl.create({
-        component: EventListPage,
-        componentProps:{
-          profile: this.profile,
-        },
-        cssClass: 'modal  modal-desktop',
-        backdropDismiss: false
-      });
-      await modal.present();
-      modal.onDidDismiss();
+    if( window.innerWidth <= 801){
+      this.router.navigate(['/home/agenda/event-list']);
     } 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);
-    console.log(this.instanceId);
+    this.closePopover();
     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

@@ -43,7 +43,8 @@ export class EventsPage implements OnInit {
   public profile:string;
   currentEvent: any;
 
-  eventsList: Event[];  
+  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();
-  
-    setTimeout(() => {
-      event.target.complete();
-    }, 2000);
+    event.target.complete();
   }
   
   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 name="ellipsis-vertical-outline"></ion-icon>
-              </ion-menu-button> -->
-              <ion-icon class="font-25 cursor-pointer" name="ellipsis-vertical-outline"></ion-icon>
+            <ion-icon src="assets/images/icons-menu.svg"></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{
-      margin: 0px auto;
+  .title-content{
+    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;
-      background: #fff;
-      .middle{
-        padding: 0!important;
-        float: left;
-        width: 280px;
-        margin: 2.5px 0 0 5px;
-        display: flex;
-        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;
-        }
+      float: left;
+      padding-left: 5px;
+    }
+    .div-icon{
+      width: 40px !important;
+      font-size: 35px !important;
+      text-align: start !important;
+      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">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <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>
     </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 => {
-      if(params["serialNumber"]) {
-        this.serialNumber = params["serialNumber"];
-        console.log(params["serialNumber"]);
+    this.activatedRoute.paramMap.subscribe(params => {
+      console.log(params["params"]);
+      
+      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">
-        <ion-list>
+      <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
           <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">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <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>
     </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">
-      <button class="btn-no-color" (click)="doRefresh()">
+    <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>
     </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);
   }