diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index aa0103420..80e2775d3 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -1,15 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { AlertController, ModalController, PopoverController, Platform, NavParams } from '@ionic/angular'; import { EventBody } from 'src/app/models/eventbody.model'; -import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ProcessesService } from 'src/app/services/processes.service';import { ActivatedRoute, Router } from '@angular/router'; import { ToastService } from 'src/app/services/toast.service'; import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; -import { Location } from '@angular/common' import { SqliteService } from 'src/app/services/sqlite.service'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page'; diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 527beb5dc..2153db98c 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -20,7 +20,7 @@ - + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a2dd565a2..d7b249733 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -126,13 +126,19 @@ export class EventsPage implements OnInit { } } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } this.RefreshEvents(); this.LoadList(); } onSegmentChange() { - this.doRefresh(); + this.RefreshEvents(); + this.LoadList(); } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 8ba90122d..1e6d73458 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -10,7 +10,7 @@ Despachos
-
@@ -20,7 +20,7 @@ --> - + { if (event instanceof NavigationStart && event.url.startsWith(pathname)) { if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -223,8 +223,12 @@ export class DespachosPrPage implements OnInit { }) } - doRefresh() { - + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000) diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index c54d9bbee..bdb0b2857 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -162,7 +162,8 @@ export class PedidoPage implements OnInit { let thedate = new Date(res.taskStartDate); this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]); - this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe(users => { + this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe((users = []) => { + this.updateProcessInterveners(users) this.intervenientes = users.filter(user => { return user.Type == 'I'; diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 5d11c4f1f..fb5a22043 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -11,7 +11,7 @@ - + { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.updateAllProcess(); }, 1000); diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 245c01838..a1e4295c6 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,7 +6,7 @@ Despachos
-
@@ -14,7 +14,7 @@ - + { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); //event.target.complete(); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 22ef14217..6d344aa54 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -11,7 +11,7 @@ - + { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -45,8 +45,14 @@ export class DespachosPage implements OnInit { await this.despachoRule.getList({updateStore: true}) this.skeletonLoader = false; } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 325a11c39..ae3db3f54 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -3,14 +3,14 @@
Diplomas para assinar
-
- + { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -49,7 +49,13 @@ export class DiplomasAssinarPage implements OnInit { this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']); } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html index c14e50284..9f73c76ea 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html @@ -3,14 +3,14 @@
Diplomas por gerar
-
- + { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); }, 1000); 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 2da1413da..fd37380d0 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 @@ -3,14 +3,14 @@
Expediente
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -94,8 +94,12 @@ export class ExpedientsPage implements OnInit { }) } - doRefresh() { - + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000) diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 1cda84e29..1c1511a4f 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -3,7 +3,7 @@
Diplomas
-
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index f0520eec2..fd454c526 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -123,8 +123,14 @@ export class DiplomasPage implements OnInit { this.LoadList(); }, 1000); } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { this.LoadList(); } diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index 1ffee9b0d..dc8b90026 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -3,7 +3,7 @@
-
@@ -20,7 +20,7 @@
- + diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index ade3a41bb..e832ab727 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -51,7 +51,7 @@ export class EventsToApprovePage implements OnInit { '/home/gabinete-digital?eventos=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadToApproveEvents() } else { this.LoadToApproveEvents() } @@ -124,9 +124,13 @@ export class EventsToApprovePage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital']) } + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { - setTimeout(()=>{ this.LoadToApproveEvents(); }, 1000) diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 45472bc3c..0a7053cc4 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -3,14 +3,14 @@
Expediente
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -93,7 +93,12 @@ export class ExpedientsPage implements OnInit { }) } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 81adfc396..e2a576ce2 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -3,7 +3,7 @@
Pedidos
-
@@ -20,7 +20,7 @@ - + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -121,7 +121,12 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 0a3c33f7c..f1129d7fe 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -3,14 +3,14 @@
Pendentes
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -86,8 +86,14 @@ export class PendentesPage implements OnInit { this.listToPresent =pendentes }) } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { setTimeout(()=>{ this.LoadList(); }, 1000) diff --git a/version/git-version.ts b/version/git-version.ts index e2586510d..486635cd0 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "8df8f98c4", - "SHA": "8df8f98c4eccab3ae1fd0a5f6e3171f35ae3b048", + "shortSHA": "ac23c085f", + "SHA": "ac23c085fb436db5698015e7627ec7c098cae72c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 1 09:20:58 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4702", + "lastCommitTime": "'Wed Feb 1 18:04:01 2023 +0100'", + "lastCommitMessage": "merge", + "lastCommitNumber": "4708", "change": "", - "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.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.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.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/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file