improve settings elements

Author: TamaroWalter

Diff for: db/upgrade.php

@@ -314,7 +314,7 @@ function xmldb_moodleoverflow_upgrade($oldversion) {
         if (!$dbman->field_exists($table, $field)) {
             $dbman->add_field($table, $field);
         }
-        upgrade_mod_savepoint(true, 2024061700, 'moodleoverflow');
+        upgrade_mod_savepoint(true, 2025031200, 'moodleoverflow');
     }
 
     return true;

Diff for: lang/en/moodleoverflow.php

@@ -172,18 +172,21 @@
 $string['invalidpostid'] = 'Invalid post ID - {$a}';
 $string['invalidratingid'] = 'The submitted rating is neither an upvote nor a downvote.';
 $string['jump_to_next_post_needing_review'] = 'Jump to next post needing to be reviewed.';
-$string['la_endtime'] = 'End time students can answer';
+$string['la_endtime'] = 'Time at which students can no longer answer';
 $string['la_endtime_help'] = 'Students can not answer to qustions after the set up date';
-$string['la_starttime'] = 'Start time students can answer';
+$string['la_endtime_ruleerror'] = 'End time must be in the future';
+$string['la_sequence_error'] = 'The end time must be after the start time';
+$string['la_starttime'] = 'Time at which students can start to answer';
 $string['la_starttime_help'] = 'Students can not answer to questions until the set up date';
+$string['la_starttime_ruleerror'] = 'Start time must be in the future';
 $string['lastpost'] = 'Last post';
 $string['limitedanswer_helpicon_teacher'] = 'This can be changed in the settings of the Moodleoverflow.';
 $string['limitedanswer_info_endtime'] = 'Posts can not be answered after {$a->limitedanswerdate}.';
 $string['limitedanswer_info_start'] = 'This Moodleoverflow is in a limited answer mode.';
 $string['limitedanswer_info_starttime'] = 'Posts can not be answered until {$a->limitedanswerdate}.';
 $string['limitedanswerheading'] = 'Limited Answer Mode';
 $string['limitedanswerwarning_answers'] = 'There are already answered posts in this Moodleoverflow.';
-$string['limitedanswerwarning_conclusion'] = 'Activating or changing limited answer mode might confuse users.';
+$string['limitedanswerwarning_conclusion'] = 'You can only set a time until students are able to answer';
 $string['mailindexlink'] = 'Change your forum preferences: {$a}';
 $string['manydiscussions'] = 'Discussions per page';
 $string['markallread'] = 'Mark all posts in this discussion as read';

Diff for: mod_form.php

@@ -232,10 +232,10 @@ public function definition() {
         // Limited answer options.
         $mform->addElement('header', 'limitedanswerheading', get_string('limitedanswerheading', 'moodleoverflow'));
 
+        $answersfound = false;
         if (!empty($this->current->id)) {
 
             $limiteddate = $DB->get_record('moodleoverflow', ['id' => $this->current->id], 'la_starttime, la_endtime');
-
             // Check if limitedanswermode was already set up and place a warning in case the starttime has already expired ...
             // ... or the endtime has already expired.
 
@@ -247,23 +247,32 @@ public function definition() {
                 AND discuss.moodleoverflow = ' . $this->current->id . ';';
             $answerpostscount = $DB->get_records_sql($sql);
             $answerpostscount = $answerpostscount[array_key_first($answerpostscount)]->answerposts;
-
-            if ($answerpostscount > 0) {
+            $answersfound = $answerpostscount > 0;
+            if ($answersfound) {
                 $warningstring = get_string('limitedanswerwarning_answers', 'moodleoverflow');
                 $warningstring .= '<br>' . get_string('limitedanswerwarning_conclusion', 'moodleoverflow');
                 $htmlwarning = html_writer::div($warningstring, 'alert alert-warning', ['role' => 'alert']);
                 $mform->addElement('html', $htmlwarning);
             }
         }
 
-        // Limited answer settings.
+        // Limited answer setting elements..
+        $mform->addElement('hidden', 'la_answersfound', $answersfound);
+        $mform->setType('la_answersfound', PARAM_BOOL);
         $mform->addElement('date_time_selector', 'la_starttime', get_string('la_starttime', 'moodleoverflow'),
                 ['optional' => true]);
+        //$mform->setType('la_starttime', PARAM_INT);
         $mform->addHelpButton('la_starttime', 'la_starttime', 'moodleoverflow');
+        $mform->disabledIf('la_starttime', 'la_answersfound', 'eq', true);
+
         $mform->addElement('date_time_selector', 'la_endtime', get_string('la_endtime', 'moodleoverflow'),
             ['optional' => true]);
+        //$mform->setType('la_endtime', PARAM_INT);
         $mform->addHelpButton('la_endtime', 'la_endtime', 'moodleoverflow');
 
+        $mform->addElement('hidden', 'la_error');
+        $mform->setType('la_error', PARAM_TEXT);
+
         // Add standard elements, common to all modules.
         $this->standard_coursemodule_elements();
 
@@ -284,4 +293,32 @@ public function data_postprocessing($data) {
             $data->coursewidereputation = false;
         }
     }
+
+    public function validation($data, $files) {
+        $errors = parent::validation($data, $files);
+
+        // Validate that the limited answer settings.
+        $currenttime = time();
+        $isstarttime = !empty($data['la_starttime']);
+        $isendtime = !empty($data['la_endtime']);
+
+        if ($isstarttime && $data['la_starttime'] < $currenttime) {
+            $errors['la_starttime'] = get_string('la_starttime_ruleerror', 'moodleoverflow');
+        }
+        if ($isendtime) {
+            if ($data['la_endtime'] < $currenttime) {
+                $errors['la_endtime'] =  get_string('la_endtime_ruleerror', 'moodleoverflow');
+            }
+
+            if ($isstarttime && $data['la_endtime'] <= $data['la_starttime']) {
+                if (isset($errors['la_endtime'])) {
+                    $errors['la_endtime'] .= '<br>' . get_string('la_sequence_error', 'moodleoverflow');
+                } else {
+                    $errors['la_endtime'] = get_string('la_sequence_error', 'moodleoverflow');
+                }
+            }
+        }
+
+        return $errors;
+    }
 }