From 79b8b28ce4be6d579994bd7b15b8137807223be9 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 6 Feb 2023 10:49:58 +0100
Subject: [PATCH] Evento to approve

---
 .../event-actions-popover.page.ts             | 36 ++++++++++++++-----
 version/git-version.ts                        | 12 +++----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index d9178ec38..884cca713 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -57,11 +57,15 @@ export class EventActionsPopoverPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
 
-      this.toastService.successMessage();
+      this.toastService._successMessage('Evento aprovar')
       this.goBack();
     } catch (error) {
-
-      this.toastService.badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+       
+        this.toastService._badRequest('Evento não aprovar')
+      }
     }
     finally {
       loader.remove()
@@ -77,11 +81,15 @@ export class EventActionsPopoverPage implements OnInit {
     try {
       await this.processes.PostTaskAction(body).toPromise()
 
-      this.toastService.successMessage();
+      this.toastService._successMessage('Evento enviado para revisão');
       this.goBack();
     } catch (error) {
-
-      this.toastService.badRequest()
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+       
+        this.toastService._badRequest('Evento não enviado para revisão');
+      }
     }
     finally {
       loader.remove()
@@ -119,9 +127,16 @@ export class EventActionsPopoverPage implements OnInit {
         
         try { 
           await this.processes.PostTaskAction(body).toPromise();
+          this.toastService._successMessage('Evento enviado para revisão');
           this.toastService.successMessage('Pedido enviado');
           this.goBack();
         } catch (error) {
+          if(error.status == 0) {
+            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+          } else {
+           
+            this.toastService._badRequest('Evento não enviado para revisão');
+          }
           this.toastService.badRequest();
         }
         finally {
@@ -140,10 +155,15 @@ export class EventActionsPopoverPage implements OnInit {
     const loader = this.toastService.loading();
     try {    
       await this.processes.PostTaskAction(body).toPromise();
-      await this.toastService.successMessage('Processo rejeitado');
+      this.toastService._successMessage('Evento rejeitado')
       this.goBack();
     } catch (error) {
-      this.toastService.badRequest();
+      if(error.status == 0) {
+        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+      } else {
+       
+        this.toastService._badRequest('Evento não rejeitado')
+      }
     }
     finally {
       loader.remove();
diff --git a/version/git-version.ts b/version/git-version.ts
index 443d3c31a..8784c1487 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "61c0018c5",
-  "SHA": "61c0018c5d8d6f71c59b721862c4f1dad06025d0",
+  "shortSHA": "0bcf19ab2",
+  "SHA": "0bcf19ab25e38dd41c15a4848780d9c62fa1acd7",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 10:04:26 2023 +0100'",
-  "lastCommitMessage": "improve",
-  "lastCommitNumber": "4725",
+  "lastCommitTime": "'Mon Feb 6 10:07:37 2023 +0100'",
+  "lastCommitMessage": "fix merge",
+  "lastCommitNumber": "4728",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file