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

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

@@ -4,21 +4,15 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
 import { EventsService } from 'src/app/services/events.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { formatDate } from '@angular/common';
 import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
-import { momentG }  from 'src/plugin/momentG'
 import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
 import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
-import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';
-
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-despachos-pr-options',
@@ -45,7 +39,8 @@ export class DespachosPrOptionsPage implements OnInit {
     public popoverController: PopoverController,
     private activatedRoute: ActivatedRoute,
     private animationController: AnimationController,
-    private toastService: ToastService) { }
+    private toastService: ToastService,
+    private location: Location,) { }
 
   ngOnInit() {
     
@@ -92,10 +87,12 @@ export class DespachosPrOptionsPage implements OnInit {
 
       }
 
+      this.popoverController.dismiss('close')
+
     });
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);
       this.close();
@@ -127,6 +124,7 @@ export class DespachosPrOptionsPage implements OnInit {
         this.close();
         this.openMenu(); */
       }
+      this.popoverController.dismiss('close')
       
     });
   }

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

@@ -32,7 +32,7 @@
       <div class="solid"></div>
       <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
       <button *ngIf="p.userRole(['PR'])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efetuar Despacho</button>
-      <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
+      <!-- <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> -->
       <button (click)="openAddNoteModal('Solicitar Reapreciação')" class="btn-cancel" shape="round" >Solicitar Reapreciação</button>
       <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
       <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>

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

@@ -48,7 +48,6 @@ export class RequestOptionsPage implements OnInit {
 
     console.log('serialnumber', this.serialnumber)
 
-
     this.showEnviarPendentes = this.navParams.get('showEnviarPendentes');
 
     if(!this.showEnviarPendentes) this.showEnviarPendentes = false
@@ -66,17 +65,16 @@ export class RequestOptionsPage implements OnInit {
     };
   }
 
-  close(){
+  close() {
     if( window.innerWidth < 801){
-      this.popoverController.dismiss(); 
-    }
-    else{
-      this.modalController.dismiss();
+      this.popoverController.dismiss('close'); 
+    } else {
+      this.modalController.dismiss('close');
     }
     this.router.navigate(['/home/gabinete-digital/pedidos']);
   }
 
-  sendExpedienteToPending(){
+  sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       console.log(res);
       this.close();
@@ -90,7 +88,7 @@ export class RequestOptionsPage implements OnInit {
   async openBookMeetingModal(task: any) {
     this.popoverController.dismiss();
     let classs;
-    if( window.innerWidth <= 800){
+    if( window.innerWidth <= 800) {
       classs = 'book-meeting-modal modal modal-desktop'
     } else  {
       classs = 'modal modal-desktop showAsideOptions'
@@ -108,7 +106,7 @@ export class RequestOptionsPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    this.popoverController.dismiss();
+
     //this.modalController.dismiss();
     let classs;
     if( window.innerWidth <= 800) {
@@ -129,18 +127,16 @@ export class RequestOptionsPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then(res=> {
       console.log(res['data']);
-      if(res['data']=='openDiscart'){
+      if(res['data']=='openDiscart') {
         console.log('open discart');
         
         this.distartExpedientModal();
-        this.modalController.dismiss()
-
       }
 
     });
   }
 
-  async distartExpedientModal(){
+  async distartExpedientModal() {
     this.popoverController.dismiss();
     console.log(this.fulltask);
     const modal = await this.modalController.create({
@@ -158,9 +154,6 @@ export class RequestOptionsPage implements OnInit {
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
         this.close();
-        /* console.log('2Expedient Discard closed2');
-        this.close();
-        this.openMenu(); */
       }
       
     });
@@ -257,12 +250,9 @@ export class RequestOptionsPage implements OnInit {
       this.toastService.badRequest('Processo não arquivado')
     }
 
-
   }
 
   async openDarParecer(task: any) {
-    this.popoverController.dismiss();
-    // console.log(task);
     
     let classs;
     if( window.innerWidth <= 800){
@@ -280,12 +270,14 @@ export class RequestOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then( () => {
+      this.popoverController.dismiss('close');
+    });
+
   }
 
   async openDelegarModal(task: any) {
     this.popoverController.dismiss();
-    // console.log(task);
     
     let classs;
     if( window.innerWidth <= 800){