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

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

@@ -1,33 +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>Ações</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="approveTask(loadedEvent.serialNumber)">
-        <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
-      </ion-item>
-      <ion-item (click)="emendTask(loadedEvent.serialNumber)">
-        <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Adicionar Nota</ion-label>
-      </ion-item>
-      <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Rejeitar</ion-label>
-      </ion-item>
-      <ion-item (click)="editar(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Editar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
 
 <ion-content id="main-content">
   <div class="main-content d-flex height-100">

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

@@ -60,16 +60,6 @@ export class ApproveEventPage implements OnInit {
     this.getTask();
   }
 
-  notImplemented() {
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
-  close() {
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
-    this.closeEventToApprove.emit();
-    this.modalController.dismiss();
-  }
-
   goBack() {
     let navigationExtras: NavigationExtras = {
       queryParams: {
@@ -78,7 +68,8 @@ export class ApproveEventPage implements OnInit {
     };
     if( window.innerWidth < 801) {
       this.router.navigate(['/home/gabinete-digital/event-list']);
-    } else {
+    } 
+    else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
   }
@@ -86,9 +77,11 @@ export class ApproveEventPage implements OnInit {
   async getTask(){
     this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
     console.log(this.loadedEvent);
+
     this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-    console.log(new Date(this.today));
+
     this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
+    
     let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
     this.getAttachments(instanceId);
   }
@@ -118,8 +111,6 @@ export class ApproveEventPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
-    this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.goBack();
   }
@@ -130,9 +121,9 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
 
     try {    
-      this.processes.PostTaskAction(body).toPromise()
+      this.processes.PostTaskAction(body).toPromise();
+      await this.successMessage();
       this.goBack();
-      await this.successMessage()
     } catch (error) {
       this.badRequest()
     }
@@ -191,18 +182,15 @@ export class ApproveEventPage implements OnInit {
             "ReviewerUseComment": res.data,
           }
         }
-      console.log(body);
-
-      try { 
-        await this.processes.PostTaskAction(body).toPromise()
-        //this.router.navigate(['/home/gabinete-digital/event-list']);
-        this.goToEventsToApprove();
-        this.successMessage()
-      } catch (error) {
-        this.badRequest()
-      }
-  
+        console.log(body);
 
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.successMessage();
+          this.goBack();
+        } catch (error) {
+          this.badRequest();
+        }
       }
       else{
         //this.alertService.presentAlert('Operação cancelada!');
@@ -210,14 +198,14 @@ export class ApproveEventPage implements OnInit {
     });
   }
 
-  goToEventsToApprove(){
+  /* goToEventsToApprove(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-        "events": true,
+        "eventos": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-  }
+  } */
 
 
   async editar(serialNumber: string) {

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

@@ -16,7 +16,7 @@
             <div class="ion-icon-class">
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
-            <div class="ion-input-class">
+            <div class="ion-input-class flex-grow-1">
               <ion-textarea class="add-border" placeholder="Descrição" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
             </div>
           </div>

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

@@ -46,13 +46,13 @@
   }
   .ion-input-class{
     width: calc(100% - 45px);
-    height: 51px;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
     float: left;
     overflow: hidden;
+    flex: 1;
   }
   .ion-input-class-no-height{
     border: 1px solid #ebebeb;

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

@@ -87,7 +87,11 @@ export class ExpedienteDetailPage implements OnInit {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-  goBack(){
+  goBack() {
+    window.history.back()
+  }
+
+  /* goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
           "expedientes": true,
@@ -98,7 +102,7 @@ export class ExpedienteDetailPage implements OnInit {
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-  }
+  } */
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -242,7 +246,8 @@ export class ExpedienteDetailPage implements OnInit {
 
           try {     
             await this.processes.CompleteTask(otherbody).toPromise()
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -255,8 +260,9 @@ export class ExpedienteDetailPage implements OnInit {
       else{
         if(res['data']== 'Yes'){
           try {          
-            //await this.processes.CompleteTask(body).toPromise()
-            this.successMessage()
+            await this.processes.CompleteTask(body).toPromise();
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -270,7 +276,8 @@ export class ExpedienteDetailPage implements OnInit {
           
           try {
             await this.processes.UpdateTaskStatus(this.task.FolderId);
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }

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

@@ -77,7 +77,7 @@
             </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">{{count_exp_pr}}</span> <span class="title1">Documentos</span></p>
+            <p class="text-center exp-card-content"><span class="number">{{count_exp_pr}} </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" >
@@ -97,7 +97,7 @@
               <div class="exp-card-text">
                 <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="exp-card-content"><span class="number">{{count_exp_pr}}</span> <span class="title1">Documentos</span> </p>
+                <p class="exp-card-content"><span class="number">{{count_exp_pr}} </span> <span class="title1">Documentos</span> </p>
               </div>
             </div>
           </div>
@@ -139,7 +139,7 @@
             <p class="text-center exp-card-title">Diplomas para Assinar</p>
             <p class="text-center exp-card-content">{{count_dip_as}} <span class="title1">Documentos</span></p>
           </div>
-          
+
         </div>
       </div>
 

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { AlertService } from 'src/app/services/alert.service';
 import { ModalController } from '@ionic/angular';
@@ -7,11 +7,14 @@ import { ExpedientePage } from './expediente/expediente.page';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { DespachosPage } from './despachos/despachos.page';
 import { PedidosPage } from './pedidos/pedidos.page';
-import { PendentesPage } from './pendentes/pendentes.page';
+/* import { PendentesPage } from './pendentes/pendentes.page'; */
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
 import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page'
 import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
+import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
+import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
+import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
 @Component({
   selector: 'app-gabinete-digital',
   templateUrl: './gabinete-digital.page.html',
@@ -69,7 +72,11 @@ export class GabineteDigitalPage implements OnInit {
 
   loggeduser: User;
   mdgpr = "MDGPR";
-  pr = "PR"
+  pr = "PR";
+
+  @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;
+  @ViewChild(PendentesPage) pendentesListPage: PendentesPage;
+  @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
 
   constructor(
     private processesbackend:ProcessesService,
@@ -88,61 +95,7 @@ export class GabineteDigitalPage implements OnInit {
           this.modalController.dismiss();
         }
       };
-
-      this.activatedRoute.queryParams.subscribe(params => {
-        switch (params)
-        {
-          case params["eventos"]:
-            this.openEventsToApprovePage("MDGPR");
-            this.selectedElement='approval'
-            break;
-
-          case params["expedientes"]:
-            this.openExpedientListPage();
-            this.selectedElement='Correspondence';
-            break;
-
-          case params["pendentes"]:
-            this.openPendentesPage('');
-            this.selectedElement='Pending'
-            break;
-    
-          case params["despachos"]:
-            this.openDespachosPage('');
-            this.selectedElement='Dispatches';
-            break;
-
-          case params["pedidos"]:
-            this.openPedidosPage('parecer');
-            this.selectedElement='RequestsForOpinion';
-            break;
-
-          case params["expedientespr"]:
-            this.openEventsToApprovePage("MDGPR");
-            this.selectedElement='Expediente Presidente'
-            break;
-
-          case params["despachospr"]:
-            this.openDespachosPrPage('');
-            this.selectedElement='DispatchesPr'
-            break;
-
-          case params["diplomas"]:
-            this.openDiplomasPage('');
-            this.selectedElement='DiplomasPorAssinar'
-            break;
-
-          case params["diplomasassinar"]:
-            this.openDiplomasPage('');
-            this.selectedElement='DiplomasAssinar'
-            break;
-        }
-      });
-
-      /* if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
-        this.openEventsToApprovePage('MDGPR');
-        this.selectedElement='approval'
-      } */
+      this.checkRoutes();
       
   }
 
@@ -151,7 +104,9 @@ export class GabineteDigitalPage implements OnInit {
       showEventList: false,
       showExpediente: false
     }
-  }  
+  }
+
+
 
   ngOnInit() {
     switch(this.loggeduser.Profile){
@@ -164,9 +119,70 @@ export class GabineteDigitalPage implements OnInit {
     }
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.checkRoutes();
         this.LoadCounts();
       }
     });
+    
+  }
+
+  checkRoutes(){
+    this.activatedRoute.queryParams.subscribe(params => {
+      switch (params)
+      {
+        case params["eventos"]:
+          this.openEventsToApprovePage("MDGPR");
+          this.selectedElement='approval';
+          break;
+
+        case params["expedientes"]:
+          this.openExpedientListPage();
+          this.selectedElement='Correspondence';
+          this.expedientesPage.doRefresh();
+          break;
+
+        case params["pendentes"]:
+          this.openPendentesPage('');
+          this.selectedElement='Pending';
+          break;
+  
+        case params["despachos"]:
+          this.openDespachosPage('');
+          this.selectedElement='Dispatches';
+          break;
+
+        case params["pedidos"]:
+          this.openPedidosPage('parecer');
+          this.selectedElement='RequestsForOpinion';
+          break;
+
+        case params["expedientespr"]:
+          this.openEventsToApprovePage("MDGPR");
+          this.selectedElement='Expediente Presidente'
+          break;
+
+        case params["despachospr"]:
+          this.openDespachosPrPage('');
+          this.selectedElement='DispatchesPr'
+          break;
+
+        case params["diplomas"]:
+          this.openDiplomasPage('');
+          this.selectedElement='DiplomasPorAssinar'
+          break;
+
+        case params["diplomasassinar"]:
+          this.openDiplomasPage('');
+          this.selectedElement='DiplomasAssinar'
+          break;
+      }
+    });
+  }
+
+  refreshExpedientes(){
+    this.expedientesPage.doRefresh();
+    //this.pendentesListPage.doRefresh();
+    //this.eventsToApprove.doRefresh();
   }
 
   closeAllDesktopComponents() {
@@ -250,6 +266,7 @@ export class GabineteDigitalPage implements OnInit {
       case 'MDGPR':
         this.selectedElement='Correspondence';
         this.showExpedients = true;
+        this.expedientesPage.doRefresh();
         break;
       case 'PR':
         this.selectedElement='ExpedientesPr';
@@ -257,9 +274,9 @@ export class GabineteDigitalPage implements OnInit {
         break;
     }
     this.LoadCounts();
+    //this.refreshExpedientes();
 
     setTimeout(() => {
-      //event.target.complete();
     }, 2000);
   }
 
@@ -519,7 +536,7 @@ export class GabineteDigitalPage implements OnInit {
     //}
   }
 
-  async openPendenteList(){
+  /* async openPendenteList(){
     this.closeAllDesktopComponent();
       const modal = await this.modalController.create({
         component: PendentesPage,
@@ -531,7 +548,7 @@ export class GabineteDigitalPage implements OnInit {
       await modal.present();
       modal.onDidDismiss();
       console.log('show desktop modal')
-  }
+  } */
 
   async openDespachoList(){
     this.closeAllDesktopComponent();