diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 59968fbfa..9a611326d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,13 +1,8 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; -import { CalendarComponent } from 'ionic2-calendar'; - +import { Component, Input, OnInit } from '@angular/core'; +import { NavigationEnd, Router } from '@angular/router'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; -import { formatDate } from '@angular/common'; -import { LoadingService } from 'src/app/services/loading.service'; import { ModalController } 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'; @Component({ @@ -21,21 +16,15 @@ export class ExpedientePage implements OnInit { showLoader: boolean; //profile:string; - @ViewChild(CalendarComponent) myCal: CalendarComponent; - taskslist:DailyWorkTask[]; serialNumber:string; - @Input() profile:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); - constructor( private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, private router: Router, ) { - this.profile = 'mdgpr'; } ngOnInit() { @@ -47,11 +36,6 @@ export class ExpedientePage implements OnInit { }); } - openExpedientDetailPage(data){ - console.log(data); - this.openExpedientDetail.emit(data); - } - LoadList(){ this.showLoader = true; this.processes.GetTasksList("Expediente", false).subscribe(result => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index c55feabbb..deee08cf1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -8,7 +8,7 @@ - +
@@ -19,7 +19,7 @@
- +
@@ -85,8 +85,8 @@
-

Despacho do Presidente da República

-

Despachos criados por mim

+

Despacho do Presidente da República

+

Despachos criados por mim

{{ count_de_pr }} Documentos

@@ -109,7 +109,7 @@
-

Despacho do Presidente da República

+

Despacho do Presidente da República

{{ count_de_pr }} Documentos

@@ -146,10 +146,10 @@
- + - + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 887ed450d..d44ac7043 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -20,17 +20,17 @@ import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-a }) export class GabineteDigitalPage implements OnInit { - + segment:string; showLoader: boolean; public profile:string; - count_exp_dailywork=0; + count_exp_dailywork=0; count_exp_pr =0 count_desp_dailywork=0; - count_desp_pending=0; + count_desp_pending=0; count_par_dailywork=0; - count_par_pending=0; + count_par_pending=0; count_def_dailywork=0; count_def_pending=0; count_exp_pp : string; @@ -49,7 +49,7 @@ export class GabineteDigitalPage implements OnInit { desktopComponent: any = { showEventList: false, - showExpediente : false + showExpediente : false, } showEventsToApprove = false; @@ -63,7 +63,7 @@ export class GabineteDigitalPage implements OnInit { showDiplomas = false; showDiplomasAssinar = false; showExpedientDetail = false; - showSignedDiploma = false + showSignedDiploma = false; emptyTextDescription = 'Sem opção selecionada'; serialNumber:string; @@ -96,7 +96,7 @@ export class GabineteDigitalPage implements OnInit { } }; this.checkRoutes(); - + } closeAllDesktopComponent(){ @@ -111,7 +111,7 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { const pathname = window.location.pathname - this.router.events.forEach((event) => { + this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname) { this.checkRoutes(); this.LoadCounts(); @@ -120,11 +120,12 @@ export class GabineteDigitalPage implements OnInit { // console.log('not') } }); - - this.hideRefreshButton(); + + this.hideRefreshButton(); } checkUser(){ + this.selectedElement='Correspondence'; switch(this.loggeduser.Profile){ case 'MDGPR': this.showExpedients = true; @@ -150,6 +151,7 @@ export class GabineteDigitalPage implements OnInit { } checkRoutes(){ + this.closeAllDesktopComponents(); if(this.router.url == '/home/gabinete-digital?eventos=true'){ this.openEventsToApprovePage(); this.selectedElement='approval'; @@ -196,12 +198,6 @@ export class GabineteDigitalPage implements OnInit { } } - refreshExpedientes(){ - this.expedientesPage.doRefresh(); - //this.pendentesListPage.doRefresh(); - //this.eventsToApprove.doRefresh(); - } - closeAllDesktopComponents() { this.showEmptyContainer = false; this.showEventsToApprove = false; @@ -252,7 +248,7 @@ export class GabineteDigitalPage implements OnInit { this.count_de_pr = Object.keys(despachosPr).length; break; } - + let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; @@ -263,14 +259,14 @@ export class GabineteDigitalPage implements OnInit { this.count_dip_as_pr = Object.keys(diplomasAssinados).length; this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{ - this.count_ev_pr = res; + this.count_ev_pr = res; }); this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{ this.count_ev_md = res; }); this.showLoader = false; - + this.count_exp_pp = "-"; this.count_exp_pd = "-"; this.count_dip_apr = "-"; @@ -279,7 +275,7 @@ export class GabineteDigitalPage implements OnInit { doRefresh(event) { console.log(event); - + this.closeAllDesktopComponents(); /* switch(this.loggeduser.Profile){ case 'MDGPR': @@ -302,12 +298,8 @@ export class GabineteDigitalPage implements OnInit { } else{ console.log('null'); - - } - } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } } selectedElementF(element:string) { @@ -358,7 +350,7 @@ export class GabineteDigitalPage implements OnInit { } break; } - + } openPedidosPage(segment:string) { @@ -394,7 +386,7 @@ export class GabineteDigitalPage implements OnInit { this.showDespachos = true; } } - + openDespachosPrPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 801){ diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 8bac04586..bdabd051d 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -24,7 +24,6 @@ export class PendentesPage implements OnInit { @Input() profile:string; segment:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( private processes:ProcessesService, @@ -60,10 +59,6 @@ export class PendentesPage implements OnInit { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - openExpedientDetailPage(data){ - this.openExpedientDetail.emit(data); - } - async LoadList(){ this.showLoader = true; this.pendentesList = new Array(); diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 1844a676c..6c309e3cc 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -3,12 +3,12 @@
- +
- Editar evento por aprovar + Editar evento por aprovar MOB
@@ -31,21 +31,21 @@ - +
- +
- + Oficial @@ -67,37 +67,37 @@
- +
- - - @@ -105,37 +105,37 @@
- +
- - - @@ -144,29 +144,29 @@
- +
- Não se repete Repete - @@ -183,9 +183,9 @@
- - - + + +
@@ -235,23 +235,23 @@
Adicionar documentos -
+
- -
- + +
+ -

- {{document.SourceName}} +

+ {{document.SourceName}} Correspondencia AccoesPresidenciais ArquivoDespachoElect -

+

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

@@ -283,7 +283,7 @@ (dynamicSetIntervenient)="dynamicSetIntervenient($event)" > -
+
@@ -291,4 +291,4 @@
- \ No newline at end of file + diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index b185bd391..29cdfdb35 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -25,7 +25,6 @@ export class ExpedientsPage implements OnInit { serialNumber:string; @Input() profile:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( private processes:ProcessesService, @@ -59,11 +58,6 @@ export class ExpedientsPage implements OnInit { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } - openExpedientDetailPage(data){ - console.log(data); - this.openExpedientDetail.emit(data); - } - LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { this.taskslist = new Array();