Merge branch 'main' into issue-3911issue-3911

9 files changed, 30 insertions, 22 deletions

diff --git a/app/views/questionnaire/_overview_questionnaire.php b/app/views/questionnaire/_overview_questionnaire.php
index bb7586e..8b45d42 100644
--- a/app/views/questionnaire/_overview_questionnaire.php
+++ b/app/views/questionnaire/_overview_questionnaire.php
@@ -51,7 +51,7 @@
                 <?= htmlReady(Institute::find($assignment['range_id'])->name) ?>
             <? else : ?>
                 <?
-                foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+                foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
                     $name = $plugin->getQuestionnaireAssignmentName($assignment);
                     if ($name) {
                         echo htmlReady($name);
diff --git a/app/views/questionnaire/_widget_questionnaire.php b/app/views/questionnaire/_widget_questionnaire.php
index 22ecf72..4f625c2 100644
--- a/app/views/questionnaire/_widget_questionnaire.php
+++ b/app/views/questionnaire/_widget_questionnaire.php
@@ -30,7 +30,7 @@
             <span title="<?= _("Anzahl der Antworten") ?>">
                 <?= $questionnaire->countAnswers() ?>
             </span>
-            <span title="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>">
+            <span>
                 <? $oldbase = URLHelper::setBaseURL($GLOBALS['ABSOLUTE_URI_STUDIP']) ?>
                 <a href="<?=
                          URLHelper::getLink(
@@ -38,7 +38,8 @@
                              compact('range_type', 'range_id')
                          ) ?>"
                    class="questionnaire-qr"
-                    data-qr-code>
+                   title="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>" aria-label="<?= _("QR-Code zu diesem Fragebogen anzeigen") ?>"
+                   data-qr-code>
                     <? URLHelper::setBaseURL($oldbase) ?>
                     <?= Icon::create("code-qr", "clickable")->asImg(20, ['class' => "text-bottom"]) ?>
                 </a>
diff --git a/app/views/questionnaire/assign.php b/app/views/questionnaire/assign.php
index 4bf7fc5..5299a83 100644
--- a/app/views/questionnaire/assign.php
+++ b/app/views/questionnaire/assign.php
@@ -10,8 +10,8 @@
                     <select name="semester_id">
                         <? foreach ($available_semesters as $available_semester): ?>
                             <option value="<?= htmlReady($available_semester->id) ?>"
-                                    <?= ($available_semester->id == $semester_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($semester_id) && $available_semester->id == $semester_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_semester->name) ?>
@@ -24,13 +24,13 @@
                     (<?= _('optional') ?>)
                     <select name="institute_id">
                         <option value=""
-                                <?= ($institute_id == '' ? 'selected="selected"' : '') ?>>
+                                <?= empty($institute_id) ? 'selected' : '' ?>>
                                 <?= _('(bitte wählen)') ?>
                         </option>
                         <? foreach ($available_institutes as $available_institute): ?>
                             <option value="<?= htmlReady($available_institute['Institut_id']) ?>"
-                                    <?= ($available_institute['Institut_id'] == $institute_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($institute_id) && $available_institute['Institut_id'] == $institute_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_institute['Name']) ?>
@@ -43,13 +43,13 @@
                     (<?= _('optional') ?>)
                     <select name="course_type_id">
                         <option value=""
-                                <?= ($course_type_id == '' ? 'selected="selected"' : '') ?>>
+                                <?= empty($course_type_id) ? 'selected' : '' ?>>
                             <?= dgettext('AskALotPlugin', '(bitte wählen)') ?>
                         </option>
                         <? foreach ($available_course_types as $available_course_type): ?>
                             <option value="<?= htmlReady($available_course_type['id']) ?>"
-                                    <?= ($available_course_type['id'] == $course_type_id)
-                                      ? 'selected="selected"'
+                                    <?= isset($course_type_id) && $available_course_type['id'] == $course_type_id
+                                      ? 'selected'
                                       : ''
                                     ?>>
                                 <?= htmlReady($available_course_type['name']) ?>
diff --git a/app/views/questionnaire/context.php b/app/views/questionnaire/context.php
index 3b601c1..98e08c0 100644
--- a/app/views/questionnaire/context.php
+++ b/app/views/questionnaire/context.php
@@ -6,6 +6,10 @@
     <fieldset>
         <legend><?= _("URL zum Fragebogen") ?></legend>
         <input type="text" aria-label="<?= _("URL zum Fragebogen (nur lesbar)") ?>" readonly value="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP']."dispatch.php/questionnaire/answer/".$questionnaire->getId()) ?>">
+        <a href="<?= htmlReady($GLOBALS['ABSOLUTE_URI_STUDIP'] . "dispatch.php/questionnaire/answer/" . $questionnaire->id) ?>"
+           data-qr-code title="<?= _('QR-Code zum Link anzeigen') ?>">
+            <?= Icon::create('code-qr')->asImg(['class' => 'text-bottom']) ?>
+        </a>
     </fieldset>
     <fieldset>
         <legend><?= _("Freigaben bearbeiten") ?></legend>
@@ -89,7 +93,7 @@
         <? endif ?>
 
         <?
-        foreach (PluginManager::getInstance()->getPlugins("QuestionnaireAssignmentPlugin") as $plugin) {
+        foreach (PluginManager::getInstance()->getPlugins(QuestionnaireAssignmentPlugin::class) as $plugin) {
             $template = $plugin->getQuestionnaireAssignmentEditTemplate($this->questionnaire);
             if ($template) {
                 echo $template->render();
diff --git a/app/views/questionnaire/question_types/likert/likert_answer.php b/app/views/questionnaire/question_types/likert/likert_answer.php
index 1847587..86ccc3e 100644
--- a/app/views/questionnaire/question_types/likert/likert_answer.php
+++ b/app/views/questionnaire/question_types/likert/likert_answer.php
@@ -25,7 +25,7 @@ $responseData = isset($response->answerdata['answers']) ? $response->answerdata[
             <tr>
                 <th><?= _('Aussage') ?></th>
                 <? foreach ($answers as $answer) : ?>
-                <th><?= htmlReady($answer) ?></th>
+                <th class="option-cell"><?= htmlReady($answer) ?></th>
                 <? endforeach ?>
             </tr>
         </thead>
@@ -35,7 +35,7 @@ $responseData = isset($response->answerdata['answers']) ? $response->answerdata[
                 <? $html_id = md5(uniqid($index)) ?>
                 <td id="<?= $html_id ?>"><?= htmlReady($statements[$index]) ?></td>
                 <? foreach ($answers as $answer_index => $answer) : ?>
-                    <td>
+                    <td class="option-cell">
                         <input type="radio"
                                title="<?= htmlReady($answer) ?>"
                                aria-labelledby="<?= $html_id ?>"
diff --git a/app/views/questionnaire/question_types/likert/likert_evaluation.php b/app/views/questionnaire/question_types/likert/likert_evaluation.php
index fd4eb01..11ef4b4 100644
--- a/app/views/questionnaire/question_types/likert/likert_evaluation.php
+++ b/app/views/questionnaire/question_types/likert/likert_evaluation.php
@@ -27,7 +27,7 @@ $options = $vote->questiondata['options'];
         <tr>
             <th><?= _('Aussage') ?></th>
             <? foreach ($options as $option) : ?>
-                <th><?= htmlReady($option) ?></th>
+                <th class="option-cell"><?= htmlReady($option) ?></th>
             <? endforeach ?>
         </tr>
     </thead>
diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_answer.php b/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
index 3525b4c..4333689 100644
--- a/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
+++ b/app/views/questionnaire/question_types/rangescale/rangescale_answer.php
@@ -25,7 +25,7 @@ $responseData = $response['answerdata'] && $response['answerdata']['answers'] ?
             <tr>
                 <th><?= _('Aussage') ?></th>
                 <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                <th><?= htmlReady($i) ?></th>
+                <th class="option-cell"><?= htmlReady($i) ?></th>
                 <? endfor ?>
             </tr>
         </thead>
@@ -35,7 +35,7 @@ $responseData = $response['answerdata'] && $response['answerdata']['answers'] ?
                 <? $html_id = md5(uniqid($index)) ?>
                 <td id="<?= $html_id ?>"><?= htmlReady($statements[$index]) ?></td>
                 <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                    <td>
+                    <td class="option-cell">
                         <input type="radio"
                                title="<?= htmlReady($i) ?>"
                                aria-labelledby="<?= $html_id ?>"
diff --git a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
index 2715934..6b75ea1 100644
--- a/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
+++ b/app/views/questionnaire/question_types/rangescale/rangescale_evaluation.php
@@ -27,7 +27,7 @@ $options = range($vote->questiondata['minimum'], $vote->questiondata['maximum'])
         <tr>
             <th><?= _('Aussage') ?></th>
             <? for ($i = $vote->questiondata['minimum'] ?? 1; $i <= $vote->questiondata['maximum']; $i++) : ?>
-                <th class="rangescale_center"><?= htmlReady($i) ?></th>
+                <th class="option-cell"><?= htmlReady($i) ?></th>
             <? endfor ?>
         </tr>
     </thead>
diff --git a/app/views/questionnaire/widget.php b/app/views/questionnaire/widget.php
index 044f246..6d7f4b3 100644
--- a/app/views/questionnaire/widget.php
+++ b/app/views/questionnaire/widget.php
@@ -8,15 +8,18 @@
         <nav>
             <? if ($allowed_to_add) : ?>
                 <? if ($statusgruppen_ids): ?>
-                    <a href="<?= $controller->link_for('questionnaire/add_to_context') ?>" data-dialog="size=auto" title="<?= _('Fragebogen hinzufügen') ?>">
+                    <a href="<?= $controller->link_for('questionnaire/add_to_context') ?>" data-dialog="size=auto"
+                       title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>">
                         <?= Icon::create("add", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                     </a>
                 <? else: ?>
-                    <a href="<?= $controller->link_for('questionnaire/edit', compact('range_type', 'range_id')) ?>" data-dialog title="<?= _('Fragebogen hinzufügen') ?>">
+                    <a href="<?= $controller->link_for('questionnaire/edit', compact('range_type', 'range_id')) ?>" data-dialog
+                       title="<?= _('Fragebogen hinzufügen') ?>" aria-label="<?= _('Fragebogen hinzufügen') ?>">
                         <?= Icon::create("add", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                     </a>
                 <? endif ?>
-                <a href="<?= URLHelper::getLink("dispatch.php/questionnaire/" . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). "overview") ?>" title="<?= _('Fragebögen verwalten') ?>">
+                <a href="<?= URLHelper::getLink("dispatch.php/questionnaire/" . ($range_type == 'course' || $range_type == 'institute' ? 'course' : ''). "overview") ?>"
+                   title="<?= _('Fragebögen verwalten') ?>" aria-label="<?= _('Fragebögen verwalten') ?>">
                     <?= Icon::create("admin", "clickable")->asimg("16px", ['class' => "text-bottom"]) ?>
                 </a>
             <? endif ?>
@@ -31,7 +34,7 @@
         <section class="noquestionnaires">
             <?= _('Es sind keine Fragebögen vorhanden.') ?>
             <? if ($allowed_to_add) : ?>
-                <?= _("Um neue Fragebögen zu erstellen, klicken Sie rechts auf das Plus.") ?>
+                <?= _("Nutzen Sie die Aktion „Fragebogen hinzufügen“ um einen neuen Fragebogen hinzuzufügen.") ?>
             <? endif ?>
         </section>
     <? endif; ?>