Test: Correct Calculation of SkillLevel

See: https://mantis.ilias.de/view.php?id=42780
ILIAS-eLearning · Dec 15, 2024 · b2f6f7a · b2f6f7a
1 parent aaeffa8
commit b2f6f7a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/Modules/Test/classes/class.ilTestSkillEvaluation.php b/Modules/Test/classes/class.ilTestSkillEvaluation.php
@@ -153,10 +153,6 @@ private function initTestResultData($testResults)
                 continue;
             }
 
-            if (!$result['workedthrough']) {
-                continue;
-            }
-
             $this->reachedPointsByQuestion[ $result['qid'] ] = $result['reached'];
         }
     }
@@ -254,8 +250,6 @@ private function bookToSkillPointAccount($skillBaseId, $skillTrefId, $maxSkillPo
     private function evaluateSkillPointAccounts()
     {
         foreach ($this->skillPointAccounts as $skillKey => $skillPointAccount) {
-            /* @var ilTestSkillPointAccount $skillPointAccount */
-
             if (!$this->doesNumBookingsExceedRequiredBookingsBarrier($skillPointAccount)) {
                 continue;
             }
@@ -274,11 +268,11 @@ private function evaluateSkillPointAccounts()
                     continue;
                 }
 
-                $reachedLevelId = $level['id'];
-
                 if ($skillPointAccount->getTotalReachedSkillPercent() <= $threshold->getThreshold()) {
                     break;
                 }
+
+                $reachedLevelId = $level['id'];
             }
 
             if ($reachedLevelId) {

diff --git a/Modules/Test/classes/class.ilTestSkillEvaluationGUI.php b/Modules/Test/classes/class.ilTestSkillEvaluationGUI.php
@@ -97,7 +97,6 @@ public function setObjectiveOrientedContainer($objectiveOrientedContainer)
     public function executeCommand()
     {
         $cmd = $this->ctrl->getCmd(self::CMD_SHOW) . 'Cmd';
-
         $this->$cmd();
     }
 

diff --git a/Modules/Test/classes/class.ilTestSkillPointAccount.php b/Modules/Test/classes/class.ilTestSkillPointAccount.php
@@ -65,8 +65,6 @@ public function getNumBookings(): int
 
     public function getTotalReachedSkillPercent()
     {
-        return (
-            ($this->getTotalReachedSkillPoints() * 100) / $this->getTotalMaxSkillPoints()
-        );
+        return $this->getTotalReachedSkillPoints() * 100 / $this->getTotalMaxSkillPoints();
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         public function executeCommand()
         {
             $cmd = $this->ctrl->getCmd(self::CMD_SHOW) . 'Cmd';
             $this->$cmd();
         }
@@ Expand Down @@