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 635fb3c47..d2ab84223 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -17,6 +17,7 @@ import { ThemeService } from 'src/app/services/theme.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { SessionStore } from 'src/app/store/session.service'; +import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { parse: { @@ -84,6 +85,7 @@ export class NewEventPage implements OnInit { autoStartTime; autoEndTime; CalendarNamesOptions = ['Oficial', 'Pessoal'] + roomId:string; constructor( private modalController: ModalController, @@ -93,6 +95,7 @@ export class NewEventPage implements OnInit { private toastService: ToastService, public ThemeService: ThemeService, private platform: Platform, + private chatMethodService: ChatMethodsService, ) { this.loggeduser = SessionStore.user; this.postEvent = new Event(); @@ -100,6 +103,7 @@ export class NewEventPage implements OnInit { this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; + this.roomId = this.navParams.get('roomId'); this.selectedSegment = this.navParams.get('segment'); this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); @@ -107,20 +111,20 @@ export class NewEventPage implements OnInit { ngOnInit() { if (this.platform.is('desktop')) { - this.taskParticipants = []; + // this.taskParticipants = []; } - - this.CalendarName = this.loggeduser.Profile; - this.selectedRecurringType = "-1"; - + if(!this.CalendarName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { this.CalendarName = 'Meu calendario'; + console.log(this.eventService.calendarNamesAry) } else { this.CalendarName = this.eventService.calendarNamesAry[0] } } - + + + this.selectedRecurringType = "-1"; this.getRecurrenceTypes(); @@ -413,8 +417,22 @@ export class NewEventPage implements OnInit { }); + let data1 = { + "subject": this.postEvent.Subject, + "start": this.postEvent.StartDate, + "end": this.postEvent.EndDate, + "venue": this.postEvent.Location, + "id": eventId, + "calendarId": CalendarId + } + + if(this.roomId) { + this.chatMethodService.sendMessage(this.roomId, data1); + } + this.toastService._successMessage() - this.modalController.dismiss(this.postEvent); + let data = Object.assign(this.postEvent,{id:eventId}) + this.modalController.dismiss(data); } catch (error) { this.toastService._badRequest() diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 27d02bb37..f626c951b 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -198,24 +198,6 @@ -
-
- {{msg.u.name}} criou esta reunião
-
- - De {{showDateDuration(msg.file.start_date)}} a - {{showDateDuration(msg.file.end_date)}} -
- - - {{msg.file.venue}} -
-
- {{last ? scrollToBottom() : ''}} -
-
Apagou a mensagem
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index c464a2ab0..dae0950b1 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -586,7 +586,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { } async bookMeeting() { - this.attendees = this.members.map((val) => { + let attendees = this.ChatSystemService.getDmRoom(this.roomId).members.map((val) => { return { Name: val.name, EmailAddress: val.username + "@" + environment.domain, @@ -599,15 +599,30 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { const modal = await this.modalController.create({ component: NewEventPage, componentProps: { - attendees: this.attendees, + attendees: attendees, + roomId: this.roomId }, cssClass: 'modal modal-desktop', backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((data) => { - if (data) { - console.log(data) + if (data?.data && data.data.id) { + + // const roomId = this.roomId + + // this.ChatSystemService.getDmRoom(roomId).send({ + // file: { + // "type": "application/meeting", + // "subject": data.data.Subject, + // "start_date": data.data.StartDate, + // "end_date": data.data.EndDate, + // "venue": data.data.venue, + // "id": data.data.id, + // "calendarId": data.data.CalendarId + // }, + // temporaryData: {} + // }) } }); } 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 7b8de29aa..35f79dc98 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -643,7 +643,6 @@ export class NewEventPage implements OnInit { } selectedCalendarId () { - console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName) if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { console.log('1') diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index 18c19e4ee..cfb50d77d 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -120,22 +120,11 @@ export class ChatOptionsPopoverPage implements OnInit { async bookMeeting() { - this.popoverController.dismiss(); - if( window.innerWidth <= 1024){ - const modal = await this.modalController.create({ - component: NewEventPage, - componentProps:{ - attendees: this.attendees, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((data) => { - if(data){ - - } - }); + if( window.innerWidth < 701){ + this.popoverController.dismiss('meeting'); + } + else{ + this.modalController.dismiss('meeting'); } } diff --git a/version/git-version.ts b/version/git-version.ts index da406d513..ce748ec79 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c1816b863", - "SHA": "c1816b863e387315b1359975ecffa252775236a7", + "shortSHA": "658720f47", + "SHA": "658720f47ff463fe7e6ff672a2f562d74662480c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Jan 20 16:09:27 2023 +0100'", - "lastCommitMessage": "merg", - "lastCommitNumber": "4676", + "lastCommitTime": "'Sun Jan 22 15:27:01 2023 +0100'", + "lastCommitMessage": "save", + "lastCommitNumber": "4677", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\n\tmodified: src/app/shared/header/header.page.html\n\tmodified: src/environments/environment.prod.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file