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 f5b0e38f2..d37a9b6ea 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 @@ -164,7 +164,7 @@ export class DocumentSetUpMeetingPage implements OnInit { setEndDate() { if(!this.postData.EndDate) { - this.postData.EndDate = this.postData.StartDate; + this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate); } } @@ -463,6 +463,13 @@ export class DocumentSetUpMeetingPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + checkRoleInArray(str) { return this._eventService.calendarRole.includes(str); } diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index e62cd8684..e30588840 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -62,13 +62,11 @@ export class EditEventPage implements OnInit { public showSeconds = false; public touchUi = false; public enableMeridian = false; - public minDate = new Date().toISOString().slice(0,10) public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10) public maxDate: any; public stepHour = 1; public stepMinute = 15; public stepSecond = 15; - currentDate = this.roundTimeQuarterHour(); loadedEventAttachments: Attachment[] = []; taskParticipants: any = []; @@ -193,6 +191,13 @@ export class EditEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + onSelectedRecurringChanged(ev?:any) { this.calculetedLastOccurrence(ev); diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index f20ea370e..804edb193 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -51,7 +51,6 @@ export class NewEventPage implements OnInit { public stepMinute = 15; public stepSecond = 15; public color: ThemePalette = 'primary'; - currentDate = this.roundTimeQuarterHour(); Form: FormGroup; validateFrom = false @@ -190,7 +189,7 @@ export class NewEventPage implements OnInit { setDefaultTime() { this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); - this.postEvent.EndDate = this.postEvent.StartDate; + this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate); } close() { @@ -219,6 +218,12 @@ export class NewEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } setStartDate() { if(!this.postEvent.StartDate) { this.postEvent.StartDate = this.roundTimeQuarterHour(); 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 5b47f7d17..907e76b46 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 @@ -135,8 +135,9 @@ export class BookMeetingModalPage implements OnInit { this.postData.Subject = this.task.Folio; this.postData.CalendarName = "Oficial"; - this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour())); - this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour()))); + let startDate = this.roundTimeQuarterHour() + this.dateControlStart = new FormControl(moment(startDate)); + this.dateControlEnd = new FormControl(moment(this.roundTimeQuarterHourPlus15(startDate))); this.postData.Category = 'Reunião' @@ -200,7 +201,7 @@ export class BookMeetingModalPage implements OnInit { setDefaultTime() { this.postData.StartDate = this.roundTimeQuarterHour(); - this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000)) + this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate); } getAttachments() { @@ -520,6 +521,15 @@ export class BookMeetingModalPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + + + setStartDate() { this.postData.StartDate = this.roundTimeQuarterHour(); } 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 07555701b..575f1121d 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -73,7 +73,7 @@ export class NewActionPage implements OnInit { this.folder = new PublicationFolder(); this.dateControlStart = new FormControl(this.roundTimeQuarterHour()); - this.dateControlEnd = new FormControl(this.dateControlStart.value); + this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value)); } @@ -177,4 +177,11 @@ export class NewActionPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 759750e44..81a806fc8 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -48,7 +48,6 @@ export class EditEventPage implements OnInit { public stepHour = 1; public stepMinute = 15; public stepSecond = 15; - currentDate = this.roundTimeQuarterHour(); Form: FormGroup; validateFrom = false @@ -238,6 +237,13 @@ export class EditEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + onSelectedRecurringChanged(ev:any){ this.calculetedLastOccurrence(ev); diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index d5f6d6104..79770cd98 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -227,7 +227,7 @@ export class NewEventPage implements OnInit { setDefaultTime() { this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); - this.postEvent.EndDate = this.postEvent.StartDate; + this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate); } roundTimeQuarterHour(timeToReturn = new Date()): Date { @@ -254,6 +254,13 @@ export class NewEventPage implements OnInit { return date } + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } + roundTimeQuarterHour1 (timeToReturn) { let date: any = new Date(timeToReturn) || new Date(); diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 87683b872..c52d4fb31 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -185,6 +185,13 @@ export class NewActionPage implements OnInit { return date } + + roundTimeQuarterHourPlus15(date:Date) { + const _date = new Date(date); + const minutes = _date .getMinutes(); + _date .setMinutes(minutes + 15) + return _date + } setStartDate() { @@ -192,6 +199,6 @@ export class NewActionPage implements OnInit { } setEndDate() { - this.folder.DateEnd = this.folder.DateBegin; + this.folder.DateEnd = this.roundTimeQuarterHourPlus15(this.folder.DateBegin); } } diff --git a/version/git-version.ts b/version/git-version.ts index 55b530f86..62873964d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "44dddff12", - "SHA": "44dddff12453e7f9e43677a42999900a7437e3f6", + "shortSHA": "1f5abcaa7", + "SHA": "1f5abcaa7a5e9a759596ea52975412f708d6394a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 13 17:51:36 2023 +0100'", - "lastCommitMessage": "add break line to tet", - "lastCommitNumber": "4772", + "lastCommitTime": "'Mon Feb 13 18:23:20 2023 +0100'", + "lastCommitMessage": "fix agenda", + "lastCommitNumber": "4773", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.html", + "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.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file