diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 6af927624..86e8b92b3 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -10,7 +10,7 @@ - Agenda + Agenda diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 4bb685237..c5c899c6f 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1150,8 +1150,6 @@ export class AgendaPage implements OnInit { this.postEvent = false; } - - async changeSegment(segments: "Combinado" | "Pessoal" | "Oficial") { this.segment = segments; @@ -1162,5 +1160,4 @@ export class AgendaPage implements OnInit { } } - } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 14273edd9..e0357154b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -20,7 +20,7 @@
-
+
@@ -28,7 +28,7 @@

{{count_ev_md+count_ev_pr}} Documentos

-
+
@@ -36,7 +36,7 @@

{{count_exp_dailywork}} Documentos

-
+
@@ -44,21 +44,24 @@

Pendentes

- Documentos

-
+ +

Pedidos de Parecer

- Documentos

-
+ +

Pedidos de Deferimento

- Documentos

-
+ +
@@ -66,15 +69,15 @@

- Documentos

- -
+

Expediente Presidente

- Documentos

-
+ +
@@ -82,9 +85,7 @@

- Documentos

- - -
+
@@ -95,7 +96,8 @@
-
+ +
@@ -107,14 +109,16 @@
-
+

Diplomas assinaldos PR

- Documentos

+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 3a3b9b069..0b5a60046 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -345,3 +345,9 @@ ion-content{ width: 25%; } } + + +.active { + border: 1px solid green; + box-sizing: border-box; +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 8cc4ca006..34ad0b2c6 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,6 +12,7 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router'; templateUrl: './gabinete-digital.page.html', styleUrls: ['./gabinete-digital.page.scss'], }) + export class GabineteDigitalPage implements OnInit { segment:string; @@ -27,11 +28,13 @@ export class GabineteDigitalPage implements OnInit { count_ev_pr=0; count_ev_md=0; + selectedElement = ""; desktopComponent: any = { showEventList: false, showExpediente : false } + showEventsToApprove = false; showEmptyContainer = false; showExpedients = true; @@ -46,7 +49,7 @@ export class GabineteDigitalPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, private router: Router, - ) { + ) { window.onresize = (event) => { // if not mobile remove all component @@ -74,6 +77,7 @@ export class GabineteDigitalPage implements OnInit { showExpediente: false } } + ngOnInit() { //Initialize profile as mdgpr this.profile = "MDGPR"; @@ -174,6 +178,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ //} } + openExpedientListPage(){ this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ @@ -183,6 +188,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedients = true; } } + openExpedientPage(data){ console.log(data); @@ -195,6 +201,7 @@ this.processesbackend.GetActionsList().subscribe(res=>{ this.showExpedientDetail = true; } } + async openExpedientList(){ this.closeAllDesktopComponent();