Merge pull request #577 from portnox/jeernest/new-scheduler-fix

New scheduler - minutes fix
Azure · Nov 15, 2023 · d66392a · d66392a
2 parents a0a67d1 + 2020bb5
commit d66392a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AdminSite/Views/Scheduler/NewScheduler.cshtml b/src/AdminSite/Views/Scheduler/NewScheduler.cshtml
@@ -32,7 +32,7 @@
               var output = d.getFullYear()+ '-' +
                           ((''+month).length<2 ? '0' : '') + month + '-' +
                            ((''+day).length<2 ? '0' : '') + day +'T'+
-                           ((''+d.getHours()).length<2 ? '0' : '')+d.getHours()+':'+
+                           ((''+d.getHours()).length<2 ? '0' : '')+(d.getHours()+1)+':'+
                            ((''+d.getMinutes()).length<2 ? '0' : '')+d.getMinutes();
 
               var date=document.getElementById("FirstRunDate")

diff --git a/src/DataAccess/Services/MeteredPlanSchedulerManagementRepository.cs b/src/DataAccess/Services/MeteredPlanSchedulerManagementRepository.cs
@@ -63,7 +63,7 @@ public int Save(MeteredPlanSchedulerManagement entity)
         if (entity.StartDate.HasValue)
         {
             int minute = entity.StartDate.Value.Minute;
-            if (entity.StartDate.Value.Minute >= 30)
+            if (entity.StartDate.Value.Minute >= 30 || entity.StartDate.Value.ToUniversalTime() < DateTime.UtcNow)
             {
                 minute = 60 - entity.StartDate.Value.Minute;
                 entity.StartDate = entity.StartDate.Value.AddMinutes(minute);