mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -53,7 +53,8 @@ export class PendentesPage implements OnInit {
|
||||
}
|
||||
|
||||
goBack() {
|
||||
this.router.navigate(['/home/gabinete-digital']);
|
||||
|
||||
window.history.back();
|
||||
}
|
||||
|
||||
notImplemented(){
|
||||
@@ -66,41 +67,20 @@ export class PendentesPage implements OnInit {
|
||||
}
|
||||
|
||||
async LoadList(){
|
||||
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
|
||||
//ParecerList
|
||||
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
|
||||
//DeferimentoList
|
||||
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
|
||||
this.pendentesList = new Array();
|
||||
//PendentesList
|
||||
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
|
||||
pendentes.forEach(element => {
|
||||
let DocId = element.workflowInstanceDataFields.FolderID;
|
||||
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
|
||||
this.totalDocs = res.DocumentsTotal;
|
||||
console.log(res.DocumentsTotal);
|
||||
|
||||
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 = {
|
||||
"SerialNumber": element.serialNumber,
|
||||
"Folio": element.workflowInstanceDataFields.Subject,
|
||||
"Senders": element.workflowInstanceDataFields.Sender,
|
||||
"CreateDate": taskDate,
|
||||
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
|
||||
"Remetente": element.workflowInstanceDataFields.Remetente,
|
||||
"DocumentsQty": this.totalDocs,
|
||||
"DocId": element.workflowInstanceDataFields.DocId,
|
||||
"WorkflowName": element.workflowDisplayName,
|
||||
"activityInstanceName": element.activityInstanceName,
|
||||
}
|
||||
this.pendentesList.push(task);
|
||||
},
|
||||
(error)=>{
|
||||
|
||||
let date = new Date(element.taskStartDate);
|
||||
this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
|
||||
//ParecerList
|
||||
this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => {
|
||||
//DeferimentoList
|
||||
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => {
|
||||
this.pendentesList = new Array();
|
||||
//PendentesList
|
||||
let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
|
||||
pendentes.forEach(element => {
|
||||
let DocId = element.workflowInstanceDataFields.FolderID;
|
||||
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
|
||||
this.totalDocs = res.DocumentsTotal;
|
||||
console.log(res.DocumentsTotal);
|
||||
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();
|
||||
|
||||
@@ -116,14 +96,33 @@ export class PendentesPage implements OnInit {
|
||||
"WorkflowName": element.workflowDisplayName,
|
||||
"activityInstanceName": element.activityInstanceName,
|
||||
}
|
||||
this.pendentesList.push(task);
|
||||
});
|
||||
this.pendentesList.push(task);
|
||||
},
|
||||
(error)=>{
|
||||
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 = {
|
||||
"SerialNumber": element.serialNumber,
|
||||
"Folio": element.workflowInstanceDataFields.Subject,
|
||||
"Senders": element.workflowInstanceDataFields.Sender,
|
||||
"CreateDate": taskDate,
|
||||
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
|
||||
"Remetente": element.workflowInstanceDataFields.Remetente,
|
||||
"DocumentsQty": 0,
|
||||
"DocId": element.workflowInstanceDataFields.DocId,
|
||||
"WorkflowName": element.workflowDisplayName,
|
||||
"activityInstanceName": element.activityInstanceName,
|
||||
}
|
||||
this.pendentesList.push(task);
|
||||
});
|
||||
console.log(pendentes);
|
||||
console.log(this.pendentesList);
|
||||
});//Fim deferimento
|
||||
});//Fim parecer
|
||||
});//Fim despacho
|
||||
});
|
||||
console.log(pendentes);
|
||||
console.log(this.pendentesList);
|
||||
});//Fim deferimento
|
||||
});//Fim parecer
|
||||
});//Fim despacho
|
||||
}
|
||||
|
||||
doRefresh(event) {
|
||||
@@ -151,17 +150,19 @@ export class PendentesPage implements OnInit {
|
||||
|
||||
goToDespacho(serialNumber:any){
|
||||
let navigationExtras: NavigationExtras = {
|
||||
queryParams: {
|
||||
"serialNumber": serialNumber,
|
||||
}
|
||||
};
|
||||
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
|
||||
queryParams: {
|
||||
"serialNumber": serialNumber,
|
||||
"from": "pendentes"
|
||||
}
|
||||
};
|
||||
this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras);
|
||||
}
|
||||
|
||||
goToPedido(serialNumber:any){
|
||||
goToPedido(serialNumber:any) {
|
||||
let navigationExtras: NavigationExtras = {
|
||||
queryParams: {
|
||||
queryParams: {
|
||||
"serialNumber": serialNumber,
|
||||
"from": "pendentes"
|
||||
}
|
||||
};
|
||||
this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);
|
||||
@@ -171,6 +172,7 @@ export class PendentesPage implements OnInit {
|
||||
let navigationExtras: NavigationExtras = {
|
||||
queryParams: {
|
||||
"serialNumber": serialNumber,
|
||||
"from": "pendentes"
|
||||
}
|
||||
};
|
||||
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
|
||||
|
||||
Reference in New Issue
Block a user