From 98f543772e82b240d4c2b05f81d7be2d66118715 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 6 Feb 2023 16:30:11 +0100
Subject: [PATCH] set time by default and round number to 15

---
 .../document-set-up-meeting.page.html         |  4 +-
 .../document-set-up-meeting.page.ts           | 68 +++++++-------
 src/app/models/publicationfolder.ts           |  4 +-
 .../agenda/edit-event/edit-event.page.ts      | 43 ++++-----
 .../agenda/new-event/new-event.page.html      |  4 +-
 .../pages/agenda/new-event/new-event.page.ts  | 52 +++++------
 .../book-meeting-modal.page.html              |  4 +-
 .../book-meeting-modal.page.ts                | 45 ++++------
 .../new-action/new-action.page.html           |  4 +-
 .../new-action/new-action.page.ts             | 42 ++++-----
 .../agenda/edit-event/edit-event.page.ts      | 41 ++++-----
 .../agenda/new-event/new-event.page.html      |  4 +-
 .../shared/agenda/new-event/new-event.page.ts | 59 ++++++-------
 .../new-action/new-action.page.html           |  7 +-
 .../publication/new-action/new-action.page.ts | 88 ++++++++++---------
 version/git-version.ts                        | 12 +--
 16 files changed, 213 insertions(+), 268 deletions(-)

diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index 028404566..c17cc6c21 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -138,7 +138,7 @@
                 [(ngModel)]="postData.StartDate"
                 [disabled]="disabled"
               >
-              <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+              <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
               <ngx-mat-datetime-picker #picker1
                 [showSpinners]="showSpinners"
                 [showSeconds]="showSeconds"
@@ -166,7 +166,7 @@
                   [disabled]="disabled"
                   [min]="postData.StartDate"
                 >
-                <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
+                <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
                 <ngx-mat-datetime-picker #fim
                   [showSpinners]="showSpinners"
                   [showSeconds]="showSeconds"
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index 933b5d47e..fcacd6ad8 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -141,8 +141,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
     this.setDefaultTime()
     this.getRecurrenceTypes();
     
-    this.setStartDate();
-    this.setEndDate();
   
   }
 
@@ -153,8 +151,20 @@ export class DocumentSetUpMeetingPage implements OnInit {
   }
 
   setDefaultTime() {
-    // this.postData.StartDate =  new Date()
-    // this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
+    this.setStartDate()
+    this.setEndDate();
+  }
+
+  setStartDate() {
+    if(!this.postData.StartDate) {
+      this.postData.StartDate = this.roundTimeQuarterHour();
+    }
+  }
+
+  setEndDate() {
+    if(!this.postData.EndDate) {
+      this.postData.EndDate = this.postData.StartDate;
+    }
   }
 
   close() {
@@ -430,45 +440,27 @@ export class DocumentSetUpMeetingPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour() {
-    var timeToReturn = new Date();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+  roundTimeQuarterHour(timeToReturn?) {
+    let date = timeToReturn || new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    var m = (Math.round(minutes/15) * 15) % 60;
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
-
-    // console.log("AFTER IF MINUTES: " +m);
-    // console.log("AFTER HOURS: " +h);     
-    
-    return timeToReturn;
+    return date
   }
 
-  setStartDate(){
-    this.postData.StartDate = this.roundTimeQuarterHour();
-  }
-
-  setEndDate(){
-    this.postData.EndDate = this.postData.StartDate;
-  }
 
 }
diff --git a/src/app/models/publicationfolder.ts b/src/app/models/publicationfolder.ts
index 19366e297..e7a6477e1 100644
--- a/src/app/models/publicationfolder.ts
+++ b/src/app/models/publicationfolder.ts
@@ -2,7 +2,7 @@ export class PublicationFolder {
   ProcessId: string;
   Description: string;
   Detail: string;
-  DateBegin: string;
-  DateEnd: string;
+  DateBegin: any;
+  DateEnd: any;
   ActionType: string;
 }
\ No newline at end of file
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 60382ad0f..3576d878e 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -171,37 +171,26 @@ export class EditEventPage implements OnInit {
     });
   }
 
-  roundTimeQuarterHour() {
-    var timeToReturn = new Date();
-    // var minutes = timeToReturn.getMinutes();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+  roundTimeQuarterHour(timeToReturn?) {
+    let date = timeToReturn || new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    // console.log("MINUTOS: " +minutes);
-    // console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
-
-    var m = (Math.round(minutes/15) * 15) % 60;
-    // console.log("AFTER MINUTES: " +m);
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
+    return date
   }
 
   onSelectedRecurringChanged(ev?:any) {
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 3b6d54c6f..d23c5089e 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -123,7 +123,7 @@
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
@@ -156,7 +156,7 @@
               [min]="postEvent.StartDate"
 
             >
-            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
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 9de2af286..f09d00732 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -195,45 +195,37 @@ export class NewEventPage implements OnInit {
   }
 
   roundTimeQuarterHour(timeToReturn?) {
-    var timeToReturn = timeToReturn || new Date();
+    let date: any = new Date(timeToReturn) || Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
-
-    var m = (Math.round(minutes/15) * 15) % 60;
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
-
-    // console.log("AFTER IF MINUTES: " +m);
-    // console.log("AFTER HOURS: " +h);     
-    
-    return timeToReturn;
+    return date
   }
 
-  setStartDate(){
-    this.postEvent.StartDate = this.roundTimeQuarterHour();
+  setStartDate() {
+    if(!this.postEvent.StartDate) { 
+      this.postEvent.StartDate = this.roundTimeQuarterHour();
+    }
   }
 
   setEndDate(){
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    if(!this.postEvent.EndDate) {
+      this.postEvent.EndDate = this.postEvent.StartDate;
+    }
   }
 
 
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index f23c6590d..f61651c6b 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -124,7 +124,7 @@
                 [formControl]="dateControlStart"
                 [disabled]="disabled"
               >
-              <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+              <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
               <ngx-mat-datetime-picker #picker1
                 [showSpinners]="showSpinners"
                 [showSeconds]="showSeconds"
@@ -152,7 +152,7 @@
                   [disabled]="disabled"
                   [min] = "dateControlStart.value"
                 >
-                <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
+                <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
                 <ngx-mat-datetime-picker #fim
                   [showSpinners]="showSpinners"
                   [showSeconds]="showSeconds"
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 97edd0698..160db6ee0 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -135,8 +135,8 @@ export class BookMeetingModalPage implements OnInit {
       this.postData.Subject = this.task.Folio;
       this.postData.CalendarName = "Oficial";
 
-     this.dateControlStart = new FormControl(moment(new Date()));
-     this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
+     this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
+     this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour() + 15 * 60000)));
 
      this.postData.Category = 'Reunião'
 
@@ -499,36 +499,25 @@ export class BookMeetingModalPage implements OnInit {
 
 
   roundTimeQuarterHour(timeToReturn?) {
-    var timeToReturn = timeToReturn || new Date();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+    let date = timeToReturn || new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    var m = (Math.round(minutes/15) * 15) % 60;
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    } else {
-      if(minutes > m) {
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      } else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
-
-    // console.log("AFTER IF MINUTES: " +m);
-    // console.log("AFTER HOURS: " +h);     
-    
-    return timeToReturn;
+    return date
   }
 
   setStartDate() {
diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html
index 72447f31c..ceffc5934 100644
--- a/src/app/pages/publications/new-action/new-action.page.html
+++ b/src/app/pages/publications/new-action/new-action.page.html
@@ -36,7 +36,7 @@
             [formControl]="dateControlStart"
             [disabled]="disabled"
           >
-          <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+          <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
           <ngx-mat-datetime-picker #picker1
             [showSpinners]="showSpinners"
             [showSeconds]="showSeconds"
@@ -65,7 +65,7 @@
             [formControl]="dateControlEnd"
             [disabled]="disabled"
           >
-          <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
+          <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
           <ngx-mat-datetime-picker #fim
             [showSpinners]="showSpinners"
             [showSeconds]="showSeconds"
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index ebd0175b8..a921f0686 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -157,38 +157,30 @@ export class NewActionPage implements OnInit {
   }
 
 
-  roundTimeQuarterHour() {
-    var timeToReturn = new Date();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+  roundTimeQuarterHour(timeToReturn?) {
+    let date = timeToReturn || new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    var m = (Math.round(minutes/15) * 15) % 60;
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m) {
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }    
-    
-    return timeToReturn;
+    return date
   }
 
   setStartDate(){
-    this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
+    this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour() as any));
   }
 
   setEndDate(){
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 32893bf60..2282022c1 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -217,36 +217,25 @@ export class EditEventPage implements OnInit {
   }
 
   roundTimeQuarterHour() {
-    var timeToReturn = new Date();
-    // var minutes = timeToReturn.getMinutes();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+    let date = new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    // console.log("MINUTOS: " +minutes);
-    // console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
-
-    var m = (Math.round(minutes/15) * 15) % 60;
-    // console.log("AFTER MINUTES: " +m);
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
+    return date
   }
 
   onSelectedRecurringChanged(ev:any){
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 0be3e0bc3..ae46f3049 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -129,7 +129,7 @@
               [disabled]="disabled"
               [min]="currentDate"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1              
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
@@ -161,7 +161,7 @@
               [disabled]="disabled"
               [min]="postEvent.StartDate"
             >
-            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #fim
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
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 9d8b460ea..7c7d9af44 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -231,42 +231,41 @@ export class NewEventPage implements OnInit {
     this.postEvent.EndDate = this.postEvent.StartDate;
   }
 
-  roundTimeQuarterHour(timeToReturn?) {
-    var timeToReturn = timeToReturn || new Date();
-    // var minutes = timeToReturn.getMinutes();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+  roundTimeQuarterHour(timeToReturn?): Date {
+    
+    let date: any = new Date(timeToReturn) || Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    // console.log("MINUTOS: " +minutes);
-    // console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
-
-    var m = (Math.round(minutes/15) * 15) % 60;
-    // console.log("AFTER MINUTES: " +m);
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
+      
+    } 
 
-        m = m + 15;
+    return date
+  }
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
+
+  roundTimeQuarterHour1 (timeToReturn) {
+    let date: any = new Date(timeToReturn) || Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
+
+    if((minutes % 15) != 0 ) {
+      let a = (Math.floor(minutes / 15) + 1) * 15
+      date.setMinutes(a)
     }
 
-    // console.log("AFTER IF MINUTES: " +m);
-    // console.log("AFTER HOURS: " +h);     
-    
-    return timeToReturn;
+    return date
   }
 
   setStartDate(){
diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html
index abe2e7b7d..dcbe92e3c 100644
--- a/src/app/shared/publication/new-action/new-action.page.html
+++ b/src/app/shared/publication/new-action/new-action.page.html
@@ -1,7 +1,7 @@
 <ion-header class="ion-no-border pt-20 px-20">
   <div class="title-content d-flex align-center justify-space-between ">
     <div class="div-title">
-      <ion-label class="title"> Nova Acção</ion-label>
+      <ion-label class="title"> Nova Acção ...</ion-label>
     </div>
     <!-- <div class="actionType">
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
@@ -40,14 +40,13 @@
             max="2025">
           </ion-datetime> -->
 
-
           <mat-form-field appearance="none" class="width-100 date-hour-picker  d-md-block">
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Data inicio*"
               [(ngModel)]="folder.DateBegin"
               [disabled]="disabled"
             >
-            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
@@ -83,7 +82,7 @@
               [(ngModel)]="folder.DateEnd"
               [disabled]="disabled"
             >
-            <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2" (click)="setEndDate()"></mat-datepicker-toggle>
+            <mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker2
               [showSpinners]="showSpinners"
               [showSeconds]="showSeconds"
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index c6bbcef8c..bfca3fc25 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -31,10 +31,6 @@ export class NewActionPage implements OnInit {
   Form: FormGroup;
   validateFrom = false
 
-  public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
-  public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
-
-
   @Output() closeDesktopComponent= new EventEmitter<any>();
   @Output() getActions= new EventEmitter<any>();
 
@@ -44,15 +40,11 @@ export class NewActionPage implements OnInit {
   ) {
     this.folder = new PublicationFolder();
 
+    
+    this.setStartDate()
+    this.setEndDate()
   }
 
-  get dateStart () {
-    return this.dateControlStart.value
-  }
-
-  get dateEnd () {
-    return this.dateControlEnd.value
-  }
 
   ngOnInit() {
     this.segment = "Evento";
@@ -150,44 +142,56 @@ export class NewActionPage implements OnInit {
   }
 
 
+  round() {
+    let date = new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
+
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
+      }
+
+    } 
+
+    return date
+  }
+  
   roundTimeQuarterHour() {
-    var timeToReturn = new Date();
-    var minutes = timeToReturn.getMinutes();
-    var hours = timeToReturn.getHours();
+    let date = new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
 
-    var m = (Math.round(minutes/15) * 15) % 60;
-    var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
-
-    if (m == 0) {
-      if(minutes > m){        
-        m = m + 15;
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 1) {
+        date.setMinutes(15)
       }
-      timeToReturn.setHours(h);
-      timeToReturn.setMinutes(m);
-    }else{
-      if(minutes > m){
 
-        m = m + 15;
+    } 
 
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }else {
-        timeToReturn.setHours(h);
-        timeToReturn.setMinutes(m);
-      }
-    }
+    return date
+  }
+  
 
-    // console.log("AFTER IF MINUTES: " +m);
-    // console.log("AFTER HOURS: " +h);     
-    
-    return timeToReturn;
+  setStartDate() {
+    this.folder.DateBegin = this.roundTimeQuarterHour()
   }
 
-  setStartDate(){
-    this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
-  }
-
-  setEndDate(){
-    this.dateControlEnd = this.dateControlStart;
+  setEndDate() {
+    this.folder.DateEnd = this.folder.DateBegin;
   }
 }
diff --git a/version/git-version.ts b/version/git-version.ts
index 9b86a4ca8..ede22e2f3 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0bf43b629",
-  "SHA": "0bf43b629c1963689cb2a829757e095a2f7d575c",
+  "shortSHA": "35945a55e",
+  "SHA": "35945a55e747eca0538c0032b782a7acdbd453db",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 6 13:52:08 2023 +0100'",
-  "lastCommitMessage": "change date picker",
-  "lastCommitNumber": "4733",
+  "lastCommitTime": "'Mon Feb 6 15:00:42 2023 +0100'",
+  "lastCommitMessage": "remove refresh button",
+  "lastCommitNumber": "4734",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified:   src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified:   src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/shared/gabinete-digital/pendentes/pendentes.page.html",
+  "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.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/models/publicationfolder.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\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.html\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.html\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/publication/new-action/new-action.page.html\n\tmodified:   src/app/shared/publication/new-action/new-action.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file