Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/mpp-tool

# Conflicts:
#	httpdocs/src/Controller/UserController.php

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' => Utils::getSortedObjects('getCreationDate', $user->getWorksheets()),
+                'worksheets' => $resWorksheets,
                 'numWorksheetsLeft' => $numWorksheetsLeft,
             ]
         );

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();