peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-10 09:40:14 +01:00
parent ca32bc3808
commit 62cd2e4f66
11 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+1 -1
View File
@@ -151,7 +151,7 @@ export class AllProcessesPage implements OnInit {
else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
else if (workflowName == "Pedido de Parecer do Presidente") {
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+5 -7
View File
@@ -1,12 +1,10 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router';
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationStart, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
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, NavParams } from '@ionic/angular';
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';
import { User } from 'src/app/models/user.model';
@@ -66,8 +64,8 @@ export class ExpedientesPrPage implements OnInit {
LoadList(){
this.skeletonLoader = true;
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -131,7 +131,7 @@ export class PendentesPage implements OnInit {
else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
}
else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
else if(workflowName == 'Expediente' && this.loggeduser.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
else if (task.activityInstanceName == "Tarefa de Parecer") {