diff --git a/src/app/controller/process/dispactch.ts b/src/app/controller/process/dispactch.ts deleted file mode 100644 index 2c17bf3cf..000000000 --- a/src/app/controller/process/dispactch.ts +++ /dev/null @@ -1,3 +0,0 @@ -export class DispatchController { - -} diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index ea7625c27..770bd86a1 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -674,10 +674,6 @@ export class AgendaPage implements OnInit { loadRangeEvents(startTime: Date, endTime: Date) { this.weekToShow() - if (!this.eventService.hasAnyCalendar) { - return false - } - this.array = []; this.rangeStartDate = startTime this.rangeEndDate = endTime @@ -708,16 +704,14 @@ export class AgendaPage implements OnInit { tracing.addEvent('load range start') - if (SessionStore?.user?.OwnerCalendars?.length == 0 && SessionStore.user.SharedCalendars.length == 0) { - return false - } - this.rangeStartDate = startTime this.rangeEndDate = endTime const selectedCalendarIds = await this.getSelectedAgendaCalendars() this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) + // console.log('this.listToPresent', this.listToPresent) + this.updateEventListBox() try { @@ -727,6 +721,8 @@ export class AgendaPage implements OnInit { let load = 0; + + // console.log('selectedCalendarIds', selectedCalendarIds) for (const selectedCalendar of selectedCalendarIds) { if(selectedCalendar.wxUserId) { @@ -826,6 +822,8 @@ export class AgendaPage implements OnInit { const data = await this.AgendaDataRepositoryService.geCalendars() + // console.log('this.AgendaDataRepositoryService.geCalendars()', data) + const array = [] const selected = data.find( e => e.wxUserId == this.selectedUserCalendar) diff --git a/src/app/services/camera/camera.service.spec.ts b/src/app/services/camera/camera.service.spec.ts deleted file mode 100644 index 73b57d3a5..000000000 --- a/src/app/services/camera/camera.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { CameraService } from './camera.service'; - -describe('CameraService', () => { - let service: CameraService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(CameraService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/services/camera/camera.service.ts b/src/app/services/camera/camera.service.ts deleted file mode 100644 index 73fa4b515..000000000 --- a/src/app/services/camera/camera.service.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class CameraService { - - constructor() { } -} diff --git a/src/app/services/native-notification.service.ts b/src/app/services/native-notification.service.ts index 484592ea1..68601bddf 100644 --- a/src/app/services/native-notification.service.ts +++ b/src/app/services/native-notification.service.ts @@ -89,7 +89,7 @@ export class NativeNotificationService { const notifications = []; - console.log({events}); + // console.log({events}); events = events .filter(e => new Date().getTime() <= new Date(e.start).getTime()) diff --git a/version/git-version.ts b/version/git-version.ts index be87d4640..44b41ba1d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "02d5e3e1e", - "SHA": "02d5e3e1ec95d74934874571cf07a2ff91c22304", + "shortSHA": "2e04ef0b2", + "SHA": "2e04ef0b20088e58bfa574391ba3086de71a14cd", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Oct 17 12:17:24 2024 +0100'", - "lastCommitMessage": "fix all errors", - "lastCommitNumber": "6097", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 1 commit.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts\n\tmodified: src/app/core/chat/usecase/room/room-get-list-use-case.service.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/infra/socket/signalR/signal-r.service.ts\n\tmodified: src/app/infra/socket/signalR/signalR.ts\n\tmodified: src/app/modals/view-event/view-event.page.html\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts\n\tmodified: src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\tmodified: src/app/module/notification/data/datasource/local-notification.service.ts\n\tmodified: src/app/module/user/data/datasource/user-local-repository.service.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\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/agenda/view-event/view-event.page.html\n\tdeleted: src/app/pages/events/edit-event/edit-event-routing.module.ts\n\tdeleted: src/app/pages/events/edit-event/edit-event.module.ts\n\tdeleted: src/app/pages/events/edit-event/edit-event.page.html\n\tdeleted: src/app/pages/events/edit-event/edit-event.page.scss\n\tdeleted: src/app/pages/events/edit-event/edit-event.page.spec.ts\n\tdeleted: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/events-routing.module.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/services/shareIntent.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/firebase-messaging-sw.js\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Thu Oct 17 13:01:24 2024 +0100'", + "lastCommitMessage": "remove console logs", + "lastCommitNumber": "6098", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tdeleted: src/app/controller/process/dispactch.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tdeleted: src/app/services/camera/camera.service.spec.ts\n\tdeleted: src/app/services/camera/camera.service.ts\n\tmodified: src/app/services/native-notification.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file