Prevent hints from being released after correct answer is submitted. (#…

…4580)
oppia · Jan 21, 2018 · 006b351 · 006b351
1 parent b145937
commit 006b351
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/core/templates/dev/head/pages/exploration_player/ConversationSkinDirective.js b/core/templates/dev/head/pages/exploration_player/ConversationSkinDirective.js
@@ -706,7 +706,7 @@ oppia.directive('conversationSkin', [
                           hasContinueButton: true
                         });
                       }
-                      $scope.$broadcast(EVENT_NEW_CARD_AVAILABLE);
+                      $rootScope.$broadcast(EVENT_NEW_CARD_AVAILABLE);
                       _nextFocusLabel = $scope.CONTINUE_BUTTON_FOCUS_LABEL;
                       FocusManagerService.setFocusIfOnDesktop(_nextFocusLabel);
                       scrollToBottom();

diff --git a/core/templates/dev/head/pages/exploration_player/HintsAndSolutionManagerService.js b/core/templates/dev/head/pages/exploration_player/HintsAndSolutionManagerService.js
@@ -20,10 +20,12 @@ oppia.factory('HintsAndSolutionManagerService', [
   '$timeout', '$rootScope', 'PlayerTranscriptService',
   'DELAY_FOR_HINT_FEEDBACK_MSEC', 'HINT_REQUEST_STRING_I18N_IDS',
   'WAIT_FOR_FIRST_HINT_MSEC', 'WAIT_FOR_SUBSEQUENT_HINTS_MSEC',
+  'EVENT_NEW_CARD_AVAILABLE',
   function(
       $timeout, $rootScope, PlayerTranscriptService,
       DELAY_FOR_HINT_FEEDBACK_MSEC, HINT_REQUEST_STRING_I18N_IDS,
-      WAIT_FOR_FIRST_HINT_MSEC, WAIT_FOR_SUBSEQUENT_HINTS_MSEC) {
+      WAIT_FOR_FIRST_HINT_MSEC, WAIT_FOR_SUBSEQUENT_HINTS_MSEC,
+      EVENT_NEW_CARD_AVAILABLE) {
     var timeout = null;
     var ACCELERATED_HINT_WAIT_TIME_MSEC = 10000;
     var WAIT_FOR_TOOLTIP_TO_BE_SHOWN_MSEC = 60000;
@@ -35,6 +37,7 @@ oppia.factory('HintsAndSolutionManagerService', [
     var hintsForLatestCard = [];
     var solutionForLatestCard = null;
     var wrongAnswersSinceLastHintConsumed = 0;
+    var correctAnswerSubmitted = false;
 
     // tooltipIsOpen is a flag which says that the tooltip is currently
     // visible to the learner.
@@ -44,6 +47,11 @@ oppia.factory('HintsAndSolutionManagerService', [
     var hintsDiscovered = false;
     var tooltipTimeout = null;
 
+
+    $rootScope.$on(EVENT_NEW_CARD_AVAILABLE, function() {
+      correctAnswerSubmitted = true;
+    });
+
     // This replaces any timeouts that are already queued.
     var enqueueTimeout = function(func, timeToWaitMsec) {
       if (timeout) {
@@ -58,10 +66,12 @@ oppia.factory('HintsAndSolutionManagerService', [
     };
 
     var releaseHint = function() {
-      numHintsReleased++;
-      if (!hintsDiscovered && !tooltipTimeout) {
-        tooltipTimeout = $timeout(
-          showTooltip, WAIT_FOR_TOOLTIP_TO_BE_SHOWN_MSEC);
+      if (!correctAnswerSubmitted) {
+        numHintsReleased++;
+        if (!hintsDiscovered && !tooltipTimeout) {
+          tooltipTimeout = $timeout(
+            showTooltip, WAIT_FOR_TOOLTIP_TO_BE_SHOWN_MSEC);
+        }
       }
     };
     var releaseSolution = function() {
@@ -108,6 +118,7 @@ oppia.factory('HintsAndSolutionManagerService', [
         hintsForLatestCard = newHints;
         solutionForLatestCard = newSolution;
         wrongAnswersSinceLastHintConsumed = 0;
+        correctAnswerSubmitted = false;
         if (timeout) {
           $timeout.cancel(timeout);
         }