save and get are working fine

Nikita Kulshreshtha
1 parent 9e84e369
Showing 4 changed files with 13 additions and 8 deletions
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
400-SOURCECODE/AIAHTML5.API/Models/LabExercise.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/services/LabExerciseService.js
@@ -943,7 +943,7 @@ namespace AIAHTML5.API.Models
                         le.totalQuestions = Convert.ToInt32(dr["TotalQuestions"]);
                         LabEcerciseDetails led = new LabEcerciseDetails();
-                        led.StateObject = dr["StateObject"].ToString();
+                       // led.StateObject = dr["StateObject"].ToString();
                         led.UserAnswers = dr["UserAnswers"].ToString();
                         led.Score = Convert.ToInt32(dr["Score"]);
                         led.MaxScore = Convert.ToInt32(dr["MaxScore"]);
@@ -54,6 +54,6 @@ namespace AIAHTML5.API.Models
         public string CorrectAnswers { get; set; }
         public string DragItems { get; set; }
         public int Score { get; set; }
-        public string StateObject { get; set; }
+        //public string StateObject { get; set; }
     }
 }
 \ No newline at end of file
@@ -84,6 +84,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.getLabExerciseTitle = function (title) {
         $rootScope.menuLabExer = 1;
+        $scope.quiznumber = 1;
         if (title != null) {
             $scope.LabExerciseQuiz = title;
@@ -107,13 +108,14 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
            .then(
                function (labResult) {
-                   if (labResult != undefined && labResult != AIAConstants.SAVED_LAB_EXERCISE_NOT_FOUND) {
+                   if (labResult != undefined && labResult.lastQuestion>0 && labResult != AIAConstants.SAVED_LAB_EXERCISE_NOT_FOUND) {
                        $scope.SavedLabExercise = labResult;
                        $scope.quiznumber = $scope.SavedLabExercise.lastQuestion;
                        $scope.GetQuizByTopic();
                    }
-                   else
+                   else {
                        $scope.GetQuizByTopic();
+                   }
                },
                function(error){
                    console.log('error in getting save ddata');
@@ -192,9 +194,12 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                                    });
                                    $timeout(function ()
                                    {
-                                       if ($scope.isResetClicked!= true)
-                                           $scope.ShowSavedLabExercise();
-                                       $scope.isResetClicked = false;
+                                       if ($scope.SavedLabExercise != undefined && $scope.SavedLabExercise.lastQuestion > 0) {
+                                           if ($scope.isResetClicked != true) {
+                                               $scope.ShowSavedLabExercise();
+                                               $scope.isResetClicked = false;
+                                           }
+                                       }
                                    },100);
                                   // $scope.ShowSavedLabExercise();
@@ -33,7 +33,7 @@
             $http({
                 url: "/API/api/LabExercise", 
                 method: "GET",
-                params: {userId:1, labExerciseIdentifier:'di'}
+                params: { userId: labExerciseInfo.userId, labExerciseIdentifier: labExerciseInfo.identifier }
             })
             .success(function (data, status, headers, config) {