2 files changed, 18 insertions, 8 deletions
diff --git a/app/views/course/wizard/steps/basicdata/index.php b/app/views/course/wizard/steps/basicdata/index.php
index f19643a..372d587 100644
--- a/app/views/course/wizard/steps/basicdata/index.php
+++ b/app/views/course/wizard/steps/basicdata/index.php
@@ -1,3 +1,8 @@
+<?php
+/**
+ * @var Semester[] $semesters
+ */
+?>
 <legend>
     <?= _('Grunddaten') ?>
 </legend>
@@ -21,13 +26,18 @@
     <label for="wizard-start-time" class="required">
         <?= _('Semester') ?>
     </label>
-    <select name="start_time" id="wizard-start-time" >
-        <?php foreach (array_reverse($semesters) as $semester) { ?>
-            <? ($values['start_time'] < time()) ? (($semester->beginn <= time() && time() <= $semester->ende) ? $values['start_time'] = $semester->beginn : '' ): '' ?>
-            <option value="<?= $semester->beginn ?>"<?= $semester->beginn == $values['start_time'] ? ' selected="selected"' : '' ?>>
+    <select name="semester_id" id="wizard-start-time" >
+        <?php
+        $default_semester = Semester::findDefault();
+        if ($default_semester && empty($values['start_semester'])) {
+            $values['start_semester'] = $default_semester;
+        }
+        ?>
+        <?php foreach (array_reverse($semesters) as $semester) : ?>
+            <option value="<?= htmlReady($semester->id) ?>" <?= $semester->id == $values['start_semester'] ? ' selected' : '' ?>>
                 <?= htmlReady($semester->name) ?>
             </option>
-        <?php } ?>
+        <?php endforeach ?>
     </select>
 </section>
 <section>
diff --git a/app/views/course/wizard/steps/basicdata/index_studygroup.php b/app/views/course/wizard/steps/basicdata/index_studygroup.php
index d7417ab..9f75da5 100644
--- a/app/views/course/wizard/steps/basicdata/index_studygroup.php
+++ b/app/views/course/wizard/steps/basicdata/index_studygroup.php
@@ -71,9 +71,9 @@
     <?= _('Einverstanden') ?>
 </label>
 
-<input type="hidden" name="institute" value="<?= htmlReady($values['institute']) ?>">
-<input type="hidden" name="start_time" value="<?= htmlReady($values['start_time']) ?>">
+<input type="hidden" name="institute" value="<?= $values['institute'] ?>"/>
+<input type="hidden" name="start_semester" value="<?= htmlReady($values['start_semester']) ?>">
 <input type="hidden" name="studygroup" value="1"/>
 <?php foreach ($values['lecturers'] as $id => $assigned) : ?>
-    <input type="hidden" name="lecturers[<?= htmlReady($id) ?>]" value="1">
+    <input type="hidden" name="lecturers[<?= $id ?>]" value="1"/>
 <?php endforeach ?>