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

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;
       }
     });