MDL-53009 Quiz: Replace maxmark on Edit quiz page

with the inplace_editible element

Author: mkassaei

public/mod/quiz/classes/output/edit_renderer.php

@@ -794,6 +794,8 @@ public function question(structure $structure, int $slot, \moodle_url $pageurl)
             'questionnumber' => $this->question_number($questionnumber, $structure->get_slot_by_number($slot)->defaultnumber),
             'questionname' => $this->get_question_name_for_slot($structure, $slot, $pageurl),
             'questionicons' => $this->get_action_icon($structure, $slot, $pageurl),
+            'questionmaxmark' => $structure->make_slot_maxmark_in_place_editable($structure->get_slot_id_for_slot($slot),
+                    $structure->get_context()),
             'questiondependencyicon' => ($structure->can_be_edited() ? $this->question_dependency_icon($structure, $slot) : ''),
             'versionselection' => false,
             'draftversion' => $structure->get_question_in_slot($slot)->status == question_version_status::QUESTION_STATUS_DRAFT,
@@ -1175,22 +1177,12 @@ public function marked_out_of_field(structure $structure, $slot) {
             return html_writer::span($output, 'instancemaxmarkcontainer infoitem');
         }
 
-        $output = html_writer::span($structure->formatted_question_grade($slot),
-                'instancemaxmark decimalplaces_' . $structure->get_decimal_places_for_question_marks(),
-                ['title' => get_string('maxmark', 'quiz')]);
+        $output = $this->output->render($structure->make_slot_maxmark_in_place_editable(
+                $structure->get_slot_id_for_slot($slot), $structure->get_context()));
 
-        $output .= html_writer::span(
-            html_writer::link(
-                new \moodle_url('#'),
-                $this->pix_icon('t/editstring', '', 'moodle', ['class' => 'editicon visibleifjs', 'title' => '']),
-                [
-                    'class' => 'editing_maxmark',
-                    'data-action' => 'editmaxmark',
-                    'title' => get_string('editmaxmark', 'quiz'),
-                ]
-            )
-        );
-        return html_writer::span($output, 'instancemaxmarkcontainer');
+        return html_writer::span($output,
+                'instancemaxmarkcontainer instancemaxmark .mod_quiz_summarks newsummarks decimalplaces_' .
+                $structure->get_decimal_places_for_question_marks());
     }
 
     /**

public/mod/quiz/classes/structure.php

@@ -204,6 +204,26 @@ public function make_slot_display_number_in_place_editable(int $slotid, \context
                 get_string('edit_slotdisplaynumber_label', 'mod_quiz', $displayvalue));
     }
 
+    /**
+     * Make slot maxmark in place editable api call.
+
+     * @param int $slotid
+     * @param \context $context
+     * @return \core\output\inplace_editable
+     */
+    public function make_slot_maxmark_in_place_editable(int $slotid, \context $context): \core\output\inplace_editable {
+        $slot = $this->get_slot_by_id($slotid);
+        $editable = has_capability('mod/quiz:manage', $context);
+
+        // Get the current value.
+        $displayvalue = \html_writer::span(s($this->formatted_question_grade($slot->slot)),
+                '', ['data-sum-marks' => quiz_format_grade($this->get_quiz(), $this->get_quiz()->sumgrades)]);
+        return new inplace_editable('mod_quiz', 'slotmaxmark', $slotid,
+                $editable, $displayvalue, $slot->maxmark + 0,
+                get_string('editmaxmark', 'mod_quiz'),
+                get_string('editmaxmarkhint', 'mod_quiz', $displayvalue));
+    }
+
     /**
      * Get the page a given slot is on.
      *
@@ -1158,6 +1178,10 @@ public function unset_question($slotid) {
     public function update_slot_maxmark($slot, $maxmark) {
         global $DB;
 
+        if (is_null($maxmark) || empty(trim($maxmark))) {
+            return false;
+        }
+
         if (abs($maxmark - $slot->maxmark) < 1e-7) {
             // Grade has not changed. Nothing to do.
             return false;

public/mod/quiz/edit_rest.php

@@ -120,27 +120,6 @@
                         $result = ['visible' => true];
                         break;
 
-                    case 'getmaxmark':
-                        require_capability('mod/quiz:manage', $modcontext);
-                        $slot = $DB->get_record('quiz_slots', ['id' => $id], '*', MUST_EXIST);
-                        $result = ['instancemaxmark' => quiz_format_question_grade($quiz, $slot->maxmark)];
-                        break;
-
-                    case 'updatemaxmark':
-                        require_capability('mod/quiz:manage', $modcontext);
-                        $slot = $structure->get_slot_by_id($id);
-                        if ($structure->update_slot_maxmark($slot, $maxmark)) {
-                            // Grade has really changed.
-                            quiz_delete_previews($quiz);
-                            $gradecalculator->recompute_quiz_sumgrades();
-                            $gradecalculator->recompute_all_attempt_sumgrades();
-                            $gradecalculator->recompute_all_final_grades();
-                            quiz_update_grades($quiz, 0, true);
-                        }
-                        $result = ['instancemaxmark' => quiz_format_question_grade($quiz, $maxmark),
-                                'newsummarks' => quiz_format_grade($quiz, $quiz->sumgrades)];
-                        break;
-
                     case 'updatepagebreak':
                         require_capability('mod/quiz:manage', $modcontext);
                         $slots = $structure->update_page_break($id, $value);

public/mod/quiz/lang/en/quiz.php

@@ -304,6 +304,7 @@
 $string['editingquiz_link'] = 'mod/quiz/edit';
 $string['editingquizx'] = 'Editing quiz: {$a}';
 $string['editmaxmark'] = 'Edit maximum mark';
+$string['editmaxmarkhint'] = 'New value for {$a}';
 $string['editoverride'] = 'Edit override';
 $string['editqcats'] = 'Edit questions categories';
 $string['editquestion'] = 'Edit question';

public/mod/quiz/lib.php

@@ -1095,33 +1095,49 @@ function quiz_review_option_form_to_db($fromform, $field) {
 }
 
 /**
- * In place editable callback for slot displaynumber.
+ * In place editable callback to quiz slots.
  *
- * @param string $itemtype slotdisplarnumber
+ * @param string $itemtype the slot type
  * @param int $itemid the id of the slot in the quiz_slots table
- * @param string $newvalue the new value for displaynumber field for a given slot in the quiz_slots table
+ * @param string $newvalue the new value for a given slot in the quiz_slots table
  * @return \core\output\inplace_editable|void
  */
 function mod_quiz_inplace_editable(string $itemtype, int $itemid, string $newvalue): \core\output\inplace_editable {
     global $DB;
 
-    if ($itemtype === 'slotdisplaynumber') {
-        // Work out which quiz and slot this is.
-        $slot = $DB->get_record('quiz_slots', ['id' => $itemid], '*', MUST_EXIST);
-        $quizobj = quiz_settings::create($slot->quizid);
+    // Work out which quiz and slot this is.
+    $slot = $DB->get_record('quiz_slots', ['id' => $itemid], '*', MUST_EXIST);
+    $quizobj = quiz_settings::create($slot->quizid);
+
+    // Validate the context, and check the required capability.
+    $context = $quizobj->get_context();
+    \core_external\external_api::validate_context($context);
+    require_capability('mod/quiz:manage', $context);
 
-        // Validate the context, and check the required capability.
-        $context = $quizobj->get_context();
-        \core_external\external_api::validate_context($context);
-        require_capability('mod/quiz:manage', $context);
+    $structure = $quizobj->get_structure();
 
+    if ($itemtype === 'slotdisplaynumber') {
         // Update the value - truncating the size of the DB column.
-        $structure = $quizobj->get_structure();
         $structure->update_slot_display_number($itemid, core_text::substr($newvalue, 0, 16));
 
         // Prepare the element for the output.
         return $structure->make_slot_display_number_in_place_editable($itemid, $context);
     }
+    if ($itemtype === 'slotmaxmark') {
+        if ($structure->update_slot_maxmark($slot, $newvalue)) {
+            // Grade has really changed.
+            $gradecalculator = $quizobj->get_grade_calculator();
+            quiz_delete_previews($quizobj->get_quiz());
+            $gradecalculator->recompute_quiz_sumgrades();
+            $gradecalculator->recompute_all_attempt_sumgrades();
+            $gradecalculator->recompute_all_final_grades();
+            quiz_update_grades($quizobj->get_quiz());
+        }
+
+        // Prepare the element for the output - reload structure to ensure totals are correct.
+        $structure = $quizobj->get_structure();
+        return $structure->make_slot_maxmark_in_place_editable($itemid, $context);
+    }
 }
 
 /**

public/mod/quiz/styles.css

@@ -664,9 +664,8 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer {
-    background: white;
-    padding: 0.5em 0 0.5em 0.1em;
-    margin: 2px;
+    padding: 0;
+    margin: 0;
 }
 
 #page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer .editicon {
@@ -677,10 +676,6 @@ table.quizreviewsummary td.cell {
     background: transparent;
 }
 
-#page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmarkcontainer form {
-    display: inline;
-}
-
 #page-mod-quiz-edit ul.slots li.section li.activity .instancemaxmark {
     display: inline-block;
     text-align: right;
@@ -1093,7 +1088,7 @@ table.quizreviewsummary td.cell {
     background: #fdfdfe;
     display: inline-block;
     margin: 2px;
-    padding: 0.5em 0 0.5em 0.1em;
+    padding: 0.5em 0 0.5em;
 }
 #page-mod-quiz-edit .inplaceeditable.inplaceeditingon input {
     width: 64px;

public/mod/quiz/tests/behat/behat_mod_quiz.php

@@ -475,13 +475,10 @@ public function i_add_question_to_the_quiz_with($questiontype, $quizname, TableN
      * @param string $newmark the mark to set
      */
     public function i_set_the_max_mark_for_quiz_question($questionname, $newmark) {
-        $this->execute('behat_general::click_link', $this->escape(get_string('editmaxmark', 'quiz')));
-
-        $this->execute('behat_general::wait_until_exists', ["li input[name=maxmark]", "css_element"]);
-
-        $this->execute('behat_general::assert_page_contains_text', $this->escape(get_string('edittitleinstructions')));
-
-        $this->execute('behat_general::i_type', [$newmark]);
+        $this->execute('behat_forms::i_set_the_field_to',
+                [get_string('editmaxmark', 'mod_quiz'), $newmark]);
+        $this->execute('behat_general::i_press_named_key', ['', 'enter']);
+        // The press enter is needed again.
         $this->execute('behat_general::i_press_named_key', ['', 'enter']);
     }