diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 0fa726144..f858e6094 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -34,6 +34,7 @@ import { DataService } from 'src/app/services/data.service';
import { Storage } from '@ionic/storage';
import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
import { SessionStore } from 'src/app/store/session.service';
+import { async } from '@angular/core/testing';
@@ -47,7 +48,7 @@ export class GabineteDigitalPage implements OnInit {
segment: string;
segmentVista: string;
- showLoader: boolean;
+ showLoader: boolean = false
public profile: string;
allProcessesList: any = new Array();
@@ -149,6 +150,8 @@ export class GabineteDigitalPage implements OnInit {
public p: PermissionService
) {
+
+
this.loggeduser = SessionStore.user;
window.onresize = (event) => {
// if not mobile remove all component
@@ -252,71 +255,65 @@ export class GabineteDigitalPage implements OnInit {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('GabineteProcess').then((allprocess: any[]) => {
- if(allprocess.forEach) {
- allprocess.forEach(element => {
- let date = new Date(element.taskStartDate);
- date.setMonth(date.getMonth() + 1);
-
- let task = {
- "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.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DispatchDocId,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
- "Agenda": element.workflowInstanceDataFields.Agenda,
- "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
- }
-
- this.allProcessesList.push(task);
- this.allProcessesList = removeDuplicate(this.allProcessesList);
- this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
- });
- }
+ allprocess.forEach(element => {
+ let date = new Date(element.taskStartDate);
+ date.setMonth(date.getMonth() + 1);
+ let task = {
+ "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.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DispatchDocId,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ "Agenda": element.workflowInstanceDataFields.Agenda,
+ "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
+ }
+
+ this.allProcessesList.push(task);
+ this.allProcessesList = removeDuplicate(this.allProcessesList);
+ this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+
+ });
})
} else {
this.sqliteservice.getAllProcess().then((allprocess: any[]) => {
- if(allprocess.forEach) {
- allprocess.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();
-
- var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
-
- let task = {
- "SerialNumber": element.serialNumber,
- "Folio": workflowInstanceDataFields.Subject,
- "Senders": workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": workflowInstanceDataFields.ViewerRequest,
- "Remetente": workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": workflowInstanceDataFields.DispatchDocId,
- "FolderID": workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": workflowInstanceDataFields.Status,
- "Agenda": workflowInstanceDataFields.Agenda,
- "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
- }
-
- this.allProcessesList.push(task);
- this.allProcessesList = removeDuplicate(this.allProcessesList)
- this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
- });
- }
+ allprocess.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();
+ var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
+
+ let task = {
+ "SerialNumber": element.serialNumber,
+ "Folio": workflowInstanceDataFields.Subject,
+ "Senders": workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": workflowInstanceDataFields.ViewerRequest,
+ "Remetente": workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": workflowInstanceDataFields.DispatchDocId,
+ "FolderID": workflowInstanceDataFields.FolderID,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": workflowInstanceDataFields.Status,
+ "Agenda": workflowInstanceDataFields.Agenda,
+ "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
+ }
+
+ this.allProcessesList.push(task);
+ this.allProcessesList = removeDuplicate(this.allProcessesList)
+ this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+
+ });
})
}
@@ -369,7 +366,10 @@ export class GabineteDigitalPage implements OnInit {
return thedate.getHours() + ":" +
thedate.getMinutes();
}
-
+ goto(url) {
+ this.router.navigate([url])
+ }
+
goToProcess(serialNumber: string, workflowName: string, activityName: string) {
@@ -389,7 +389,7 @@ export class GabineteDigitalPage implements OnInit {
else if (activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
- // alert('bug!')
+ alert('bug!')
}
}
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
@@ -535,177 +535,286 @@ export class GabineteDigitalPage implements OnInit {
return this.AllProcess.length
}
+ loadProcess = {}
+
+ get getloadKeys() {
+ return Object.keys(this.loadProcess)
+ }
+
async LoadCounts() {
- let expedientes;
- this.showLoader = true
-
- try {
- expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
- this.loadCount = true;
- this.showLoader = false;
- } catch(error) {
- this.showLoader = false
- this.loadCount = true;
- }
-
- expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active")
-
- expedientes = expedientes.filter((item) => {
- return item.activityInstanceName != 'Retificar Expediente'
- });
-
- expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
-
- this.expedientegbstore.count = expedientes.length;
- this.expedientegbstore.reset(expedientes);
-
-
- let despachos = await this.despachoRule.getList({ updateStore: true })
- if (despachos) {
- this.despachoStore.reset(despachos)
- }
-
-
- let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
- let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
-
- let allParecer = pareceres.concat(pareceresPr);
-
- this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
- this.pedidosstore.countparecer = this.count_par_dailywork;
-
- this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
- return {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": new Date(element.taskStartDate),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- }));
-
- let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
- this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
- this.pedidosstore.countdeferimento = this.count_def_dailywork;
-
- this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
- return {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": new Date(element.taskStartDate),
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- }
- }));
-
-
- let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
- this.count_total_pending = Object.keys(pendentes).length;
- this.pendentesstore.count = this.count_total_pending;
-
- pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
-
- this.pendentesstore.reset(pendentes);
-
- let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ (async () =>{
+ if(!this.loadProcess['expedientes']) {
+ try {
+ this.loadProcess['expedientes'] = true
+ let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();
+ expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
+ expedientes = expedientes.filter((item) => {
+ return item.activityInstanceName != 'Retificar Expediente'
+ });
+ expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
+
+ this.expedientegbstore.count = expedientes.length;
+ this.expedientegbstore.reset(expedientes);
+ delete this.loadProcess['expedientes']
+ this.loadCount = true
+ } catch(error) {
+ this.loadCount = true
+ delete this.loadProcess['expedientes']
+ }
+ }
+ })();
- if(this.loggeduser.Profile != 'PR') {
-
- let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
- depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
- depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
-
- this.despachoprstore.reset(depacho)
- } else if(this.loggeduser.Profile == 'PR') {
-
- let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
- depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
- this.despachoprstore.reset(depacho)
- }
-
- let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
- let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
- let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+ (async () =>{
- eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+ if(!this.loadProcess['despachos']) {
+ try {
+ this.loadProcess['despachos'] = true
+
+ let despachos = await this.despachoRule.getList({ updateStore: true })
+ if (despachos) {
+ this.despachoStore.reset(despachos)
+ }
+
+ delete this.loadProcess['despachos']
+ } catch(error) {
+ delete this.loadProcess['despachos']
+ }
+ }
+
+
+ })();
- this.eventoaprovacaostore.countMd = eventsMDGPRList.length
- this.eventoaprovacaostore.resetmd(eventsMDGPRList);
+ (async()=>{
- let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
- let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
- let eventsPRList = prEventsOficial.concat(prEventsPessoal);
- eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
-
- this.eventoaprovacaostore.countPr = eventsPRList.length
- this.eventoaprovacaostore.resetpr(eventsPRList);
-
- let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
- this.count_dip_pv = Object.keys(diplomasValidar).length;
-
- diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
-
-
- this.deplomasStore.resetDiplomasReview(diplomasValidar.map((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();
-
- return {
- "SerialNumber": element.serialNumber,
- "Folio": element.workflowInstanceDataFields.Subject,
- "Senders": element.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
- "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
- "Remetente": element.workflowInstanceDataFields.Remetente,
- "DocumentsQty": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
+ if(!this.loadProcess['parecerespareceresPr']) {
+ try {
+ this.loadProcess['parecerespareceresPr'] = true
+
+ let pareceres, pareceresPr;
+ pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
+ pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+ let allParecer = pareceres.concat(pareceresPr);
+
+ this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+ this.pedidosstore.countparecer = this.count_par_dailywork;
+
+ this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+ return {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": new Date(element.taskStartDate),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ }));
+
+ delete this.loadProcess['parecerespareceresPr']
+ } catch(error) {
+ delete this.loadProcess['parecerespareceresPr']
+ }
}
- }))
+
+ })();
- let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
+ (async()=>{
+ if(!this.loadProcess['deferimentos']) {
+ try {
+ this.loadProcess['deferimentos'] = true
+
+ let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
+ this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+ this.pedidosstore.countdeferimento = this.count_def_dailywork;
+
+ this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+ return {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": new Date(element.taskStartDate),
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ }
+ }));
+
+ delete this.loadProcess['deferimentos']
+ } catch(error) {
+ delete this.loadProcess['deferimentos']
+ }
+ }
+
+ })();
- this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
- let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
- this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
+ (async()=>{
+ if(!this.loadProcess['despachos']) {
+ try {
+ this.loadProcess['despachos'] = true
+
+ let despachos = await this.despachoRule.getList({ updateStore: true })
+ if (despachos) {
+ this.despachoStore.reset(despachos)
+ }
+
+ delete this.loadProcess['despachos']
+ } catch(error) {
+ delete this.loadProcess['despachos']
+ }
+ }
+ })();
- this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {
- this.count_ev_apr = res;
- });
- this.showLoader = false;
+ (async()=>{
+ let pendentes
+ try {
+ pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
+ this.count_total_pending = Object.keys(pendentes).length;
+ this.pendentesstore.count = this.count_total_pending;
+
+ pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
+
+ this.pendentesstore.reset(pendentes);
+ } catch (error) {
+ }
+
+ })();
+
+
+ (async()=>{
+ if(!this.loadProcess['despachosPr']) {
+ try {
+ let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ if(this.loggeduser.Profile != 'PR') {
+
+ let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+ depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active");
+
+ depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+
+ this.despachoprstore.reset(depacho)
+ } else if(this.loggeduser.Profile == 'PR') {
+
+ let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
+ depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+ this.despachoprstore.reset(depacho)
+
+ let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
+ this.count_dip_pv = Object.keys(diplomasValidar).length;
+
+ diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
+
+
+ this.deplomasStore.resetDiplomasReview(diplomasValidar.map((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();
+
+ return {
+ "SerialNumber": element.serialNumber,
+ "Folio": element.workflowInstanceDataFields.Subject,
+ "Senders": element.workflowInstanceDataFields.Sender,
+ "CreateDate": taskDate,
+ "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+ "Remetente": element.workflowInstanceDataFields.Remetente,
+ "DocumentsQty": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ }
+ }))
+
+
+ let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
+
+ this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
+
+ let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
+ this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
+ }
+
+ delete this.loadProcess['despachosPr']
+ } catch(error) {
+ delete this.loadProcess['despachosPr']
+ }
+ }
+
+ })();
+
+
+ (async()=>{
+ if(!this.loadProcess['EventosMD']) {
+ try {
+ this.loadProcess['EventosMD'] = true
+
+ let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+ let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+ let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+
+ eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
+ this.eventoaprovacaostore.countMd = eventsMDGPRList.length
+ this.eventoaprovacaostore.resetmd(eventsMDGPRList);
+
+
+ delete this.loadProcess['EventosMD']
+ } catch(error) {
+ delete this.loadProcess['EventosMD']
+ }
+ }
+
+ })();
+
+
+ (async()=>{
+ if(!this.loadProcess['EventosPR']) {
+ try {
+ this.loadProcess['EventosPR'] = true
+
+ let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
+ let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
+ let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+ eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
+ this.eventoaprovacaostore.countPr = eventsPRList.length
+ this.eventoaprovacaostore.resetpr(eventsPRList);
+
+ delete this.loadProcess['EventosPR']
+ } catch(error) {
+ delete this.loadProcess['EventosPR']
+ }
+ }
+
+ })();
+
+ (async()=>{
+ this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {
+ this.count_ev_apr = res;
+ }, (error) =>{
+ console.error(error)
+ });
+ })();
this.count_exp_pp = "-";
this.count_exp_pd = "-";
this.count_dip_apr = "-";
-
-
-
- this.loadCount = true
}
doRefresh(event) {
-
this.LoadCounts();
if (event) {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index cbae58091..6017eec40 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -181,7 +181,6 @@ export class AuthService {
if (event.type === HttpEventType.DownloadProgress) {
//this.downloadProgess = Math.round((100 * event.loaded) / event.total);
- //
return true
} else if (event.type === HttpEventType.Response) {
downloadFile = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));