fixe go back

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

@@ -220,7 +220,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.executado(note, documents, this.serialnumber).toPromise();
       this.httpErrorHandle.httpsSucessMessagge('Executado')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -237,7 +237,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Arquivar')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -264,7 +264,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Reexecução')
       this.TaskService.loadDespachos();
-      this.close();
+       //this.close();
 
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
@@ -292,7 +292,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Gerar Diploma')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error);
     }   finally {
@@ -496,9 +496,16 @@ export class DespachoPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present().then(()=> {
+    await popover.present();
-      this.TaskService.loadDespachos();
+    
+    popover.onDidDismiss().then((res)=> {
+      console.log('res', res.data)
+      if(res.data == 'back') {
+        this.goBack();
+      }
+      
     })
+
   }
 
 

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

@@ -47,12 +47,9 @@ export class DespachosOptionsPage implements OnInit {
   ngOnInit() {
   }
 
-  close () {
-    this.goBack()
-  }
 
   async openTaskProcessModal(taskAction: any, task: any) {
-    this.popoverController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -70,18 +67,17 @@ export class DespachosOptionsPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then( res => {
-      this.goBack();
+      // this.goBack();
     });
   }
 
   sendExpedienteToPending() {
     const loader = this.toastService.loading()
-    this.popoverController.dismiss();
     this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
       this.httpErrorHandle.httpsSucessMessagge('Enviar para Pendentes')
       loader.remove()
       
-      this.close();
+      this.goBack('back');
     },(error)=>{
       loader.remove()
       this.httpErrorHandle.httpStatusHandle(error)
@@ -89,7 +85,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   async distartExpedientModal(){
-    this.popoverController.dismiss();
+
     
     const modal = await this.modalController.create({
       component: DiscartExpedientModalPage,
@@ -105,14 +101,14 @@ export class DespachosOptionsPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then(res=>{
       if(res['data']=='close'){
-        this.close();
+        this.goBack('back');
       }
     });
   }
 
 
   async openBookMeetingModal(task: any) {
-    this.popoverController.dismiss();
+  
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -128,11 +124,13 @@ export class DespachosOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(() => {
+      this.goBack('no');
+    })
   }
 
   async openDelegarModal(task: any) {
-    this.popoverController.dismiss();
+  
     let classs;
     if( window.innerWidth <= 800){
       classs = 'book-meeting-modal modal modal-desktop'
@@ -152,7 +150,7 @@ export class DespachosOptionsPage implements OnInit {
       if(res){
         const data = res.data;
         if(data == 'close') {
-          this.goBack();
+          this.goBack('back');
         }
       }
 
@@ -175,7 +173,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage()
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -191,7 +189,7 @@ export class DespachosOptionsPage implements OnInit {
 
   async openAddNoteModal(actionName:string) {
 
-    this.popoverController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -229,7 +227,7 @@ export class DespachosOptionsPage implements OnInit {
         if(actionName == 'Executado') {
           await this.executado(res.data.note, docs);
         }
-        else if(actionName == 'Arquivar'){
+        else if(actionName == 'Arquivar') {
          await this.arquivar(res.data.note, docs);
         }
         else if(actionName == 'Gerar Diploma') {
@@ -241,7 +239,7 @@ export class DespachosOptionsPage implements OnInit {
         else if(actionName == 'Reexecução') {
           await this.reexecutar(res.data.note, docs);
         }
-        this.goBack();
+
       }
     });
   }
@@ -262,7 +260,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage('Processo arquivado')
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -293,7 +291,7 @@ export class DespachosOptionsPage implements OnInit {
 
     try {
       await this.processes.CompleteTask(body).toPromise()
-      this.close();
+      this.goBack('back');
       this.toastService._successMessage()
     } catch(error) {
       if(error.status == 0) {
@@ -326,7 +324,7 @@ export class DespachosOptionsPage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise()
       this.toastService._successMessage()
-      this.close();
+      this.goBack('back');
     } catch (error) {
       if(error.status == 0) {
         this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
@@ -340,8 +338,8 @@ export class DespachosOptionsPage implements OnInit {
 
   }
 
-  goBack() {
+  goBack(params) {
-    this.RouteService.goBack();
+    this.popoverController.dismiss()
   }
 
 }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "2f6588c16",
+  "shortSHA": "ffa1f34b4",
-  "SHA": "2f6588c16488e7ab520cdacaa354abf1760b7506",
+  "SHA": "ffa1f34b4c00e60a4a5ea48fc82fd5822e264773",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sat Jun 10 14:44:42 2023 +0100'",
+  "lastCommitTime": "'Sat Jun 10 15:58:45 2023 +0100'",
-  "lastCommitMessage": "update details un upload file",
+  "lastCommitMessage": "labels",
-  "lastCommitNumber": "4963",
+  "lastCommitNumber": "4964",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/generic/task-list-header/task-list-header.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts",
   "changeAuthor": "peter.maquiran"
 }