This commit is contained in:
Peter Maquiran
2023-02-09 16:05:36 +01:00
parent 07b958651a
commit d933df5b31
37 changed files with 139 additions and 48 deletions
+2
View File
@@ -410,7 +410,9 @@ export class ChatPage implements OnInit {
doRefresh(event) { doRefresh(event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 1000); }, 1000);
} }
@@ -211,9 +211,13 @@ export class EditEventPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -209,9 +209,13 @@ export class EventDetailModalPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -207,9 +207,13 @@ export class EventDetailPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
+2
View File
@@ -129,7 +129,9 @@ export class EventsPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
this.RefreshEvents(); this.RefreshEvents();
@@ -227,7 +227,9 @@ export class DespachosPrPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
setTimeout(() => { setTimeout(() => {
@@ -117,7 +117,9 @@ export class DespachosPage implements OnInit {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -232,7 +232,9 @@ export class EventListPage implements OnInit {
setTimeout(() => { setTimeout(() => {
this.LoadToApproveEvents(); this.LoadToApproveEvents();
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 1000); }, 1000);
} }
@@ -103,7 +103,9 @@ export class ExpedientePage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 1000); }, 1000);
} }
@@ -95,7 +95,9 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -792,7 +792,9 @@ export class GabineteDigitalPage implements OnInit {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try { try {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
} catch(error) {} } catch(error) {}
}, 2000); }, 2000);
@@ -299,7 +299,9 @@ export class PedidosPage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -170,7 +170,9 @@ export class PendentesPage implements OnInit {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail(); this.getPublicationDetail();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -124,7 +124,9 @@ export class PublicationsPage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.getActions(); this.getActions();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 250); }, 250);
} }
@@ -63,7 +63,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail(); this.getPublicationDetail();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -98,7 +98,9 @@ export class ViewPublicationsPage implements OnInit {
//this.testForkJoin() //this.testForkJoin()
this.getPublicationDetail(); this.getPublicationDetail();
this.getPublicationsIds(); this.getPublicationsIds();
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
//}, 3000); //}, 3000);
} }
+6 -1
View File
@@ -102,6 +102,11 @@ export class ChatSystemService {
} }
}); });
if(SessionStore.user?.ChatData?.data) {
this.restoreRooms();
}
} }
loadChat() { loadChat() {
@@ -166,7 +171,7 @@ export class ChatSystemService {
async restoreRooms() { async restoreRooms() {
try { try {
const rooms = await this.storage.remove('Rooms'); const rooms = await this.storage.get('Rooms');
if(rooms) { if(rooms) {
for (let roomData of rooms.result.update) { for (let roomData of rooms.result.update) {
@@ -206,9 +206,13 @@ export class EditEventPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -203,9 +203,13 @@ export class EventDetailModalPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -204,9 +204,13 @@ export class EventDetailPage implements OnInit {
} }
doRefresh(event){ doRefresh(event){
/* this.RefreshEvents(); */ /* this.RefreshEvents(); */
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
+2
View File
@@ -125,7 +125,9 @@ export class EventsPage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.RefreshEvents(); this.RefreshEvents();
this.LoadList(); this.LoadList();
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
} }
onSegmentChange() { onSegmentChange() {
@@ -168,7 +168,9 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents(); this.LoadToApproveEvents();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -62,7 +62,9 @@ export class AllProcessesPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
setTimeout(() => { setTimeout(() => {
@@ -89,13 +89,19 @@ constructor (
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
setTimeout(() => { setTimeout(() => {
this.LoadList(); this.LoadList();
//event?.target?.complete(); try {
event?.target?.complete();
} catch(error) {}
}, 1000); }, 1000);
} }
@@ -49,7 +49,9 @@ export class DespachosPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -52,7 +52,9 @@ export class DiplomasAssinarPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -41,7 +41,9 @@ export class DiplomasGerarPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -97,7 +97,9 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
setTimeout(() => { setTimeout(() => {
@@ -121,7 +121,9 @@ export class DiplomasPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -126,7 +126,9 @@ export class EventsToApprovePage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -87,7 +87,9 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -96,7 +96,9 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -124,7 +124,9 @@ export class PedidosPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
setTimeout(() => { setTimeout(() => {
@@ -90,7 +90,9 @@ export class PendentesPage implements OnInit {
doRefresh(event) { doRefresh(event) {
if (event) { if (event) {
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail(); this.getPublicationDetail();
setTimeout(() => { setTimeout(() => {
try {
event?.target?.complete(); event?.target?.complete();
} catch(error) {}
}, 2000); }, 2000);
} }
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "7e2691cf8", "shortSHA": "07b958651",
"SHA": "7e2691cf8d9cf4ce2e2f652ff7ba199e2d7a5d0a", "SHA": "07b958651a574b627e9d04fce33427260960525b",
"branch": "no_bug_movemente", "branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Feb 9 12:06:37 2023 +0100'", "lastCommitTime": "'Thu Feb 9 15:26:14 2023 +0100'",
"lastCommitMessage": "publicate name", "lastCommitMessage": "fix take picture immage to big",
"lastCommitNumber": "4759", "lastCommitNumber": "4760",
"change": "", "change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts", "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\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.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events/edit-event/edit-event.page.ts\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/services/events/event-detail/event-detail.page.ts\n\tmodified: src/app/services/events/events.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\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.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\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.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\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.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/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }