MOBILE-2127 data: Sync activity

crazyserver · Jul 19, 2017 · 3301978 · 3301978
1 parent 6c6fd78
commit 3301978
Show file tree

Hide file tree

Showing 7 changed files with 491 additions and 9 deletions.
diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
@@ -166,7 +166,7 @@ angular.module('mm.addons.mod_data')
 
             // Create an ID to assign files.
             var entryTemp = entryId;
-            if ((typeof entryId == "undefined" || entryId === false) && offline) {
+            if (typeof entryId == "undefined" || entryId === false) {
                 entryTemp = - (new Date().getTime());
             }
 

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
@@ -23,14 +23,15 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q, $mmEvents,
         $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged,
-        $ionicHistory, $mmaModDataOffline) {
+        $ionicHistory, $mmaModDataOffline, mmaModDataEventAutomSynced) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         entryId = $stateParams.entryid || false,
         page = $stateParams.page || false,
         data,
         entryChangedObserver,
+        syncObserver,
         scrollView,
         access,
         offlineActions = [];
@@ -211,7 +212,21 @@ angular.module('mm.addons.mod_data')
         }
     });
 
+    // Refresh entry on sync.
+    syncObserver = $mmEvents.on(mmaModDataEventAutomSynced, function(eventData) {
+        if (eventData.entryid == entryId && data.id == eventData.dataid && $mmSite.getId() == eventData.siteid) {
+            if (eventData.deleted) {
+                // If deleted, go back.
+                $ionicHistory.goBack();
+            } else {
+                $scope.databaseLoaded = false;
+                return fetchEntryData(true);
+            }
+        }
+    });
+
     $scope.$on('$destroy', function() {
         entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
+        syncObserver && syncObserver.off && syncObserver.off();
     });
 });
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
@@ -23,14 +23,16 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments, $mmaModDataOffline) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments, $mmaModDataOffline, $mmaModDataSync,
+        mmaModDataEventAutomSynced) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         siteId = $mmSite.getId(),
         data,
         entryChangedObserver,
         onlineObserver,
+        syncObserver,
         hasComments = false;
 
     $scope.title = module.name;
@@ -65,9 +67,14 @@ angular.module('mm.addons.mod_data')
             $scope.data = databaseData;
 
             $scope.database = data;
-
+            if (sync) {
+                // Try to synchronize the feedback.
+                return syncDatabase(showErrors).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function() {
             return $mmaModData.getDatabaseAccessInformation(data.id);
-
         }).then(function(accessData) {
             $scope.access = accessData;
 
@@ -288,6 +295,22 @@ angular.module('mm.addons.mod_data')
         });
     }
 
+    // Tries to synchronize the database.
+    function syncDatabase(showErrors) {
+        return $mmaModDataSync.syncDatabase(data.id).then(function(result) {
+            if (result.warnings && result.warnings.length) {
+                $mmUtil.showErrorModal(result.warnings[0]);
+            }
+
+            return result.updated;
+        }).catch(function(error) {
+            if (showErrors) {
+                $mmUtil.showErrorModalDefault(error, 'mm.core.errorsync', true);
+            }
+            return $q.reject();
+        });
+    }
+
     fetchDatabaseData(false, true).then(function() {
         $mmaModData.logView(data.id).then(function() {
             $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
@@ -399,16 +422,26 @@ angular.module('mm.addons.mod_data')
         $scope.isOnline = online;
     });
 
-    // Refresh entry on change.
+    // Refresh entries on change.
     entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
         if (data.id == eventData.dataId && siteId == eventData.siteId) {
             $scope.databaseLoaded = false;
             return fetchDatabaseData(true);
         }
     });
 
+    // Refresh entries on sync.
+    syncObserver = $mmEvents.on(mmaModDataEventAutomSynced, function(eventData) {
+        // Update just when all database is synced.
+        if (data.id == eventData.dataid && siteId == eventData.siteid && typeof eventData.entryid == "undefined") {
+            $scope.databaseLoaded = false;
+            return fetchDatabaseData(true);
+        }
+    });
+
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
         entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
+        syncObserver && syncObserver.off && syncObserver.off();
     });
 });
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
@@ -17,6 +17,8 @@ angular.module('mm.addons.mod_data', ['mm.core'])
 .constant('mmaModDataComponent', 'mmaModData')
 .constant('mmaModDataEventEntryChanged', 'mma-mod_data_entry_changed')
 .constant('mmaModDataPerPage', 25)
+.constant('mmaModDataEventAutomSynced', 'mma_mod_data_autom_synced')
+.constant('mmaModDataSyncTime', 300000) // In milliseconds.
 
 .config(function($stateProvider) {
 
@@ -81,4 +83,9 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:approve', '$mmaModDataHandlers.approveEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:delete', '$mmaModDataHandlers.deleteEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:edit', '$mmaModDataHandlers.editEntryLinksHandler');
+})
+
+.run(function($mmCronDelegate) {
+    // Register sync handler.
+    $mmCronDelegate.register('mmaModData', '$mmaModDataHandlers.syncHandler');
 });
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
@@ -626,7 +626,12 @@ angular.module('mm.addons.mod_data')
                 params.groupid = groupId;
             }
 
-            return site.write('mod_data_add_entry', params).catch(function(error) {
+            return site.write('mod_data_add_entry', params).then(function(result) {
+                if (result.newentryid) {
+                    return result;
+                }
+                return $q.reject();
+            }).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)
@@ -758,7 +763,12 @@ angular.module('mm.addons.mod_data')
                     data: data
                 };
 
-            return site.write('mod_data_update_entry', params).catch(function(error) {
+            return site.write('mod_data_update_entry', params).then(function(result) {
+                if (result.updated) {
+                    return result;
+                }
+                return $q.reject();
+            }).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)