diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index ef117e824..f05b9ba00 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -70,7 +70,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
Minha agenda
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index ed4121982..f5b0e38f2 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -131,7 +131,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.taskParticipants = [{
EmailAddress: SessionStore.user.Email,
IsRequired: true,
- Name: SessionStore.user.UserName
+ Name: SessionStore.user.FullName
}]
}
diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 66d8692c9..4a299e49f 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -236,7 +236,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 7373e3317..dc5a0382d 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -38,7 +38,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
Minha agenda
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 21c724d57..d90ef3bc7 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -410,7 +410,9 @@ export class ChatPage implements OnInit {
doRefresh(event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 1000);
}
diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts
index ba9f618dc..b2a307b33 100644
--- a/src/app/pages/events/edit-event/edit-event.page.ts
+++ b/src/app/pages/events/edit-event/edit-event.page.ts
@@ -211,9 +211,13 @@ export class EditEventPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
index 1d9d2c64d..9dfb832b5 100644
--- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
+++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
@@ -209,9 +209,13 @@ export class EventDetailModalPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts
index df9a312a2..21bb0ab28 100644
--- a/src/app/pages/events/event-detail/event-detail.page.ts
+++ b/src/app/pages/events/event-detail/event-detail.page.ts
@@ -207,9 +207,13 @@ export class EventDetailPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 7e65d35c5..a6a479a70 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -129,7 +129,9 @@ export class EventsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
this.RefreshEvents();
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 054df15ed..73c3d1222 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -227,7 +227,9 @@ export class DespachosPrPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
setTimeout(() => {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index d0b30d841..2099aa24c 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -117,7 +117,9 @@ export class DespachosPage implements OnInit {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index 235adfc26..4c861bad8 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -22,7 +22,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 73e1218a8..8ace81ef5 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -234,7 +234,9 @@ export class EventListPage implements OnInit {
setTimeout(() => {
this.LoadToApproveEvents();
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 1000);
}
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 8b1c2ae12..dd91b625f 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -44,7 +44,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
Minha agenda
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index c4634e139..5b47f7d17 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -153,7 +153,7 @@ export class BookMeetingModalPage implements OnInit {
this.taskParticipants = [{
EmailAddress: SessionStore.user.Email,
IsRequired: true,
- Name: SessionStore.user.UserName
+ Name: SessionStore.user.FullName
}]
}
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 8a83066c9..2ac6b4555 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -103,7 +103,9 @@ export class ExpedientePage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 1000);
}
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 3940c94ad..411b2b2a1 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -95,7 +95,9 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 51d3aafc0..3808f3ac2 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -792,7 +792,9 @@ export class GabineteDigitalPage implements OnInit {
if (event) {
setTimeout(() => {
try {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
} catch(error) {}
}, 2000);
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 5491bf809..659a5a1de 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -299,7 +299,9 @@ export class PedidosPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index 05de31ff0..3db7eadd3 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -170,7 +170,9 @@ export class PendentesPage implements OnInit {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index 50ffbaa64..a773b5cf9 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -18,8 +18,6 @@ import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera
import { Filesystem, Directory } from '@capacitor/filesystem';
import { NgxImageCompressService } from "ngx-image-compress";
-import { readAndCompressImage } from 'browser-image-resizer';
-import { environment } from 'src/environments/environment';
const IMAGE_DIR = 'stored-images';
@@ -110,7 +108,7 @@ export class NewPublicationPage implements OnInit {
}
async takePicture() {
- alert('take')
+
const capturedImage = await Camera.getPhoto({
quality: 90,
// allowEditing: true,
@@ -121,30 +119,11 @@ export class NewPublicationPage implements OnInit {
const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
- const config = {
- quality: 0.5,
- maxWidth: 800,
- debug: true
- };
-
- var file = new File([blob], "camera.jpg");
-
- // Note: A single file comes from event.target.files on
- readAndCompressImage(file, config)
- .then(resizedImage => {
- console.log('resizedImage', resizedImage);
-
- this.convertBlobToBase64Worker.postMessage(resizedImage);
- this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
- this.capturedImage = oEvent.data
-
- }
- })
- .then(result => {
- // TODO: Handle the result
- console.log('result', result);
- });
+ this.convertBlobToBase64Worker.postMessage(blob);
+ this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
+ this.capturedImage = oEvent.data
+ }
}
imageSize(image) {
@@ -200,35 +179,12 @@ export class NewPublicationPage implements OnInit {
const response = await fetch(capturedImage.webPath!);
const blob = await response.blob();
-
-
- const config = {
- quality: 0.9,
- maxWidth: 800,
- debug: !environment.production
- };
-
- var file = new File([blob], "camera.jpg");
-
- // Note: A single file comes from event.target.files on
- readAndCompressImage(file, config)
- .then(resizedImage => {
- console.log('resizedImage', resizedImage);
-
- this.convertBlobToBase64Worker.postMessage(resizedImage);
- this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
- this.capturedImage = oEvent.data
-
- }
- })
- .then(result => {
- // TODO: Handle the result
- // console.log('result', result);
- });
-
-
+ this.convertBlobToBase64Worker.postMessage(blob);
+ this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
+ this.capturedImage = oEvent.data
+ }
}
@@ -242,7 +198,7 @@ export class NewPublicationPage implements OnInit {
this.Form = new FormGroup({
Subject: new FormControl(this.pub.Title, [
- Validators.required,
+ //Validators.required,
// Validators.minLength(4)
]),
capturedImage: new FormControl(this.capturedImage, [
@@ -285,11 +241,11 @@ export class NewPublicationPage implements OnInit {
try {
await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
- this.toastService.successMessage("Publicação editada")
+ this.toastService._successMessage("Publicação editada")
this.close();
} catch (error) {
- this.toastService.badRequest("Publicação não editada")
+ this.toastService._badRequest("Publicação não editada")
} finally {
loader.remove()
}
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index 452ce4222..6f986f089 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 6882c1b45..b689691b9 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -124,7 +124,9 @@ export class PublicationsPage implements OnInit {
doRefresh(event) {
this.getActions();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+ } catch(error) {}
}, 250);
}
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 23b6b92e9..b0080a8f8 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -63,7 +63,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 76fb37f95..44951aa3a 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -98,7 +98,9 @@ export class ViewPublicationsPage implements OnInit {
//this.testForkJoin()
this.getPublicationDetail();
this.getPublicationsIds();
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
//}, 3000);
}
diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index f6bc9eab7..cbe4a74cc 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -102,6 +102,11 @@ export class ChatSystemService {
}
});
+
+ if(SessionStore.user?.ChatData?.data) {
+ this.restoreRooms();
+ }
+
}
loadChat() {
@@ -166,7 +171,7 @@ export class ChatSystemService {
async restoreRooms() {
try {
- const rooms = await this.storage.remove('Rooms');
+ const rooms = await this.storage.get('Rooms');
if(rooms) {
for (let roomData of rooms.result.update) {
diff --git a/src/app/services/events/edit-event/edit-event.page.ts b/src/app/services/events/edit-event/edit-event.page.ts
index d481ac538..0d2be2c45 100644
--- a/src/app/services/events/edit-event/edit-event.page.ts
+++ b/src/app/services/events/edit-event/edit-event.page.ts
@@ -206,9 +206,13 @@ export class EditEventPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts
index faf8bb0e6..4029cefb8 100644
--- a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts
+++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts
@@ -203,9 +203,13 @@ export class EventDetailModalPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/services/events/event-detail/event-detail.page.ts b/src/app/services/events/event-detail/event-detail.page.ts
index 0df1d1109..e06180717 100644
--- a/src/app/services/events/event-detail/event-detail.page.ts
+++ b/src/app/services/events/event-detail/event-detail.page.ts
@@ -204,9 +204,13 @@ export class EventDetailPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts
index 7de67ac4d..7b42f57c5 100644
--- a/src/app/services/events/events.page.ts
+++ b/src/app/services/events/events.page.ts
@@ -125,7 +125,9 @@ export class EventsPage implements OnInit {
doRefresh(event) {
this.RefreshEvents();
this.LoadList();
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}
onSegmentChange() {
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 69004c032..1e7bb0289 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -16,7 +16,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index c47bb9815..440f8d888 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -170,7 +170,9 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 5fc142ee0..21c47292c 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -49,7 +49,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
Minha agenda
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index f4feb806e..97a971346 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -62,7 +62,9 @@ export class AllProcessesPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
setTimeout(() => {
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index f9e05e50c..ec7d1aaed 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -89,13 +89,19 @@ constructor (
doRefresh(event) {
if (event) {
setTimeout(() => {
+
+ try {
event?.target?.complete();
+ } catch(error) {}
+
}, 2000);
}
setTimeout(() => {
this.LoadList();
- //event?.target?.complete();
+ try {
+ event?.target?.complete();
+ } catch(error) {}
}, 1000);
}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index a2eebfd0b..562c93249 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -49,7 +49,9 @@ export class DespachosPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 8fc1cce52..c5cec5334 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -52,7 +52,9 @@ export class DiplomasAssinarPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
index d52d9b170..577cceeb5 100644
--- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
@@ -41,7 +41,9 @@ export class DiplomasGerarPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
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 4be0e734c..c7c1dfdc2 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
@@ -97,7 +97,9 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
setTimeout(() => {
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 50f4cf8d5..8478feb09 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -121,7 +121,9 @@ export class DiplomasPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
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 e6004146f..7befc35be 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
@@ -15,7 +15,7 @@
Agenda do PR
Agenda do MD
- Agenda do {{calendars.FullName}}
+ Agenda do {{calendars.Fullname}}
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 4ef2dcb5e..4b9b3272e 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
@@ -129,7 +129,9 @@ export class EventsToApprovePage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
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 cb7128427..152c34e9b 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
@@ -87,7 +87,9 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 3aa4de89e..06f99cca3 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -96,7 +96,9 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 14c7e5f5c..b2efdd485 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -124,7 +124,9 @@ export class PedidosPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
setTimeout(() => {
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index da2c8a9d4..aa75db94a 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -90,7 +90,9 @@ export class PendentesPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 2ef3b802b..ffee18231 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -54,7 +54,9 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event?.target?.complete();
+ try {
+ event?.target?.complete();
+} catch(error) {}
}, 2000);
}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 38a854fa6..53f31b337 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt'
-export const environment: Environment = doneITProd;
\ No newline at end of file
+export const environment: Environment = oaprProd;
\ No newline at end of file
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index aaefbfe6d..10909d23b 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
-export const environment: Environment = doneITDev;
\ No newline at end of file
+export const environment: Environment = oaprDev;
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index fa5cbb297..b4101b066 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "3e2d797c9",
- "SHA": "3e2d797c908bc1e109cf519adaad36d02f043cf8",
+ "shortSHA": "d46b8a34b",
+ "SHA": "d46b8a34bcff9131feaeefa60e9bca2c0c69f75c",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Thu Feb 9 17:03:26 2023 +0100'",
- "lastCommitMessage": "changed xcalendario to agenda",
- "lastCommitNumber": "4760",
+ "lastCommitTime": "'Thu Feb 9 17:04:59 2023 +0100'",
+ "lastCommitMessage": "merge with Peter changes",
+ "lastCommitNumber": "4763",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: version/git-version.ts",
+ "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\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.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.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/new-publication/new-publication.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.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.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.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.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/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\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file