From 8a3854e49599e4b5417c2d7bff68e34dbcf06a27 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Wed, 16 Sep 2020 11:00:58 +0100 Subject: [PATCH 1/4] save --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index f1cbcca57..2e57e514e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -55,14 +55,14 @@ Diplomas - - Assinados pelo PR - {{count_dip_apr}} - Por validar (MDGPR) {{count_dip_pv}} + + Assinados pelo PR + {{count_dip_apr}} + From 25e838fe5a34d04c548b20969ec644174cf54dd1 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Wed, 30 Sep 2020 14:04:47 +0100 Subject: [PATCH 2/4] added menu at expedient detail --- .../expediente-detail.page.html | 56 +++++++++++++++++++ .../expediente-detail.page.ts | 18 +++++- src/environments/environment.ts | 2 +- 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index f1f69ae5d..8c48de08c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -4,9 +4,65 @@ Expediente + + + + + + + Menu + + + + + + + Apresentação de OGE 2020 + + + + Efectuar Despacho + + + + Pedido de Parecer + + + + Pedido de Deferimento + + + + Descartar + + + + Enviar para pendentes + + + + Marcar reunião + + + + +
+ + + + + + Inbox + + + + Open Menu + +
+

Detalhes do Expediente

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 98747d6d9..21ec8ce52 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -7,6 +7,8 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; +import { MenuController } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; @Component({ selector: 'app-expediente-detail', @@ -19,7 +21,9 @@ export class ExpedienteDetailPage implements OnInit { private processes:ProcessesService, private iab: InAppBrowser, private attachments: AttachmentsService, - private events: EventsService) { } + private events: EventsService, + private menu: MenuController, + private alertService: AlertService) { } task: DailyWorkTask; eventsList: Event[]; @@ -36,6 +40,7 @@ export class ExpedienteDetailPage implements OnInit { }); } + async LoadTaskDetail(serial:string) { this.processes.GetTask(serial).subscribe(result => { @@ -73,4 +78,15 @@ export class ExpedienteDetailPage implements OnInit { const browser = this.iab.create(url,"_blank"); browser.show(); } + + openFirst() { + this.menu.enable(true, 'first'); + this.menu.open('first'); + } + openMenu() { + this.menu.open(); + } + dispatchExpedient(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4fb899a73..dd2e51b11 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/v2/api/', domain: 'gabinetedigital.local', - defaultuser: 'tiago.kayaya', + defaultuser: 'paulo.pinto', defaultuserpwd: 'tabteste@006' }; From 0aff75123b592b8b7e64e9de1ab409bcc5b1226c Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Wed, 30 Sep 2020 14:43:14 +0100 Subject: [PATCH 3/4] changed menu icon --- .../expediente/expediente-detail/expediente-detail.page.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 8c48de08c..1d5568bc4 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -5,7 +5,9 @@ Expediente - + + + From e79d34488e7bf31a6654a78b87b39b3abe635241 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Fri, 23 Oct 2020 13:41:08 +0100 Subject: [PATCH 4/4] save --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 011e748d5..afec2a39c 100644 --- a/package.json +++ b/package.json @@ -94,4 +94,4 @@ "android" ] } -} \ No newline at end of file +}