diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts
index 40c21b007..d46c40d24 100644
--- a/src/app/modals/dar-parecer/dar-parecer.page.ts
+++ b/src/app/modals/dar-parecer/dar-parecer.page.ts
@@ -35,7 +35,7 @@ export class DarParecerPage implements OnInit {
}
- cancel(){
+ cancel() {
this.modalController.dismiss();
}
@@ -64,15 +64,18 @@ export class DarParecerPage implements OnInit {
}
console.log(body);
- try {
+ const loader = this.toastService.loading()
+
+ try {
await this.processes.CompleteTask(body).toPromise();
this.modalController.dismiss();
- this.toastService.successMessage('Pedido de Parecer solicitado')
+ this.toastService.successMessage('Parecer enviado');
} catch (error) {
- this.toastService.badRequest("Pedido de Parecer não solicitado")
+ this.toastService.badRequest("Parecer não solicitado");
+ } finally {
+ loader.remove()
}
-
}
removeAttachment(index: number){
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index f70b1cf8b..b477a5d49 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -1,11 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
import { ModalController, NavParams } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index c102eafb1..9b2949b7e 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -27,43 +27,47 @@
-
Intervenientes
-
-
-
-
{{interveniente.Name}}
-
-
-
-
0">
-
Com conhecimento
+
+
+
+
Intervenientes
-
-
{{c.Name}}
+
+
0">
+
Com conhecimento
+
+
+
+
+
+
+
-
-
Detalhes
-
-
-
+
+
+ Documentos Anexados
+
+
+ {{ Document.Assunto }}
+ {{ Document.Sender}}{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}
+
+
+
-
-
- Documentos Anexados
-
-
- {{ Document.Assunto }}
- {{ Document.Sender}}{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}
-
-
-
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 72429282d..20c979908 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -7,7 +7,7 @@
-
Despachos
+
Despachos
+
diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts
index 6b4c2ab12..46684831e 100644
--- a/src/app/shared/popover/request-options/request-options.page.ts
+++ b/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'
@@ -135,13 +133,10 @@ export class RequestOptionsPage implements OnInit {
this.distartExpedientModal();
}
- this.modalController.dismiss('close')
- this.popoverController.dismiss('close')
-
});
}
- async distartExpedientModal(){
+ async distartExpedientModal() {
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
@@ -159,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(); */
}
});
@@ -258,12 +250,9 @@ export class RequestOptionsPage implements OnInit {
this.toastService.badRequest('Processo não arquivado')
}
-
}
async openDarParecer(task: any) {
- this.popoverController.dismiss('close');
- // console.log(task);
let classs;
if( window.innerWidth <= 800){
@@ -281,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){