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 83bfacb0a..11feae8d8 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -173,6 +173,7 @@ export class NewEventPage implements OnInit { roundTimeQuarterHour() { var timeToReturn = new Date(); + // var minutes = timeToReturn.getMinutes(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -180,23 +181,31 @@ export class NewEventPage implements OnInit { // 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; + } 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 MINUTES: " +m); - console.log("AFTER HOURS: " +h); - + // console.log("AFTER IF MINUTES: " +m); + // console.log("AFTER HOURS: " +h); + return timeToReturn; } 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 e4ecf5002..c85cb5e77 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -220,6 +220,7 @@ export class NewEventPage implements OnInit { roundTimeQuarterHour() { var timeToReturn = new Date(); + // var minutes = timeToReturn.getMinutes(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -231,12 +232,19 @@ export class NewEventPage implements OnInit { var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours; if (m == 0) { + if(minutes > m){ + m = m + 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); }