time

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts

@@ -440,7 +440,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour(timeToReturn?) {
+  roundTimeQuarterHour(timeToReturn = new Date()) {
     let date = timeToReturn || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);

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

@@ -171,7 +171,7 @@ export class EditEventPage implements OnInit {
     });
   }
 
-  roundTimeQuarterHour(timeToReturn?) {
+  roundTimeQuarterHour(timeToReturn = new Date()) {
     let date = timeToReturn || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);

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

@@ -194,8 +194,8 @@ export class NewEventPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  roundTimeQuarterHour(timeToReturn?) {
+  roundTimeQuarterHour(timeToReturn = new Date()) {
-    let date: any = new Date(timeToReturn) || Date();
+    let date: any = new Date(timeToReturn) || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);
 
@@ -526,7 +526,7 @@ export class NewEventPage implements OnInit {
     this.postEvent.Attendees = data;
   }
 
-  setIntervenientCC(data){
+  setIntervenientCC(data) {
     this.taskParticipantsCc = [];
     this.taskParticipantsCc = data;
   }
@@ -561,7 +561,7 @@ export class NewEventPage implements OnInit {
     });
   }
 
-  removeAttachment(index: number){
+  removeAttachment(index: number) {
 
     this.documents = this.documents.filter( (e, i) =>  index != i);
 

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts

@@ -136,7 +136,7 @@ export class BookMeetingModalPage implements OnInit {
       this.postData.CalendarName = "Oficial";
 
      this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
-     this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour() + 15 * 60000)));
+     this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour())));
 
      this.postData.Category = 'Reunião'
 
@@ -498,7 +498,7 @@ export class BookMeetingModalPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour(timeToReturn?) {
+  roundTimeQuarterHour(timeToReturn = new Date()) {
     let date = timeToReturn || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);

src/app/pages/publications/new-action/new-action.page.ts

@@ -157,7 +157,7 @@ export class NewActionPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour(timeToReturn?) {
+  roundTimeQuarterHour(timeToReturn = new Date()) {
     let date = timeToReturn || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);

src/app/services/chat/room.service.ts

@@ -34,6 +34,7 @@ export class RoomService {
   messages: MessageService[] = []
   storageMessage: any[] = [];
   lastMessage: MessageService;
+  messagesBeforeOfflineAPI: MessageService[] = []
 
   customFields: any;
   id = ''

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

@@ -156,7 +156,7 @@ export class NewEventPage implements OnInit {
       this.postEvent.Body = this.eventBody;
 
       if(this.selectedSegment != "Combinada") {
-        this.postEvent ={
+        this.postEvent = {
           EventId: '',
           Subject: '',
           Body: this.eventBody,
@@ -231,9 +231,10 @@ export class NewEventPage implements OnInit {
     this.postEvent.EndDate = this.postEvent.StartDate;
   }
 
-  roundTimeQuarterHour(timeToReturn?): Date {
+  roundTimeQuarterHour(timeToReturn = new Date()): Date {
+    
+    let date = new Date(timeToReturn) || new Date();
 
-    let date: any = new Date(timeToReturn) || Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);
 
@@ -256,7 +257,7 @@ export class NewEventPage implements OnInit {
 
 
   roundTimeQuarterHour1 (timeToReturn) {
-    let date: any = new Date(timeToReturn) || Date();
+    let date: any = new Date(timeToReturn) || new Date();
     const minutes = date.getMinutes();
     date.setSeconds(0);
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "98f543772",
+  "shortSHA": "18b647e70",
-  "SHA": "98f543772e82b240d4c2b05f81d7be2d66118715",
+  "SHA": "18b647e7023b6fc305dcb61cd06b6ad871eebaf8",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 16:30:11 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 6 16:31:55 2023 +0100'",
-  "lastCommitMessage": "set time by default and round number to 15",
+  "lastCommitMessage": "fix merge",
-  "lastCommitNumber": "4735",
+  "lastCommitNumber": "4740",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/app/services/notifications.service.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\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/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/services/chat/room.service.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts",
   "changeAuthor": "peter.maquiran"
 }