finessed date and time combo generation

RocketMan · Oct 17, 2024 · b1ba2f0 · b1ba2f0
1 parent 1871ac3
commit b1ba2f0
Showing 1 changed file with 12 additions and 21 deletions.
diff --git a/ui/Home.php b/ui/Home.php
@@ -47,38 +47,29 @@ public function recentSpins() {
     }
 
     protected function makeDatePicker() {
-        $result = [];
-
-        $now = new \DateTime();
-        $result[] = clone $now;
-
-        for($i=0; $i<6; $i++) {
-            $now->modify("-1 days");
-            $result[] = clone $now;
-        }
+        $result = array_map(function($i) {
+            return (new \DateTime())->modify("-$i days");
+        }, range(0, 6));
 
         $this->addVar("dates", $result);
     }
 
     protected function makeTimePicker($date=null) {
-        $result = [];
-
         $now = new \DateTime();
         if(!$date || $now->format("Y-m-d") == $date) {
             // today
             $hour = (int)$now->format("H");
-            $result[] = -1;
-        } else {
-            $hour = 23;
-            $result[] = $hour;
-        }
+            $initial = -1;
+        } else
+            $initial = $hour = 23;
+
+        $result = array_filter(range(1, $hour), function($i) {
+            return $i % 3 === 0;
+        });
 
-        do {
-            if($hour % 3) continue;
-            $result[] = $hour;
-        } while(--$hour > 0);
+        $result[] = $initial;
 
-        $this->addVar("times", $result);
+        $this->addVar("times", array_reverse($result));
     }
 
     public function getTimes() {