Merge pull request #931 from crazyserver/MOBILE-1966-2

Mobile 1966 2

Author: jleyva

www/addons/mod/assign/submission/file/directive.js

@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_assign')
  * @name mmaModAssignSubmissionFile
  */
 .directive('mmaModAssignSubmissionFile', function($mmaModAssign, $mmaModAssignSubmissionFileSession, $mmaModAssignHelper,
-            $mmaModAssignOffline, mmaModAssignSubmissionFileName) {
+            $mmaModAssignOffline, mmaModAssignSubmissionFileName, $mmFileUploaderHelper) {
     return {
         restrict: 'A',
         priority: 100,
@@ -40,13 +40,9 @@ angular.module('mm.addons.mod_assign')
                         offlineData.plugindata.files_filemanager.offline) {
                     // Has offline files.
                     return $mmaModAssignHelper.getStoredSubmissionFiles(scope.assign.id, mmaModAssignSubmissionFileName)
-                            .then(function(result) {
-                        // Mark the files as pending offline.
-                        angular.forEach(result, function(file) {
-                            file.offline = true;
-                            file.filename = file.name;
-                        });
-                        scope.files = scope.files.concat(result);
+                            .then(function(files) {
+                        files = $mmFileUploaderHelper.markOfflineFiles(files);
+                        scope.files = scope.files.concat(files);
                     });
                 }
             }).finally(function() {

www/addons/mod/assign/submission/file/handlers.js

@@ -24,7 +24,8 @@ angular.module('mm.addons.mod_assign')
  * @name $mmaModAssignSubmissionFileHandler
  */
 .factory('$mmaModAssignSubmissionFileHandler', function($mmaModAssignSubmissionFileSession, $mmaModAssign, $mmSite, $q,
-            $mmaModAssignHelper, $mmWS, $mmFS, $mmFilepool, $mmUtil, $mmaModAssignOffline, mmaModAssignSubmissionFileName) {
+            $mmaModAssignHelper, $mmWS, $mmFS, $mmFilepool, $mmUtil, $mmaModAssignOffline, mmaModAssignSubmissionFileName,
+            $mmFileUploaderHelper) {
 
     var self = {};
 
@@ -42,13 +43,8 @@ angular.module('mm.addons.mod_assign')
 
         // Clear the files in session for this assign.
         $mmaModAssignSubmissionFileSession.clearFiles(assign.id);
-
         // Now delete the local files from the tmp folder.
-        files.forEach(function(file) {
-            if (!file.offline && file.remove) {
-                file.remove();
-            }
-        });
+        $mmFileUploaderHelper.clearTmpFiles(files);
     };
 
     /**

www/addons/mod/forum/controllers/discussion.js

@@ -24,7 +24,7 @@ angular.module('mm.addons.mod_forum')
 .controller('mmaModForumDiscussionCtrl', function($q, $scope, $stateParams, $mmaModForum, $mmSite, $mmUtil, $translate, $mmEvents,
             $ionicScrollDelegate, mmaModForumComponent, mmaModForumReplyDiscussionEvent, $mmaModForumOffline, $mmaModForumSync,
             mmaModForumAutomSyncedEvent, mmaModForumManualSyncedEvent, $mmApp, $ionicPlatform, mmCoreEventOnlineStatusChanged,
-            $mmaModForumHelper) {
+            $mmaModForumHelper, $mmFileUploaderHelper) {
 
     var discussionId = $stateParams.discussionid,
         courseId = $stateParams.cid,
@@ -285,7 +285,7 @@ angular.module('mm.addons.mod_forum')
 
         return promise.then(function() {
             // Delete the local files from the tmp folder.
-            $mmaModForumHelper.clearTmpFiles($scope.newPost.files);
+            $mmFileUploaderHelper.clearTmpFiles($scope.newPost.files);
         });
     }
 

www/addons/mod/forum/controllers/newdiscussion.js

@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_forum')
  */
 .controller('mmaModForumNewDiscussionCtrl', function($scope, $stateParams, $mmGroups, $q, $mmaModForum, $mmEvents, $ionicPlatform,
             $mmUtil, $ionicHistory, $translate, mmaModForumNewDiscussionEvent, $mmaModForumOffline, $mmSite, mmaModForumComponent,
-            mmaModForumAutomSyncedEvent, $mmSyncBlock, $mmaModForumSync, $mmText, $mmaModForumHelper) {
+            mmaModForumAutomSyncedEvent, $mmSyncBlock, $mmaModForumSync, $mmText, $mmaModForumHelper, $mmFileUploaderHelper) {
 
     var courseId = $stateParams.cid,
         forumId = $stateParams.forumid,
@@ -250,7 +250,7 @@ angular.module('mm.addons.mod_forum')
         $mmEvents.trigger(mmaModForumNewDiscussionEvent, data);
 
         // Delete the local files from the tmp folder.
-        $mmaModForumHelper.clearTmpFiles($scope.newDiscussion.files);
+        $mmFileUploaderHelper.clearTmpFiles($scope.newDiscussion.files);
 
         if ($ionicPlatform.isTablet()) {
             // Empty form.
@@ -278,7 +278,7 @@ angular.module('mm.addons.mod_forum')
 
         return promise.then(function() {
             // Delete the local files from the tmp folder.
-            $mmaModForumHelper.clearTmpFiles($scope.newDiscussion.files);
+            $mmFileUploaderHelper.clearTmpFiles($scope.newDiscussion.files);
         });
     }
 

www/addons/mod/forum/directives/discussionpost.js

@@ -41,7 +41,7 @@ angular.module('mm.addons.mod_forum')
  * @param {Object}   [originalData]   Original newpost data. Used to detect if data has changed.
  */
 .directive('mmaModForumDiscussionPost', function($mmaModForum, $mmUtil, $translate, $q, $mmaModForumOffline, $mmSyncBlock,
-        mmaModForumComponent, $mmaModForumSync, $mmText, $mmaModForumHelper, $ionicScrollDelegate) {
+        mmaModForumComponent, $mmaModForumSync, $mmText, $mmaModForumHelper, $ionicScrollDelegate, $mmFileUploaderHelper) {
 
     // Confirm discard changes if any.
     function confirmDiscard(scope) {
@@ -56,7 +56,7 @@ angular.module('mm.addons.mod_forum')
     // Set data to new post, clearing tmp files and updating original data.
     function setPostData(scope, scrollView, replyingTo, editing, isEditing, subject, text, files) {
         // Delete the local files from the tmp folder if any.
-        $mmaModForumHelper.clearTmpFiles(scope.newpost.files);
+        $mmFileUploaderHelper.clearTmpFiles(scope.newpost.files);
 
         scope.newpost.replyingto = replyingTo;
         scope.newpost.editing = editing;

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

@@ -21,29 +21,11 @@ angular.module('mm.addons.mod_forum')
  * @ngdoc service
  * @name $mmaModForumHelper
  */
-.factory('$mmaModForumHelper', function($mmaModForumOffline, $mmSite, $mmFileUploader, $mmFS, mmaModForumComponent, $mmUser, $q) {
+.factory('$mmaModForumHelper', function($mmaModForumOffline, $mmSite, $mmFileUploader, $mmFS, mmaModForumComponent, $mmUser, $q,
+        $mmFileUploaderHelper) {
 
     var self = {};
 
-    /**
-     * Clear temporary attachments because a new discussion or post was cancelled.
-     * Attachments already saved in an offline discussion or post will NOT be deleted.
-     *
-     * @module mm.addons.mod_forum
-     * @ngdoc method
-     * @name $mmaModForumHelper#clearTmpFiles
-     * @param  {Object[]} files List of current files.
-     * @return {Void}
-     */
-    self.clearTmpFiles = function(files) {
-        // Delete the local files from the tmp folder.
-        files.forEach(function(file) {
-            if (!file.offline && file.remove) {
-                file.remove();
-            }
-        });
-    };
-
     /**
      * Convert offline reply to online format in order to be compatible with them.
      *
@@ -150,7 +132,7 @@ angular.module('mm.addons.mod_forum')
      */
     self.getNewDiscussionStoredFiles = function(forumId, timecreated, siteId) {
         return $mmaModForumOffline.getNewDiscussionFolder(forumId, timecreated, siteId).then(function(folderPath) {
-            return getStoredFiles(folderPath);
+            return $mmFileUploaderHelper.getStoredFiles(folderPath);
         });
     };
 
@@ -168,27 +150,10 @@ angular.module('mm.addons.mod_forum')
      */
     self.getReplyStoredFiles = function(forumId, postId, siteId, userId) {
         return $mmaModForumOffline.getReplyFolder(forumId, postId, siteId, userId).then(function(folderPath) {
-            return getStoredFiles(folderPath);
+            return $mmFileUploaderHelper.getStoredFiles(folderPath);
         });
     };
 
-    /**
-     * Get the files stored in a folder, marking them as offline.
-     *
-     * @param  {String} folderPath Folder where to get the files.
-     * @return {Promise}           Promise resolved with the list of files.
-     */
-    function getStoredFiles(folderPath) {
-        return $mmFS.getDirectoryContents(folderPath).then(function(files) {
-            // Mark the files as pending offline.
-            angular.forEach(files, function(file) {
-                file.offline = true;
-                file.filename = file.name;
-            });
-            return files;
-        });
-    }
-
     /**
      * Check if the data of a post/discussion has changed.
      *
@@ -205,20 +170,11 @@ angular.module('mm.addons.mod_forum')
             return false;
         }
 
-        var postFiles = post.files || [],
-            originalFiles = original.files || [];
-
-        if (original.subject != post.subject || original.text != post.text || postFiles.length != originalFiles.length) {
+        if (original.subject != post.subject || original.text != post.text) {
             return true;
         }
 
-        for (var i = 0; i < postFiles.length; i++) {
-            if (postFiles[i].name != originalFiles[i].name) {
-                return true;
-            }
-        }
-
-        return false;
+        return $mmFileUploaderHelper.areFileListDifferent(post.files, original.files);
     };
 
     /**

www/addons/mod/glossary/controllers/edit.js

@@ -22,14 +22,17 @@ angular.module('mm.addons.mod_glossary')
  * @name mmaModGlossaryEditCtrl
  */
 .controller('mmaModGlossaryEditCtrl', function($stateParams, $scope, mmaModGlossaryComponent, $mmUtil, $q, $mmaModGlossary, $mmText,
-        $translate, $ionicHistory, $mmEvents, mmaModGlossaryAddEntryEvent, $mmaModGlossaryOffline, $mmaModGlossaryHelper) {
+        $translate, $ionicHistory, $mmEvents, mmaModGlossaryAddEntryEvent, $mmaModGlossaryOffline, $mmaModGlossaryHelper, $mmLang,
+        $mmFileUploaderHelper) {
 
     var module = $stateParams.module,
         courseId = $stateParams.courseid,
         cmid = $stateParams.cmid,
         glossaryId = $stateParams.glossaryid,
         glossary = $stateParams.glossary || {},
-        entry = $stateParams.entry || false;
+        originalData = null,
+        entry = $stateParams.entry || false,
+        allowDuplicateEntries = !!glossary.allowduplicatedentries;
 
     $scope.entry = {
         concept: '',
@@ -38,11 +41,11 @@ angular.module('mm.addons.mod_glossary')
     $scope.title = module.name;
     $scope.component = mmaModGlossaryComponent;
     $scope.componentId = module.id;
-    $scope.autolinking = glossary.usedynalink;
+    $scope.autolinking = !!glossary.usedynalink;
     $scope.options = {
         categories: null,
         aliases: "",
-        usedynalink: glossary.usedynalink,
+        usedynalink: false,
         casesensitive: false,
         fullmatch: false
     };
@@ -51,18 +54,27 @@ angular.module('mm.addons.mod_glossary')
     if (entry) {
         $scope.entry.concept = entry.concept || '';
         $scope.entry.text = entry.definition || '';
+
+        originalData = {};
+        originalData.text = $scope.entry.text;
+        originalData.concept = $scope.entry.concept;
+        originalData.files = [];
+
         if (entry.options) {
             $scope.options.categories = entry.options.categories || null;
             $scope.options.aliases = entry.options.aliases || "";
-            $scope.options.usedynalink = !!entry.options.usedynalink || glossary.usedynalink;
-            $scope.options.casesensitive = !!entry.options.casesensitive;
-            $scope.options.fullmatch = !!entry.options.fullmatch;
+            $scope.options.usedynalink = !!entry.options.usedynalink;
+            if ($scope.options.usedynalink) {
+                $scope.options.casesensitive = !!entry.options.casesensitive;
+                $scope.options.fullmatch = !!entry.options.fullmatch;
+            }
         }
 
         // Treat offline attachments if any.
         if (entry.attachments && entry.attachments.offline) {
-            $mmaModGlossaryHelper.getStoredFiles(glossaryId, entry.concept).then(function(files) {
+            $mmaModGlossaryHelper.getStoredFiles(glossaryId, entry.concept, entry.timecreated).then(function(files) {
                 $scope.attachments = files;
+                originalData.files = angular.copy(files);
             });
         }
     }
@@ -92,7 +104,7 @@ angular.module('mm.addons.mod_glossary')
     function cancel() {
         var promise;
 
-        if (!$mmaModGlossaryHelper.hasEntryDataChanged($scope.entry, $scope.attachments)) {
+        if (!$mmaModGlossaryHelper.hasEntryDataChanged($scope.entry, $scope.attachments, originalData)) {
            promise = $q.when();
         } else {
             // Show confirmation if some data has been modified.
@@ -101,7 +113,7 @@ angular.module('mm.addons.mod_glossary')
 
         return promise.then(function() {
             // Delete the local files from the tmp folder.
-            $mmaModGlossaryHelper.clearTmpFiles($scope.attachments);
+            $mmFileUploaderHelper.clearTmpFiles($scope.attachments);
         });
     }
 
@@ -110,6 +122,7 @@ angular.module('mm.addons.mod_glossary')
             definition = $scope.entry.text,
             modal,
             attachments,
+            timecreated = entry && entry.timecreated || Date.now(),
             saveOffline = false;
 
         if (!concept || !definition) {
@@ -126,22 +139,15 @@ angular.module('mm.addons.mod_glossary')
                 definition = $mmText.formatHtmlLines(definition);
             }
 
-            // If editing an offline entry and concept is different, delete previous first.
-            if (entry.concept && entry.concept != concept) {
-                return $mmaModGlossaryOffline.deleteAddEntry(glossaryId, entry.concept);
-            }
-            return $q.when();
-
-        }).then(function() {
             attachments = $scope.attachments;
 
             // Upload attachments first if any.
             if (attachments.length) {
-                return $mmaModGlossaryHelper.uploadOrStoreFiles(glossaryId, concept, attachments, false)
+                return $mmaModGlossaryHelper.uploadOrStoreFiles(glossaryId, concept, timecreated, attachments, false)
                         .catch(function() {
                     // Cannot upload them in online, save them in offline.
                     saveOffline = true;
-                    return $mmaModGlossaryHelper.uploadOrStoreFiles(glossaryId, concept, attachments, true);
+                    return $mmaModGlossaryHelper.uploadOrStoreFiles(glossaryId, concept, timecreated, attachments, true);
                 });
             }
         }).then(function(attach) {
@@ -165,21 +171,37 @@ angular.module('mm.addons.mod_glossary')
             }
 
             if (saveOffline) {
-                // Save entry in offline.
-                return $mmaModGlossaryOffline.saveAddEntry(glossaryId, concept, definition, courseId, options, attach).then(function() {
-                    // Don't return anything.
+                var promise;
+                if (entry && !allowDuplicateEntries) {
+                    // Check if the entry is duplicated in online or offline mode.
+                    promise = $mmaModGlossary.isConceptUsed(glossaryId, concept).then(function() {
+                        // There's a entry with same name, reject with error message.
+                        return $mmLang.translateAndReject('mma.mod_glossary.errconceptalreadyexists');
+                    }, function() {
+                        // Not found, entry can be sent.
+                    });
+                } else {
+                    promise = $q.when();
+                }
+
+                return promise.then(function() {
+                    // Save entry in offline.
+                    return $mmaModGlossaryOffline.saveAddEntry(glossaryId, concept, definition, courseId, options, attach,
+                            undefined, undefined, entry).then(function() {
+                        // Don't return anything.
+                    });
                 });
             } else {
                 // Try to send it to server.
                 // Don't allow offline if there are attachments since they were uploaded fine.
                 return $mmaModGlossary.addEntry(glossaryId, concept, definition, courseId, options, attach, undefined,
-                    !attachments.length);
+                    entry, !attachments.length);
             }
         }).then(function(entryId) {
             if (entryId) {
                 $scope.entry.id = entryId;
                 // Data sent to server, delete stored files (if any).
-                $mmaModGlossaryHelper.deleteStoredFiles(glossaryId, concept);
+                $mmaModGlossaryHelper.deleteStoredFiles(glossaryId, concept, timecreated);
             }
             $scope.entry.glossaryid = glossaryId;
             $scope.entry.definition = definition;
@@ -198,7 +220,7 @@ angular.module('mm.addons.mod_glossary')
             entry: $scope.entry
         };
 
-        $mmaModGlossaryHelper.clearTmpFiles($scope.attachments);
+        $mmFileUploaderHelper.clearTmpFiles($scope.attachments);
 
         $mmEvents.trigger(mmaModGlossaryAddEntryEvent, data);
 

www/addons/mod/glossary/controllers/entry.js

@@ -85,6 +85,6 @@ angular.module('mm.addons.mod_glossary')
         // Log that the entry was viewed.
         $mmaModGlossary.logEntryView(entry.id);
     }).finally(function() {
-        $scope.loaded = true;
+        $scope.entryLoaded = true;
     });
 });