MDL-66958 core_grade: Add comparison js for grade saves
authorMathew May <mathewm@hotmail.co.nz>
Tue, 5 Nov 2019 02:48:28 +0000 (10:48 +0800)
committerMathew May <mathewm@hotmail.co.nz>
Mon, 11 Nov 2019 02:44:09 +0000 (10:44 +0800)
grade/amd/build/grades/grader/gradingpanel/comparison.min.js [new file with mode: 0644]
grade/amd/build/grades/grader/gradingpanel/comparison.min.js.map [new file with mode: 0644]
grade/amd/src/grades/grader/gradingpanel/comparison.js [new file with mode: 0644]
mod/forum/amd/build/local/grades/grader.min.js
mod/forum/amd/build/local/grades/grader.min.js.map
mod/forum/amd/src/local/grades/grader.js

diff --git a/grade/amd/build/grades/grader/gradingpanel/comparison.min.js b/grade/amd/build/grades/grader/gradingpanel/comparison.min.js
new file mode 100644 (file)
index 0000000..b5c2fef
Binary files /dev/null and b/grade/amd/build/grades/grader/gradingpanel/comparison.min.js differ
diff --git a/grade/amd/build/grades/grader/gradingpanel/comparison.min.js.map b/grade/amd/build/grades/grader/gradingpanel/comparison.min.js.map
new file mode 100644 (file)
index 0000000..0f76f2e
Binary files /dev/null and b/grade/amd/build/grades/grader/gradingpanel/comparison.min.js.map differ
diff --git a/grade/amd/src/grades/grader/gradingpanel/comparison.js b/grade/amd/src/grades/grader/gradingpanel/comparison.js
new file mode 100644 (file)
index 0000000..2507d8b
--- /dev/null
@@ -0,0 +1,80 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Compare a given form's values and its previously set data attributes.
+ *
+ * @module     core_grades/grades/grader/gradingpanel/comparison
+ * @package    core_grades
+ * @copyright  2019 Mathew May <mathew.solutions>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+export const fillInitialValues = (form) => {
+    Array.prototype.forEach.call(form.elements, (input) => {
+        if (input.type === 'submit' || input.type === 'button') {
+            return;
+        } else if (input.type === 'radio' || input.type === 'checkbox') {
+            input.dataset.initialValue = JSON.stringify(input.checked);
+        } else if (typeof input.value !== 'undefined') {
+            input.dataset.initialValue = JSON.stringify(input.value);
+        } else if (input.type === 'select-one') {
+            Array.prototype.forEach.call(input.options, (option) => {
+                option.dataset.initialValue = JSON.stringify(option.selected);
+            });
+        }
+   });
+};
+
+
+/**
+ * Compare the form data with the initial form data from when the form was set up.
+ *
+ * If values have changed, return a truthy value.
+ *
+ * @param {HTMLElement} form
+ * @return {Boolean}
+ */
+export const compareData = (form) => {
+    const result = Array.prototype.some.call(form.elements, (input) => {
+        if (input.type === 'submit' || input.type === 'button') {
+            return false;
+        } else if (input.type === 'radio' || input.type === 'checkbox') {
+            if (typeof input.dataset.initialValue !== 'undefined') {
+                return input.dataset.initialValue !== JSON.stringify(input.checked);
+            }
+        } else if (typeof input.value !== 'undefined') {
+            if (typeof input.dataset.initialValue !== 'undefined') {
+                return input.dataset.initialValue !== JSON.stringify(input.value);
+            }
+        } else if (input.type === 'select-one') {
+            return Array.prototype.some.call(input.options, (option) => {
+                if (typeof option.dataset.initialValue !== 'undefined') {
+                    return option.dataset.initialValue !== JSON.stringify(option.selected);
+                }
+
+                return false;
+            });
+        }
+
+        // No value found to check. Assume that there were changes.
+        return true;
+    });
+
+    // Fill the initial values again as the form may not be reloaded.
+    fillInitialValues(form);
+
+    return result;
+};
index b6cee86..a385785 100644 (file)
Binary files a/mod/forum/amd/build/local/grades/grader.min.js and b/mod/forum/amd/build/local/grades/grader.min.js differ
index bb34334..464f45d 100644 (file)
Binary files a/mod/forum/amd/build/local/grades/grader.min.js.map and b/mod/forum/amd/build/local/grades/grader.min.js.map differ
index d681414..c9166db 100644 (file)
@@ -31,6 +31,7 @@ import {get_string as getString} from 'core/str';
 import {failedUpdate} from 'core_grades/grades/grader/gradingpanel/normalise';
 import {addIconToContainerWithPromise} from 'core/loadingicon';
 import {debounce} from 'core/utils';
+import {fillInitialValues} from 'core_grades/grades/grader/gradingpanel/comparison';
 
 const templateNames = {
     grader: {
@@ -95,6 +96,8 @@ const getUpdateUserContentFunction = (root, getContentForUser, getGradeForUser)
         const panelContainer = root.querySelector(Selectors.regions.gradingPanelContainer);
         const panel = panelContainer.querySelector(Selectors.regions.gradingPanel);
         Templates.replaceNodeContents(panel, gradingPanelHtml, gradingPanelJS);
+        fillInitialValues(panel.querySelector('form'));
+
         panelContainer.scrollTop = 0;
         firstLoad = false;