offer full release options for all assignment types, fixes #179

controllers/solutions.php

@@ -402,8 +402,6 @@ class SolutionsController extends StudipController
             $widget->addRadioButton(_vips('nichts'),
                 $this->link_for('solutions/change_released', ['assignment_id' => $assignment_id, 'released' => 0]),
                 $released == 0);
-
-            if ($assignment->type === 'exam') {
             $widget->addRadioButton(_vips('vergebene Punkte'),
                 $this->link_for('solutions/change_released', ['assignment_id' => $assignment_id, 'released' => 1]),
                 $released == 1);
@@ -413,12 +411,6 @@ class SolutionsController extends StudipController
             $widget->addRadioButton(_vips('… zusätzlich Aufgaben und Korrektur'),
                 $this->link_for('solutions/change_released', ['assignment_id' => $assignment_id, 'released' => 3]),
                 $released == 3);
-            } else {
-                $widget->addRadioButton(_vips('Aufgaben, Punkte und Korrektur'),
-                    $this->link_for('solutions/change_released', ['assignment_id' => $assignment_id, 'released' => 3]),
-                    $released >= 1 && $released <= 3);
-            }
-
             $widget->addRadioButton(_vips('… zusätzlich Musterlösungen'),
                 $this->link_for('solutions/change_released', ['assignment_id' => $assignment_id, 'released' => 4]),
                 $released == 4);

lib/VipsAssignment.php

@@ -640,7 +640,7 @@ class VipsAssignment extends SimpleORMap
                     return $this->options['released'];
                 }
             } else {
-                if ($this->options['released'] >= 3) {
+                if ($this->options['released'] > 0) {
                     return $this->options['released'];
                 }
             }

views/solutions/assignments_list.php

@@ -107,11 +107,11 @@
                                 </td>
 
                                 <td style="text-align: center;">
-                                    <? if ($ass['released'] == 1 && $ass['assignment']->type === 'exam') : ?>
+                                    <? if ($ass['released'] == 1): ?>
                                         <?= _vips('Punkte') ?>
-                                    <? elseif ($ass['released'] == 2 && $ass['assignment']->type === 'exam') : ?>
+                                    <? elseif ($ass['released'] == 2): ?>
                                         <?= _vips('Komment.') ?>
-                                    <? elseif ($ass['released'] >= 1 && $ass['released'] <= 3) : ?>
+                                    <? elseif ($ass['released'] == 3): ?>
                                         <?= _vips('Korrektur') ?>
                                     <? elseif ($ass['released'] == 4): ?>
                                         <?= _vips('Lösungen') ?>

views/solutions/update_released_dialog.php

@@ -9,7 +9,6 @@
         <?= _vips('nichts') ?>
     </label>
 
-    <? if ($exam_options): ?>
     <label>
         <input type="radio" name="released" value="1" <?= $default == 1 ? 'checked' : '' ?>>
         <?= _vips('vergebene Punkte') ?>
@@ -24,12 +23,6 @@
         <input type="radio" name="released" value="3" <?= $default == 3 ? 'checked' : '' ?>>
         <?= _vips('… zusätzlich Aufgaben und Korrektur') ?>
     </label>
-    <? else: ?>
-        <label>
-            <input type="radio" name="released" value="3" <?= $default >= 1 && $default <= 3 ? 'checked' : '' ?>>
-            <?= _vips('Aufgaben, Punkte und Korrektur') ?>
-        </label>
-    <? endif ?>
 
     <label>
         <input type="radio" name="released" value="4" <?= $default == 4 ? 'checked' : '' ?>>