From 0b876e516b606fcf9d0c905695b286f6c5ed714e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 18 Mar 2024 11:42:36 +0100 Subject: [PATCH] fix change order and agenda list --- src/app/pages/agenda/agenda.page.html | 3 +-- src/app/pages/agenda/agenda.page.ts | 8 ++------ src/app/pages/events/events.page.html | 1 + src/app/services/agenda/list-box.service.ts | 9 ++++++++- src/app/services/chat/room.service.ts | 1 + src/app/services/events.service.ts | 16 ++++++++++++++-- version/git-version.ts | 2 +- 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a7d692dcc..ca33b9cea 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -216,7 +216,6 @@
-
Hoje,  {{ timelineDate }}
@@ -231,7 +230,7 @@
-
+
{{ day.daysInfo.dayName }}
{{month.monthInfo.monthName}}
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 00b16691a..65804070c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -283,6 +283,7 @@ export class AgendaPage implements OnInit { this.calendar.currentDate = new Date(); + //this.onCurrentChanged(new Date()) try { this.myCal.update(); @@ -290,7 +291,7 @@ export class AgendaPage implements OnInit { this.onDropDownScrollWeal() } catch (e) { } - this.reloadCalendar(); + //this.reloadCalendar(); this.updateEventListBox() realoadCounter++; @@ -449,11 +450,6 @@ export class AgendaPage implements OnInit { } - onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { - this.eventSelectedDate2 = ev.selectedTime; - } - - currentMoth = { rangeStartDate: null, rangeEndDate: null diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 69270ebc2..569c40a82 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -315,3 +315,4 @@ +Visit W3Schools.com! diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 192498ec2..afbd53d31 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -99,7 +99,6 @@ export class ListBoxService { display(list: CustomCalendarEvent[], selectedDate) { - let days = {}; const year: Year[] = [] @@ -174,6 +173,14 @@ export class ListBoxService { const EndEvent = this.transForm(cloneEvent, {startMany: false,endMany: true, middle: true}) if(this.CanPush(cloneEvent, selectedDate) && cloneEvent.start.getTime() >= cloneSelectedDate.getTime()) { days[otherDays].push(EndEvent) ; this.push(EndEvent, year) + } else { + if( cloneEvent.start.getFullYear() == cloneSelectedDate.getFullYear() && cloneEvent.start.getDate() == cloneSelectedDate.getDate() && cloneEvent.start.getMonth() == cloneSelectedDate.getMonth()) { + // console.log("00_00") + days[otherDays].push(EndEvent) ; this.push(EndEvent, year) + } else { + // console.log('0000000000000000000000000',cloneEvent.start.getTime(), cloneSelectedDate.getTime()) + // console.log('0000000000000000000000000',cloneEvent.start, cloneSelectedDate) + } } } diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 857a802f0..63a8dd45f 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -391,6 +391,7 @@ export class RoomService { this.name = ChatMessage.msg } + this.sortRoomList() // this.changeDetector() setTimeout(() => { done() diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 1011c14d8..e4dc8f6b0 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -1206,11 +1206,23 @@ export class EventsService { }) ) } else { + const calendar = this.DetectCalendars(calendarId) + const header = this.makeHeader(calendar) + options = { + headers: header, + params: params + }; + + return this.http.delete(`${puturl}`, options).pipe( + catchError(err => { + + this.offlinemanager.storeRequestData('eventDelete', arrayReq); + throw new Error(err); + }) + ) } - throw('header not found') - } diff --git a/version/git-version.ts b/version/git-version.ts index 1de26ec54..163c4f2d5 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -5,7 +5,7 @@ export let versionData = { "lastCommitAuthor": "'Peter Maquiran'", "lastCommitTime": "'Thu Aug 31 12:00:52 2023 +0100'", "lastCommitMessage": "add attachments", - "lastCommitNumber": "1514", + "lastCommitNumber": "1515", "change": "", "changeStatus": "On branch notification-header/feature\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/shared/header/header.page.ts\n\tnew file: src/app/store/notification-holder.service.spec.ts\n\tnew file: src/app/store/notification-holder.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html", "changeAuthor": "peter.maquiran"