ADAM / AIAHTML5

Commit b0665952ec99296a70b4dc4e4adf677f4303189c

Authored by unknown
1 parent 4147a3d3

Commit Changes

Inline Side-by-side
Showing 1 changed file with 19 additions and 16 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @b066595
@@ -239,15 +239,18 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -239,15 +239,18 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
239 $scope.resetQuiz(); 239 $scope.resetQuiz();
240 $scope.ShowHideDiv(); 240 $scope.ShowHideDiv();
241 241
242 - for (var i = 0; i <= $rootScope.selectedDivArray.length - 1; i++) {  
243 - if ($scope.quiznumber == $rootScope.selectedDivArray[i].questionNo) {  
244 - document.getElementById($rootScope.selectedDivArray[i].droppedID).innerHTML = $rootScope.selectedDivArray[i].draggedText;  
245 - // $('#'+$rootScope.selectedDivArray[i].droppedID).html($rootScope.selectedDivArray[i].draggedText);  
246 - document.getElementById($rootScope.selectedDivArray[i].droppedID).style.display = "none";  
247 - // $('#'+$rootScope.selectedDivArray[i].draggedID).css("display","none!important");  
248 - }  
249 242
250 - } 243 +
  244 + //for (var i = 0; i <= $rootScope.selectedDivArray.length - 1; i++) {
  245 + // if ($scope.quiznumber == $rootScope.selectedDivArray[i].questionNo) {
  246 + // alert($rootScope.selectedDivArray[i].draggedText);
  247 + // document.getElementById($rootScope.selectedDivArray[i].droppedID).innerHTML = $rootScope.selectedDivArray[i].draggedText;
  248 + // // $('#'+$rootScope.selectedDivArray[i].droppedID).html($rootScope.selectedDivArray[i].draggedText);
  249 + // document.getElementById($rootScope.selectedDivArray[i].droppedID).style.display = "none";
  250 + // // $('#'+$rootScope.selectedDivArray[i].draggedID).css("display","none!important");
  251 + // }
  252 +
  253 + //}
251 } 254 }
252 255
253 256
@@ -312,15 +315,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -312,15 +315,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
312 // alert($scope.dragableId); 315 // alert($scope.dragableId);
313 // $scope.dragableText = $("#" + $scope.dragableId).text(); 316 // $scope.dragableText = $("#" + $scope.dragableId).text();
314 317
315 - $rootScope.selectedDivArray.push({  
316 - "questionNo": $scope.quiznumber,  
317 - "draggedID": $scope.dragableId,  
318 - "draggedText": $scope.dragableText,  
319 - "droppedID": id  
320 - }); 318 + //$rootScope.selectedDivArray.push({
  319 + // "questionNo": $scope.quiznumber,
  320 + // "draggedID": $scope.dragableId,
  321 + // "draggedText": $scope.dragableText,
  322 + // "droppedID": id
  323 + //});
321 324
322 325
323 - console.log($rootScope.selectedDivArray); 326 + //console.log($rootScope.selectedDivArray);
324 327
325 var keywords = $location.search(); 328 var keywords = $location.search();
326 $scope.labExercideIdentifier = (keywords.labexercise.replace('.json', '')).split('dat_')[1]; 329 $scope.labExercideIdentifier = (keywords.labexercise.replace('.json', '')).split('dat_')[1];
@@ -543,7 +546,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location @@ -543,7 +546,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
543 title: $scope.activityTitle, 546 title: $scope.activityTitle,
544 } 547 }
545 548
546 - alert($scope.LabExerciseAttemptedData.MaxScore + " " + $scope.LabExerciseAttemptedData.Score); 549 + console.log($scope.LabExerciseAttemptedData.MaxScore + " " + $scope.LabExerciseAttemptedData.Score);
547 if ($scope.MaxScore == $scope.Score) 550 if ($scope.MaxScore == $scope.Score)
548 { 551 {
549 $scope.usersCorrectQuestData.push({ 552 $scope.usersCorrectQuestData.push({