MOBILE-2103 assign: Check offline data when leaving feedback

Author: crazyserver

upgrade.txt

@@ -15,6 +15,7 @@ information provided here is intended especially for developers.
  * The function $mmUtil#getMimeType has been deprecated. Please use $mmUtil#getMimeTypeFromUrl instead.
  * The functions $mmFilepool#invalidateAllFiles and $mmFilepool#invalidateFilesByComponent now accept a new param onlyUnknown which defaults to true, so it only invalidates some of the files. It is advised to use onlyUnknown=true to decrease the network usage and improve the app's performance.
  * The directive mm-loading no longer accepts the param loadingPaddingTop since now the spinner is centered vertically.
+ * Assignment feedback delegates hasDataChanged now accepts userId in order to manage offline data.
 
 === 3.2.1 ===
 

www/addons/mod/assign/controllers/feedbackedit.js

@@ -53,7 +53,7 @@ angular.module('mm.addons.mod_assign')
 
     // Check if data has changed.
     function hasDataChanged() {
-        return $mmaModAssignFeedbackDelegate.hasPluginDataChanged($scope.assign, $scope.plugin, getInputData()).catch(function() {
+        return $mmaModAssignFeedbackDelegate.hasPluginDataChanged($scope.assign, $scope.userId, $scope.plugin, getInputData()).catch(function() {
             // Ignore errors.
             return true;
         });

www/addons/mod/assign/directives/submission.js

@@ -233,12 +233,8 @@ angular.module('mm.addons.mod_assign')
 
                 if (!scope.feedback || !scope.feedback.plugins) {
                     scope.feedback = {};
-
                     // Feedback plugins not present, we have to use assign configs to detect the plugins used.
                     scope.feedback.plugins = $mmaModAssignHelper.getPluginsEnabled(assign, 'assignfeedback');
-                    console.error(assign, scope.feedback.plugins);
-                } else {
-                    console.error(scope.feedback);
                 }
 
                 // Check if there's any offline data for this submission.
@@ -254,17 +250,21 @@ angular.module('mm.addons.mod_assign')
                                 scope.grade.grade = data.grade;
                                 scope.gradingStatusTranslationId = 'mma.mod_assign.gradenotsynced';
                                 scope.gradingClass = "";
+                                originalGrades.grade = scope.grade.grade;
                             }
 
                             scope.grade.applyToAll = data.applytoall;
                             scope.grade.addAttempt = data.addattempt;
+                            originalGrades.applyToAll = scope.grade.applyToAll;
+                            originalGrades.addAttempt = scope.grade.addAttempt;
 
                             if (data.outcomes && Object.keys(data.outcomes).length) {
                                 angular.forEach(scope.gradeInfo.outcomes, function(outcome) {
                                     if (typeof data.outcomes[outcome.itemNumber] != "undefined") {
                                         // If outcome has been modified from gradebook, do not use offline.
                                         if (outcome.modified < data.timemodified) {
                                             outcome.selectedId = data.outcomes[outcome.itemNumber];
+                                            originalGrades.outcomes[outcome.id] = outcome.selectedId;
                                         }
                                     }
                                 });
@@ -822,7 +822,7 @@ angular.module('mm.addons.mod_assign')
                 }
 
                 if (scope.feedback && scope.feedback.plugins) {
-                    return $mmaModAssignHelper.hasFeedbackDraftData(scope.assign.id, submitId, scope.feedback).catch(function() {
+                    return $mmaModAssignHelper.hasFeedbackDataChanged(scope.assign, submitId, scope.feedback).catch(function() {
                         // Error ocurred, omit error as not modified.
                         return $q.when(false);
                     });

www/addons/mod/assign/feedback/comments/handlers.js

@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_assign')
  * @ngdoc service
  * @name $mmaModAssignFeedbackCommentsHandler
  */
-.factory('$mmaModAssignFeedbackCommentsHandler', function($mmText, $mmSite, $mmUtil) {
+.factory('$mmaModAssignFeedbackCommentsHandler', function($mmText, $mmSite, $mmUtil, $mmaModAssignOffline) {
 
     var self = {},
         drafts = {};
@@ -97,15 +97,29 @@ angular.module('mm.addons.mod_assign')
      * @param  {Object} assign     Assignment.
      * @param  {Object} plugin     Plugin.
      * @param  {Object} inputData  Data entered in the feedback form.
+     * @param  {Number} userId     User Id.
      * @return {Promise}           Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasDataChanged = function(assign, plugin, inputData) {
-        // Check if text has changed.
-        if (typeof plugin.originalText != 'undefined') {
-            return plugin.originalText != inputData.assignfeedbackcomments_editor;
-        } else {
-            return false;
-        }
+    self.hasDataChanged = function(assign, plugin, inputData, userId) {
+        // Get it from plugin or offline.
+        return $mmaModAssignOffline.getSubmissionGrade(assign.id, userId).catch(function() {
+            // No offline data found.
+        }).then(function(data) {
+            if (data && data.plugindata && data.plugindata.assignfeedbackcomments_editor) {
+                return data.plugindata.assignfeedbackcomments_editor.text;
+            }
+            // No offline data found, get text from plugin.
+            return plugin.originalText || "";
+        }).then(function(initialText) {
+            var text = getTextToSubmit(plugin, inputData);
+            if (typeof text == "undefined") {
+                return false;
+            }
+            text = text.text || text;
+
+            // Check if text has changed.
+            return initialText != text;
+        });
     };
 
     /**

www/addons/mod/assign/services/feedbackdelegate.js

@@ -118,14 +118,15 @@ angular.module('mm.addons.mod_assign')
      * @ngdoc method
      * @name $mmaModAssignFeedbackDelegate#hasPluginDataChanged
      * @param  {Object} assign     Assignment.
+     * @param  {Number} userId     User Id.
      * @param  {Object} plugin     Plugin.
      * @param  {Object} inputData  Data entered in the submission form.
      * @return {Promise}           Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasPluginDataChanged = function(assign, plugin, inputData) {
+    self.hasPluginDataChanged = function(assign, userId, plugin, inputData) {
         var handler = self.getPluginHandler(plugin.type);
         if (handler && handler.hasDataChanged) {
-            return $q.when(handler.hasDataChanged(assign, plugin, inputData));
+            return $q.when(handler.hasDataChanged(assign, plugin, inputData, userId));
         }
         return $q.when(false);
     };
@@ -343,7 +344,7 @@ angular.module('mm.addons.mod_assign')
      *                                                           based in the draft data saved.
      *                             - getFeedbackDataToDraft(plugin, inputData) Optional.
      *                                                           Get feedback data base in the input data to save as draft.
-     *                             - hasDataChanged(assign, plugin, inputData) (Promise|Boolean) Optional.
+     *                             - hasDataChanged(assign, plugin, inputData, userId) (Promise|Boolean) Optional.
      *                                                           Check if the feedback data has changed for this plugin.
      *                             - getDraft(assignId, userId, siteId) (Object|Boolean) Optional.
      *                                                           Return the draft saved data of the feedback plugin.

www/addons/mod/assign/services/helper.js

@@ -271,34 +271,35 @@ angular.module('mm.addons.mod_assign')
     };
 
     /**
-     * Check if the feedback has draft data for a certain submission and assign.
+     * Check if the feedback data has changed for a certain submission and assign.
      *
      * @module mm.addons.mod_assign
      * @ngdoc method
-     * @name $mmaModAssignHelper#hasFeedbackDraftData
-     * @param  {Number} assignId        Assignment Id.
+     * @name $mmaModAssignHelper#hasFeedbackDataChanged
+     * @param  {Object} assign        Assignment.
      * @param  {Number} userId          User Id.
      * @param  {Object} feedback        Feedback data.
-     * @param  {String} [siteId]        Site ID. If not defined, current site.
      * @return {Promise}                Promise resolved with true if data has changed, resolved with false otherwise.
      */
-    self.hasFeedbackDraftData = function(assignId, userId, feedback, siteId) {
-        var hasDraft = false,
+    self.hasFeedbackDataChanged = function(assign, userId, feedback) {
+        var hasChanged = false,
             promises = [];
 
         angular.forEach(feedback.plugins, function(plugin) {
-            promises.push($mmaModAssignFeedbackDelegate.hasPluginDraftData(assignId, userId, plugin, siteId)
-                    .then(function(draft) {
-                if (draft) {
-                    hasDraft = true;
-                }
-            }).catch(function() {
-                // Ignore errors.
+            promises.push(self.prepareFeedbackPluginData(assign.id, userId, feedback).then(function(inputData) {
+                return $mmaModAssignFeedbackDelegate.hasPluginDataChanged(assign, userId, plugin, inputData)
+                        .then(function(changed) {
+                    if (changed) {
+                        hasChanged = true;
+                    }
+                }).catch(function() {
+                    // Ignore errors.
+                });
             }));
         });
 
         return $mmUtil.allPromises(promises).then(function() {
-            return hasDraft;
+            return hasChanged;
         });
     };