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

Merge branches 'developer' and 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-06 09:03:09 +01:00
parent 2c28abbf12 c081a1ac28
commit 02f5ff7665
17 changed files with 361 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
-26
View File
@@ -237,32 +237,6 @@ export class DespachoPage implements OnInit {
}
async reencaminhar(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
"action": "Reencaminhar",
"ActionTypeId": 98,
"dataFields": {
"ReviewUserComment": note,
},
"AttachmentList" :documents,
}
const loader = this.toastService.loading()
try {
await this.processes.CompleteTask(body).toPromise()
this.toastService.successMessage()
this.close();
} catch (error) {
this.toastService.badRequest()
}
finally {
loader.remove()
}
}
async reexecute(note:string, documents:any) {
let body = {
"serialNumber": this.serialnumber,
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+18 -7
View File
@@ -52,14 +52,24 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
async LoadList(){
this.skeletonLoader = true
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
try {
const expedientePr: object[] = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise()
const expedienteMD: object[] = await this.processes.GetTasksList("Expediente", false).toPromise()
const result = expedientePr.concat(expedienteMD)
console.log('result', result);
console.log('expedientePr', expedientePr)
console.log('expedienteMD', expedienteMD)
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
res.forEach((element: any) => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
@@ -80,10 +90,11 @@ export class ExpedientePage implements OnInit {
console.log(this.taskslist);
this.expedienteStorage.reset(this.taskslist);
this.skeletonLoader = false;
}, ()=>{
} catch (error) {
this.toastService.badRequest('Processo não encontrado')
this.goBack()
});
}
}
async refreshing() {
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts
+2 -1
View File
@@ -26,6 +26,7 @@ import { SearchPage } from 'src/app/pages/search/search.page';
import { Attachment } from 'src/app/models/attachment.model';
import { SearchDocument } from 'src/app/models/search-document';
import { Location } from '@angular/common';
import { PedidoService } from 'src/app/Rules/pedido.service';
@Component({
selector: 'app-expediente-pr',
@@ -64,7 +65,7 @@ export class ExpedientePrPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService,
private attachmentsService: AttachmentsService,
private location: Location,
private location: Location
) {
this.loggeduser = userAuth.ValidatedUser;
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+37 -72
View File
@@ -1,7 +1,6 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationEnd, NavigationExtras, 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 { ModalController } from '@ionic/angular';
@@ -10,6 +9,7 @@ import { AlertService } from 'src/app/services/alert.service';
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service';
import { Location } from '@angular/common'
@Component({
selector: 'app-expedientes-pr',
@@ -36,6 +36,7 @@ export class ExpedientesPrPage implements OnInit {
private alertService: AlertService,
private authService: AuthService,
private router: Router,
private location: Location
) {
this.loggeduser = authService.ValidatedUser;
}
@@ -62,71 +63,35 @@ export class ExpedientesPrPage implements OnInit {
LoadList(){
this.skeletonLoader = true
switch (this.loggeduser.Profile) {
case 'MDGPR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.skeletonLoader = false
this.showLoader =false
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
this.expedienteprstore.reset(this.taskslist);
this.skeletonLoader = false
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.skeletonLoader = false
this.showLoader =false
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
});
break;
case 'PR':
this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
this.skeletonLoader = false
this.showLoader =false
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": taskDate,
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
this.expedienteprstore.reset(this.taskslist);
this.showLoader = false;
});
break;
}
console.log(this.taskslist);
this.expedienteprstore.reset(this.taskslist);
this.skeletonLoader = false
})
}
refreshing() {
@@ -164,14 +129,14 @@ export class ExpedientesPrPage implements OnInit {
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes-pr": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// let navigationExtras: NavigationExtras = {
// queryParams: {
// "expedientes-pr": true,
// }
// };
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// window.history.back();
this.location.back();
}
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+28 -30
View File
@@ -19,10 +19,8 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { ToastService } from 'src/app/services/toast.service';
import { ForwardPage } from 'src/app/modals/forward/forward.page';
import { async } from '@angular/core/testing';
import { PermissionService } from 'src/app/OtherService/permission.service';
import { Location } from '@angular/common';
@@ -496,40 +494,40 @@ export class PedidoPage implements OnInit {
goBack() {
this.location.back();
if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth <= 700) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
else {
// if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
// if (window.innerWidth <= 700) {
// this.router.navigate(['/home/gabinete-digital/pendentes']);
// }
// else {
let navigationExtras: NavigationExtras;
// let navigationExtras: NavigationExtras;
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
// if (this.task.activityInstanceName == 'Concluir Deferimento') {
// navigationExtras= { queryParams: {"deferimento": true,}};
// } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
// navigationExtras = { queryParams: {"parecer": true,}};
// }
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
else {
if (window.innerWidth <= 700) {
this.router.navigate(['/home/gabinete-digital/pedidos']);
}
else {
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// }
// }
// else {
// if (window.innerWidth <= 700) {
// this.router.navigate(['/home/gabinete-digital/pedidos']);
// }
// else {
let navigationExtras: NavigationExtras;
// let navigationExtras: NavigationExtras;
if (this.task.activityInstanceName == 'Concluir Deferimento') {
navigationExtras= { queryParams: {"deferimento": true,}};
} else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
// if (this.task.activityInstanceName == 'Concluir Deferimento') {
// navigationExtras= { queryParams: {"deferimento": true,}};
// } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
navigationExtras = { queryParams: {"parecer": true,}};
}
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
// navigationExtras = { queryParams: {"parecer": true,}};
// }
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
// }
// }
}
}