diff --git a/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts b/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts index 4c0cc9471..6e05e03b9 100644 --- a/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts +++ b/src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts @@ -43,7 +43,7 @@ export class SendLocalMessagesUseCaseService { } else { //const removeLocalRooms = allRooms.value.filter((e)=> e.local == IDBoolean.false) - console.log({localM: messages}); + // console.log({localM: messages}); for(const message of messages) { const room = allRooms.value.find(e => e.id == message.roomId || e.$id == message.roomId) diff --git a/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts b/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts index fe8b3055e..63031b8c6 100644 --- a/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts +++ b/src/app/core/chat/usecase/room/room-get-list-use-case.service.ts @@ -60,7 +60,7 @@ export class GetRoomListUseCaseService { @captureAndReraiseAsync('RoomRepositoryService/list') async execute() { - console.log('update===============') + // console.log('update===============') const result = await this.roomRemoteDataSourceService.getRoomList() const localList = await this.roomLocalDataSourceService.findAll() @@ -87,7 +87,7 @@ export class GetRoomListUseCaseService { const { roomsToDelete, roomsToInsert, roomsToUpdate } = roomListDetermineChanges(filterValidateRooms, localList.value) - console.log({roomsToDelete, roomsToInsert, roomsToUpdate}) + // console.log({roomsToDelete, roomsToInsert, roomsToUpdate}) // sometime api return duplicated rooms const insertedIds = [] diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index f3696f6ed..2b9cb2638 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -152,8 +152,8 @@ export class HomePage implements OnInit { SendIntent.checkSendIntentReceived().then((result: any) => { if (result) { - console.log('SendIntent received'); - console.log(JSON.stringify(result)); + //console.log('SendIntent received'); + //console.log(JSON.stringify(result)); } if (result.url) { window["sharedContent"] = result; @@ -236,7 +236,7 @@ export class HomePage implements OnInit { } if (this.p.userPermission([this.p.permissionList.Agenda.access]) && !this.eventService.hasAnyCalendar) { - throw ('User ' + SessionStore.user.FullName + 'has No calendar'); + // throw ('User ' + SessionStore.user.FullName + 'has No calendar'); } if (this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID != this.RoleIdService.PRES) { throw ('User has PRES permission but not roleId'); @@ -338,7 +338,7 @@ export class HomePage implements OnInit { logDeviceInfo = async () => { const info = await Device.getInfo(); - console.log('DEVICE INFO ',info); + // console.log('DEVICE INFO ',info); } updateList() { diff --git a/src/app/infra/socket/signalR/signal-r.service.ts b/src/app/infra/socket/signalR/signal-r.service.ts index b5213e6c1..b3bc62eb1 100644 --- a/src/app/infra/socket/signalR/signal-r.service.ts +++ b/src/app/infra/socket/signalR/signal-r.service.ts @@ -57,7 +57,7 @@ export class SignalRService { const attempConnection = await connection.establishConnection() if(attempConnection.isOk()) { - console.log('connect') + // console.log('connect') this.connection?.closeConnection() this.connection = connection diff --git a/src/app/infra/socket/signalR/signalR.ts b/src/app/infra/socket/signalR/signalR.ts index 6050fa8b1..89ebd4639 100644 --- a/src/app/infra/socket/signalR/signalR.ts +++ b/src/app/infra/socket/signalR/signalR.ts @@ -51,7 +51,7 @@ export class SignalRConnection { .then(() => { this.hubConnection = hubConnection this.hasConnectOnce = true - console.log('Connection started'); + // console.log('Connection started'); this.connectionStateSubject.next(true); this.join() this.addMessageListener() diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html index 3c3e17779..abbf6079e 100644 --- a/src/app/modals/view-event/view-event.page.html +++ b/src/app/modals/view-event/view-event.page.html @@ -29,7 +29,7 @@ - @@ -124,7 +124,7 @@
- +
diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index 85be07220..66386bbe6 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -20,6 +20,7 @@ import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/reposito import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { isHttpError } from 'src/app/services/http.service'; import { PermissionService } from 'src/app/services/permission.service'; +import { DeleteEventRecurrencePage, EventDeleteRecurrenceComponentReturn } from '../delete-event-recurrence/delete-event-recurrence.page'; @Component({ selector: 'app-view-event', @@ -151,11 +152,66 @@ export class ViewEventPage implements OnInit { } - deleteEvent() { + async deleteYesOrNo() { + if (this.loadedEvent.IsRecurring) { + + const modal = await this.modalController.create({ + component: DeleteEventRecurrencePage, + componentProps: {}, + cssClass: 'event-recurrence-modal', + + }); + + modal.onDidDismiss().then((res) => { + + const data: EventDeleteRecurrenceComponentReturn = res.data + if(data =='DeleteAll') { + this.deleteEvent(true); + + } else if (data == 'DeleteOne') { + this.deleteEvent(false); + } else if(data == 'Cancel') { + this.close() + } else { + this.close() + } + }); + + await modal.present(); + + } else { + this.alertController.create({ + header: 'Eliminar evento?', + message: '', + buttons: [ + { + text: 'Sim', + handler: (data) => { + this.deleteEvent(false); + } + }, + { + text: 'Não', + handler: () => { + // sconsole.log('Let me think'); + } + } + ] + }).then(res => { + res.present(); + }); + } + + } + + async deleteEvent(deleteAll) { const loader = this.toastService.loading() - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { + + console.log(this.loadedEvent.EventId) + const result = await this.agendaDataRepository.deleteEvent(this.loadedEvent.EventId,deleteAll)//.subscribe(async () => { + if(result.isOk()) { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', @@ -166,15 +222,15 @@ export class ViewEventPage implements OnInit { alert.dismiss(); }, 1500); this.goBack(); - this.httpErrorHandle.httpsSucessMessagge('Evento eliminado') - }, (error) => { - this.httpErrorHandle.httpStatusHandle(error) - }, - () => { - loader.remove(); - }); + this.httpErrorHandle.httpsSucessMessagge('delete event') + } else { - loader.remove(); + console.log('delete event error: ', result.error) + this.httpErrorHandle.httpStatusHandle(result.error) + } + + + loader.remove(); } diff --git a/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts b/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts index 84fee87bd..69150a494 100644 --- a/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts +++ b/src/app/module/agenda/data/data-source/agenda-local-data-source.service.ts @@ -54,7 +54,7 @@ export class AgendaLocalDataSourceService { await AgendaDataSource.shareCalendar.bulkAdd(data); }); - console.log('Clear and add operations completed within transaction.'); + // console.log('Clear and add operations completed within transaction.'); } catch (error) { console.error('Error performing transaction:', error, data); } diff --git a/src/app/module/agenda/data/repository/agenda-data-repository.service.ts b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts index 1f61a0ccd..1b6207e80 100644 --- a/src/app/module/agenda/data/repository/agenda-data-repository.service.ts +++ b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts @@ -335,7 +335,6 @@ export class AgendaDataRepositoryService { return this.getShareCalendarItemsLive().pipe( map(data => data.sort((a, b) => { - console.log('Raw data:', data); // Debug line const priorityA = rolePriorities[a.roleId] || Infinity; const priorityB = rolePriorities[b.roleId] || Infinity; return priorityA - priorityB; diff --git a/src/app/module/notification/data/datasource/local-notification.service.ts b/src/app/module/notification/data/datasource/local-notification.service.ts index 7f1a24e6f..db6b21873 100644 --- a/src/app/module/notification/data/datasource/local-notification.service.ts +++ b/src/app/module/notification/data/datasource/local-notification.service.ts @@ -87,7 +87,7 @@ export class LocalNotificationService { await NotificationDataSource.notification.bulkAdd(notifications); }); - console.log('Clear and add operations completed within transaction.'); + // console.log('Clear and add operations completed within transaction.'); } catch (error) { console.error('Error performing transaction:', error, notifications); } diff --git a/src/app/module/user/data/datasource/user-local-repository.service.ts b/src/app/module/user/data/datasource/user-local-repository.service.ts index 862fe04fe..08d278062 100644 --- a/src/app/module/user/data/datasource/user-local-repository.service.ts +++ b/src/app/module/user/data/datasource/user-local-repository.service.ts @@ -37,7 +37,7 @@ export class UserLocalRepositoryService { await session.profilePicture.clear(); await session.profilePicture.add(data); }); - console.log('Clear and add operations completed within transaction.'); + // console.log('Clear and add operations completed within transaction.'); } catch (error) { console.error('Error performing transaction:', error, data); } diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f23517b3d..a066276e5 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -300,8 +300,8 @@ {{ event.duration }} h --> -
{{SessionStore.user.FullName}}
- {{eventService.getCalendarOwnNameByCalendarId(event.event.CalendarId)}} + 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 f47405907..09bb3212e 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -73,7 +73,6 @@ export class EditEventPage implements OnInit { caller: string; selectedRecurringType: any; - CalendarNameOwnerName = '' public date: any; public disabled = false; @@ -191,7 +190,6 @@ export class EditEventPage implements OnInit { this.agendaDataRepository.getSharedCalendar() - this.CalendarNameOwnerName = this.eventsService.detectCalendarNameByCalendarId(this.postEvent.CalendarId) this.changeAgenda() this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLiveWithOrder() } 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 8726bcb44..17187e54c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -157,7 +157,6 @@ export class NewEventPage implements OnInit { this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLive().pipe( map(data => data.sort((a, b) => { - console.log('Raw data:', data); // Debug line const priorityA = rolePriorities[a.roleId] || Infinity; const priorityB = rolePriorities[b.roleId] || Infinity; return priorityA - priorityB; diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index ea9d396e7..ae9b48862 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -31,20 +31,19 @@ -
{{loadedEvent.Location}} -
-
+
+
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
-
+
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
diff --git a/src/app/pages/events/edit-event/edit-event-routing.module.ts b/src/app/pages/events/edit-event/edit-event-routing.module.ts deleted file mode 100644 index 3616b2106..000000000 --- a/src/app/pages/events/edit-event/edit-event-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { EditEventPage } from './edit-event.page'; - -const routes: Routes = [ - { - path: '', - component: EditEventPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class EditEventPageRoutingModule {} diff --git a/src/app/pages/events/edit-event/edit-event.module.ts b/src/app/pages/events/edit-event/edit-event.module.ts deleted file mode 100644 index bcd1dc3e4..000000000 --- a/src/app/pages/events/edit-event/edit-event.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { EditEventPageRoutingModule } from './edit-event-routing.module'; - -import { EditEventPage } from './edit-event.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - EditEventPageRoutingModule - ], - declarations: [EditEventPage], - exports: [EditEventPage] -}) -export class EditEventPageModule {} diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html deleted file mode 100644 index 270e1fec0..000000000 --- a/src/app/pages/events/edit-event/edit-event.page.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - Visualizar Evento - - - - - - - -
- - - - Assunto - - - - - Campo obrigatório - - - Descrição - - - - Localização - - - - Calendário - - Pessoal - Oficial - - - - Tipo do evento - - Reunião - Viagem - Conferência - Encontro - - - - Data Início - - - - Data Fim - - - -
- - - Editar - - Intervenientes - -
-
-
- - - - {{attendee.Name}} - - -
- -
-
- -
-
-
-
- - - Editar - - Anexos - -
-
-
- - - - - -

{{ att.Description }}

-

{{ att.CreateDate }}

- - - -
-
-
- -
-
- - - - Sem anexos - - - -
- - -
- -
-
- - - - - -
- - - - - - - - - - - - -

- -

-

- -

-

- -

- - - - - - - -

- -

-

- -

-

- -

- - - - - -

- -

-

- -

-

- -

- - - -
- - - - -
- -
- - - diff --git a/src/app/pages/events/edit-event/edit-event.page.scss b/src/app/pages/events/edit-event/edit-event.page.scss deleted file mode 100644 index e1eb08a3b..000000000 --- a/src/app/pages/events/edit-event/edit-event.page.scss +++ /dev/null @@ -1,167 +0,0 @@ -@import '~src/function.scss'; - -.content{ - padding: 30px 20px 0 20px !important; - margin: 0; - float: left; - border-left: 1px solid #d8d8d8 !important; - } - .main-header{ - font-family: Roboto; - background-color: #fff; - overflow:hidden; - color:#000; - transform: translate3d(0, 1px, 0); - - .title-content{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - } - } - - .title{ - font-size: rem(25); - } - - } - .ion-item-container{ - margin: rem(15) auto; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 10px; - } - .ion-item-container-no-border{ - width: 100%; - margin: 0px auto; - padding: 0 !important; - overflow: auto; - } - .container-div{ - margin-bottom: 15px; - float: left; - overflow: auto; - } - .ion-item-class-2{ - margin: 0px auto; - } - .ion-icon-class{ - width: rem(45); - height: rem(45); - float: left; - padding: 10px; - font-size: rem(25); - } - ion-select{ - padding-left: 5px; - margin-left: 0; - } - .ion-input-class{ - width: calc(100% - 45px); - height: rem(45); - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; - padding-right: 10px; - float: left; - } - .ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; - } - .list-people{ - //width: 256px; - float: left; - - } - .add-people{ - width: rem(45); - float: right; - overflow: auto; - font-size: rem(25); - height: rem(45); - display: flex; - } - .list-people-title{ - /* font-size: rem(13); */ - color: #797979; - } - .attach-document{ - font-size: rem(15); - color: var(--title-text-color); - margin: 5px 5px 5px 10px; - padding: 5px; - float: left; - } - .attach-icon{ - width: 37px; - font-size: rem(35); - float: left; - } - .attach-title-item{ - width: 100%; - font-size: rem(15); - color:var(--title-text-color); - } - /* SPAN */ - .span-left{ - float: left; - font-size: rem(15); - } - .span-right{ - text-align: right; - float: right; - font-size: rem(13); - } - .container-footer{ - margin:0 auto; - overflow: auto; - } - .button-cancel { - width: rem(170); - height: rem(44); - border-radius: 22.5px; - --background: #e0e9ee; - --color: #061b52; - margin:10px; - } - .button-save { - width: rem(170); - height: rem(44); - border-radius: 22.5px; - --background: #42b9fe; - --color:#ffffff; - margin:10px; - } - - .text-input{ - width: 100%; - border: 1px solid #ebebeb; - margin: 0px 15px 15px 0px; - padding: 0 !important; - border-radius: 5px; - } - - /* Error Messages */ - .error{ - color:red; - font-size: rem(12); - font-weight: bold; - padding-bottom: 20px; - } - .span-color{ - color:red; - } - - - .buttons{ - display: flex; - justify-content: space-between; - padding: 20px; - overflow: auto; - } \ No newline at end of file diff --git a/src/app/pages/events/edit-event/edit-event.page.spec.ts b/src/app/pages/events/edit-event/edit-event.page.spec.ts deleted file mode 100644 index f63e92e8d..000000000 --- a/src/app/pages/events/edit-event/edit-event.page.spec.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { HttpClientModule } from '@angular/common/http'; -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { EditEventPage } from './edit-event.page'; - -describe('EditEventPage', () => { - let component: EditEventPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ EditEventPage ], - imports: [ - IonicModule.forRoot(), - HttpClientModule - ] - }).compileComponents(); - - fixture = TestBed.createComponent(EditEventPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts deleted file mode 100644 index 17b596792..000000000 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ /dev/null @@ -1,251 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { EventsService } from 'src/app/services/events.service'; -import { Router } from '@angular/router'; -import { Event } from '../../../models/event.model'; -import { EventBody } from 'src/app/models/eventbody.model'; -import { AlertController, ModalController } from '@ionic/angular'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; -import { AlertService } from 'src/app/services/alert.service'; -import { Attachment } from 'src/app/models/attachment.model'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { FormGroup, FormBuilder, Validators } from "@angular/forms"; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { AttachmentsPage } from '../attachments/attachments.page'; - -@Component({ - selector: 'app-edit-event', - templateUrl: './edit-event.page.html', - styleUrls: ['./edit-event.page.scss'], -}) - -export class EditEventPage implements OnInit { - - loadedEvent: Event; - loadedEventAttachments: Attachment[]; - pageId: string; - showLoader: boolean; - backURL: string; - ionicForm: FormGroup; - isSubmitted = false; - - minDate: Date; - - profile:string; - - constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, - private modalCtrl: ModalController, - private alertService: AlertService, - private attachamentsService: AttachmentsService, - private route: Router, - private iab: InAppBrowser) { - this.loadedEvent = new Event(); - this.loadedEvent.Body = new EventBody(); - - } - - ngOnInit() { - this.loadEvent(); - this.loadAttachments(); - this.ionicForm = this.formBuilder.group({ - subject: ['', [Validators.required]] - }) - } - - get errorControl() { - return this.ionicForm.controls; - } - - loadEvent(){ - let eventid: string; - this.activatedRoute.paramMap.subscribe(paramMap => - { - if (!paramMap.has("eventId")){ - return; - } - else{ - this.pageId = paramMap.get('eventId'); - eventid = paramMap.get('eventId'); - - - } - if (paramMap.has("caller")){ - this.backURL = "/home/" + paramMap.get('caller'); - } - } - ); - this.eventsService.getEvent(eventid).subscribe(response => { - this.loadedEvent = response; - }); - } - - async openAttendees(){ - const modal = await this.modalCtrl.create({ - component: AttendeesPageModal, - componentProps: { - hideExternalDomain: false, - eventAttendees: this.loadedEvent.Attendees - }, - cssClass: 'attendee modal-desktop', - backdropDismiss: false - }); - - - - modal.onDidDismiss().then((data) => { - if (data['data'] != null) - { - let newattendees: EventPerson[] = data['data']; - this.loadedEvent.Attendees = newattendees; - } - }); - await modal.present(); - } - - getEventAttendees(): EventPerson[] - { - return this.loadedEvent.Attendees; - } - - setEventAttendees(newattendes: EventPerson[]) - { - this.loadedEvent.Attendees = newattendes; - } - - async deleteConfirm() - { - const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Apagar evento!', - message: 'Deseja apagar o evento da agenda ' + this.loadedEvent.CalendarName + '?', - buttons: [ - { - text: 'Não', - role: 'cancel', - cssClass: 'secondary', - handler: () => { } - }, { - text: 'Sim', - handler: () => { - this.Delete(); - } - } - ] - }); - - await alert.present(); - } - - Delete() - { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => - { - const alert = await this.alertController.create({ - cssClass: 'my-custom-class', - header: 'Evento removido', - buttons: ['OK'] - }); - - setTimeout(()=>{ - alert.dismiss(); - }, 1500); - - this.router.navigate(['/home/events']); - }); - } - - Save() - { - // if (this.ionicForm.valid){ - - // this.activatedRoute.paramMap.subscribe(paramMap =>{ - // if (paramMap.has("profile")){ - - - // } - // }); - - // this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => - // { - // const alert = await this.alertController.create({ - // cssClass: 'my-custom-class', - // header: 'Evento actualizado', - // buttons: ['OK'] - // }); - - // setTimeout(()=>{ - // alert.dismiss(); - // }, 1500); - // }); - // } - } - - showAlert(){ - this.alertService.presentAlert("Funcionalidade em desenvolvimento"); - } - - loadAttachments() - { - this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { - this.loadedEventAttachments = res; - - - },((erro) => { - console.error('loadAttchament', erro) - })); - } - async viewDocument(documenturl:string) - { - const url: string = documenturl.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); - } - - back() - { - //this.back(); - } - doRefresh(event){ - /* this.RefreshEvents(); */ - try { - event?.target?.complete(); -} catch(error) {} - setTimeout(() => { - try { - event?.target?.complete(); -} catch(error) {} - }, 2000); - - } - navigateTo(ev){ - this.route.navigate(['/home/events',ev]); - } - async openAttachments(){ - const modal = await this.modalCtrl.create({ - component: AttachmentsPage, - componentProps: { - eventId: this.pageId, - attachments: this.loadedEventAttachments - }, - cssClass: 'attachments', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then((data) => { - if (data['data'] != null) - { - let newattendees: EventPerson[] = data['data']; - this.loadedEvent.Attendees = newattendees; - } - }); - - } -} diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts index 9f1364e0b..bed62be26 100644 --- a/src/app/pages/events/events-routing.module.ts +++ b/src/app/pages/events/events-routing.module.ts @@ -16,10 +16,6 @@ const routes: Routes = [ path: 'attendees', loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule) }, - { - path: 'edit-event', - loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule) - } ]; diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 5a6c7894c..6c8990af6 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -76,14 +76,14 @@ export class EventsService { private offlinemanager: OfflineManagerService) { try { - this.setHeader() + //this.setHeader() } catch (e) { console.log(e) } this.changeProfileService.registerCallback(() => { try { - this.setHeader() + //this.setHeader() } catch (e) { console.log(e) } @@ -407,55 +407,55 @@ export class EventsService { } - DetectCalendars(CalendarId) { - const calendars = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars) - return calendars.find((e) => e.CalendarId == CalendarId) - } + // DetectCalendars(CalendarId) { + // const calendars = SessionStore.user.OwnerCalendars.concat(SessionStore.user.SharedCalendars) + // return calendars.find((e) => e.CalendarId == CalendarId) + // } - makeHeader(calendar: calendarInterface) { - let header = new HttpHeaders();; - header = header.set('Authorization', 'Bearer ' + SessionStore.user.Authorization); - header = header.set('CalendarId', calendar.CalendarId); - header = header.set('CalendarRoleId', calendar.CalendarRoleId); - header = header.set('CalendarName', calendar.CalendarName); + // makeHeader(calendar: calendarInterface) { + // let header = new HttpHeaders();; + // header = header.set('Authorization', 'Bearer ' + SessionStore.user.Authorization); + // header = header.set('CalendarId', calendar.CalendarId); + // header = header.set('CalendarRoleId', calendar.CalendarRoleId); + // header = header.set('CalendarName', calendar.CalendarName); - return header - } + // return header + // } - isMyCalendar(CalendarId) { - return this.myCalendarNames[CalendarId] || "" - } + // isMyCalendar(CalendarId) { + // return this.myCalendarNames[CalendarId] || "" + // } - getCalendarOwnNameByCalendarId(CalendarId) { - return this.calendarNames[CalendarId] || "" - } + // getCalendarOwnNameByCalendarId(CalendarId) { + // return this.calendarNames[CalendarId] || "" + // } - isMyEvent(event: any) { + // isMyEvent(event: any) { - const data: any = event - return data.owner.wxUserId == SessionStore.user.UserId + // const data: any = event + // return data.owner.wxUserId == SessionStore.user.UserId - } + // } - detectCalendarNameByCalendarId(calendarId) { + // detectCalendarNameByCalendarId(calendarId) { - for ( const property in this.calendarNamesType) { - if(this.calendarNamesType[property]?.['Oficial']) { - if(this.calendarNamesType[property]['OficialId'] == calendarId) { - return property - } - } - if (this.calendarNamesType[property]?.['Pessoal']) { - if(this.calendarNamesType[property]['PessoalId'] == calendarId) { - return property - } - } - } + // for ( const property in this.calendarNamesType) { + // if(this.calendarNamesType[property]?.['Oficial']) { + // if(this.calendarNamesType[property]['OficialId'] == calendarId) { + // return property + // } + // } + // if (this.calendarNamesType[property]?.['Pessoal']) { + // if(this.calendarNamesType[property]['PessoalId'] == calendarId) { + // return property + // } + // } + // } - } + // } // getAllPrOficialEvents(startdate: string, enddate: string): Observable { @@ -854,28 +854,28 @@ export class EventsService { return this.http.get(`${geturl}`, options); } - genericGetEvent(eventid: string, calendarId: string) { - let geturl = environment.apiURL + 'calendar/GetEvent'; - let params = new HttpParams(); + // genericGetEvent(eventid: string, calendarId: string) { + // let geturl = environment.apiURL + 'calendar/GetEvent'; + // let params = new HttpParams(); - params = params.set("EventId", eventid); + // params = params.set("EventId", eventid); - const calendar = this.DetectCalendars(calendarId) - const header = this.makeHeader(calendar) + // const calendar = this.DetectCalendars(calendarId) + // const header = this.makeHeader(calendar) - if(header) { - let options = { - headers: header, - params: params - } + // if(header) { + // let options = { + // headers: header, + // params: params + // } - return this.http.get(`${geturl}`, options); - } else { + // return this.http.get(`${geturl}`, options); + // } else { - } + // } - throw('error') - } + // throw('error') + // } // putEvent(event: Event, conflictResolutionMode: number, sendInvitationsOrCancellationsMode: number, sharedagenda: string): Observable { // const puturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'PutEvent'); @@ -1019,154 +1019,154 @@ export class EventsService { // return this.http.post(`${puturl}`, body, options); // } - postEventMd(event: Event, calendarName: string) { - const puturl = environment.apiURL + 'calendar/md'; - let params = new HttpParams(); + // postEventMd(event: Event, calendarName: string) { + // const puturl = environment.apiURL + 'calendar/md'; + // let params = new HttpParams(); - const now = new Date(); - event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1] + // const now = new Date(); + // event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1] - params = params.set("CalendarName", calendarName); + // params = params.set("CalendarName", calendarName); - let options: any; - switch (calendarName) { - case 'Oficial': + // let options: any; + // switch (calendarName) { + // case 'Oficial': - options = { - headers: this.headersMdOficial, - params: params - }; - break; + // options = { + // headers: this.headersMdOficial, + // params: params + // }; + // break; - case 'Pessoal': + // case 'Pessoal': - options = { - headers: this.headersMdPessoal, - params: params - }; - break; - } + // options = { + // headers: this.headersMdPessoal, + // params: params + // }; + // break; + // } - return this.http.post(`${puturl}`, event, options) - } + // return this.http.post(`${puturl}`, event, options) + // } - postEventPr(event: Event, calendarName: string) { - const puturl = environment.apiURL + 'calendar/pr'; - let params = new HttpParams(); + // postEventPr(event: Event, calendarName: string) { + // const puturl = environment.apiURL + 'calendar/pr'; + // let params = new HttpParams(); - const now = new Date(); - event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1] + // const now = new Date(); + // event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1] - params = params.set("CalendarName", calendarName); - params = params.set("notifyUsers", true) + // params = params.set("CalendarName", calendarName); + // params = params.set("notifyUsers", true) - let options: any; - switch (calendarName) { - case 'Oficial': + // let options: any; + // switch (calendarName) { + // case 'Oficial': - options = { - headers: this.headersPrOficial, - params: params - }; - break; + // options = { + // headers: this.headersPrOficial, + // params: params + // }; + // break; - case 'Pessoal': + // case 'Pessoal': - options = { - headers: this.headersPrPessoal, - params: params - }; - break; - } + // options = { + // headers: this.headersPrPessoal, + // params: params + // }; + // break; + // } - return this.http.post(`${puturl}`, event, options) - } + // return this.http.post(`${puturl}`, event, options) + // } - postEventGeneric(event: Event, calendarName: string, CalendarId) { - const puturl = environment.apiURL + 'Calendar/PostEvent'; - let params = new HttpParams(); + // postEventGeneric(event: Event, calendarName: string, CalendarId) { + // const puturl = environment.apiURL + 'Calendar/PostEvent'; + // let params = new HttpParams(); - const now = new Date(); + // const now = new Date(); - event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]; - event.Organizer = { - "Id": SessionStore.user.UserId, - "EmailAddress": SessionStore.user.Email, - "Name": SessionStore.user.UserName, - "IsRequired": true, - "UserType": "GD" - } + // event.TimeZone = now.toString().match(/([A-Z]+[\+-][0-9]+.*)/)[1]; + // event.Organizer = { + // "Id": SessionStore.user.UserId, + // "EmailAddress": SessionStore.user.Email, + // "Name": SessionStore.user.UserName, + // "IsRequired": true, + // "UserType": "GD" + // } - params = params.set("CalendarName", calendarName); - params = params.set("notifyUsers", true) + // params = params.set("CalendarName", calendarName); + // params = params.set("notifyUsers", true) - let options: any; + // let options: any; - const calendar = this.DetectCalendars(CalendarId) - const header = this.makeHeader(calendar) + // const calendar = this.DetectCalendars(CalendarId) + // const header = this.makeHeader(calendar) - options = { - headers: header, - params: params - }; + // options = { + // headers: header, + // params: params + // }; - return this.http.post(`${puturl}`, event, options) - } + // return this.http.post(`${puturl}`, event, options) + // } - deleteEvent(eventid: string, eventDeleteType: number, calendarName: string) { - let arrayReq = []; - let Object = { - eventid: eventid, - eventDeleteType: eventDeleteType, - calendarName: calendarName - } - arrayReq.push(Object) - const puturl = environment.apiURL + 'calendar/DeleteEvent'; - let params = new HttpParams(); + // deleteEvent(eventid: string, eventDeleteType: number, calendarName: string) { + // let arrayReq = []; + // let Object = { + // eventid: eventid, + // eventDeleteType: eventDeleteType, + // calendarName: calendarName + // } + // arrayReq.push(Object) + // const puturl = environment.apiURL + 'calendar/DeleteEvent'; + // let params = new HttpParams(); - params = params.set("EventId", eventid); - // 0 for occurence and 1 for serie (delete all events) - params = params.set("eventDeleteType", eventDeleteType.toString()); + // params = params.set("EventId", eventid); + // // 0 for occurence and 1 for serie (delete all events) + // params = params.set("eventDeleteType", eventDeleteType.toString()); - let options; + // let options; - switch (SessionStore.user.Profile) { - case 'MDGPR': - if (calendarName == 'Pessoal') { - options = { - headers: this.headersMdPessoal, - params: params - }; - } - else if (calendarName == 'Oficial') { - options = { - headers: this.headersMdOficial, - params: params - }; - } - break; - case 'PR': - if (calendarName == 'Pessoal') { - options = { - headers: this.headersPrPessoal, - params: params - }; - } - else if (calendarName == 'Oficial') { - options = { - headers: this.headersPrOficial, - params: params - }; - } - break; - } + // switch (SessionStore.user.Profile) { + // case 'MDGPR': + // if (calendarName == 'Pessoal') { + // options = { + // headers: this.headersMdPessoal, + // params: params + // }; + // } + // else if (calendarName == 'Oficial') { + // options = { + // headers: this.headersMdOficial, + // params: params + // }; + // } + // break; + // case 'PR': + // if (calendarName == 'Pessoal') { + // options = { + // headers: this.headersPrPessoal, + // params: params + // }; + // } + // else if (calendarName == 'Oficial') { + // options = { + // headers: this.headersPrOficial, + // params: params + // }; + // } + // break; + // } - return this.http.delete(`${puturl}`, options) - } + // return this.http.delete(`${puturl}`, options) + // } // genericDeleteEvent(eventid: string, eventDeleteType: number, calendarName: string, calendarId: string) { @@ -1308,24 +1308,24 @@ export class EventsService { // return this.http.post(`${geturl}`, body, options) // } - genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) { - const geturl = environment.apiURL + 'calendar/expediente'; - let params = new HttpParams(); - let options; + // genericPostExpedientEvent(docId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) { + // const geturl = environment.apiURL + 'calendar/expediente'; + // let params = new HttpParams(); + // let options; - params = params.set("DocId", docId); - params = params.set("SerialNumber", serialNumber); - params = params.set("applicationID", applicationID); + // params = params.set("DocId", docId); + // params = params.set("SerialNumber", serialNumber); + // params = params.set("applicationID", applicationID); - const calendar = this.DetectCalendars(CalendarId) - const header = this.makeHeader(calendar) + // const calendar = this.DetectCalendars(CalendarId) + // const header = this.makeHeader(calendar) - options = { - headers: header, - params: params - } - return this.http.post(`${geturl}`, body, options) - } + // options = { + // headers: header, + // params: params + // } + // return this.http.post(`${geturl}`, body, options) + // } // createTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any) { // const geturl = environment.apiURL + 'calendar/' + ((sharedagenda != '') ? sharedagenda : 'CreateEventExpediente') + '/dispatch'; @@ -1372,38 +1372,38 @@ export class EventsService { - genericCreateTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) { - const geturl = environment.apiURL + 'calendar/dispatch'; - let params = new HttpParams(); - let options; + // genericCreateTaskEvent(folderId: any, body: any, sharedagenda: string, serialNumber: any, applicationID: any, CalendarId) { + // const geturl = environment.apiURL + 'calendar/dispatch'; + // let params = new HttpParams(); + // let options; - params = params.set("FolderId", folderId); - params = params.set("SerialNumber", serialNumber); - params = params.set("applicationID", applicationID); - params = params.set("notifyUsers", true) + // params = params.set("FolderId", folderId); + // params = params.set("SerialNumber", serialNumber); + // params = params.set("applicationID", applicationID); + // params = params.set("notifyUsers", true) - const calendar = this.DetectCalendars(CalendarId) - let header; - console.log('calendar') + // const calendar = this.DetectCalendars(CalendarId) + // let header; + // console.log('calendar') - try { + // try { - header = this.makeHeader(calendar) + // header = this.makeHeader(calendar) - } catch (error) {} + // } catch (error) {} - console.log('header') + // console.log('header') - options = { - headers: header, - params: params - } + // options = { + // headers: header, + // params: params + // } - console.log('post') - return this.http.post(`${geturl}`, body, options) - } + // console.log('post') + // return this.http.post(`${geturl}`, body, options) + // } diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts index f332942a6..1e6604a67 100644 --- a/src/app/services/rules/event.service.ts +++ b/src/app/services/rules/event.service.ts @@ -17,18 +17,18 @@ export class EventService { ) { } - create({body, calendar}) { + // create({body, calendar}) { - if(this.p.userRole(['PR'])) { - return this.eventService.postEventPr(body, calendar) - } else if(this.p.userRole(['MDGPR'])) { - return this.eventService.postEventMd(body, calendar) - } else { - return this.eventService.postEventGeneric(body, calendar, body.CalendarId) - } + // if(this.p.userRole(['PR'])) { + // return this.eventService.postEventPr(body, calendar) + // } else if(this.p.userRole(['MDGPR'])) { + // return this.eventService.postEventMd(body, calendar) + // } else { + // return this.eventService.postEventGeneric(body, calendar, body.CalendarId) + // } - } + // } addAttachment(attachment: addAttachment) { return this.attachmentsService.setEventAttachmentById(attachment) diff --git a/src/app/services/shareIntent.ts b/src/app/services/shareIntent.ts index b3135b809..bbe1be6ae 100644 --- a/src/app/services/shareIntent.ts +++ b/src/app/services/shareIntent.ts @@ -13,17 +13,17 @@ export class SendIntentService { constructor( ) { - + SendIntent.checkSendIntentReceived().then((result: any) => { // logger if (result) { - console.log('SendIntent received'); - console.log(JSON.stringify(result)); + //console.log('SendIntent received'); + //console.log(JSON.stringify(result)); } // event handler if (result.url) { this.onReceive(result) - + } }).catch(err => console.error(err)); } @@ -43,7 +43,7 @@ export class SendIntentService { if(Platform.prototype.is('ios')) { this.alertIos(); } - + }); window["sharedContent"] = result; 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 24b4ed20e..3b514038e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -96,7 +96,6 @@ export class EditEventPage implements OnInit { private participantsPipe = new ParticipantsPipe() SessionStore= SessionStore - CalendarNameOwnerName = '' allDayCheck: boolean = false; addedAttachmentsList = []; @@ -199,7 +198,6 @@ export class EditEventPage implements OnInit { }, 500); - this.CalendarNameOwnerName = this.eventsService.detectCalendarNameByCalendarId(this._postEvent.CalendarId) this.changeAgenda() } 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 8131f0752..86ccb44bf 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -68,7 +68,6 @@ export class EventListPage implements OnInit { this.sharedCalendar = this.AgendaDataRepositoryService.getShareCalendarItemsLive().pipe( map(data => data.sort((a, b) => { - console.log('Raw data:', data); // Debug line const priorityA = rolePriorities[a.roleId] || Infinity; const priorityB = rolePriorities[b.roleId] || Infinity; return priorityA - priorityB; diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 4d3b66a41..2fa5ffa5c 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -55,17 +55,16 @@
{{loadedEvent.Location}} -
-
+
{{loadedEvent.CalendarName}} {{loadedEvent.CalendarName}}
-
+
{{loadedEvent.CalendarName}} data.sort((a, b) => { - console.log('Raw data:', data); // Debug line const priorityA = rolePriorities[a.roleId] || Infinity; const priorityB = rolePriorities[b.roleId] || Infinity; return priorityA - priorityB; diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 26eb544b8..a9286d593 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -113,7 +113,7 @@ export class HeaderPage implements OnInit { ngOnInit() { this.hideSearch(); - console.log('Profile picture guid ', this.SessionStore.user.UserPhoto) + // console.log('Profile picture guid ', this.SessionStore.user.UserPhoto) this.getProfilpicture(); } diff --git a/src/firebase-messaging-sw.js b/src/firebase-messaging-sw.js index 01b7c4396..ea051601f 100644 --- a/src/firebase-messaging-sw.js +++ b/src/firebase-messaging-sw.js @@ -52,7 +52,7 @@ self.addEventListener('message', function(event){ // var data = JSON.parse(event.data); // console.log("SW Received Message:"); - console.log(event.data); + // console.log(event.data); }); diff --git a/version/git-version.ts b/version/git-version.ts index 6a7101350..be87d4640 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "bfd4e44b5", - "SHA": "bfd4e44b5b32a7c340edff7c24e25b95dda58564", + "shortSHA": "02d5e3e1e", + "SHA": "02d5e3e1ec95d74934874571cf07a2ff91c22304", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Oct 15 10:42:03 2024 +0100'", - "lastCommitMessage": "fix message", - "lastCommitNumber": "6096", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/core/chat/mapper/getRoomByIdMapper.ts\n\tmodified: src/app/core/chat/mapper/getRoomListMapper.ts\n\trenamed: src/app/module/chat/domain/mapper/memberLIstMapper.ts -> src/app/core/chat/mapper/memberLIstMapper.ts\n\trenamed: src/app/module/chat/domain/mapper/messageMapper.ts -> src/app/core/chat/mapper/messageMapper.ts\n\tmodified: src/app/core/chat/repository/member/member-local-repository.ts\n\tmodified: src/app/core/chat/repository/member/member-remote-repository.ts\n\tmodified: src/app/core/chat/repository/member/member-socket-repository.ts\n\tmodified: src/app/core/chat/repository/message/message-remote-repository.ts\n\tmodified: src/app/core/chat/repository/message/message-socket-repository.ts\n\tmodified: src/app/core/chat/repository/room/room-remote-repository.ts\n\tmodified: src/app/core/chat/repository/room/room-socket-repository.ts\n\tmodified: src/app/core/chat/repository/user-photo/user-photo-remote-repository.ts\n\trenamed: src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.spec.ts -> src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.spec.ts\n\trenamed: src/app/module/chat/domain/use-case/bold/bold-remove-by-room-id.service.ts -> src/app/core/chat/usecase/bold/bold-remove-by-room-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/contact/contact-list.service.ts -> src/app/core/chat/usecase/contact/contact-list.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/-use-case.service.ts -> src/app/core/chat/usecase/member/-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-add-use-case.service.ts -> src/app/core/chat/usecase/member/member-add-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-admin-use-case.service.ts -> src/app/core/chat/usecase/member/member-admin-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service.ts -> src/app/core/chat/usecase/member/member-list-http-sync-use-case.ts.service.ts\n\trenamed: src/app/module/chat/domain/use-case/member/member-remove-socket-use-case.service.ts -> src/app/core/chat/usecase/member/member-remove-socket-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-message-by-roomId.service.ts -> src/app/core/chat/usecase/message/listen-message-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-message-update-by-roomId.service.ts -> src/app/core/chat/usecase/message/listen-message-update-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listen-send-message.service.ts -> src/app/core/chat/usecase/message/listen-send-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/listene-message-delete-by-roomId.service.ts -> src/app/core/chat/usecase/message/listene-message-delete-by-roomId.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-attachment-by-message-id.service.ts -> src/app/core/chat/usecase/message/message-attachment-by-message-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-create-use-case.service.ts -> src/app/core/chat/usecase/message/message-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-delete-by-id-live-use-case.service.ts -> src/app/core/chat/usecase/message/message-delete-by-id-live-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-download-attachment-user-case.service.ts -> src/app/core/chat/usecase/message/message-download-attachment-user-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-get-attachment-localy-use-case.service.ts -> src/app/core/chat/usecase/message/message-get-attachment-localy-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-local-get-by-id.service.ts -> src/app/core/chat/usecase/message/message-local-get-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-mark-all-message-as-read-by-room-id.service.ts -> src/app/core/chat/usecase/message/message-mark-all-message-as-read-by-room-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-mark-as-read-use-case.service.ts -> src/app/core/chat/usecase/message/message-mark-as-read-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-reaction-by-id-use-case.service.ts -> src/app/core/chat/usecase/message/message-reaction-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/message-update-by-id-use-case.service.ts -> src/app/core/chat/usecase/message/message-update-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/messages-send-offline-use-case.service.ts -> src/app/core/chat/usecase/message/messages-send-offline-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts -> src/app/core/chat/usecase/message/sync-all-room-messages.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service.ts -> src/app/core/chat/usecase/room/room-bold-sync-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-create-local-direct-message.service.ts -> src/app/core/chat/usecase/room/room-create-local-direct-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-create-use-case.service.ts -> src/app/core/chat/usecase/room/room-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-delete-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-delete-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-direct-on-set-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-direct-on-set-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-list-on-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-get-list-use-case.service.ts -> src/app/core/chat/usecase/room/room-get-list-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-getlocal-by-id.service.ts -> src/app/core/chat/usecase/room/room-getlocal-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-leave-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-leave-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-set-last-message.service.ts -> src/app/core/chat/usecase/room/room-set-last-message.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-set-local-to-false-by-id.service.ts -> src/app/core/chat/usecase/room/room-set-local-to-false-by-id.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-update-by-id-use-case.service.ts -> src/app/core/chat/usecase/room/room-update-by-id-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/room/room-update-name-sync.service.ts -> src/app/core/chat/usecase/room/room-update-name-sync.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket-connect-use-case.service.ts -> src/app/core/chat/usecase/socket-connect-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket-join-use-case.service.ts -> src/app/core/chat/usecase/socket-join-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service.ts -> src/app/core/chat/usecase/socket/member-list-update-status-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-create-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-delete-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/socket/socket-message-update-use-case.service.ts -> src/app/core/chat/usecase/socket/socket-message-update-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/typing/typing-send-use-case.service.ts -> src/app/core/chat/usecase/typing/typing-send-use-case.service.ts\n\trenamed: src/app/module/chat/domain/use-case/user-photo/user-photo-get-by-id-use-case.service.ts -> src/app/core/chat/usecase/user-photo/user-photo-get-by-id-use-case.service.ts\n\tmodified: src/app/infra/http/http.service.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomByIdChangeDetector.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomListChangeDetector.ts\n\tmodified: src/app/module/chat/data/async/list/rooms/roomMembersChangeDetector.ts\n\tmodified: src/app/module/chat/data/repository/member/member-list-local-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/member/member-list-remote-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/member/member-socket-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/message/message-live-signalr-data-source.service.ts\n\tmodified: src/app/module/chat/data/repository/message/message-remote-data-source.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-local-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-remote-repository.service.ts\n\tmodified: src/app/module/chat/data/repository/room/room-socket-repository.service.ts\n\tmodified: src/app/module/chat/domain/chat-service.service.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/app/store/publication-folder.service.ts\n\tmodified: src/app/ui/chat/chat.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.html\n\tmodified: src/app/ui/chat/component/messages/messages.page.scss\n\tmodified: src/app/ui/chat/modal/messages/messages.page.html\n\tmodified: src/app/ui/chat/modal/messages/messages.page.scss\n\tmodified: src/app/ui/chat/modal/messages/messages.page.ts\n\tmodified: src/app/ui/chat/store/roomStore.ts", + "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", "changeAuthor": "peter.maquiran" } \ No newline at end of file