Merge pull request #497 from dpalou/MOBILE-1600

Mobile 1600

Author: jleyva

www/addons/mod/quiz/controllers/index.js

@@ -165,7 +165,7 @@ angular.module('mm.addons.mod_quiz')
             // User just finished an attempt in offline and it seems it's been synced, since it's finished in online.
             // Go to the review of this attempt if the user hasn't left this view.
             if (!$scope.$$destroyed && $state.current.name == 'site.mod_quiz') {
-                goToAutoReview();
+                promises.push(goToAutoReview());
             }
             autoReview = undefined;
         }
@@ -332,7 +332,16 @@ angular.module('mm.addons.mod_quiz')
 
     // Go to review an attempt that has just been finished.
     function goToAutoReview() {
-        $state.go('site.mod_quiz-review', {courseid: courseId, quizid: quiz.id, attemptid: autoReview.attemptId});
+        // Verify that user can see the review.
+        var attemptId = autoReview.attemptId;
+        if (quizAccessInfo.canreviewmyattempts) {
+            return $mmaModQuiz.getAttemptReview(attemptId, -1).then(function() {
+                return $state.go('site.mod_quiz-review', {courseid: courseId, quizid: quiz.id, attemptid: attemptId});
+            }).catch(function() {
+                // Ignore errors.
+            });
+        }
+        return $q.when();
     }
 
     // Open a quiz to attempt it.
@@ -450,18 +459,23 @@ angular.module('mm.addons.mod_quiz')
             return;
         }
 
-        var forwardView = $ionicHistory.forwardView();
+        var forwardView = $ionicHistory.forwardView(),
+            promise;
         if (forwardView && forwardView.stateName === 'site.mod_quiz-player') {
             if (autoReview && autoReview.synced) {
-                goToAutoReview();
+                promise = goToAutoReview();
                 autoReview = undefined;
+            } else {
+                promise = $q.when();
             }
 
             // Refresh data.
             $scope.quizLoaded = false;
             scrollView.scrollTop();
-            refreshData().finally(function() {
-                $scope.quizLoaded = true;
+            promise.then(function() {
+                refreshData().finally(function() {
+                    $scope.quizLoaded = true;
+                });
             });
         } else {
             autoReview = undefined;

www/addons/mod/quiz/services/quiz.js

@@ -30,7 +30,8 @@ angular.module('mm.addons.mod_quiz')
 
     var self = {},
         blockedQuizzes = {},
-        $mmaModQuizSync; // We'll inject it using $injector to prevent circular dependencies.
+        $mmaModQuizSync, // We'll inject it using $injector to prevent circular dependencies.
+        downloadPromises = {}; // Store download promises to prevent duplicate requests.
 
     // Constants.
 
@@ -2073,31 +2074,49 @@ angular.module('mm.addons.mod_quiz')
             startAttempt,
             quiz,
             quizAccessInfo,
+            attemptAccessInfo,
             preflightData = {},
-            scope;
+            scope,
+            prefetchPromise,
+            deleted = false;
+
+        if (downloadPromises[siteId] && downloadPromises[siteId][module.id]) {
+            // There's already a download ongoing for this package, return the promise.
+            return downloadPromises[siteId][module.id];
+        } else if (!downloadPromises[siteId]) {
+            downloadPromises[siteId] = {};
+        }
 
         // Mark package as downloading.
-        return $mmFilepool.storePackageStatus(siteId, mmaModQuizComponent, module.id, mmCoreDownloading).then(function() {
+        prefetchPromise = $mmFilepool.storePackageStatus(siteId, mmaModQuizComponent, module.id, mmCoreDownloading).then(function() {
             // Get quiz.
             return self.getQuiz(courseId, module.id, siteId).then(function(q) {
                 quiz = q;
             });
         }).then(function() {
             var promises = [];
 
-            // Get user attempts and data not related with attempts.
+            // Get some quiz data.
             promises.push(self.getQuizAccessInformation(quiz.id, false, true, siteId).then(function(info) {
                 quizAccessInfo = info;
             }));
             promises.push(self.getQuizRequiredQtypes(quiz.id, true, siteId));
             promises.push(self.getUserAttempts(quiz.id, 'all', true, false, true, siteId).then(function(atts) {
                 attempts = atts;
             }));
+            promises.push(self.getAttemptAccessInformation(quiz.id, 0, false, true, siteId).then(function(info) {
+                attemptAccessInfo = info;
+            }));
 
             return $q.all(promises);
         }).then(function() {
             var attempt = attempts[attempts.length - 1];
             if (!attempt || self.isAttemptFinished(attempt.state)) {
+                // Check if the user can attempt the quiz.
+                if (attemptAccessInfo.preventnewattemptreasons.length) {
+                    return $q.reject($mmText.buildMessage(attemptAccessInfo.preventnewattemptreasons));
+                }
+
                 startAttempt = true;
                 attempt = undefined;
             }
@@ -2161,7 +2180,14 @@ angular.module('mm.addons.mod_quiz')
             if (scope) {
                 scope.$destroy();
             }
+            deleted = true;
+            delete downloadPromises[siteId][module.id];
         });
+
+        if (!deleted) {
+            downloadPromises[siteId][module.id] = prefetchPromise;
+        }
+        return prefetchPromise;
     };
 
     /**
@@ -2192,7 +2218,13 @@ angular.module('mm.addons.mod_quiz')
             var rules = quizAccessInfo.activerulenames;
             return $mmaModQuizAccessRulesDelegate.getFixedPreflightData(rules, quiz, attempt, preflightData, true, siteId)
                     .then(function() {
-                // Don't return anything.
+
+                if (!attempt) {
+                    // We need to create a new attempt.
+                    return self.startAttempt(quiz.id, preflightData).then(function() {
+                        // Don't return anything.
+                    });
+                }
             });
         }
     };
@@ -2264,7 +2296,9 @@ angular.module('mm.addons.mod_quiz')
             }
 
             angular.forEach(pages, function(page) {
-                promises.push(self.getAttemptReview(attempt.id, page, true, siteId));
+                promises.push(self.getAttemptReview(attempt.id, page, true, siteId).catch(function() {
+                    // Ignore failures, maybe the user can't review the attempt.
+                }));
             });
              // All questions in same page.
             promises.push(self.getAttemptReview(attempt.id, -1, true, siteId).then(function(data) {
@@ -2274,6 +2308,8 @@ angular.module('mm.addons.mod_quiz')
                     questionPromises.push($mmQuestionHelper.prefetchQuestionFiles(question, siteId));
                 });
                 return $q.all(questionPromises);
+            }, function() {
+                // Ignore failures, maybe the user can't review the attempt.
             }));
         } else {