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

7 files changed, 17 insertions, 17 deletions

diff --git a/app/views/shared/contacts/add_ranges_to_contact.php b/app/views/shared/contacts/add_ranges_to_contact.php
index 389e72c..0f4ae3f 100644
--- a/app/views/shared/contacts/add_ranges_to_contact.php
+++ b/app/views/shared/contacts/add_ranges_to_contact.php
@@ -16,7 +16,7 @@
         <select style="display: inline-block;" name="ansp_typ">

             <option value=""<?= empty($ansp_typ) ? ' selected' : '' ?>></option>

         <? foreach ($GLOBALS['MVV_CONTACTS']['TYPE']['values'] as $key => $entry) : ?>

-            <option value="<?= $key ?>"<?= $key == $ansp_typ ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>

+            <option value="<?= $key ?>"<?= isset($ansp_typ) && $key == $ansp_typ ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>

         <? endforeach; ?>

         </select>

     </label>

@@ -26,7 +26,7 @@
         <?= _('Kategorie') ?>

         <select style="display: inline-block;" name="ansp_kat">

         <? foreach (MvvContactRange::getCategoriesByRangetype($range_type) as $key => $entry) : ?>

-            <option value="<?= $key ?>"<?= $key == $ansp_kat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>

+            <option value="<?= $key ?>"<?= isset($ansp_kat) && $key == $ansp_kat ? ' selected' : '' ?>><?= htmlReady($entry['name']) ?></option>

         <? endforeach; ?>

         </select>

     </label>

diff --git a/app/views/shared/contacts/details.php b/app/views/shared/contacts/details.php
index f39d200..a4605ce 100644
--- a/app/views/shared/contacts/details.php
+++ b/app/views/shared/contacts/details.php
@@ -45,7 +45,7 @@
                                     </td>
                                     <? if ($object_type === 'Studiengang') : ?>
                                     <td>
-                                        <?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$rel['type']]['name']); ?>
+                                        <?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$rel['type']]['name'] ?? ''); ?>
                                     </td>
                                     <? endif; ?>
                                     <td>
diff --git a/app/views/shared/contacts/index.php b/app/views/shared/contacts/index.php
index 6073574..6604263 100644
--- a/app/views/shared/contacts/index.php
+++ b/app/views/shared/contacts/index.php
@@ -84,7 +84,7 @@
                     $pagination->set_attribute('page', $page);
                     $page_link = reset(explode('?', $controller->action_url('index'))) . '?page_contacts=%s';
                     $pagination->set_attribute('pagelink', $page_link);
-                    echo $pagination->render('shared/pagechooser');
+                    echo $pagination->render();
                     ?>
                 </td>
             </tr>
diff --git a/app/views/shared/contacts/range.php b/app/views/shared/contacts/range.php
index d66c494..f58b286 100644
--- a/app/views/shared/contacts/range.php
+++ b/app/views/shared/contacts/range.php
@@ -40,7 +40,7 @@
             <td><?= htmlReady($mvv_contact->position); ?></td>
             <td><?= htmlReady($mvv_contact->name) ?></td>
         <? if($range_type !== 'Modul'): ?>
-            <td><?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$mvv_contact->type]['name']) ?></td>
+            <td><?= htmlReady($GLOBALS['MVV_CONTACTS']['TYPE']['values'][$mvv_contact->type]['name'] ?? '') ?></td>
         <? endif; ?>
             <td><?= htmlReady($mvv_contact->getCategoryDisplayname()); ?></td>
             <td ><?= htmlReady($mvv_contact->count_relations); ?></td>
diff --git a/app/views/shared/log_event/show.php b/app/views/shared/log_event/show.php
index ea96f89..eec2164 100644
--- a/app/views/shared/log_event/show.php
+++ b/app/views/shared/log_event/show.php
@@ -32,7 +32,7 @@ use Studip\Button, Studip\LinkButton;
         </th>
       </tr>
       <? foreach ($log_events as $log_event): ?>
-        <tr class="<?= TextHelper::cycle('table_row_even', 'table_row_odd') ?>">
+        <tr>
           <td style="font-size: smaller; white-space: nowrap;">
             <?= date('d.m.Y H:i:s', $log_event['time']) ?>
           </td>
diff --git a/app/views/shared/modul/_modul.php b/app/views/shared/modul/_modul.php
index c813c44..461e486 100644
--- a/app/views/shared/modul/_modul.php
+++ b/app/views/shared/modul/_modul.php
@@ -46,7 +46,7 @@
             <td><strong><?= _('Semester der erstmaligen Durchführung') ?></strong></td>
             <td data-mvv-field="mvv_modul.start"><?= htmlReady($startSemester['name'] ?? '') ?></td>
         </tr>
-        <? if ($instituteName) : ?>
+        <? if (!empty($instituteName)) : ?>
         <tr>
             <td><strong><?= _('Fachbereich/Institut') ?></strong></td>
             <td data-mvv-field="mvv_modul_inst"><?= htmlReady($instituteName) ?></td>
@@ -135,7 +135,7 @@
             <td><strong><?= _('Modulinhalte') ?></strong></td>
             <td data-mvv-field="mvv_modul_deskriptor.inhalte"><?= formatReady($modulDeskriptor->inhalte) ?></td>
         </tr>
-        <? if ($type !== 3) : ?>
+        <? if (!isset($type) || $type !== 3) : ?>
         <tr>
             <td><strong><?= ngettext('Lehrveranstaltungsform', 'Lehrveranstaltungsformen', count($modul->modulteile)) ?></strong></td>
             <td data-mvv-field="mvv_modulteil_deskriptor.lernlehrform">
@@ -171,7 +171,7 @@
         </tr>
         <tr>
             <td><strong><?= _('Prüfungsebene') ?></strong></td>
-            <td data-mvv-field="mvv_modul.pruef_ebene"><?= htmlReady($pruefungsEbene) ?></td>
+            <td data-mvv-field="mvv_modul.pruef_ebene"><?= htmlReady($pruefungsEbene ?? '') ?></td>
         </tr>
         <tr>
             <td><strong><?= _('Credit-Points') ?></strong></td>
@@ -180,7 +180,7 @@
         <tr>
             <td><strong><?= _('Modulabschlussnote') ?></strong></td>
             <td>
-                <? if ($type !== 3) : ?>
+                <? if (!isset($type) || $type !== 3) : ?>
                     <? $nummer_modulteil = 1; ?>
                     <? $note = []; ?>
                     <? foreach ($modul->modulteile as $modulteil): ?>
diff --git a/app/views/shared/modul/_modul_ohne_lv.php b/app/views/shared/modul/_modul_ohne_lv.php
index 07e5310..f3c74ec 100644
--- a/app/views/shared/modul/_modul_ohne_lv.php
+++ b/app/views/shared/modul/_modul_ohne_lv.php
@@ -3,12 +3,12 @@
         <? $modulSumme =  $modul->wl_selbst + $modul->wl_pruef ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Workload selbstgestaltete Arbeit') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_selbst mvv_modul_deskriptor.kommentar_wl_selbst"><?= htmlReady($modul->wl_selbst) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_selbst) ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_selbst)) : '' ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_selbst mvv_modul_deskriptor.kommentar_wl_selbst"><?= htmlReady($modul->wl_selbst) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_selbst ?? '') ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_selbst)) : '' ?></td>
 
         </tr>
         <tr>
             <td style="width: 30%;"><strong><?= _('Workload Prüfung incl. Vorbereitung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_pruef mvv_modul_deskriptor.kommentar_wl_pruef"><?= htmlReady($modul->wl_pruef) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_pruef) ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_pruef)) : '' ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul.wl_pruef mvv_modul_deskriptor.kommentar_wl_pruef"><?= htmlReady($modul->wl_pruef) ?> <?= MVVController::trim($modulDeskriptor->kommentar_wl_pruef ?? '') ? sprintf(" (%s)", formatReady($modulDeskriptor->kommentar_wl_pruef)) : '' ?></td>
 
         </tr>
         <tr>
@@ -17,21 +17,21 @@
         </tr>
     </tbody>
 </table>
-<table class="mvv-modul-details" data-mvv-id="<?= $modulDeskriptor?$modulDeskriptor->getId():''; ?>" data-mvv-type="moduldeskriptor">
+<table class="mvv-modul-details" data-mvv-id="<?= isset($modulDeskriptor) ? $modulDeskriptor->getId() : ''; ?>" data-mvv-type="moduldeskriptor">
     <tbody>
-        <? if (trim($modulDeskriptor->pruef_vorleistung)) : ?>
+        <? if (trim($modulDeskriptor->pruef_vorleistung ?? '')) : ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Prüfungsvorleistung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_vorleistung" ><?= formatReady($modulDeskriptor->pruef_vorleistung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_vorleistung" ><?= formatReady($modulDeskriptor->pruef_vorleistung ?? '') ?></td>
         </tr>
         <? endif; ?>
         <tr>
             <td style="width: 30%;"><strong><?= _('Prüfungsform') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_leistung"><?= formatReady($modulDeskriptor->pruef_leistung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_leistung"><?= formatReady($modulDeskriptor->pruef_leistung ?? '') ?></td>
         </tr>
         <tr>
             <td style="width: 30%;"><strong><?= _('Wiederholungsprüfung') ?></strong></td>
-            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_wiederholung"><?= formatReady($modulDeskriptor->pruef_wiederholung) ?></td>
+            <td style="width: 70%;" data-mvv-field="mvv_modul_deskriptor.pruef_wiederholung"><?= formatReady($modulDeskriptor->pruef_wiederholung ?? '') ?></td>
         </tr>
     </tbody>
 </table>