-
-
+
-
+
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index 1d3f95802..ebd0175b8 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -75,8 +75,8 @@ export class NewActionPage implements OnInit {
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
- // this.folder.DateBegin = new Date().toISOString()
- // this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
+ // this.dateControlStart.value = new Date().toISOString()
+ // this.dateControlEnd.value = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
}
@@ -85,33 +85,18 @@ export class NewActionPage implements OnInit {
// this.setDefaultTime()
}
- setDefaultTime() {
- this.folder.DateBegin = new Date().toISOString()
- this.folder.DateEnd = (new Date(new Date().getTime() + 15 * 60000)).toISOString()
- }
segmentChanged(ev: any) {
}
get dateValid() {
- var validado: boolean;
-
- if (window.innerWidth <= 800) {
- if ((this.folder.DateBegin < this.folder.DateEnd)) {
- validado = true;
- } else {
- validado = false;
- }
- return validado == true ? ['ok']: [];
- } else {
- return ['ok']
- }
+ return new Date(this.dateStart).getTime() < new Date(this.dateEnd).getTime() ? 'ok': null
}
runValidation() {
this.validateFrom = true;
- if(new Date(this.folder.DateBegin).getTime() > new Date(this.folder.DateEnd).getTime()){
+ if(new Date(this.dateControlStart.value).getTime() > new Date(this.dateControlEnd.value).getTime()){
this.toastService._badRequest("A data de início não pode ser superior a data de fim");
}
}
@@ -144,8 +129,8 @@ export class NewActionPage implements OnInit {
ProcessId: null,
Description: this.folder.Description,
Detail: this.folder.Detail,
- DateBegin: this.folder.DateBegin,
- DateEnd: this.folder.DateEnd,
+ DateBegin: this.dateControlStart.value,
+ DateEnd: this.dateControlEnd.value,
ActionType: this.segment,
}
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 33551ca50..452ce4222 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,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index ea982cf74..6882c1b45 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -124,7 +124,7 @@ export class PublicationsPage implements OnInit {
doRefresh(event) {
this.getActions();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 69ea05b84..23b6b92e9 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,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 ec2fafa17..76fb37f95 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,7 @@ export class ViewPublicationsPage implements OnInit {
//this.testForkJoin()
this.getPublicationDetail();
this.getPublicationsIds();
- event.target.complete();
+ event?.target?.complete();
//}, 3000);
}
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 d6566596d..d481ac538 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,9 @@ export class EditEventPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event.target.complete();
+ event?.target?.complete();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 7edc0a417..faf8bb0e6 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,9 @@ export class EventDetailModalPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event.target.complete();
+ event?.target?.complete();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 fd77669ad..0df1d1109 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,9 @@ export class EventDetailPage implements OnInit {
}
doRefresh(event){
/* this.RefreshEvents(); */
- event.target.complete();
+ event?.target?.complete();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts
index 22affd076..7de67ac4d 100644
--- a/src/app/services/events/events.page.ts
+++ b/src/app/services/events/events.page.ts
@@ -125,7 +125,7 @@ export class EventsPage implements OnInit {
doRefresh(event) {
this.RefreshEvents();
this.LoadList();
- event.target.complete();
+ event?.target?.complete();
}
onSegmentChange() {
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 953e2c271..1463ebabe 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -168,7 +168,7 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
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 1ba181929..f4feb806e 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,7 @@ export class AllProcessesPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 80ade841e..f9e05e50c 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,13 @@ constructor (
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
setTimeout(() => {
this.LoadList();
- //event.target.complete();
+ //event?.target?.complete();
}, 1000);
}
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index 862f6cc58..a2eebfd0b 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -49,7 +49,7 @@ export class DespachosPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 6c68005f6..6e3998ae3 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,7 @@ export class DiplomasAssinarPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 991be71f7..d52d9b170 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,7 @@ export class DiplomasGerarPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 ec803e7ff..4be0e734c 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,7 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 5b46dabbf..be14d6caa 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -127,7 +127,7 @@ export class DiplomasPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 dcdaac781..cb7128427 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,7 @@ export class ExpedientesPrPage implements OnInit {
doRefresh(event) {
this.LoadList();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 4a883aa50..3aa4de89e 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -96,7 +96,7 @@ export class ExpedientsPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 746575fb0..14c7e5f5c 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -124,7 +124,7 @@ export class PedidosPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 af503c4d5..da2c8a9d4 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -90,7 +90,7 @@ export class PendentesPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 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 fa1aff7ef..2ef3b802b 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,7 @@ export class PublicationDetailPage implements OnInit {
this.getPublicationDetail();
setTimeout(() => {
- event.target.complete();
+ event?.target?.complete();
}, 2000);
}
diff --git a/version/git-version.ts b/version/git-version.ts
index b0c55bd13..a6d05450d 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "009f2fa92",
- "SHA": "009f2fa9283b293f24900817e05b25aeb1e45cb2",
+ "shortSHA": "2470e0abf",
+ "SHA": "2470e0abfc9ad022e8a7a9e9566e52fbe4d9a41e",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Mon Feb 6 11:38:15 2023 +0100'",
- "lastCommitMessage": "improve",
- "lastCommitNumber": "4731",
+ "lastCommitTime": "'Mon Feb 6 12:11:14 2023 +0100'",
+ "lastCommitMessage": "fix book meeting modal",
+ "lastCommitNumber": "4732",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\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",
+ "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/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.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/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.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/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/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: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file