-
+
- {{ 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') }); }