MDL-26689 mod_lesson: deprecate lesson dependency

moodle · Mar 27, 2015 · e8a434b · e8a434b
1 parent 20d3883
commit e8a434b
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 24 deletions.
diff --git a/mod/lesson/lang/en/lesson.php b/mod/lesson/lang/en/lesson.php
@@ -376,6 +376,7 @@
 $string['practice'] = 'Practice lesson';
 $string['practice_help'] = 'A practice lesson does not appear in the gradebook.';
 $string['preprocesserror'] = 'Error occurred during pre-processing!';
+$string['prerequisiteisobsolete'] = 'The prerequisite lesson option is due to be removed. Please use access restrictions instead.';
 $string['prerequisitelesson'] = 'Prerequisite lesson';
 $string['preview'] = 'Preview';
 $string['previewlesson'] = 'Preview {$a}';
@@ -467,6 +468,7 @@
 $string['viewhighscores'] = 'View high scores list';
 $string['viewreports'] = 'View {$a->attempts} completed {$a->student} attempts';
 $string['viewreports2'] = 'View {$a} completed attempts';
+$string['warning'] = 'Warning';
 $string['welldone'] = 'Well done!';
 $string['whatdofirst'] = 'What would you like to do first?';
 $string['wronganswerjump'] = 'Wrong answer jump';

diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php
@@ -187,34 +187,49 @@ function definition() {
         $mform->disabledIf('passwordunmask', 'usepassword', 'eq', 0);
 
         // Dependent on.
-        $mform->addElement('header', 'dependencyon', get_string('prerequisitelesson', 'lesson'));
+        if ($this->current && isset($this->current->dependency) && $this->current->dependency) {
+            $mform->addElement('header', 'dependencyon', get_string('prerequisitelesson', 'lesson'));
+            $mform->addElement('static', 'warningobsolete',
+                get_string('warning', 'lesson'),
+                get_string('prerequisiteisobsolete', 'lesson'));
+            $options = array(0 => get_string('none'));
+            if ($lessons = get_all_instances_in_course('lesson', $COURSE)) {
+                foreach ($lessons as $lesson) {
+                    if ($lesson->id != $this->_instance) {
+                        $options[$lesson->id] = format_string($lesson->name, true);
+                    }
 
-        $options = array(0=>get_string('none'));
-        if ($lessons = get_all_instances_in_course('lesson', $COURSE)) {
-            foreach($lessons as $lesson) {
-                if ($lesson->id != $this->_instance){
-                    $options[$lesson->id] = format_string($lesson->name, true);
                 }
-
             }
+            $mform->addElement('select', 'dependency', get_string('dependencyon', 'lesson'), $options);
+            $mform->addHelpButton('dependency', 'dependencyon', 'lesson');
+            $mform->setDefault('dependency', 0);
+
+            $mform->addElement('text', 'timespent', get_string('timespentminutes', 'lesson'));
+            $mform->setDefault('timespent', 0);
+            $mform->setType('timespent', PARAM_INT);
+            $mform->disabledIf('timespent', 'dependency', 'eq', 0);
+
+            $mform->addElement('checkbox', 'completed', get_string('completed', 'lesson'));
+            $mform->setDefault('completed', 0);
+            $mform->disabledIf('completed', 'dependency', 'eq', 0);
+
+            $mform->addElement('text', 'gradebetterthan', get_string('gradebetterthan', 'lesson'));
+            $mform->setDefault('gradebetterthan', 0);
+            $mform->setType('gradebetterthan', PARAM_INT);
+            $mform->disabledIf('gradebetterthan', 'dependency', 'eq', 0);
+        } else {
+            $mform->addElement('hidden', 'dependency', 0);
+            $mform->setType('dependency', PARAM_INT);
+            $mform->addElement('hidden', 'timespent', 0);
+            $mform->setType('timespent', PARAM_INT);
+            $mform->addElement('hidden', 'completed', 0);
+            $mform->setType('completed', PARAM_INT);
+            $mform->addElement('hidden', 'gradebetterthan', 0);
+            $mform->setType('gradebetterthan', PARAM_INT);
+            $mform->setConstants(array('dependency' => 0, 'timespent' => 0,
+                    'completed' => 0, 'gradebetterthan' => 0));
         }
-        $mform->addElement('select', 'dependency', get_string('dependencyon', 'lesson'), $options);
-        $mform->addHelpButton('dependency', 'dependencyon', 'lesson');
-        $mform->setDefault('dependency', 0);
-
-        $mform->addElement('text', 'timespent', get_string('timespentminutes', 'lesson'));
-        $mform->setDefault('timespent', 0);
-        $mform->setType('timespent', PARAM_INT);
-        $mform->disabledIf('timespent', 'dependency', 'eq', 0);
-
-        $mform->addElement('checkbox', 'completed', get_string('completed', 'lesson'));
-        $mform->setDefault('completed', 0);
-        $mform->disabledIf('completed', 'dependency', 'eq', 0);
-
-        $mform->addElement('text', 'gradebetterthan', get_string('gradebetterthan', 'lesson'));
-        $mform->setDefault('gradebetterthan', 0);
-        $mform->setType('gradebetterthan', PARAM_INT);
-        $mform->disabledIf('gradebetterthan', 'dependency', 'eq', 0);
 
         // Flow control.
         $mform->addElement('header', 'flowcontrol', get_string('flowcontrol', 'lesson'));