From 0752eaa6e922b874b99b8c5735d09eb766dc9e19 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 7 Jul 2023 11:28:35 +0200 Subject: [PATCH 1/2] sorting worksheets --- httpdocs/src/Controller/UserController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/httpdocs/src/Controller/UserController.php b/httpdocs/src/Controller/UserController.php index 95b3d16..f8e0f2c 100644 --- a/httpdocs/src/Controller/UserController.php +++ b/httpdocs/src/Controller/UserController.php @@ -37,12 +37,18 @@ class UserController extends AbstractController /** @var User $user */ $user = $this->getUser(); - $cntWorksheets = count($user->getWorksheets()); + $worksheets = $user->getWorksheets(); + $cntWorksheets = count($worksheets); $numWorksheetsLeft = $user->getMaxWorksheets() - $cntWorksheets; + $resWorksheets = $worksheets->toArray(); + usort($resWorksheets, function(UserWorksheet $a, UserWorksheet $b) { + return $a->getCreationDate() > $b->getCreationDate(); + }); + return $this->render('pages/start.html.twig', [ - 'worksheets' => $user->getWorksheets(), + 'worksheets' => $resWorksheets, 'numWorksheetsLeft' => $numWorksheetsLeft, ] ); From 256500c7bed57e5ca89addfff04bb2417578a1bd Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 7 Jul 2023 11:30:31 +0200 Subject: [PATCH 2/2] inverted dropdown view control --- httpdocs/src/Service/CalculatorService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpdocs/src/Service/CalculatorService.php b/httpdocs/src/Service/CalculatorService.php index 51048ef..9f8b2d5 100644 --- a/httpdocs/src/Service/CalculatorService.php +++ b/httpdocs/src/Service/CalculatorService.php @@ -30,7 +30,7 @@ class CalculatorService $riskFactor = Utils::$riskPoints[$riskPoints]['factor']; $recCycleMaintenance = $asset->getCycleMonthsMax(); - if ((int)($params['maintenance']) === 1 || ((int)$params['check']) === 1 ) { + if ((int)($params['maintenance']) === 1 || ((int)$params['check']) === 0 ) { $recCycleMaintenance = (int) ($asset->getCycleMonthsMax() * $riskFactor); if ($recCycleMaintenance < $asset->getCycleMonthsMin()) { $recCycleMaintenance = $asset->getCycleMonthsMin();