diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 0223b877b..a9a7fc272 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -253,7 +253,7 @@ ion-content{
}
.exp-card-long{
- display: none !important;
+ //display: none;
width: 100% !important;
cursor: pointer;
user-select: none;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 56850f698..37809c9ec 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -53,13 +53,13 @@ export class GabineteDigitalPage implements OnInit {
showEventsToApprove = false;
showEmptyContainer = false;
- showExpedients = true;
+ showExpedients = false;
+ showExpedientesPr = false;
showPedidos = false;
showDespachos = false;
showDespachosPr = false;
showPendentes = false;
showDiplomas = false;
- showExpedientesPr = false;
showExpedientDetail = false;
showSignedDiploma = false
emptyTextDescription = 'Sem opção selecionada';
@@ -146,27 +146,19 @@ export class GabineteDigitalPage implements OnInit {
}
ngOnInit() {
- //Initialize profile as mdgpr
- this.profile = "MDGPR";
-
+ switch(this.loggeduser.Profile){
+ case 'MDGPR':
+ this.showExpedients = true;
+ break;
+ case 'PR':
+ this.showExpedientesPr = true;
+ break;
+ }
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
this.LoadCounts();
}
});
-
- this.LoadCounts();
- /* this.eventService.getAllMdEvents.subscribe(res=>{
- console.log(res);
-
- });
- console.log(this.eventService.getAllPrEvents.length);
- */
- // this.processesbackend.GetActionsList().subscribe(res=>{
- // console.log(res);
-
- //});
-
}
closeAllDesktopComponents() {
@@ -187,7 +179,14 @@ export class GabineteDigitalPage implements OnInit {
this.showLoader = true;
let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise();
- this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+ switch(this.loggeduser.Profile){
+ case 'MDGPR':
+ this.count_exp_dailywork = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+ break;
+ case 'PR':
+ this.count_exp_pr = Object.keys(expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+ break;
+ }
let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise();
this.count_desp_dailywork = Object.keys(despachos).length;
@@ -237,14 +236,22 @@ export class GabineteDigitalPage implements OnInit {
}
- doRefresh(event) {
+ doRefresh() {
this.closeAllDesktopComponents();
- this.selectedElement='Correspondence';
- this.showExpedients = true;
+ switch(this.loggeduser.Profile){
+ case 'MDGPR':
+ this.selectedElement='Correspondence';
+ this.showExpedients = true;
+ break;
+ case 'PR':
+ this.selectedElement='ExpedientesPr';
+ this.showExpedientesPr = true;
+ break;
+ }
this.LoadCounts();
setTimeout(() => {
- event.target.complete();
+ //event.target.complete();
}, 2000);
}
@@ -296,16 +303,33 @@ export class GabineteDigitalPage implements OnInit {
openExpedientListPage() {
this.closeAllDesktopComponents();
- if( window.innerWidth <= 800) {
- //this.openExpedientList();
- this.router.navigate(['/home/gabinete-digital/expediente']);
- }
- else {
- this.selectedElement='Correspondence'
- let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
- this.router.navigate(['/home/gabinete-digital'], navigationExtras);
- this.showExpedients = true;
+ switch(this.loggeduser.Profile){
+ case 'MDGPR':
+ if( window.innerWidth <= 800) {
+ //this.openExpedientList();
+ this.router.navigate(['/home/gabinete-digital/expediente']);
+ }
+ else {
+ this.selectedElement='Correspondence'
+ let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
+ this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+ this.showExpedients = true;
+ }
+ break;
+ case 'PR':
+ if( window.innerWidth <= 800) {
+ //this.openExpedientList();
+ this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
+ }
+ else {
+ this.selectedElement='ExpedientesPr'
+ let navigationExtras: NavigationExtras = { queryParams: {"expedientes": true,}};
+ this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+ this.showExpedientesPr = true;
+ }
+ break;
}
+
}
openExpedientPage(data){
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index d02769421..f48661482 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -33,7 +33,7 @@
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 0ea5b16bb..bb069a1ad 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -36,6 +36,7 @@ export class ExpedientesPrPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
+ private router: Router,
) {
this.profile = 'mdgpr';
this.loggeduser = authService.ValidatedUser;
@@ -119,6 +120,15 @@ export class ExpedientesPrPage implements OnInit {
}, 2000);
}
+ goToExpediente(serialNumber:any){
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "serialNumber": serialNumber,
+ }
+ };
+ this.router.navigate(['/home/gabinete-digital/expedientes-pr/expediente-pr'], navigationExtras);
+ }
+
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index 723435dc4..b1e4397e6 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -301,6 +301,13 @@
min-height: 190px;
}
.exp-options .popover-content{
+ width: 100% !important;
+ left: 0 !important;
+ bottom: 0 !important;
+ right: 0 !important;
+ top: unset !important;
+}
+/* .exp-options .popover-content{
width: 100% !important;
left: 0 !important;
bottom: 0 !important;
@@ -308,7 +315,7 @@
top: calc(100% - 260px) !important;
max-height: 260px;
min-height: 260px;
-}
+} */
.chat-options-popover .popover-content{
width: 100% !important;
left: 0 !important;