-
+
- {{ 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/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
-
-
Intervenientes
- - -
-

{{interveniente.Name}}

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

{{c.Name}}

+
+

{{interveniente.Name}}

+
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+
+
+
+
+
Detalhes
+ +

+
+
-
-
Detalhes
- -

-
-
-
-
- -
Documentos Anexados
- - + +
Documentos Anexados
+ -

{{ attachment.Assunto }}

-

{{ attachment.DocNumber }}

-

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

-
-
-
+ +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

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

+
+ + +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 82eff454d..2a232317f 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -20,7 +20,6 @@ display: flex; font-family: Roboto; background-color: #fff; - overflow:auto; color:#000; transform: translate3d(0, 1px, 0); .title-content{ @@ -63,7 +62,6 @@ ion-button{ .upper-content{ font-family: Roboto; margin-left: 41px; - overflow: auto; font-size: 18px; .label{ diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index aaa8bb324..8e4e43aeb 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -210,7 +210,15 @@ export class PedidoPage implements OnInit { }, translucent: true }); - return await popover.present(); + await popover.present(); + + popover.onDidDismiss().then(( res =>{ + + if( res['data'] == 'close') { + this.goBack() + } + + })) } async repreciar(note:string, documents:any) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index d22060ed1..ce73fd988 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -98,7 +98,7 @@
- {{task.Senders}} sender + {{task.Senders}}
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index e6c4d94a0..d7a83f62d 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -68,9 +68,8 @@ export class AllProcessesPage implements OnInit { this.allProcessesList = removeDuplicate( this.allProcessesList) this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); }); - //this.pendentesstore.reset(this.allProcessesList); - this.skeletonLoader = false; + this.skeletonLoader = false; } sortArrayISODate(myArray: any){ @@ -98,8 +97,8 @@ export class AllProcessesPage implements OnInit { let diffMinutes = minutes; console.log(allday); - if(totalDays == 0){ - if(allday){ + if(totalDays == 0) { + if(allday) { customDate = this.getCustomDate(start)+", "+this.getCustomHours(start)+" (todo dia)"; console.log(customDate); return customDate; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 1e721e63c..5a42d4af1 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -60,6 +60,7 @@
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 2ccd800bd..1887bb852 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -1,4 +1,4 @@ - +
Pedidos
@@ -28,7 +28,7 @@ -
+
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss index 85dcc5689..b8fbc29f0 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.scss @@ -1,7 +1,7 @@ @import '~src/function.scss'; /* CONTENT */ :host{ - padding: 30px 20px 0 20px !important; + padding: 30px 00px 0 00px !important; margin: 0; } .title{ diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 645ba8592..4fb891ea3 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -1,4 +1,4 @@ - +
Pendentes
@@ -18,7 +18,7 @@ -
+
{ console.log(res); this.close(); @@ -127,6 +124,7 @@ export class DespachosPrOptionsPage implements OnInit { this.close(); this.openMenu(); */ } + this.popoverController.dismiss('close') }); } diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index ff06fba4c..8f88ee8de 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -32,7 +32,7 @@
- + 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 8b925bc4c..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' @@ -108,7 +106,7 @@ export class RequestOptionsPage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { - this.popoverController.dismiss(); + //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800) { @@ -129,18 +127,16 @@ export class RequestOptionsPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=> { console.log(res['data']); - if(res['data']=='openDiscart'){ + if(res['data']=='openDiscart') { console.log('open discart'); this.distartExpedientModal(); - this.modalController.dismiss() - } }); } - async distartExpedientModal(){ + async distartExpedientModal() { this.popoverController.dismiss(); console.log(this.fulltask); const modal = await this.modalController.create({ @@ -158,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(); */ } }); @@ -257,12 +250,9 @@ export class RequestOptionsPage implements OnInit { this.toastService.badRequest('Processo não arquivado') } - } async openDarParecer(task: any) { - this.popoverController.dismiss(); - // console.log(task); let classs; if( window.innerWidth <= 800){ @@ -280,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){