fixed

Nikita Kulshreshtha
1 parent 23b2c7a4
Showing 1 changed file with 47 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -828,21 +828,45 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                             var correctResponse = result.LabExercise[index].Questions[index1].correctResponse;
                             var Options = result.LabExercise[index].Questions[index1].Options;
                             $.each(correctResponse, function (inx, value2) {
+                                if (correctResponse[inx].Answer.indexOf('|') != -1) {
+                                    var multipleanswer = correctResponse[inx].Answer.split('|');
+                                    option = multipleanswer[0];
+                                }
+                                else
+                                    option = correctResponse[inx].Answer;
+
+                                var options = new jinqJs()
+                                              .from(Options)
+                                               .where('OptionNumber == ' + option)
+                                               .select();
+                                var optionText = options[0].OptionTitle;
+
                                 $scope.OptionName = "";
                                 $.each(Options, function (inx1, value3) {
-                                    if (Options[inx1].OptionTitle == $('#blockans-' + correctResponse[inx].OptionBox).text()) {
-                                        $scope.OptionName = Options[inx1].OptionNumber;
+
+                                   
+                                    if (optionText == $('#blockans-' + correctResponse[inx].OptionBox).text()) {
+                                        $scope.OptionName = option;
                                     }
+                                    //if (Options[inx1].OptionTitle == $('#blockans-' + correctResponse[inx].OptionBox).text()) {
+                                    //    $scope.OptionName = Options[inx1].OptionNumber;
+                                    //}
                                 });
-                                if (correctResponse[inx].Answer == $scope.OptionName) {
+                                //if (correctResponse[inx].Answer == $scope.OptionName) {
+                                //    blReviewAttempt = true;
+                                //}
+                                //else {
+                                //    blReviewAttempt = false;
+                                //    $('#blockans-' + correctResponse[inx].OptionBox).css("background", "#ff4e00");
+                                //}
+
+                                if (option == $scope.OptionName) {
                                     blReviewAttempt = true;
                                 }
                                 else {
                                     blReviewAttempt = false;
                                     $('#blockans-' + correctResponse[inx].OptionBox).css("background", "#ff4e00");
                                 }
-
-
                             });
                         }
                     });
@@ -1118,7 +1142,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
                           .where('OptionNumber == ' + option)
                           .select();
             var optionText = options[0].OptionTitle;
-            $scope.correctResponse += blankBox + ' ' + option + ',';
+            //$scope.correctResponse += blankBox + ' ' + option + ',';
+            $scope.correctResponse += blankBox + ' ' + cr[0].correctResponse[i].Answer + ',';
+
             $scope.correctResponseForSavingDatabase += parseInt(blankBox.replace('T', '')) - 1 + ':' + optionText + ',';
         }
@@ -1148,8 +1174,21 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
             var userOptedAnswer = value.BlankBoxName + ' ' + value.OptionName;
             for (var i = 0; i < $scope.correctResonseKeyValue.length; i++) {
-                if (userOptedAnswer == $scope.correctResonseKeyValue[i]) {
-                    $scope.Score += 1;
+                if ($scope.correctResonseKeyValue[i].indexOf('|') != -1) {
+                    var splitedOption = $scope.correctResonseKeyValue[i].split(' ');
+                    var multipleanswer = splitedOption[1].split('|');
+                    var opt1 = splitedOption[0]+' '+ multipleanswer[0];
+                    var opt2 = splitedOption[0] + ' ' + multipleanswer[1];
+
+                    if (userOptedAnswer == opt1 || userOptedAnswer == opt2) {
+                        $scope.Score += 1;
+                    }
+                }
+                else {
+
+                    if (userOptedAnswer == $scope.correctResonseKeyValue[i]) {
+                        $scope.Score += 1;
+                    }
                 }
             }