diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index af3858a..1aebac6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -109,6 +109,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
if (labResult != undefined && labResult.lastQuestion>0 && labResult != AIAConstants.SAVED_LAB_EXERCISE_NOT_FOUND) {
$scope.SavedLabExercise = labResult;
$scope.quiznumber = $scope.SavedLabExercise.lastQuestion;
+ $scope.initialQuestioNo = $scope.SavedLabExercise.lastQuestion;
$scope.GetQuizByTopic();
}
else {
@@ -310,7 +311,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
$scope.SubmitAttempt = function () {
-
+
$scope.CreateLabExerciseDataToSave();
$("#submitResultHtml").css("display", "block");
@@ -321,6 +322,14 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
var labExerciseHtml = $("#resultLabData").append("
" + $scope.usersCorrectQuestData[i].QuestionNo + " | " + $scope.usersCorrectQuestData[i].title + " | " + $scope.usersCorrectQuestData[i].CorrectStatus + " | |
");
$compile(labExerciseHtml)($scope);
}
+ if ($scope.initialQuestioNo > 0) {
+ for (var i = $scope.initialQuestioNo - 1; i > 0; i--) {
+ var labExerciseHtml_1 = $("#resultLabData").prepend("" + i + " | | Incorrect | |
");
+ $compile(labExerciseHtml_1)($scope);
+ }
+ }
+
+
}
@@ -575,6 +584,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
//LabExerciseService.saveLabExerciseAttempt("superadmin", $scope.LabExerciseAttemptedData)
$scope.labExerciseAttempt = [];
$scope.labExerciseAttempt.push({ 'LabExerciseUserData': $scope.LabExerciseUserData, 'userId': $scope.userId, 'labExerciseIdentifier': $scope.labExerciseIdentifier, 'LastQuestion': $scope.LastQuestion, 'TotalQuestions': $scope.TotalQuestions });
+ $scope.initialQuestioNo = $scope.LastQuestion;
LabExerciseService.saveLabExerciseAttempt($scope.labExerciseAttempt)
.then(
function (result) {
@@ -635,33 +645,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
title: $scope.activityTitle
}
- alert("$scope.MaxScore=" + $scope.MaxScore + ", " + "$scope.Score=" + $scope.Score);
- if ($scope.MaxScore == $scope.Score)
- {
- $scope.usersCorrectQuestData.push({
- MaxScore: $scope.MaxScore,
- UserAnswer: $scope.commaSeperatedUserAnswers,
- QuestionNo: $scope.quiznumber,
- CorrectAnswer: JSON.stringify($scope.correctResponseForSavingDatabase),
- DragItems: $scope.DragItems,
- Score: $scope.Score,
- title: $scope.activityTitle,
- CorrectStatus : 'Correct'
- });
- }
- else
- {
- $scope.usersCorrectQuestData.push({
- MaxScore: $scope.MaxScore,
- UserAnswer: $scope.commaSeperatedUserAnswers,
- QuestionNo: $scope.quiznumber,
- CorrectAnswer: JSON.stringify($scope.correctResponseForSavingDatabase),
- DragItems: $scope.DragItems,
- Score: $scope.Score,
- title: $scope.activityTitle,
- CorrectStatus: 'Incorrect'
- });
- }
+
+
var thisQuestiondataInLabExerciseUserData = new jinqJs()
.from($scope.LabExerciseUserData)
@@ -685,7 +670,70 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
})
}
else
- $scope.LabExerciseUserData.push($scope.LabExerciseAttemptedData);
+ $scope.LabExerciseUserData.push($scope.LabExerciseAttemptedData);
+
+ $scope.usersCorrectQuestData = [];
+ if ($scope.LabExerciseUserData.length > 0) {
+
+ for(var i=0;i<=$scope.LabExerciseUserData.length-1;i++)
+ {
+
+ if ($scope.LabExerciseUserData[i].MaxScore == $scope.LabExerciseUserData[i].Score) {
+ $scope.usersCorrectQuestData.push({
+ MaxScore: $scope.LabExerciseUserData[i].MaxScore,
+ UserAnswer: $scope.LabExerciseUserData[i].UserAnswer,
+ QuestionNo: $scope.LabExerciseUserData[i].QuestionNo,
+ CorrectAnswer: JSON.stringify($scope.LabExerciseUserData[i].CorrectAnswer),
+ DragItems: $scope.LabExerciseUserData[i].DragItems,
+ Score: $scope.LabExerciseUserData[i].Score,
+ title: $scope.LabExerciseUserData[i].title,
+ CorrectStatus: 'Correct'
+ });
+ }
+ else {
+ $scope.usersCorrectQuestData.push({
+ MaxScore: $scope.LabExerciseUserData[i].MaxScore,
+ UserAnswer: $scope.LabExerciseUserData[i].UserAnswer,
+ QuestionNo: $scope.LabExerciseUserData[i].QuestionNo,
+ CorrectAnswer: JSON.stringify($scope.LabExerciseUserData[i].CorrectAnswer),
+ DragItems: $scope.LabExerciseUserData[i].DragItems,
+ Score: $scope.LabExerciseUserData[i].Score,
+ title: $scope.LabExerciseUserData[i].title,
+ CorrectStatus: 'Incorrect'
+ });
+ }
+ }
+
+ }
+ else {
+ if ($scope.MaxScore == $scope.Score) {
+ $scope.usersCorrectQuestData.push({
+ MaxScore: $scope.MaxScore,
+ UserAnswer: $scope.commaSeperatedUserAnswers,
+ QuestionNo: $scope.quiznumber,
+ CorrectAnswer: JSON.stringify($scope.correctResponseForSavingDatabase),
+ DragItems: $scope.DragItems,
+ Score: $scope.Score,
+ title: $scope.activityTitle,
+ CorrectStatus: 'Correct'
+ });
+ }
+ else {
+ $scope.usersCorrectQuestData.push({
+ MaxScore: $scope.MaxScore,
+ UserAnswer: $scope.commaSeperatedUserAnswers,
+ QuestionNo: $scope.quiznumber,
+ CorrectAnswer: JSON.stringify($scope.correctResponseForSavingDatabase),
+ DragItems: $scope.DragItems,
+ Score: $scope.Score,
+ title: $scope.activityTitle,
+ CorrectStatus: 'Incorrect'
+ });
+ }
+ }
+
+ // console.log($scope.usersCorrectQuestData);
+ // console.log($scope.LabExerciseUserData);
}
$scope.reviewAttemptAnswer = function (evt) {
$scope.isReviewBtnSelected = true;
@@ -867,12 +915,12 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
}
}
-
+
var labQuestionData = new jinqJs()
.from($scope.LabExData.LabExercise[0].Questions)
.where('Number == ' + lastQuestion)
.select();
-
+
angular.forEach($scope.QustionAnsKeyValue, function (value, key) {
var questionOptionBox = new jinqJs()
.from(labQuestionData[0].OptionBox)