diff --git a/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php b/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php index 1d7afa2004..e1db1ca868 100644 --- a/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php +++ b/app/AccountancyModule/EducationModule/presenters/EducationPresenter.php @@ -105,27 +105,6 @@ private function getCashbookId(int $skautisEducationId): CashbookId return $this->queryBus->handle(new EducationCashbookIdQuery(new SkautisEducationId($skautisEducationId))); } - /** @param array $terms */ - private function countDays(array $terms): int - { - $days = []; - - foreach ($terms as $term) { - $date = $term->startDate; - - while ($date->lessThanOrEquals($term->endDate)) { - $days[] = $date; - $date = $date->addDay(); - } - } - - return count( - array_unique( - $days, - ), - ); - } - /** * @param array $arr * diff --git a/app/model/Event/EducationTerm.php b/app/model/Event/EducationTerm.php index 989bcc5e9d..26c41e71c9 100644 --- a/app/model/Event/EducationTerm.php +++ b/app/model/Event/EducationTerm.php @@ -47,16 +47,11 @@ public static function countTotalDays(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) { + while ($date->lessThanOrEquals($term->endDate)) { + $days[] = $date; $date = $date->addDay(); - $days[] = $date->__toString(); - if ($date->eq($term->endDate)) { - break; - } } }