date correct on new event

package-lock.json

@@ -152,7 +152,6 @@
         "lite-server": "^2.6.1",
         "minisearch": "^6.0.1",
         "moment": "^2.29.3",
-        "mux.js": "^6.3.0",
         "neverthrow": "^6.1.0",
         "ng-lazyload-image": "^9.1.2",
         "ng2-pdf-viewer": "^3.0.8",
@@ -3682,6 +3681,7 @@
       "version": "7.14.8",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
       "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -4087,8 +4087,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz",
       "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==",
-<<<<<<< HEAD
-<<<<<<< HEAD
       "funding": [
         {
           "type": "github",
@@ -4107,10 +4105,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@capawesome/capacitor-screen-orientation/-/capacitor-screen-orientation-5.0.1.tgz",
       "integrity": "sha512-IaF7HjlxS1EXjUNCa8Ztu9EpxsplAYsNcDUHVX2x3B+KRqB0f7DQYi96cnKYeWpMt9JhrLPXc8XGRP4suU4NYw==",
-=======
->>>>>>> feature/upload-streaming-videos
-=======
->>>>>>> 5ca2cf9f13e03228ebbda6cf9e1ebdb2d7644002
       "funding": [
         {
           "type": "github",
@@ -4321,33 +4315,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@ffmpeg/core": {
-      "version": "0.12.6",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.12.6.tgz",
-      "integrity": "sha512-PrjWBTfGn2WVn9T7wGnzfFwChbqWeZc7tM9vvJZVRadYFUDakfzy7W0LpYC0cvvK0xT82qlBsk38lQhJ/Hps5A==",
-      "engines": {
-        "node": ">=16.x"
-      }
-    },
-    "node_modules/@ffmpeg/ffmpeg": {
-      "version": "0.12.10",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/ffmpeg/-/ffmpeg-0.12.10.tgz",
-      "integrity": "sha512-lVtk8PW8e+NUzGZhPTWj2P1J4/NyuCrbDD3O9IGpSeLYtUZKBqZO8CNj1WYGghep/MXoM8e1qVY1GztTkf8YYQ==",
-      "dependencies": {
-        "@ffmpeg/types": "^0.12.2"
-      },
-      "engines": {
-        "node": ">=18.x"
-      }
-    },
-    "node_modules/@ffmpeg/types": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/types/-/types-0.12.2.tgz",
-      "integrity": "sha512-NJtxwPoLb60/z1Klv0ueshguWQ/7mNm106qdHkB4HL49LXszjhjCCiL+ldHJGQ9ai2Igx0s4F24ghigy//ERdA==",
-      "engines": {
-        "node": ">=16.x"
-      }
-    },
     "node_modules/@firebase/analytics": {
       "version": "0.6.18",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz",
@@ -26912,22 +26879,6 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
-    "node_modules/mux.js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
-      "integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.11.2",
-        "global": "^4.4.0"
-      },
-      "bin": {
-        "muxjs-transmux": "bin/transmux.js"
-      },
-      "engines": {
-        "node": ">=8",
-        "npm": ">=5"
-      }
-    },
     "node_modules/nan": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
@@ -46344,6 +46295,7 @@
       "version": "7.14.8",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
       "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
@@ -46655,18 +46607,12 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-5.3.0.tgz",
       "integrity": "sha512-r+cfD+9FCBXMYtckSovgi7WoMWT5cxzNDaH3SDNuiORiyQklOl+7DExfhW00p1DqsDR+f50nADk/NBb4IsGVYg==",
-<<<<<<< HEAD
-<<<<<<< HEAD
       "requires": {}
     },
     "@capawesome/capacitor-screen-orientation": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@capawesome/capacitor-screen-orientation/-/capacitor-screen-orientation-5.0.1.tgz",
       "integrity": "sha512-IaF7HjlxS1EXjUNCa8Ztu9EpxsplAYsNcDUHVX2x3B+KRqB0f7DQYi96cnKYeWpMt9JhrLPXc8XGRP4suU4NYw==",
-=======
->>>>>>> feature/upload-streaming-videos
-=======
->>>>>>> 5ca2cf9f13e03228ebbda6cf9e1ebdb2d7644002
       "requires": {}
     },
     "@cnakazawa/watch": {
@@ -46829,24 +46775,6 @@
       "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
-    "@ffmpeg/core": {
-      "version": "0.12.6",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/core/-/core-0.12.6.tgz",
-      "integrity": "sha512-PrjWBTfGn2WVn9T7wGnzfFwChbqWeZc7tM9vvJZVRadYFUDakfzy7W0LpYC0cvvK0xT82qlBsk38lQhJ/Hps5A=="
-    },
-    "@ffmpeg/ffmpeg": {
-      "version": "0.12.10",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/ffmpeg/-/ffmpeg-0.12.10.tgz",
-      "integrity": "sha512-lVtk8PW8e+NUzGZhPTWj2P1J4/NyuCrbDD3O9IGpSeLYtUZKBqZO8CNj1WYGghep/MXoM8e1qVY1GztTkf8YYQ==",
-      "requires": {
-        "@ffmpeg/types": "^0.12.2"
-      }
-    },
-    "@ffmpeg/types": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@ffmpeg/types/-/types-0.12.2.tgz",
-      "integrity": "sha512-NJtxwPoLb60/z1Klv0ueshguWQ/7mNm106qdHkB4HL49LXszjhjCCiL+ldHJGQ9ai2Igx0s4F24ghigy//ERdA=="
-    },
     "@firebase/analytics": {
       "version": "0.6.18",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.6.18.tgz",
@@ -64438,15 +64366,6 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
     },
-    "mux.js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz",
-      "integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==",
-      "requires": {
-        "@babel/runtime": "^7.11.2",
-        "global": "^4.4.0"
-      }
-    },
     "nan": {
       "version": "2.17.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",

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

@@ -24,6 +24,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { TaskService } from 'src/app/services/task.service'
 import { ContactsService } from 'src/app/services/contacts.service';
 import { DomSanitizerService } from 'src/app/services/DomSanitizer.service';
+import { momentG } from 'src/plugin/momentG';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -125,6 +126,9 @@ export class NewEventPage implements OnInit {
     this.selectedDate = this.navParams.get('eventSelectedDate');
     this.taskParticipants = this.navParams.get('attendees');
     this.CalendarDate = this.navParams.get('CalendarDate')
+    this.postEvent.StartDate = this.navParams.get('DefaultStartDate')
+    this.postEvent.EndDate = this.navParams.get('DefaultEndDate')
+    console.log('end date', this.postEvent.EndDate)
   }
 
   ngOnInit() {
@@ -220,8 +224,10 @@ export class NewEventPage implements OnInit {
 
 
   setDefaultTime() {
+    console.log('defalt call')
     this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
     this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
+    console.log('defalt call', this.postEvent.StartDate)
   }
 
   close() {
@@ -230,7 +236,9 @@ export class NewEventPage implements OnInit {
 
   roundTimeQuarterHour(timeToReturn = new Date()) {
     let date: any = new Date(timeToReturn) || new Date();
-    const minutes = date.getMinutes();
+    let newdate = new Date();
+    const minutes = newdate.getMinutes();
+    date.setHours(newdate.getHours())
     date.setSeconds(0);
 
     if (minutes % 15 != 0) {

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

@@ -264,7 +264,9 @@ export class NewEventPage implements OnInit {
 
     let date = new Date(timeToReturn) || new Date();
 
-    const minutes = date.getMinutes();
+    let newdate = new Date();
+    const minutes = newdate.getMinutes();
+    date.setHours(newdate.getHours())
     date.setSeconds(0);
 
     if (minutes % 15 != 0) {