diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 2c28d3921..7b7aad4cc 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -59,16 +59,6 @@ export class ApproveEventPage implements OnInit {
this.getTask();
}
- notImplemented() {
- this.alertService.presentAlert('Funcionalidade em desenvolvimento');
- }
-
- close() {
- /* this.router.navigate(['/home/gabinete-digital/event-list']); */
- this.closeEventToApprove.emit();
- this.modalController.dismiss();
- }
-
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
@@ -77,7 +67,8 @@ export class ApproveEventPage implements OnInit {
};
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
- } else {
+ }
+ else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
@@ -85,9 +76,11 @@ export class ApproveEventPage implements OnInit {
async getTask(){
this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
console.log(this.loadedEvent);
+
this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
- console.log(new Date(this.today));
+
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
+
let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
this.getAttachments(instanceId);
}
@@ -117,8 +110,6 @@ export class ApproveEventPage implements OnInit {
}
emendTask(serialNumber:string){
- /* console.log('Emendar'); */
- this.menu.close();
this.openEmendMessageModal(serialNumber);
this.goBack();
}
@@ -129,9 +120,9 @@ export class ApproveEventPage implements OnInit {
console.log(body);
try {
- this.processes.PostTaskAction(body).toPromise()
+ this.processes.PostTaskAction(body).toPromise();
+ await this.successMessage();
this.goBack();
- await this.successMessage()
} catch (error) {
this.badRequest()
}
@@ -190,18 +181,15 @@ export class ApproveEventPage implements OnInit {
"ReviewerUseComment": res.data,
}
}
- console.log(body);
-
- try {
- await this.processes.PostTaskAction(body).toPromise()
- //this.router.navigate(['/home/gabinete-digital/event-list']);
- this.goToEventsToApprove();
- this.successMessage()
- } catch (error) {
- this.badRequest()
- }
-
+ console.log(body);
+ try {
+ await this.processes.PostTaskAction(body).toPromise();
+ this.successMessage();
+ this.goBack();
+ } catch (error) {
+ this.badRequest();
+ }
}
else{
//this.alertService.presentAlert('Operação cancelada!');
@@ -209,14 +197,14 @@ export class ApproveEventPage implements OnInit {
});
}
- goToEventsToApprove(){
+ /* goToEventsToApprove(){
let navigationExtras: NavigationExtras = {
queryParams: {
- "events": true,
+ "eventos": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
- }
+ } */
async editar(serialNumber: string) {
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 bd37a2a32..f1634357c 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
@@ -86,7 +86,11 @@ export class ExpedienteDetailPage implements OnInit {
this.toastService.presentToast('Não foi possível fazer login"');
}
- goBack(){
+ goBack() {
+ window.history.back()
+ }
+
+ /* goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
@@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit {
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
- }
+ } */
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -241,7 +245,8 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
- this.successMessage()
+ this.successMessage();
+ this.goBack();
} catch (error) {
this.badRequest()
}
@@ -254,8 +259,9 @@ export class ExpedienteDetailPage implements OnInit {
else{
if(res['data']== 'Yes'){
try {
- //await this.processes.CompleteTask(body).toPromise()
- this.successMessage()
+ await this.processes.CompleteTask(body).toPromise();
+ this.successMessage();
+ this.goBack();
} catch (error) {
this.badRequest()
}
@@ -269,7 +275,8 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.UpdateTaskStatus(this.task.FolderId);
- this.successMessage()
+ this.successMessage();
+ this.goBack();
} catch (error) {
this.badRequest()
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 72577ea63..d47713f8b 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { AlertService } from 'src/app/services/alert.service';
import { ModalController } from '@ionic/angular';
@@ -7,11 +7,14 @@ import { ExpedientePage } from './expediente/expediente.page';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { DespachosPage } from './despachos/despachos.page';
import { PedidosPage } from './pedidos/pedidos.page';
-import { PendentesPage } from './pendentes/pendentes.page';
+/* import { PendentesPage } from './pendentes/pendentes.page'; */
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page'
import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
+import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
+import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
+import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
@Component({
selector: 'app-gabinete-digital',
templateUrl: './gabinete-digital.page.html',
@@ -69,7 +72,11 @@ export class GabineteDigitalPage implements OnInit {
loggeduser: User;
mdgpr = "MDGPR";
- pr = "PR"
+ pr = "PR";
+
+ @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;
+ @ViewChild(PendentesPage) pendentesListPage: PendentesPage;
+ @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
constructor(
private processesbackend:ProcessesService,
@@ -88,61 +95,7 @@ export class GabineteDigitalPage implements OnInit {
this.modalController.dismiss();
}
};
-
- this.activatedRoute.queryParams.subscribe(params => {
- switch (params)
- {
- case params["eventos"]:
- this.openEventsToApprovePage("MDGPR");
- this.selectedElement='approval'
- break;
-
- case params["expedientes"]:
- this.openExpedientListPage();
- this.selectedElement='Correspondence';
- break;
-
- case params["pendentes"]:
- this.openPendentesPage('');
- this.selectedElement='Pending'
- break;
-
- case params["despachos"]:
- this.openDespachosPage('');
- this.selectedElement='Dispatches';
- break;
-
- case params["pedidos"]:
- this.openPedidosPage('parecer');
- this.selectedElement='RequestsForOpinion';
- break;
-
- case params["expedientespr"]:
- this.openEventsToApprovePage("MDGPR");
- this.selectedElement='Expediente Presidente'
- break;
-
- case params["despachospr"]:
- this.openDespachosPrPage('');
- this.selectedElement='DispatchesPr'
- break;
-
- case params["diplomas"]:
- this.openDiplomasPage('');
- this.selectedElement='DiplomasPorAssinar'
- break;
-
- case params["diplomasassinar"]:
- this.openDiplomasPage('');
- this.selectedElement='DiplomasAssinar'
- break;
- }
- });
-
- /* if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
- this.openEventsToApprovePage('MDGPR');
- this.selectedElement='approval'
- } */
+ this.checkRoutes();
}
@@ -151,7 +104,9 @@ export class GabineteDigitalPage implements OnInit {
showEventList: false,
showExpediente: false
}
- }
+ }
+
+
ngOnInit() {
switch(this.loggeduser.Profile){
@@ -164,9 +119,70 @@ export class GabineteDigitalPage implements OnInit {
}
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
+ this.checkRoutes();
this.LoadCounts();
}
});
+
+ }
+
+ checkRoutes(){
+ this.activatedRoute.queryParams.subscribe(params => {
+ switch (params)
+ {
+ case params["eventos"]:
+ this.openEventsToApprovePage("MDGPR");
+ this.selectedElement='approval';
+ break;
+
+ case params["expedientes"]:
+ this.openExpedientListPage();
+ this.selectedElement='Correspondence';
+ this.expedientesPage.doRefresh();
+ break;
+
+ case params["pendentes"]:
+ this.openPendentesPage('');
+ this.selectedElement='Pending';
+ break;
+
+ case params["despachos"]:
+ this.openDespachosPage('');
+ this.selectedElement='Dispatches';
+ break;
+
+ case params["pedidos"]:
+ this.openPedidosPage('parecer');
+ this.selectedElement='RequestsForOpinion';
+ break;
+
+ case params["expedientespr"]:
+ this.openEventsToApprovePage("MDGPR");
+ this.selectedElement='Expediente Presidente'
+ break;
+
+ case params["despachospr"]:
+ this.openDespachosPrPage('');
+ this.selectedElement='DispatchesPr'
+ break;
+
+ case params["diplomas"]:
+ this.openDiplomasPage('');
+ this.selectedElement='DiplomasPorAssinar'
+ break;
+
+ case params["diplomasassinar"]:
+ this.openDiplomasPage('');
+ this.selectedElement='DiplomasAssinar'
+ break;
+ }
+ });
+ }
+
+ refreshExpedientes(){
+ this.expedientesPage.doRefresh();
+ //this.pendentesListPage.doRefresh();
+ //this.eventsToApprove.doRefresh();
}
closeAllDesktopComponents() {
@@ -250,6 +266,7 @@ export class GabineteDigitalPage implements OnInit {
case 'MDGPR':
this.selectedElement='Correspondence';
this.showExpedients = true;
+ this.expedientesPage.doRefresh();
break;
case 'PR':
this.selectedElement='ExpedientesPr';
@@ -257,9 +274,9 @@ export class GabineteDigitalPage implements OnInit {
break;
}
this.LoadCounts();
+ //this.refreshExpedientes();
setTimeout(() => {
- //event.target.complete();
}, 2000);
}
@@ -519,7 +536,7 @@ export class GabineteDigitalPage implements OnInit {
//}
}
- async openPendenteList(){
+ /* async openPendenteList(){
this.closeAllDesktopComponent();
const modal = await this.modalController.create({
component: PendentesPage,
@@ -531,7 +548,7 @@ export class GabineteDigitalPage implements OnInit {
await modal.present();
modal.onDidDismiss();
console.log('show desktop modal')
- }
+ } */
async openDespachoList(){
this.closeAllDesktopComponent();
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index a8264ef84..1015447c2 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -47,7 +47,7 @@
-
+
Seu calendário
@@ -22,7 +22,7 @@
-
+
@@ -51,7 +51,8 @@
+ (click)="goToEventDetail(event)"
+ >
{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 23ebdb775..b0a7f8e2d 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -1,11 +1,11 @@
import { Component, Input, OnInit } from '@angular/core';
import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
-import { Event } from 'src/app/models/event.model';
import { ProcessesService } from 'src/app/services/processes.service';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page';
+import { User } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-events-to-approve',
@@ -14,7 +14,6 @@ import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page'
})
export class EventsToApprovePage implements OnInit {
- //segment:string;
showLoader: boolean;
eventsPRList: any;
eventsMDGPRList: any;
@@ -22,25 +21,25 @@ export class EventsToApprovePage implements OnInit {
eventBody: EventBody;
categories: string[];
serialnumber:string;
-
- @Input() profile:string;
+ loggeduser: User;
+ segment:string;
constructor(
private processes:ProcessesService,
private modalController: ModalController,
private router: Router,
- //private navParams: NavParams,
- ) { }
+ private userAuth: AuthService,
+ )
+ {
+ this.loggeduser = userAuth.ValidatedUser;
+ }
ngOnInit() {
- //this.segment = this.navParams.get('segment');
- /* console.log(this.navParams.get('md')); */
- console.log(this.profile);
+ this.segment = this.loggeduser.Profile;
this.LoadToApproveEvents();
-
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
- this.LoadToApproveEvents();
+ this.doRefresh();
}
});
@@ -87,7 +86,7 @@ export class EventsToApprovePage implements OnInit {
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
}
- async openApproveModal(eventToAprove) {
+ /* async openApproveModal(eventToAprove) {
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -118,13 +117,19 @@ export class EventsToApprovePage implements OnInit {
this.LoadToApproveEvents();
});
+ } */
+
+ lis(){
+ console.log('Teste');
+
}
- doRefresh(event) {
+ doRefresh() {
+ console.log('Refresh Events');
+
this.LoadToApproveEvents();
console.log('refresh');
setTimeout(() => {
- event.target.complete();
}, 2000);
}
close(){
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 f8973bdea..c55e5c2e3 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 { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -39,6 +39,11 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() {
this.LoadList();
+ this.router.events.forEach((event) => {
+ if(event instanceof NavigationEnd && event.url == this.router.url) {
+ this.doRefresh();
+ }
+ });
}
notImplemented(){
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 9d433cd06..ba409c126 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -40,6 +40,11 @@ export class ExpedientsPage implements OnInit {
//Inicializar segment
this.segment = "expedientes";
this.LoadList();
+ this.router.events.forEach((event) => {
+ if(event instanceof NavigationEnd && event.url == this.router.url) {
+ this.doRefresh();
+ }
+ });
}
segmentChanged(){
@@ -83,11 +88,12 @@ export class ExpedientsPage implements OnInit {
});
}
- doRefresh(event) {
+ doRefresh() {
+ console.log('refresh expedientes1');
+
this.LoadList();
setTimeout(() => {
- event.target.complete();
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 8ba6ed443..6bef156e8 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -2,7 +2,7 @@
Pedidos
-
@@ -19,7 +19,7 @@
-
+
{
+ if(event instanceof NavigationEnd && event.url == this.router.url) {
+ this.doRefresh();
+ }
+ });
}
segmentChanged(ev: any) {
@@ -134,10 +139,9 @@ export class PedidosPage implements OnInit {
console.log(this.taskType);
}
- doRefresh(event) {
+ doRefresh() {
this.LoadList();
setTimeout(() => {
- event.target.complete();
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 762f82f8c..12fff9c1f 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -45,10 +45,14 @@ export class PendentesPage implements OnInit {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
- this.authService.userData$.subscribe((res:any)=>{
- console.log(res);
- });
+
+ this.router.events.forEach((event) => {
+ if(event instanceof NavigationEnd && event.url == this.router.url) {
+ this.doRefresh();
+ }
+ });
}
+
segmentChanged(ev: any) {
this.LoadList();
}
@@ -64,7 +68,9 @@ export class PendentesPage implements OnInit {
async LoadList(){
this.showLoader = true;
- this.pendentesList = new Array();
+ this.pendentesList = [];
+ console.log('clear');
+
let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
@@ -72,7 +78,8 @@ export class PendentesPage implements OnInit {
let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise();
let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise();
- let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+ let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).filter(data => data.workflowInstanceDataFields.Status == "Pending");
+
pendentes.forEach(element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
@@ -87,7 +94,7 @@ export class PendentesPage implements OnInit {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
+ "CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Sender,
"DocumentsQty": 0,
@@ -102,7 +109,7 @@ export class PendentesPage implements OnInit {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+ "CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
@@ -113,14 +120,23 @@ export class PendentesPage implements OnInit {
this.pendentesList.push(task);
});
});
+ this.pendentesList = this.sortArrayISODate(this.pendentesList).reverse();
this.showLoader = false;
}
+
+ sortArrayISODate(myArray: any){
+ return myArray.sort(function(a, b) {
+ return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+ });
+ }
+
- doRefresh(event) {
+ doRefresh() {
+ console.log('Refresh pendentes');
+
this.LoadList();
setTimeout(() => {
- //event.target.complete();
}, 2000);
}