reset is working fine with saved data

Nikita Kulshreshtha
1 parent 33046d8e
Showing 2 changed files with 18 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -17,6 +17,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.dragableId = "";
     $scope.UserAttempt = [];
     $scope.blReviewAttempt = false;
+    $scope.isResetClicked = false;
+
     $scope.$on('$viewContentLoaded', function (event) {
         // code that will be executed ... 
         // every time this view is loaded
@@ -120,6 +122,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     }
     $scope.GetQuizByTopic = function () {
+       
         var keywords = $location.search();
         $scope.LabExerciseName = keywords.labexercise;
         $scope.LabExerciseModules = null;
@@ -189,7 +192,9 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                                    });
                                    $timeout(function ()
                                    {
-                                       $scope.ShowSavedLabExercise();
+                                       if ($scope.isResetClicked!= true)
+                                           $scope.ShowSavedLabExercise();
+                                       $scope.isResetClicked = false;
                                    },100);
                                   // $scope.ShowSavedLabExercise();
@@ -262,7 +267,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                        .where('OptionTitle == ' + optionText)
                        .select();
             var option = optionData[0].OptionNumber;
-            $scope.dragableId = optionText + '-' + option;
+            //$scope.dragableId = optionText + '-' + option;
         }
     };
@@ -374,6 +379,12 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
         //return false;
     };
+    $scope.OnResetClick = function () {
+
+        $scope.isResetClicked = true;
+        $scope.resetQuiz();
+    }
+
     $scope.resetQuiz = function () {
         $scope.DraggedList = [];
         $scope.UserAttempt = [];
@@ -666,8 +677,11 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                                    .from(labQuestionData[0].OptionBox)
                                    .where('BoxName == ' + value.blockbox)
                                    .select();
+            if (value.text != "") {
+              //  $scope.DraggedList.push({ "id": 'blockbox-' + value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord });
+                $scope.DraggedList.push({ "id":  value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord });
-            $scope.DraggedList.push({ "id": 'blockbox-' + value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord });
+            }
         })
@@ -66,7 +66,7 @@
                                 <div class="btn-group pull-left marginR5">
                                     <button class="btn btn-sm btn-primary" ng-click="SaveAnswer()">Save</button>
                                     <button class="btn btn-sm btn-primary" ng-click="ReviewAttempt()">Review Your Attempt</button>
-                                    <button class="btn btn-sm btn-primary" ng-click="resetQuiz()">Reset</button>
+                                    <button class="btn btn-sm btn-primary" ng-click="OnResetClick()">Reset</button>
                                 </div>
                                 <div class="btn-group">
                                     <button class="btn btn-sm btn-black" ng-click="prevQuiz()"><i class="fa fa-arrow-left"></i></button>