-
+
- {{ task.Folio}} +
{{ task.Folio}}
- - +
@@ -29,53 +26,57 @@
-
-
-
Intervenientes
- - -
-

{{interveniente.Name}}

-
- - -
-
- .. {{ cc | json }} .. -
Com conhecimento
- - -
-

{{c.Name}}

-
+
+
+
+
Intervenientes
+ + +
+

{{interveniente.Name}}

+
+ + +
+
+ .. {{ cc | json }} .. + +
Com conhecimento
+ + +
+

{{c.Name}}

+
+ + +
+
+
Detalhes
+ +

+ +
+
+
+ +
Documentos Anexados
+ + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

 -
-
-
Detalhes
- -

- +
-
- -
Documentos Anexados
- - -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

- - - -
+
-
+
Responder ao PR
@@ -100,7 +101,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss index 74ae451b5..3fa6143cf 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss @@ -5,7 +5,7 @@ border-top-right-radius: 25px; } .content{ - padding: 30px 20px 0 20px !important; + padding: 30px 00px 0 00px !important; margin: 0; float: left; } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 325c266b7..a14652cef 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -50,10 +50,8 @@ export class DespachoPrPage implements OnInit { private menu: MenuController, private router: Router, private modalController: ModalController, - private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, - private animationController: AnimationController, private toastService: ToastService, private location: Location, ) { @@ -510,7 +508,17 @@ export class DespachoPrPage implements OnInit { }, translucent: true }); - return await popover.present(); + + await popover.present(); + + popover.onDidDismiss().then(( res =>{ + + if( res['data'] == 'close') { + this.goBack() + } + + })) + } diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 4301cab84..0f9b4b2ff 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -4,21 +4,15 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; -import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; -import { momentG } from 'src/plugin/momentG' import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.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 { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { ToastService } from 'src/app/services/toast.service'; - +import { Location } from '@angular/common' @Component({ selector: 'app-despachos-pr-options', @@ -45,7 +39,8 @@ export class DespachosPrOptionsPage implements OnInit { public popoverController: PopoverController, private activatedRoute: ActivatedRoute, private animationController: AnimationController, - private toastService: ToastService) { } + private toastService: ToastService, + private location: Location,) { } ngOnInit() { @@ -92,10 +87,12 @@ export class DespachosPrOptionsPage implements OnInit { } + this.popoverController.dismiss('close') + }); } - sendExpedienteToPending(){ + sendExpedienteToPending() { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.close(); @@ -127,6 +124,7 @@ export class DespachosPrOptionsPage implements OnInit { this.close(); this.openMenu(); */ } + this.popoverController.dismiss('close') }); } From 53d6896abf1f10e7fc953d81aabaedf81c6a0174 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Aug 2021 17:02:41 +0100 Subject: [PATCH 4/4] Fix --- .../modals/dar-parecer/dar-parecer.page.ts | 13 ++-- .../despachos-pr/despachos-pr.page.ts | 4 +- .../despachos/despacho/despacho.page.html | 62 ++++++++++--------- .../despachos/despachos.page.html | 2 +- .../pedidos/pedido/pedido.page.scss | 2 - .../all-processes/all-processes.page.ts | 7 +-- .../diplomas-assinar.page.html | 1 + .../request-options/request-options.page.ts | 31 ++++------ 8 files changed, 58 insertions(+), 64 deletions(-) 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}}

-
- - -
-
Com conhecimento
+ +
+
+
Intervenientes
-
-

{{c.Name}}

+
+

{{interveniente.Name}}

+
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+ + +
+
+
Detalhes
+ +

+ +
-
-
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){