Fix #1853

main/course_progress/thematic_advance.php

@@ -165,7 +165,7 @@ if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
 
         // set default values
         $default['content'] = isset($thematic_advance_data['content']) ? $thematic_advance_data['content'] : null;
-        $default['duration_in_hours'] = isset($thematic_advance_data['duration']) ? $thematic_advance_data['duration'] : null;
+        $default['duration_in_hours'] = isset($thematic_advance_data['duration']) ? $thematic_advance_data['duration'] : 1;
         if (empty($thematic_advance_data['attendance_id'])) {
             $default['start_date_type'] = 1;
             $default['custom_start_date'] = null;
@@ -189,6 +189,10 @@ if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
     if ($form->validate()) {
         $values = $form->exportValues();
 
+        if (isset($_POST['start_date_by_attendance'])) {
+            $values['start_date_by_attendance'] = $_POST['start_date_by_attendance'];
+        }
+
         $thematic = new Thematic();
         $thematic->set_thematic_advance_attributes(
             isset($values['thematic_advance_id']) ? $values['thematic_advance_id'] : null,

main/inc/ajax/thematic.ajax.php

@@ -112,7 +112,7 @@ switch ($action) {
 
             $label = get_lang('StartDate');
             if (!empty($attendance_calendar)) {
-                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="5">';
+                $input_select .= '<select id="start_date_select_calendar" name="start_date_by_attendance" size="7" class="form-control">';
                 foreach ($attendance_calendar as $calendar) {
                     $selected = null;
                     $insert = true;
@@ -139,7 +139,7 @@ switch ($action) {
         ?>
         <div class="form-group">
             <label class="col-sm-2 control-label"><?php echo $label ?></label>
-            <div class="col-sm-10"><?php echo $input_select ?></div>
+            <div class="col-sm-8"><?php echo $input_select ?></div>
         </div>
         <?php
         break;