ADAM / AIAHTML5

Commit f725cce26fec4c5d39c075a0cbe490a29d0c05e9

Authored by Nikita Kulshreshtha
2 parents 80df633e 5a9818dd

Merge branch 'ReLabExerReport_1' into Develop

Inline Side-by-side
Showing 2 changed files with 10 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @f725cce
... ... @@ -119,7 +119,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
119 119 }
120 120 )
121 121 }
122   -
  122 + $scope.labExerciseModuleData = [];
123 123 $scope.GetQuizByTopic = function () {
124 124  
125 125 $rootScope.isLoading = true;
... ... @@ -140,7 +140,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
140 140 var keywords = $location.search();
141 141 $scope.labExercideIdentifier = (keywords.labexercise.replace('.json', '')).split('dat_')[1];
142 142  
143   -
  143 + $scope.labExerciseModuleData = result.LabExercise;
144 144 $.each(result.LabExercise, function (index, value) {
145 145  
146 146 $scope.LabExerciseName = result.LabExercise[index].Topic;
... ... @@ -425,7 +425,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
425 425  
426 426 $scope.scoreResult = (parseInt($scope.CorrectAnswer) / parseInt($scope.inCorrectAnswer)) * 100;
427 427 $scope.scoreResult = Math.round($scope.scoreResult);
428   -
  428 + $("#resultLabData tr td:nth-child(2)").each(function (key, value) {
  429 + if ($(this).text().length == 1) {
  430 + var a = parseInt($(this).prev().text()) - 1;
  431 + $(this).text($scope.labExerciseModuleData[0].Questions[a].activityTitle);
  432 + $(this).next().text("Not Attempted");
  433 + }
  434 + });
429 435 }
430 436  
431 437  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
  View file @f725cce
... ... @@ -93,7 +93,7 @@
93 93 <div class="panel-heading">
94 94 <div class="row">
95 95 <div class="col-sm-4 text-left"><strong>{{LabExerciseName}}</strong></div>
96   - <div class="col-sm-4 text-center">performance Report</div>
  96 + <div class="col-sm-4 text-center">Performance Report</div>
97 97 <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
98 98 </div>
99 99 </div>
... ...