merge

src/app/pages/agenda/new-event/new-event.page.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ModalController, NavParams } from '@ionic/angular';
+import { ModalController, NavParams, Platform } from '@ionic/angular';
 import { EventAttachment } from 'src/app/models/attachment.model';
 import { EventBody } from 'src/app/models/eventbody.model';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -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: {
@@ -62,6 +63,7 @@ export class NewEventPage implements OnInit {
   eventAttendees: EventPerson[];
   selectedSegment: string;
   selectedDate: Date;
+  CalendarDate: Date;
   recurringTypes: any;
   selectedRecurringType: any;
 
@@ -84,6 +86,7 @@ export class NewEventPage implements OnInit {
   autoStartTime;
   autoEndTime;
   CalendarNamesOptions = ['Oficial', 'Pessoal']
+  roomId:string;
 
   constructor(
     private modalController: ModalController,
@@ -91,7 +94,9 @@ export class NewEventPage implements OnInit {
     public eventService: EventsService,
     private attachmentsService: AttachmentsService,
     private toastService: ToastService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private platform: Platform,
+    private chatMethodService: ChatMethodsService,
   ) {
     this.loggeduser = SessionStore.user;
     this.postEvent = new Event();
@@ -99,27 +104,29 @@ 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');
+    this.CalendarDate = this.navParams.get('CalendarDate')
+  }
 
+  ngOnInit() {
+    if (this.platform.is('desktop')) {
+      // this.taskParticipants = [];
+    }
 
     if(!this.CalendarName) {
       if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
         this.CalendarName = 'Meu calendario';
-      } else if(this.eventService.calendarNamesAry.length == 1 ) {
+        console.log(this.eventService.calendarNamesAry)
+      } else {
         this.CalendarName = this.eventService.calendarNamesAry[0]
       }
     }
 
-  }
 
-  ngOnInit() {
-
-    this.CalendarName = this.loggeduser.Profile;
     this.selectedRecurringType = "-1";
-    
-    
 
     this.getRecurrenceTypes();
 
@@ -174,14 +181,23 @@ export class NewEventPage implements OnInit {
       }
     };  
 
+    this.setDefaultTime()
+
+  }
+
+  setDefaultTime() {
+    console.log(this.CalendarDate)
+    this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
+    this.postEvent.EndDate = this.postEvent.StartDate;
   }
 
   close() {
     this.modalController.dismiss();
   }
 
-  roundTimeQuarterHour() {
-    var timeToReturn = new Date();
+  roundTimeQuarterHour(timeToReturn?) {
+    var timeToReturn = timeToReturn || new Date();
+
     var minutes = timeToReturn.getMinutes();
     var hours = timeToReturn.getHours();
 
@@ -412,8 +428,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()
@@ -485,12 +515,8 @@ export class NewEventPage implements OnInit {
           const newAttendees: EventPerson[] = data['taskParticipants'];
           const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
 
-          if(newAttendees.length) {
-            this.setIntervenient(newAttendees);
-          }
-          if(newAttendeesCC) {
-            this.setIntervenientCC(newAttendeesCC);
-          }
+          this.setIntervenient(newAttendees);
+          this.setIntervenientCC(newAttendeesCC);
 
         }
 
@@ -499,11 +525,13 @@ export class NewEventPage implements OnInit {
   }
 
   setIntervenient(data) {
+    this.taskParticipants = [];
     this.taskParticipants = data;
     this.postEvent.Attendees = data;
   }
 
   setIntervenientCC(data){
+    this.taskParticipantsCc = [];
     this.taskParticipantsCc = data;
   }