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

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

@@ -1,11 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.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 { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page';
 
 @Component({
   selector: 'app-event-actions-popover',
@@ -38,7 +39,17 @@ export class EventActionsPopoverPage implements OnInit {
 
   goBack(){
     this.closePopover();
+
+    if (window.innerWidth <= 801) {
       this.router.navigate(['/home/gabinete-digital/event-list']);
+    } else {
+      let navigationExtras: NavigationExtras = {
+        queryParams: {
+          'eventos': true
+        }
+      }
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
   }
 
   closePopover(){
@@ -58,16 +69,44 @@ export class EventActionsPopoverPage implements OnInit {
     }
   }
 
-  emendarTask() {
-    let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" }
-    console.log(body);
-    try {  
-      this.processes.PostTaskAction(body).toPromise();
-      this.toastService.successMessage();
-      this.goBack();
-    } catch (error) {
-      this.toastService.badRequest()
-    }
+  async emendarTask() {
+    console.log('Mobile');
+    
+    const modal = await this.modalController.create({
+      component: EmendMessageModalPage,
+      componentProps:{
+      },
+      cssClass: 'emend-message-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss()
+    .then( async (res) => {
+      console.log(res.data);
+      
+      if(res.data !== ''){
+        let body = { "serialNumber": this.serialNumber, 
+        "action": "Emendar",
+            "dataFields": {
+            "ReviewUserComment": res.data,
+          }
+        }
+        console.log(body);
+
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.toastService.successMessage('Pedido enviado');
+          this.goBack();
+        } catch (error) {
+          this.toastService.badRequest();
+        }
+      }
+      else{
+        //this.alertService.presentAlert('Operação cancelada!');
+      }
+    });
   }
 
   async rejeitar(){

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

@@ -14,11 +14,11 @@
 <ion-footer>
   <ion-toolbar class="width-100 d-flex justify-space-between px-20">
     <ion-buttons slot="start">
-      <button class="btn-delete" shape="round" (click)="close()">Não</button>
+      <button class="btn-delete" shape="round" (click)="save()">Sim</button>
     </ion-buttons>
     <ion-title></ion-title>
     <ion-buttons slot="end">
-      <button class="btn-ok" shape="round" (click)="save()">Sim</button>
+      <button class="btn-ok" shape="round" (click)="close()">Não</button>
     </ion-buttons>
   </ion-toolbar>
 </ion-footer>

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

@@ -115,9 +115,47 @@ export class ApproveEventPage implements OnInit {
     }); */
   }
 
-  emendTask(serialNumber:string){
-    this.openEmendMessageModal(serialNumber);
-    this.goBack();
+  async emendTask(serialNumber:string){
+    console.log('Desktop');
+
+    const modal = await this.modalController.create({
+      component: EmendMessageModalPage,
+      componentProps:{
+      },
+      cssClass: 'emend-message-modal',
+      backdropDismiss: false
+    });
+
+    await modal.present();
+
+    modal.onDidDismiss()
+    .then( async (res) => {
+      console.log(res.data);
+      
+      if(res.data !== ''){
+        let body = { "serialNumber": serialNumber, 
+        "action": "Emendar",
+            "dataFields": {
+            "ReviewUserComment": res.data,
+          }
+        }
+        console.log(body);
+
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.toastService.successMessage('Pedido enviado');
+          this.goBack();
+        } catch (error) {
+          this.toastService.badRequest();
+        }
+      }
+      else{
+        //this.alertService.presentAlert('Operação cancelada!');
+      }
+    });
+    
+    //this.openEmendMessageModal(serialNumber);
+    //this.goBack();
   }
 
   async rejeitar(serialNumber:string){

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

@@ -186,12 +186,12 @@ export class GabineteDigitalPage implements OnInit {
 
         case params["diplomas"]:
           this.openDiplomasPage('');
-          this.selectedElement='DiplomasPorAssinar'
+          this.selectedElement='DiplomasPorAssinar';
           break;
 
         case params["diplomasassinar"]:
           this.openDiplomasPage('');
-          this.selectedElement='DiplomasAssinar'
+          this.selectedElement='DiplomasAssinar';
           break;
       }
     });