diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index fae6ae7..ff3adf5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -461,18 +461,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, var x = $("#droppable").offset(); var id = $(this).attr("id"); - - // $scope.dragableText = $("#" + $scope.dragableId).text(); - - //$rootScope.selectedDivArray.push({ - // "questionNo": $scope.quiznumber, - // "draggedID": $scope.dragableId, - // "draggedText": $scope.dragableText, - // "droppedID": id - //}); - - - //console.log($rootScope.selectedDivArray); + var keywords = $location.search(); @@ -1043,7 +1032,16 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, .select(); if (value.text != "") { - $scope.DraggedList.push({ "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord }); + var OptionList = new jinqJs() + .from(labQuestionData[0].Options) + .where('OptionTitle == ' + value.text) + .select(); + + var blockId = 'block-' + OptionList[0].OptionNumber; + $scope.DraggedList.push({ "blockID": blockId, "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord }); + + + // $scope.DraggedList.push({ "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord }); $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden');