peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-30 10:47:08 +01:00
parent 29b2bc9c38
commit afafd20566
4 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+12 -8
View File
@@ -81,7 +81,7 @@ export class DespachosPrPage implements OnInit {
}
}
});
}
segmentChanged(ev: any) {
@@ -109,25 +109,29 @@ export class DespachosPrPage implements OnInit {
async LoadList() {
this.skeletonLoader = true
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.despachoList = [];
this.skeletonLoader = false
this.skeletonLoader = false;
console.log(result);
let despachosPr;
switch (this.loggeduser.Profile) {
case 'MDGPR':
despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
break;
case 'PR':
console.log(result);
despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
console.log(despachosPr);
break;
}
console.log(despachosPr);
despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
despachosPr.forEach( (element, index) => {
@@ -163,11 +167,11 @@ export class DespachosPrPage implements OnInit {
}
doRefresh() {
setTimeout(()=>{
this.LoadList();
}, 1000)
}
async viewExpedientDetail(serialNumber:any) {
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+13 -5
View File
@@ -7,6 +7,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { AlertService } from 'src/app/services/alert.service';
import { PendentesStore } from 'src/app/store/pendestes-store.service';
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
@Component({
@@ -22,6 +24,7 @@ export class PendentesPage implements OnInit {
serialNumber:string;
totalDocs:any;
showLoader: boolean;
loggeduser: User;
@Input() profile:string;
segment:string;
@@ -32,8 +35,10 @@ export class PendentesPage implements OnInit {
private processes:ProcessesService,
private alertService: AlertService,
private router: Router,
private authService: AuthService,
private activatedRoute: ActivatedRoute,
) {
this.loggeduser = authService.ValidatedUser;
this.profile = 'mdgpr';
}
@@ -43,7 +48,7 @@ export class PendentesPage implements OnInit {
const location = window.location
const pathname = location.pathname + location.search
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -69,12 +74,12 @@ export class PendentesPage implements OnInit {
}
async LoadList(){
this.skeletonLoader = true
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
this.pendentesList = [];
pendentes.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
@@ -100,7 +105,7 @@ export class PendentesPage implements OnInit {
});
this.pendentesstore.reset(this.pendentesList);
this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){
@@ -133,6 +138,9 @@ 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') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
}
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+2 -2
View File
@@ -57,7 +57,7 @@ skeletonLoader = true
}
doRefresh() {
setTimeout(() => {
this.LoadList();
//event.target.complete();
@@ -88,7 +88,7 @@ skeletonLoader = true
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+19 -10
View File
@@ -8,6 +8,7 @@ import { ModalController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { AuthService } from 'src/app/services/auth.service';
import { PendentesStore } from 'src/app/store/pendestes-store.service';
import { User } from 'src/app/models/user.model';
@Component({
@@ -24,6 +25,7 @@ export class PendentesPage implements OnInit {
totalDocs:any;
skeletonLoader: boolean;
pendentesstore = PendentesStore;
loggeduser: User;
@Input() profile:string;
segment:string;
@@ -37,6 +39,7 @@ export class PendentesPage implements OnInit {
private router: Router,
) {
this.profile = 'mdgpr';
this.loggeduser = authService.ValidatedUser;
}
ngOnInit() {
@@ -46,7 +49,7 @@ export class PendentesPage implements OnInit {
this.LoadList();
this.router.events.forEach((event) => {
if (event instanceof NavigationStart &&
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?pendentes=true')) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -58,7 +61,7 @@ export class PendentesPage implements OnInit {
}
});
}
segmentChanged(ev: any) {
@@ -72,10 +75,10 @@ export class PendentesPage implements OnInit {
async LoadList(){
this.skeletonLoader = true;
let pendentes = await this.processes.GetPendingTasks(false).toPromise();
this.pendentesList = [];
pendentes.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
@@ -114,7 +117,7 @@ export class PendentesPage implements OnInit {
setTimeout(()=>{
this.LoadList();
}, 1000)
}
async viewTaskDetails(serialNumber:string, workflowName:string , task) {
@@ -127,14 +130,20 @@ export class PendentesPage implements OnInit {
}
else if(workflowName == 'Expediente') {
this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
} else if (task.activityInstanceName == "Tarefa de Parecer") {
}
else if(workflowName == 'Expediente do Presidente' && this.loggeduser.Profile == 'PR') {
this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
}
else if (task.activityInstanceName == "Tarefa de Parecer") {
this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
} else if(task.activityInstanceName == "Tarefa de Despacho") {
}
else if(task.activityInstanceName == "Tarefa de Despacho") {
this.router.navigate(['/home/gabinete-digital/despachos',serialNumber,'gabinete-digital']);
} else {
}
else {
console.log('cant find page for this task', task)
}
}
}
}