Show Only Points

mbecker-databay · Oct 19, 2023 · 20201a5 · 20201a5
1 parent 8208b7d
commit 20201a5
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/Modules/Test/classes/MainSettings/ilObjTestSettingsQuestionBehaviour.php b/Modules/Test/classes/MainSettings/ilObjTestSettingsQuestionBehaviour.php
@@ -67,6 +67,7 @@ public function toForm(
         $inputs['title_output'] = $f->radio($lng->txt('tst_title_output'))
             ->withOption('0', $lng->txt('tst_title_output_full'))
             ->withOption('1', $lng->txt('tst_title_output_hide_points'))
+            ->withOption('3', $lng->txt('tst_title_output_only_points'))
             ->withOption('2', $lng->txt('tst_title_output_no_title'))
             ->withValue($this->getQuestionTitleOutputMode())
             ->withAdditionalTransformation($refinery->kindlyTo()->int());

diff --git a/Modules/Test/classes/class.ilObjTest.php b/Modules/Test/classes/class.ilObjTest.php
@@ -1464,16 +1464,37 @@ public function &getQuestionTitlesAndIndexes(): array
      * @return string The title for the question title output
      * @access public
      */
-    public function getQuestionTitle($title, $nr = null): string
+    public function getQuestionTitle($title, $nr = null, $points = null): string
     {
-        if ($this->getTitleOutput() !== 2) {
-            return $title;
-        }
+        switch($this->getTitleOutput())
+        {
+            case '0':
+            case '1':
+                return $title;
+                break;
+            case '2':
+                if (isset($nr)) {
+                    return $this->lng->txt("ass_question") . ' ' . $nr;
+                }
+                return $this->lng->txt("ass_question");
+                break;
+            case 3:
+                if (isset($nr)) {
+                    $txt = $this->lng->txt("ass_question") . ' ' . $nr;
+                } else {
+                    $txt = $this->lng->txt("ass_question");
+                }
+                if($points != '') {
+                    $lngv = $this->lng->txt('points');
+                    if ($points == 1) {
+                        $lngv = $this->lng->txt('point');
+                    }
+                    $txt .= ' - ' . $points . ' ' . $lngv;
+                }
+                return $txt;
+                break;
 
-        if ($this->getTitleOutput() === 2 && isset($nr)) {
-            return $this->lng->txt("ass_question") . ' ' . $nr;
         }
-
         return $this->lng->txt("ass_question");
     }
     // fau.

diff --git a/Modules/Test/classes/class.ilTestQuestionHeaderBlockBuilder.php b/Modules/Test/classes/class.ilTestQuestionHeaderBlockBuilder.php
@@ -302,6 +302,9 @@ protected function buildQuestionRelatedObjectivesString(): string
     public function getPresentationTitle(): string
     {
         switch ($this->getHeaderMode()) {
+            case 3:     // only points => show no title here
+                return $this->buildQuestionPointsString();
+                break;
             case 2: 	// neither titles nor points => show position as title
                 return $this->buildQuestionPositionString();
                 break;
@@ -329,6 +332,9 @@ public function getQuestionInfoHTML(): string
                 $text = $this->buildQuestionPositionString();
                 break;
 
+            case 3: // only points => show nothing here
+                $text = $this->buildQuestionPositionString();
+                break;
             case 2: //	neither titles nor points => position is separate title, show nothing here
                 $text = '';
                 break;

diff --git a/Modules/Test/classes/class.ilTestService.php b/Modules/Test/classes/class.ilTestService.php
@@ -247,10 +247,12 @@ public function getQuestionSummaryData(ilTestSequenceSummaryProvider $testSequen
                 }
             }
 
+
+
             // fau: testNav - add number parameter for getQuestionTitle()
             $data[] = array(
                 'order' => $value["nr"],
-                'title' => $this->object->getQuestionTitle($value["title"], $value["nr"]),
+                'title' => $this->object->getQuestionTitle($value["title"], $value["nr"], $value["points"]),
                 'description' => $description,
                 'disabled' => $disableLink,
                 'worked_through' => $value["worked_through"],

diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
@@ -1882,6 +1882,7 @@ assessment#:#tst_title_output#:#Anzeige der Fragentitel
 assessment#:#tst_title_output_full#:#Fragentitel und erreichbare Punkte
 assessment#:#tst_title_output_hide_points#:#Nur Fragentitel
 assessment#:#tst_title_output_no_title#:#Weder Fragentitel noch erreichbare Punkte
+assessment#:#tst_title_output_only_points#:#Nur erreichbare Punkte
 assessment#:#tst_trigger_result_refreshing#:#Es erfolgt eine Neuberechnung des Ergebnisses. Dies kann eine Weile dauern.
 assessment#:#tst_type#:#Test-Typ
 assessment#:#tst_unchanged_answer_is_correct#:#Die vorgegebene Antwort ist korrekt.

diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
@@ -1882,6 +1882,7 @@ assessment#:#tst_title_output#:#Show Question Title
 assessment#:#tst_title_output_full#:#Question Titles and Available Points
 assessment#:#tst_title_output_hide_points#:#Only Question Titles
 assessment#:#tst_title_output_no_title#:#Neither Question Titles nor Available Points
+assessment#:#tst_title_output_only_points#:#Only Available Points
 assessment#:#tst_trigger_result_refreshing#:#Results need to be recalculated. This may take a while.
 assessment#:#tst_type#:#Test Type
 assessment#:#tst_unchanged_answer_is_correct#:#The preset answer is correct###fau: testNav