diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index b2acd540f..805a54fd9 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -189,138 +189,169 @@ export class TaskService { } async loadExpedientes() { - let expedientes; - expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise() - expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active") + try { + let expedientes; + expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise() + + expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active") + + expedientes = expedientes.filter((item) => { + return item.activityInstanceName != 'Retificar Expediente' + }); + + expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); + + this.expedientegbstore.reset(expedientes); + } catch (error) { + + } - expedientes = expedientes.filter((item) => { - return item.activityInstanceName != 'Retificar Expediente' - }); - expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); - - this.expedientegbstore.reset(expedientes); } async loadPedidos() { - 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); + try { + 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.pedidosstore.countparecer = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; + + this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { + return this.customTaskPipe.transform(element) + })); + + let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise(); + this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length + this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { + return this.customTaskPipe.transform(element) + })); + } catch (error) { + + } - this.pedidosstore.countparecer = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - - this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { - return this.customTaskPipe.transform(element) - })); - - let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise(); - this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length - this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { - return this.customTaskPipe.transform(element) - })); } async loadPendestes() { - let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise(); - this.pendentesstore.count = Object.keys(pendentes).length; + try { + + let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise(); + this.pendentesstore.count = Object.keys(pendentes).length; - pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) + pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) - this.pendentesstore.reset(pendentes); + this.pendentesstore.reset(pendentes); + } catch (error) { + + } + } async loadEventosParaAprovacao() { - for(let calendar of this.eventService.calendarNamesAry) { - if(calendar == 'Meu calendario') { - // color - let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise(); - let eventsList - try { - eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); - } catch (error) { - eventsList = []; + + try { + for(let calendar of this.eventService.calendarNamesAry) { + if(calendar == 'Meu calendario') { + // color + let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise(); + let eventsList + try { + eventsList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } catch (error) { + eventsList = []; + } + + this.eventoaprovacaostore.save(calendar, eventsList) + + } else { + let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise() + let eventsList + try { + eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); + } catch(error) { + eventsList = [] + } + + this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList) } - - this.eventoaprovacaostore.save(calendar, eventsList) - - } else { - let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise() - let eventsList - try { - eventsList = this.sortService.sortArrayByDate(allEvents).reverse(); - } catch(error) { - eventsList = [] - } - - this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList) } + } catch (error) { + } + } async loadDiplomas() { - let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - - if(SessionStore.user.Profile != 'PR') { - - let depacho: any = 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(SessionStore.user.Profile == 'PR') { - - let depacho: any = 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 gerarDiploma = depachoAPI.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); - let diplomasList = [] - - gerarDiploma.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element); - diplomasList.push(task); - }); - - diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate') - this.deplomasStore.resetDiplomaGerar(diplomasList); + try { + + let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); + if(SessionStore.user.Profile != 'PR') { + + let depacho: any = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); - diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho"); + depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) + + this.despachoprstore.reset(depacho) + + } else if(SessionStore.user.Profile == 'PR') { + + let depacho: any = 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) + + } - this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> { + let gerarDiploma = depachoAPI.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); + let diplomasList = [] - 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(); + gerarDiploma.forEach(element => { + let task: customTask = this.customTaskPipe.transform(element); + diplomasList.push(task); + }); - return this.customTaskPipe.transform(element) - })) + diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate') + this.deplomasStore.resetDiplomaGerar(diplomasList); + + + let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); + + diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho"); - let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); - diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element)) - this.sortService.sortDate(diplomasAssinar, 'CreateDate') - this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> { - let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); - diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element)) - this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) + 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 this.customTaskPipe.transform(element) + })) + + + let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); + diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element)) + this.sortService.sortDate(diplomasAssinar, 'CreateDate') + this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + + let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); + diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element)) + this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) + } catch (error) { + + } + } } diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html index ad9285d17..733e08b7e 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html @@ -60,15 +60,15 @@
Lista vazia
-
+
- + diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts index 2ecb18465..5b90d7686 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts @@ -17,7 +17,6 @@ import { TaskService } from 'src/app/services/task.service' export class ExpedientsPage implements OnInit { segment: string; - taskslist = []; serialNumber: string; @Input() profile: string; @@ -65,37 +64,41 @@ export class ExpedientsPage implements OnInit { this.skeletonLoader = true this.processes.GetTaskListExpediente(false).subscribe(result => { - this.taskslist = []; - this.skeletonLoader = false + let taskslist = []; let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { let task = this.expedienteTaskPipe.transform(element) - this.taskslist.push(task); + taskslist.push(task); }); - this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') - this.addProcessTODb(this.taskslist); - this.taskslist = this.taskslist.filter(function(item) { + taskslist = this.sortService.sortDate(taskslist, 'CreateDate') + // this.addProcessTODb(taskslist); + taskslist = taskslist.filter(function(item) { return item.activityInstanceName != 'Retificar Expediente' }) - this.expedientegbstore.reset(this.taskslist); + this.expedientegbstore.reset(taskslist); + }, (error) => { - this.getEventsFromLocalDb(); + this.skeletonLoader = false + //this.getEventsFromLocalDb(); + console.log('stop') + }, () =>{ + this.skeletonLoader = false }); } - addProcessTODb(task) { - this.storage.set('gabinete-expediente', task).then(() => { + // addProcessTODb(task) { + // this.storage.set('gabinete-expediente', task).then(() => { - }) - } + // }) + // } - getEventsFromLocalDb() { - this.storage.get('gabinete-expediente').then((expediente) => { - this.taskslist = expediente - }) - } + // getEventsFromLocalDb() { + // this.storage.get('gabinete-expediente').then((expediente) => { + // taskslist = expediente + // }) + // } doRefresh(event) { if (event) { diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index a09093d46..bb49d4b7f 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -139,29 +139,79 @@ Lista vazia
-
- - - - - - -

-

-

-
-
- - - - - -

-

-

-
-
+
+
+ Lista vazia +
+
+ +
+
+ Lista vazia +
+
+ + +
+ + + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
+
+
+ +
+ + + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss index f16a177d3..b3fda1d0e 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss @@ -227,3 +227,13 @@ ion-item{ float: right; margin-right: 10px; } + + +.centered-div{ + width: 100px; + height: 100px; + position: absolute; + top: 50%; + left: 50%; + margin: -35px 0 0 -35px; +} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index b992eec57..b2ee7f390 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -78,6 +78,9 @@ export class ExpedientesPrPage implements OnInit { this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false; + }, (error) => { + this.skeletonLoader = false + // this.getEventsFromLocalDb(); }); } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 36d411e20..3651a81ab 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -91,14 +91,14 @@
Lista vazia
-
- +
+ diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index d478e1b7c..fe51ddbc3 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -17,7 +17,6 @@ import { TaskService } from 'src/app/services/task.service' export class ExpedientsPage implements OnInit { segment: string; - taskslist = []; serialNumber: string; @Input() profile: string; @@ -73,37 +72,40 @@ export class ExpedientsPage implements OnInit { this.skeletonLoader = true this.processes.GetTaskListExpediente(false).subscribe(result => { - this.taskslist = []; + + let taskslist = []; this.skeletonLoader = false let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); - this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e)) - this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') - this.addProcessTODb(this.taskslist); + taskslist = res.map((e) => this.expedienteTaskPipe.transform(e)) + taskslist = this.sortService.sortDate(taskslist, 'CreateDate') + // this.addProcessTODb(taskslist); - this.taskslist = this.taskslist.filter(function(item) { + taskslist = taskslist.filter(function(item) { return item.activityInstanceName != 'Retificar Expediente' }) - this.expedientegbstore.reset(this.taskslist); + this.expedientegbstore.reset(taskslist); }, (error) => { this.skeletonLoader = false - this.getEventsFromLocalDb(); + // this.getEventsFromLocalDb(); + }, () =>{ + this.skeletonLoader = false }); } - addProcessTODb(task) { - this.storage.set('gabinete-expediente', task).then(() => { + // addProcessTODb(task) { + // this.storage.set('gabinete-expediente', task).then(() => { - }) - } + // }) + // } - getEventsFromLocalDb() { - this.storage.get('gabinete-expediente').then((expediente) => { - this.taskslist = expediente - }) - } + // getEventsFromLocalDb() { + // this.storage.get('gabinete-expediente').then((expediente) => { + // this.taskslist = expediente + // }) + // } doRefresh(event) { if (event) { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 1d2ed1694..bbb058c9a 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -36,7 +36,7 @@ -
s +
@@ -145,7 +145,7 @@
Lista vazia @@ -154,16 +154,16 @@
Lista vazia
-
+
- + @@ -186,6 +186,33 @@
+ +
+ + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
+
+
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index f0926c313..6944e6b93 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -76,6 +76,7 @@ export class PendentesPage implements OnInit { }) }, (error) => { + this.skeletonLoader = false; if(error.status == 0){ this.getFromDb(); } diff --git a/version/git-version.ts b/version/git-version.ts index 8fb9b9962..2be078df8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "04785f32f", - "SHA": "04785f32f92e970c7be48e91384d2df3845df9a0", + "shortSHA": "fd0941999", + "SHA": "fd0941999df1a7a4dad3ab7c72f698bd5cf4f037", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Apr 24 11:30:21 2023 +0100'", - "lastCommitMessage": "fix count", - "lastCommitNumber": "4928", + "lastCommitTime": "'Mon Apr 24 11:47:00 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4929", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file