Simplified education term day counting

skaut · Oct 8, 2023 · 66d0bbd · 66d0bbd
1 parent 1434f7c
commit 66d0bbd
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php b/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php
@@ -112,27 +112,17 @@ private function countDays(array $terms): int
         $days = [];
 
         foreach ($terms as $term) {
-            $date   = $term->startDate;
-            $days[] = $date;
+            $date = $term->startDate;
 
-            // Could be while(true), but don't want to risk infinite loop
-            for ($i = 0; $i < 50; ++$i) {
-                $date   = $date->addDay();
+            while($date->lessThanOrEquals($term->endDate)) {
                 $days[] = $date;
-                if ($date->eq($term->endDate)) {
-                    break;
-                }
+                $date   = $date->addDay();
             }
         }
 
         return count(
             array_unique(
-                array_map(
-                    static function ($date) {
-                        return $date->__toString();
-                    },
-                    $days,
-                ),
+                $days,
             ),
         );
     }