Report is complete. On;y nned to do sorting in showing question numbers.

currently questions are not shown in ascending order. Email is pending

Report is complete. On;y nned to do sorting in showing question numbers.
currently questions are not shown in ascending order. Email is pending
Nikita Kulshreshtha
2 parents 122e15b3 207f0331
Showing 3 changed files with 117 additions and 50 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -69,15 +69,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="4.5.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -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 {
@@ -312,25 +313,55 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.SubmitAttempt = function () {
-      
+       
         $scope.CreateLabExerciseDataToSave();
         $("#submitResultHtml").css("display", "block");
         $("#questionHtml").css("display", "none");
         console.log($scope.usersCorrectQuestData);
         $("#resultLabData").empty();
-        for (var i = 0; i <= $scope.usersCorrectQuestData.length - 1; i++) {
-            if ($scope.usersCorrectQuestData[i].CorrectStatus == "Correct") {
-                var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#007ab3;border-color:#007ab3;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>");
-                $compile(labExerciseHtml)($scope);
+       
+        $scope.usersCorrectQuestData.sort(function (obj1, obj2) {
+            // Ascending: first age less than the previous
+            return obj1.QuestionNo - obj2.QuestionNo;
+        });
+
+
+        for (var j = $scope.TotalNumberofQuiz; j >= 1; j--) {
+            for (var i = 0; i <= $scope.usersCorrectQuestData.length - 1; i++) {
+                if (j == $scope.usersCorrectQuestData[i].QuestionNo)
+                {
+                    if ($scope.usersCorrectQuestData[i].CorrectStatus == "Correct") {
+                        var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style='background-color:#007ab3;border-color:#007ab3;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>");
+                        $compile(labExerciseHtml)($scope);
+                    }
+                    else {
+                        var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style=' background-color:#d9534f;border-color:#d9534f;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>");
+                        $compile(labExerciseHtml)($scope);
+                    }
+                    break;
+                }
+                else
+                {
+                    var labExerciseHtml_1 = $("#resultLabData").prepend("<tr><td>" + j + "</td><td>&nbsp;</td><td>Incorrect</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + j + " class='btn btn-danger btn-sm'><i class='fa fa-times'></i> Review</button></td></tr>");
+                    $compile(labExerciseHtml_1)($scope);
+                    break;
+                }
+            }
+        }
+
+
+        $scope.inCorrectAnswer = 0;
+        $scope.CorrectAnswer = 0;
+        $("#resultLabData tr td:nth-child(3)").each(function () {
+            if ($(this).text() == "Incorrect") {
+                $scope.inCorrectAnswer = $scope.inCorrectAnswer + 1;
             }
             else
             {
-                var labExerciseHtml = $("#resultLabData").append("<tr><td>" + $scope.usersCorrectQuestData[i].QuestionNo + "</td><td>" + $scope.usersCorrectQuestData[i].title + "</td><td>" + $scope.usersCorrectQuestData[i].CorrectStatus + "</td><td><button ng-click='reviewAttemptAnswer($event);' id=" + $scope.usersCorrectQuestData[i].QuestionNo + " class='btn btn-sm' style=' background-color:#d9534f;border-color:#d9534f;color:#ffffff;'><i class='fa fa-times'></i> Review</button></td></tr>");
-                $compile(labExerciseHtml)($scope);
+                $scope.CorrectAnswer = $scope.CorrectAnswer + 1;
             }
-
-        }
+        });
     }
@@ -585,6 +616,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) {
@@ -611,7 +643,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.usersCorrectQuestData = [];
     $scope.CreateLabExerciseDataToSave = function () {
-
+        
         $scope.LabExerciseAttemptedData = [];
         $scope.lb = [];
         //get user answers
@@ -645,36 +677,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
             title: $scope.activityTitle
         }
-        console.log($scope.LabExerciseAttemptedData);
-        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)
@@ -698,7 +702,71 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
             })
         }
        else
-        $scope.LabExerciseUserData.push($scope.LabExerciseAttemptedData);
+            $scope.LabExerciseUserData.push($scope.LabExerciseAttemptedData);
+      
+        $scope.usersCorrectQuestData = [];
+       //alert($scope.LabExerciseUserData);
+        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;
@@ -710,10 +778,10 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
         $("#reportBtn").css("display", "block");
         $("#quizSubmitBtn").css("display", "none");
         $scope.quiznumber = evt.target.id;
-        $scope.CreateLabExerciseDataToSave();
+       // $scope.CreateLabExerciseDataToSave();
         $scope.dragableId = "";
-        // $scope.resetQuiz();
-        $scope.GetQuizByTopic();
+         $scope.resetQuiz();
+      //  $scope.GetQuizByTopic();
         //$scope.ShowHideDiv();
     }
@@ -836,7 +904,6 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.ShowSavedLabExercise = function () {
         //from database
-   
             var lastQuestion = $scope.quiznumber;
             var lastQuestionDetails;
             var lastQuestionAnswers;
@@ -102,9 +102,9 @@
                                         </thead>
                                         <tbody>
                                             <tr class="text-center">
-                                                <td>18</td>
-                                                <td>0</td>
-                                                <td>18</td>
+                                                <td>{{TotalNumberofQuiz}}</td>
+                                                <td>{{CorrectAnswer}}</td>
+                                                <td>{{inCorrectAnswer}}</td>
                                             </tr>
                                         </tbody>
                                     </table>