Commit d41d59744e73c3c7502135fc7cdeaaf652bc4f8c

Authored by Nikita Kulshreshtha
1 parent 5fd27848

merged Develop into PreQA

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -624,6 +624,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -624,6 +624,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
624 } 624 }
625 } 625 }
626 626
  627 + // we are loading most of alll data used in DA by this function so that at the time of any functionality delay in data laod will not happened.
  628 +
627 $scope.loadDAView = function (currentBodyViewId) 629 $scope.loadDAView = function (currentBodyViewId)
628 { 630 {
629 631
@@ -645,6 +647,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -645,6 +647,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
645 console.log('currentBodyViewId just before sending: ' + currentBodyViewId); 647 console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
646 $scope.loadBodyViewData(currentBodyViewId); 648 $scope.loadBodyViewData(currentBodyViewId);
647 649
  650 +
  651 + $scope.GetBodySystemData(currentBodyViewId);
648 //2. load bodyRegion data 652 //2. load bodyRegion data
649 $rootScope.isLoading = true; 653 $rootScope.isLoading = true;
650 $rootScope.voId = $rootScope.getLocalStorageValue("currentBodyViewId"); 654 $rootScope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
@@ -3023,17 +3027,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3023,17 +3027,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3023 $scope.DisableUI(); 3027 $scope.DisableUI();
3024 $('.ui-slider').slider('disable'); 3028 $('.ui-slider').slider('disable');
3025 3029
  3030 +
  3031 + if ($scope.isTransparencyActivated) {
  3032 +
  3033 + $scope.layerNumber = $rootScope.currentLayerNumber;
  3034 + }
  3035 + else {
  3036 + $scope.layerNumber = $('#txtlayerNumber').val();
  3037 + $rootScope.currentLayerNumber = $scope.layerNumber;
  3038 + }
  3039 +
3026 $("#btnTranparency").attr('disabled', 'disabled'); 3040 $("#btnTranparency").attr('disabled', 'disabled');
3027 - $rootScope.currentLayerNumber = $scope.layerNumber; 3041 +
3028 3042
3029 - $scope.layerNumber = $('#txtlayerNumber').val(); 3043 +
3030 3044
3031 $rootScope.isLoading = true; 3045 $rootScope.isLoading = true;
3032 $('#spinner').css('visibility', 'visible'); 3046 $('#spinner').css('visibility', 'visible');
3033 3047
3034 3048
3035 if ($rootScope.isHighLight == true) { 3049 if ($rootScope.isHighLight == true) {
3036 - $rootScope.isHighLight = false; 3050 + // $rootScope.isHighLight = false;
3037 $scope.CloseTransparencyBox(); 3051 $scope.CloseTransparencyBox();
3038 } 3052 }
3039 3053
@@ -3041,11 +3055,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3041,11 +3055,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3041 3055
3042 $scope.highlightedBR = []; 3056 $scope.highlightedBR = [];
3043 3057
3044 -  
3045 - var matchedTermListPath = '~/../content/data/json/da/body-views/1/BodySystem_' + $rootScope.systemNumber + '.json';  
3046 var grayImageDataVar = null; 3058 var grayImageDataVar = null;
3047 -  
3048 - // DataService.getJson(matchedTermListPath)  
3049 TermService.getTermData($scope.layerNumber, $rootScope.voId, $rootScope.systemNumber, $rootScope.zoomInOut) 3059 TermService.getTermData($scope.layerNumber, $rootScope.voId, $rootScope.systemNumber, $rootScope.zoomInOut)
3050 3060
3051 .then( 3061 .then(
@@ -3059,7 +3069,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3059,7 +3069,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3059 //remove existing data and draw fresh data 3069 //remove existing data and draw fresh data
3060 $scope.removeCurrentHighlightedBodySystem(); 3070 $scope.removeCurrentHighlightedBodySystem();
3061 3071
3062 -  
3063 3072
3064 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE; 3073 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
3065 $("#daMessageModal").modal('show'); 3074 $("#daMessageModal").modal('show');
@@ -3292,7 +3301,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -3292,7 +3301,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3292 3301
3293 }); 3302 });
3294 3303
3295 - // } 3304 +
3296 } 3305 }
3297 3306
3298 3307
@@ -7964,6 +7973,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7964,6 +7973,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7964 //5. change the search terms as per the selected bodyview 7973 //5. change the search terms as per the selected bodyview
7965 $rootScope.loadSearchData(); 7974 $rootScope.loadSearchData();
7966 7975
  7976 + $scope.GetBodySystemData(currentBodyViewId);
7967 //6. 7977 //6.
7968 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Female', 'Male'); 7978 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Female', 'Male');
7969 7979
@@ -7996,6 +8006,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7996,6 +8006,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7996 //5. change the search terms as per the selected bodyview 8006 //5. change the search terms as per the selected bodyview
7997 $rootScope.loadSearchData(); 8007 $rootScope.loadSearchData();
7998 8008
  8009 + $scope.GetBodySystemData(currentBodyViewId);
7999 //6. 8010 //6.
8000 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Male', 'Female'); 8011 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Male', 'Female');
8001 8012
@@ -8241,6 +8252,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -8241,6 +8252,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8241 //4. change the search terms as per the selected bodyview 8252 //4. change the search terms as per the selected bodyview
8242 $rootScope.loadSearchData(); 8253 $rootScope.loadSearchData();
8243 8254
  8255 + $scope.GetBodySystemData($rootScope.voId);
  8256 +
8244 //5.Change the popup title next to search 8257 //5.Change the popup title next to search
8245 $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle"); 8258 $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle");
8246 8259
@@ -8402,6 +8415,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -8402,6 +8415,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8402 // $scope.loadSelectedBodyView(data.reloadDABodyViewId); 8415 // $scope.loadSelectedBodyView(data.reloadDABodyViewId);
8403 8416
8404 $scope.loadNavigatorForSelectedBodyView(data.reloadDABodyViewId); 8417 $scope.loadNavigatorForSelectedBodyView(data.reloadDABodyViewId);
  8418 +
  8419 + if($scope.layerNumber!= 0) {
  8420 + $scope.EnableUI();
  8421 + }
8405 } 8422 }
8406 // $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle"); 8423 // $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle");
8407 8424
@@ -8487,7 +8504,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -8487,7 +8504,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8487 8504
8488 //body highlight options functinality 8505 //body highlight options functinality
8489 $scope.LoadBodySystemData = function (event) { 8506 $scope.LoadBodySystemData = function (event) {
8490 - event.stopPropagation(); 8507 + event.stopPropagation();
8491 $("#structureDropdown").toggle(); 8508 $("#structureDropdown").toggle();
8492 $("#genderChangeId").css("display", "none"); 8509 $("#genderChangeId").css("display", "none");
8493 $("#viewID").css("display", "none"); 8510 $("#viewID").css("display", "none");
@@ -8507,6 +8524,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -8507,6 +8524,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8507 systemListHtml = systemListHtml + '</ul>'; 8524 systemListHtml = systemListHtml + '</ul>';
8508 $('#bodySystem').append(systemListHtml); 8525 $('#bodySystem').append(systemListHtml);
8509 8526
  8527 +
  8528 + // var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
  8529 + // DataService.getJson(bodySystemDataPath)
  8530 + //.then(
  8531 + // function (result) {
  8532 +
  8533 + // $rootScope.BodySystemData = result;
  8534 +
  8535 + // },
  8536 + // function (error) {
  8537 + // console.log(error.statusText)
  8538 + // }
  8539 + // )
  8540 +
  8541 + }
  8542 +
  8543 + $scope.GetBodySystemData = function (currentBodyViewId) {
  8544 + //var currentBodyViewId = $rootScope.voId;
8510 var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json'; 8545 var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
8511 DataService.getJson(bodySystemDataPath) 8546 DataService.getJson(bodySystemDataPath)
8512 .then( 8547 .then(
@@ -8519,7 +8554,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8519,7 +8554,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8519 console.log(error.statusText) 8554 console.log(error.statusText)
8520 } 8555 }
8521 ) 8556 )
8522 -  
8523 } 8557 }
8524 8558
8525 angular.element(document).click(function () { 8559 angular.element(document).click(function () {
@@ -8547,11 +8581,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l @@ -8547,11 +8581,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8547 8581
8548 $rootScope.systemNumber = event.currentTarget.id; 8582 $rootScope.systemNumber = event.currentTarget.id;
8549 8583
  8584 +
8550 if ($rootScope.systemNumber == 0) { 8585 if ($rootScope.systemNumber == 0) {
8551 8586
8552 console.log("inside HighlightBodyByBodySystem ..came inside current structure"); 8587 console.log("inside HighlightBodyByBodySystem ..came inside current structure");
8553 //clear highlighted system 8588 //clear highlighted system
8554 $scope.removeCurrentHighlightedBodySystem(); 8589 $scope.removeCurrentHighlightedBodySystem();
  8590 + $rootScope.isHighlightBodyByBodySystem = false;
  8591 + $scope.isbodySystemHighlight = false;
8555 $scope.EnableUI(); 8592 $scope.EnableUI();
8556 } 8593 }
8557 8594
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -65,14 +65,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -65,14 +65,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
65 65
66 //to get all lab exercise modules from json files 66 //to get all lab exercise modules from json files
67 $scope.getLabExerciseModules = function () { 67 $scope.getLabExerciseModules = function () {
68 - //debugger; 68 +
69 $scope.LabExerciseModules1 = null; 69 $scope.LabExerciseModules1 = null;
70 var labExerciseModulePath = '~/../content/data/json/le/labexercise.json'; 70 var labExerciseModulePath = '~/../content/data/json/le/labexercise.json';
71 71
72 DataService.getAnotherJson(labExerciseModulePath).then( 72 DataService.getAnotherJson(labExerciseModulePath).then(
73 function (result) { 73 function (result) {
74 - //debugger;  
75 - //alert(JSON.stringify(result));  
76 $scope.LabExerciseModules1 = result; 74 $scope.LabExerciseModules1 = result;
77 }, 75 },
78 function (error) { 76 function (error) {
@@ -176,7 +174,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -176,7 +174,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
176 $scope.Imagepath = keywords.labexercise + "/" + result.LabExercise[index].Questions[index1].ImagePath; 174 $scope.Imagepath = keywords.labexercise + "/" + result.LabExercise[index].Questions[index1].ImagePath;
177 } 175 }
178 176
179 - if ($scope.Title == "Complete the statements below.") { 177 + if ($("#textblock").css("display") == "block") {
180 $("#imgdiv").css("position", "static"); 178 $("#imgdiv").css("position", "static");
181 $("#imgdiv").find("div").each(function () { 179 $("#imgdiv").find("div").each(function () {
182 var answerDiv = $(this).attr("id").split("-"); 180 var answerDiv = $(this).attr("id").split("-");
@@ -450,11 +448,20 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -450,11 +448,20 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
450 448
451 $scope.dragableId = $(this).attr("Id"); 449 $scope.dragableId = $(this).attr("Id");
452 $scope.a = $scope.dragableId; 450 $scope.a = $scope.dragableId;
453 - 451 +
454 console.log($scope.dragableId); 452 console.log($scope.dragableId);
455 $scope.dragableText = $("#" + $scope.dragableId).text(); 453 $scope.dragableText = $("#" + $scope.dragableId).text();
456 - // alert($("#" + $scope.dragableId).text());  
457 - 454 +
  455 + if ($scope.dragableId.split('-')[0] != 'block') {
  456 + $scope.draggableAttribute = $("#" + $scope.dragableId).attr("draggedattr");
  457 + // $("#" + $scope.dragableId).removeAttr("draggedattr");
  458 + }
  459 + else
  460 + {
  461 +
  462 + $scope.draggableAttribute = '';
  463 + }
  464 +
458 //if user drag already selected answer from one blankbox to another than it gets id of blank box so need to get answer 465 //if user drag already selected answer from one blankbox to another than it gets id of blank box so need to get answer
459 if ($scope.dragableId.indexOf('T') != -1) { 466 if ($scope.dragableId.indexOf('T') != -1) {
460 var optionText = document.getElementById($scope.dragableId).innerHTML; 467 var optionText = document.getElementById($scope.dragableId).innerHTML;
@@ -498,8 +505,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -498,8 +505,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
498 var x = $("#droppable").offset(); 505 var x = $("#droppable").offset();
499 506
500 var id = $(this).attr("id"); 507 var id = $(this).attr("id");
501 -  
502 - 508 +
  509 +
503 var keywords = $location.search(); 510 var keywords = $location.search();
504 511
505 if ($.browser.msie) { 512 if ($.browser.msie) {
@@ -528,13 +535,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -528,13 +535,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
528 if ($scope.DraggedList != null) { 535 if ($scope.DraggedList != null) {
529 $.each($scope.DraggedList, function (inx1, value3) { 536 $.each($scope.DraggedList, function (inx1, value3) {
530 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); 537 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
531 - if ($scope.DraggedList[inx1].id == $scope.a.split('-')[1]) {  
532 - $scope.b = $scope.DraggedList[inx1].blockID;  
533 - $scope.DraggedList.splice(inx1, 1);  
534 - $('#' + $scope.b).css({ "display": "block", "color": "#000000!important" });  
535 - $('#blockans-' + $scope.b.split('-')[1]).css("background-color", "transparent !important");  
536 - // alert('removed from dropbox= '+'blockans-' + $scope.b.split('-')[1]);  
537 - } 538 + if ($scope.DraggedList[inx1].DraggedAttr == $scope.draggableAttribute) {
  539 + // $scope.b = $scope.DraggedList[inx1].blockID;
  540 + $scope.DraggedList.splice(inx1, 1);
  541 + $('#' + $scope.draggableAttribute).css({ "display": "block", "color": "#000000!important" });
  542 + $('#blockans-' + $scope.a.split('-')[1]).css("background-color", "transparent !important");
  543 + }
  544 +
538 }); 545 });
539 } 546 }
540 } 547 }
@@ -567,21 +574,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -567,21 +574,13 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
567 $.each(Options, function (inx, value2) { 574 $.each(Options, function (inx, value2) {
568 if (Options[inx].BoxName == id.split('-')[1]) { 575 if (Options[inx].BoxName == id.split('-')[1]) {
569 if ($scope.DraggedList != null) { 576 if ($scope.DraggedList != null) {
570 - //$.each($scope.DraggedList, function (inx1, value3) {  
571 - // if ($scope.DraggedList[inx1].Value == dataText) {  
572 - // $scope.DraggedList.splice(inx1, 1);  
573 - // }  
574 - //});  
575 for (var i = 0; i <= $scope.DraggedList.length - 1; i++) { 577 for (var i = 0; i <= $scope.DraggedList.length - 1; i++) {
576 -  
577 if ($scope.DraggedList[i].Value == undefined) { 578 if ($scope.DraggedList[i].Value == undefined) {
578 i = 0; 579 i = 0;
579 continue; 580 continue;
580 } 581 }
581 -  
582 -  
583 - //if ($scope.DraggedList[i].Value == dataText) {  
584 - if ($scope.DraggedList[i].id == id.split('-')[1]) { 582 + if ($scope.DraggedList[i].DraggedAttr == $scope.draggableAttribute)
  583 + {
585 $scope.DraggedList.splice(i, 1); 584 $scope.DraggedList.splice(i, 1);
586 } 585 }
587 } 586 }
@@ -589,10 +588,29 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -589,10 +588,29 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
589 // $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); 588 // $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
590 //$scope.UserAttempt.push({ balnkBox: +$scope.dragableId.split('-')[1] }); 589 //$scope.UserAttempt.push({ balnkBox: +$scope.dragableId.split('-')[1] });
591 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] }); 590 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
592 - $scope.DraggedList.push({ "blockID": $scope.dragableId, "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord }); 591 + if ($scope.dragableId.split('-')[0] == 'block') {
  592 + $scope.DraggedList.push({ "DraggedAttr": $scope.dragableId, "blockID": $scope.dragableId, "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord });
  593 + }
  594 + else
  595 + {
  596 + $scope.DraggedList.push({ "DraggedAttr": $scope.draggableAttribute, "blockID": $scope.dragableId, "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord });
  597 + }
593 $('#' + $scope.dragableId).css("display", "none"); 598 $('#' + $scope.dragableId).css("display", "none");
594 $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important"); 599 $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important");
  600 + if ($scope.dragableId.split('-')[0] == 'block') {
  601 + $timeout(function () {
  602 + $('#blockans-' + id.split('-')[1]).attr("draggedAttr", $scope.dragableId);
  603 + }, 350);
  604 + }
  605 + else
  606 + {
  607 + $timeout(function () {
  608 + $('#blockans-' + id.split('-')[1]).attr("draggedAttr", $scope.draggableAttribute);
  609 + }, 350);
  610 + }
  611 + console.log($scope.DraggedList);
595 $scope.a = $scope.dragableId; 612 $scope.a = $scope.dragableId;
  613 +
596 } 614 }
597 }); 615 });
598 } 616 }
@@ -616,7 +634,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -616,7 +634,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
616 634
617 //alert(JSON.stringify($scope.UserAttempt)); 635 //alert(JSON.stringify($scope.UserAttempt));
618 $timeout(function () { 636 $timeout(function () {
619 - if ($scope.Title == "Complete the statements below.") { 637 + if ($("#textblock").css("display") == "block") {
620 $("#imgdiv").css("position", "static"); 638 $("#imgdiv").css("position", "static");
621 $("#imgdiv").find("div").each(function () { 639 $("#imgdiv").find("div").each(function () {
622 var answerDiv = $(this).attr("id").split("-"); 640 var answerDiv = $(this).attr("id").split("-");
@@ -759,6 +777,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -759,6 +777,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
759 $("#messageModal").modal('show'); 777 $("#messageModal").modal('show');
760 } 778 }
761 ) 779 )
  780 +
  781 +
762 }; 782 };
763 783
764 $scope.usersCorrectQuestData = []; 784 $scope.usersCorrectQuestData = [];
@@ -1071,21 +1091,33 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -1071,21 +1091,33 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1071 $('#' + blocks[j].id).css("display", "none"); 1091 $('#' + blocks[j].id).css("display", "none");
1072 break; 1092 break;
1073 } 1093 }
1074 - 1094 +
1075 }; 1095 };
1076 - 1096 +
1077 } 1097 }
1078 1098
1079 } 1099 }
1080 } 1100 }
1081 1101
1082 - else {  
1083 - var dragList = lastQuestionDetails[0].DragList;  
1084 - angular.forEach(dragList, function (v, k) {  
1085 - $('#' + v.blockID).css("display", "none");  
1086 - })  
1087 - } 1102 + }
  1103 + if (lastQuestionDetails != undefined && lastQuestionDetails.length > 0 && !isFromDB) {
  1104 + var dragList = lastQuestionDetails[0].DragList;
  1105 + var blocks = $("div[id*='block-']");
  1106 + angular.forEach(dragList, function (v, k) {
  1107 +
  1108 + for (var j = 0; j < blocks.length; j++) {
  1109 +
  1110 + if ((blocks[j].innerHTML).toString() == v.Value) {
  1111 + if ($('#' + blocks[j].id).css('display').toLowerCase() == 'block') {
  1112 + $('#' + blocks[j].id).css("display", "none");
  1113 + break;
  1114 + }
  1115 +
  1116 + };
1088 1117
  1118 + }
  1119 + //$('#' + v.blockID).css("display", "none");
  1120 + })
1089 } 1121 }
1090 var labQuestionData = new jinqJs() 1122 var labQuestionData = new jinqJs()
1091 .from($scope.LabExData.LabExercise[0].Questions) 1123 .from($scope.LabExData.LabExercise[0].Questions)
@@ -1104,13 +1136,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -1104,13 +1136,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1104 .where('OptionTitle == ' + value.text) 1136 .where('OptionTitle == ' + value.text)
1105 .select(); 1137 .select();
1106 1138
1107 - 1139 +
1108 var blockId = 'block-' + OptionList[0].OptionNumber; 1140 var blockId = 'block-' + OptionList[0].OptionNumber;
1109 if (OptionList != undefined && OptionList.length > 1 && blockIds.indexOf(blockId) != -1) { 1141 if (OptionList != undefined && OptionList.length > 1 && blockIds.indexOf(blockId) != -1) {
1110 blockId = 'block-' + OptionList[1].OptionNumber; 1142 blockId = 'block-' + OptionList[1].OptionNumber;
1111 } 1143 }
1112 blockIds.push(blockId); 1144 blockIds.push(blockId);
1113 - $scope.DraggedList.push({ "blockID": blockId, "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord }); 1145 + console.log($scope.draggedIDArray);
  1146 + $scope.DraggedList.push({ "DraggedAttr": blockId, "blockID": blockId, "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord });
1114 1147
1115 1148
1116 // $scope.DraggedList.push({ "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord }); 1149 // $scope.DraggedList.push({ "id": value.blockbox, "optionName": value.blockbox, "Value": value.text, "topcoord": questionOptionBox[0].topcoord, "leftcoord": questionOptionBox[0].leftcoord });
@@ -1120,7 +1153,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter, @@ -1120,7 +1153,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1120 1153
1121 1154
1122 $timeout(function () { 1155 $timeout(function () {
1123 - if ($scope.Title == "Complete the statements below.") { 1156 + if ($("#textblock").css("display") == "block") {
1124 $("#imgdiv").css("position", "static"); 1157 $("#imgdiv").css("position", "static");
1125 $("#imgdiv").find("div").each(function () { 1158 $("#imgdiv").find("div").each(function () {
1126 var answerDiv = $(this).attr("id").split("-"); 1159 var answerDiv = $(this).attr("id").split("-");
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -96,19 +96,41 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -96,19 +96,41 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
96 96
97 $scope.FilterByImage(1, $scope.query); 97 $scope.FilterByImage(1, $scope.query);
98 setTimeout(function () { 98 setTimeout(function () {
99 - if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {  
100 - $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');  
101 - }  
102 - if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") {  
103 - $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); 99 + if ($('#grid-view').css("display") == "block") {
  100 + if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
  101 + $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
  102 + }
  103 + if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") {
  104 +
  105 + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
  106 +
  107 + }
  108 + }
  109 + if ($('#list-view').css("display") == "block") {
104 110
105 - }  
106 - $rootScope.isLoading = false;  
107 - $('#spinner').css('visibility', 'hidden'); 111 + var AAListViewScroll = $rootScope.getLocalStorageValue("AAListViewScroll");
  112 + if (typeof (AAListViewScroll) !== "undefined" && AAListViewScroll !== null && AAListViewScroll !== '' && $location.url() == "/tile-view-list") {
  113 + if (typeof InstallTrigger !== 'undefined') {
  114 +
  115 + $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
  116 + }
  117 + else {
  118 +
  119 + $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
  120 + }
  121 + $("#list-view table tbody tr").removeClass("active");
  122 + $("#list-view table tbody #" + $rootScope.getLocalStorageValue("listViewSelectedID")).addClass("active");
  123 + }
  124 +
  125 + }
  126 +
  127 + $rootScope.isLoading = false;
  128 + $('#spinner').css('visibility', 'hidden');
108 }, 100); 129 }, 100);
109 130
110 131
111 }, 100); 132 }, 100);
  133 +
112 //console.log(JSON.stringify(result, null, 4)); 134 //console.log(JSON.stringify(result, null, 4));
113 }, 135 },
114 function (error) { 136 function (error) {
@@ -160,8 +182,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -160,8 +182,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
160 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved }); 182 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
161 //3. set opened module item ti 183 //3. set opened module item ti
162 localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]); 184 localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]);
163 - localStorage.setItem("AAGridViewScroll", $($window).scrollTop());  
164 - localStorage.setItem("AAGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id')); 185 + if ($('#grid-view').css("display") == "block") {
  186 + localStorage.setItem("AAGridViewScroll", $($window).scrollTop());
  187 + localStorage.setItem("AAGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id'));
  188 + }
165 189
166 //3. Navigate to the Module-item-view 190 //3. Navigate to the Module-item-view
167 var u = $location.url(); 191 var u = $location.url();
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 </div> 52 </div>
53 53
54 <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div> 54 <div ng-show="IsVisible" ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" class="droppable ui-droppable options" id="blockbox-{{optionbox.BoxName}}" ng-style="{'top':{{optionbox.topcoord}}, 'left':{{optionbox.leftcoord}},'position': 'absolute', 'width': '155px', 'height':'30px', 'border':'0px solid #333', 'background': '#E8E8E8' }">{{optionbox.Answervalue}}</div>
55 - <div draggable="true" ng-repeat="ans in DraggedList" droppable="true" class="droppable ui-droppable answerdroppable" id="blockans-{{ans.id}}" ng-style="{'top':{{ans.topcoord}}, 'left':{{ans.leftcoord}},'position': 'absolute', 'width': '158px', 'height':'30px', 'border':'0px solid #333', 'background': 'transparent','font-size': '12px','border-color':'#FF0000','padding-top':'4px','line-height':'1'}">{{ans.Value}}</div> 55 + <div draggable="true" ng-repeat="ans in DraggedList" droppable="true" class="droppable ui-droppable answerdroppable" id="blockans-{{ans.id}}" draggedattr="{{ans.DraggedAttr}}" ng-style="{'top':{{ans.topcoord}}, 'left':{{ans.leftcoord}},'position': 'absolute', 'width': '158px', 'height':'30px', 'border':'0px solid #333', 'background': 'transparent','font-size': '12px','border-color':'#FF0000','padding-top':'4px','line-height':'1'}">{{ans.Value}}</div>
56 </div> 56 </div>
57 57
58 <div class="col-sm-12" style=" margin-top: 20px; min-height:100px;" id="divoptions" droppable="true"> 58 <div class="col-sm-12" style=" margin-top: 20px; min-height:100px;" id="divoptions" droppable="true">
400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="main" > 3 <div class="main" >
4 <div id="siteloader" class="col-sm-12"> 4 <div id="siteloader" class="col-sm-12">
5 <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>--> 5 <!--<object style="width:100%; height:100%" type="text/html" data={{objdata}}></object>-->
6 - <object id="externalLink" ng-style="myObj" type="text/html" data={{objdata}}></object> 6 + <object id="externalLink" ng-style="myObj" type="text/html" ng-attr-data={{objdata}}></object>
7 <iframe style="width:100%;display:none" id="externalLinkiframe" ng-style="myObj" src=""></iframe> 7 <iframe style="width:100%;display:none" id="externalLinkiframe" ng-style="myObj" src=""></iframe>
8 8
9 9
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -168,8 +168,8 @@ @@ -168,8 +168,8 @@
168 <div class="custom-tooltip">Highlight Options</div> 168 <div class="custom-tooltip">Highlight Options</div>
169 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" ng-click="LoadBodySystemData($event)"><img src="content/images/icon-highlight.png" alt="" title=""></button> 169 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" ng-click="LoadBodySystemData($event)"><img src="content/images/icon-highlight.png" alt="" title=""></button>
170 <ul class="dropdown-menu" id="structureDropdown"> 170 <ul class="dropdown-menu" id="structureDropdown">
171 - <li ng-class="CurrentStructure" ><a href="#" title="Current Structure"  
172 - ng-click="removeBodySyetemSelectionClass('CurrentStructure')">Current Structure</a></li> 171 + <li ng-class="CurrentStructure" ><a href="#" title="Current Structure"
  172 + onclick="OnBodySystemSelection(event)">Current Structure</a></li>
173 173
174 174
175 <li role="separator" class="divider"></li> 175 <li role="separator" class="divider"></li>
400-SOURCECODE/AIAHTML5.Web/content/data/json/le/qz_dat_ss.json
@@ -147,10 +147,10 @@ @@ -147,10 +147,10 @@
147 "Title": "Drag the labels to the correct location on the image.", 147 "Title": "Drag the labels to the correct location on the image.",
148 "activityTitle": "Ear I", 148 "activityTitle": "Ear I",
149 "ImagePath":"", 149 "ImagePath":"",
150 - "OptionBox": [{"BoxName": "T1","topcoord":"-223","leftcoord":"382","Answervalue":"","QuizText":"The external, visible portion of the ear is known as the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true'></span> -----------------------------------&nbsp;<span> .</span>"},  
151 - {"BoxName": "T2","topcoord":"-183","leftcoord":"356","Answervalue":"","QuizText":"The region of the ear containing the ossicles is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"},  
152 - {"BoxName": "T3","topcoord":"-146","leftcoord":"550","Answervalue":"","QuizText":"The region of the ear containing the sense organs for hearing and balance is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"},  
153 - {"BoxName": "T4","topcoord":"-104","leftcoord":"452","Answervalue":"","QuizText":"The portion of the ear containing the receptors for hearing is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"}], 150 + "OptionBox": [{"BoxName": "T1","topcoord":"-223","leftcoord":"410","Answervalue":"","QuizText":"The external, visible portion of the ear is known as the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true'></span> -----------------------------------&nbsp;<span> .</span>"},
  151 + {"BoxName": "T2","topcoord":"-183","leftcoord":"388","Answervalue":"","QuizText":"The region of the ear containing the ossicles is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"},
  152 + {"BoxName": "T3","topcoord":"-146","leftcoord":"577","Answervalue":"","QuizText":"The region of the ear containing the sense organs for hearing and balance is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"},
  153 + {"BoxName": "T4","topcoord":"-104","leftcoord":"479","Answervalue":"","QuizText":"The portion of the ear containing the receptors for hearing is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp;<span> .</span>"}],
154 "Options": [{"OptionNumber": "A","OptionTitle": "auricle","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "middle","textalign":"bottom"}, 154 "Options": [{"OptionNumber": "A","OptionTitle": "auricle","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "middle","textalign":"bottom"},
155 {"OptionNumber": "C","OptionTitle": "internal","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "cochlea","textalign":"bottom"}], 155 {"OptionNumber": "C","OptionTitle": "internal","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "cochlea","textalign":"bottom"}],
156 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}] 156 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}]
@@ -159,11 +159,11 @@ @@ -159,11 +159,11 @@
159 "Title": "Drag the labels to the correct location on the image.", 159 "Title": "Drag the labels to the correct location on the image.",
160 "activityTitle": "Ear II", 160 "activityTitle": "Ear II",
161 "ImagePath":"", 161 "ImagePath":"",
162 - "OptionBox": [{"BoxName": "T1","topcoord":"-265","leftcoord":"473","Answervalue":"","QuizText":"The portion of the ear commonly referred to as the 'ear drum' is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>----------------------------------&nbsp;<span> .</span>"},  
163 - {"BoxName": "T2","topcoord":"-227","leftcoord":"500","Answervalue":"","QuizText":"The portion of the ear containing the receptors for dynamic balance is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>----------------------------------&nbsp;<span> .</span>"},  
164 - {"BoxName": "T3","topcoord":"-183","leftcoord":"40","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the malleus."},  
165 - {"BoxName": "T4","topcoord":"-143","leftcoord":"40","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the incus."},  
166 - {"BoxName": "T5","topcoord":"-103","leftcoord":"40","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T5' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the stapes."}], 162 + "OptionBox": [{"BoxName": "T1","topcoord":"-262","leftcoord":"500","Answervalue":"","QuizText":"The portion of the ear commonly referred to as the 'ear drum' is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>----------------------------------&nbsp;<span> .</span>"},
  163 + {"BoxName": "T2","topcoord":"-224","leftcoord":"540","Answervalue":"","QuizText":"The portion of the ear containing the receptors for dynamic balance is the <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>----------------------------------&nbsp;<span> .</span>"},
  164 + {"BoxName": "T3","topcoord":"-183","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the malleus."},
  165 + {"BoxName": "T4","topcoord":"-143","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the incus."},
  166 + {"BoxName": "T5","topcoord":"-103","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T5' droppable='true'></span>----------------------------------&nbsp;&nbsp; is the common name for the stapes."}],
167 "Options": [{"OptionNumber": "A","OptionTitle": "tympanic membrane","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "semicircular canal","textalign":"bottom"}, 167 "Options": [{"OptionNumber": "A","OptionTitle": "tympanic membrane","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "semicircular canal","textalign":"bottom"},
168 {"OptionNumber": "C","OptionTitle": "hammer","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "anvil","textalign":"bottom"}, 168 {"OptionNumber": "C","OptionTitle": "hammer","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "anvil","textalign":"bottom"},
169 {"OptionNumber": "E","OptionTitle": "stirrup","textalign":"bottom"}], 169 {"OptionNumber": "E","OptionTitle": "stirrup","textalign":"bottom"}],
400-SOURCECODE/AIAHTML5.Web/content/data/json/le/qz_dat_ur.json
@@ -96,10 +96,10 @@ @@ -96,10 +96,10 @@
96 "Title": "Complete the statements below.", 96 "Title": "Complete the statements below.",
97 "activityTitle": "Anatomy", 97 "activityTitle": "Anatomy",
98 "ImagePath":"", 98 "ImagePath":"",
99 - "OptionBox": [{"BoxName": "T1","topcoord":"-231","leftcoord":"-31","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>-----------------------------------&nbsp; connects the kidney to the bladder."},  
100 - {"BoxName": "T2","topcoord":"-189","leftcoord":"-31","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp; serves as a storage tank for urine."},  
101 - {"BoxName": "T3","topcoord":"-148","leftcoord":"-31","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp; drains the bladder of urination."},  
102 - {"BoxName": "T4","topcoord":"-107","leftcoord":"-31","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp; contains the nephrons responsible for filtering blood."}], 99 + "OptionBox": [{"BoxName": "T1","topcoord":"-224","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>-----------------------------------&nbsp; connects the kidney to the bladder."},
  100 + {"BoxName": "T2","topcoord":"-182","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp; serves as a storage tank for urine."},
  101 + {"BoxName": "T3","topcoord":"-142","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp; drains the bladder of urination."},
  102 + {"BoxName": "T4","topcoord":"-102","leftcoord":"80","Answervalue":"","QuizText":"The <span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp; contains the nephrons responsible for filtering blood."}],
103 "Options": [{"OptionNumber": "A","OptionTitle": "ureter","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "bladder","textalign":"bottom"}, 103 "Options": [{"OptionNumber": "A","OptionTitle": "ureter","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "bladder","textalign":"bottom"},
104 {"OptionNumber": "C","OptionTitle": "urethra","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "kidney","textalign":"bottom"}], 104 {"OptionNumber": "C","OptionTitle": "urethra","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "kidney","textalign":"bottom"}],
105 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}] 105 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}]
@@ -108,10 +108,10 @@ @@ -108,10 +108,10 @@
108 "Title": "Complete the statements below.", 108 "Title": "Complete the statements below.",
109 "activityTitle": "Urine I", 109 "activityTitle": "Urine I",
110 "ImagePath":"", 110 "ImagePath":"",
111 - "OptionBox": [{"BoxName": "T1","topcoord":"-231","leftcoord":"-59","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>-----------------------------------&nbsp; is a feeling when it is necessary to void the bladder of urine."},  
112 - {"BoxName": "T2","topcoord":"-189","leftcoord":"-59","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp; is the frequent voiding of small amounts of urine."},  
113 - {"BoxName": "T3","topcoord":"-148","leftcoord":"-59","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp; is a condition where the bladder is unable to expel urine."},  
114 - {"BoxName": "T4","topcoord":"-107","leftcoord":"-59","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp; is a condition when a person is unable to voluntarily control the external urethral sphincter."}], 111 + "OptionBox": [{"BoxName": "T1","topcoord":"-224","leftcoord":"50","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T1' droppable='true' ></span>-----------------------------------&nbsp; is a feeling when it is necessary to void the bladder of urine."},
  112 + {"BoxName": "T2","topcoord":"-182","leftcoord":"50","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T2' droppable='true'></span>-----------------------------------&nbsp; is the frequent voiding of small amounts of urine."},
  113 + {"BoxName": "T3","topcoord":"-142","leftcoord":"50","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T3' droppable='true'></span>-----------------------------------&nbsp; is a condition where the bladder is unable to expel urine."},
  114 + {"BoxName": "T4","topcoord":"-102","leftcoord":"50","Answervalue":"","QuizText":"<span style='position: absolute;border: 0px solid rgb(51, 51, 51); background: rgb(232, 232, 232);height:30px;width:160px;top:-6px;' id='blockbox-T4' droppable='true'></span>-----------------------------------&nbsp; is a condition when a person is unable to voluntarily control the external urethral sphincter."}],
115 "Options": [{"OptionNumber": "A","OptionTitle": "Urgency","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "Frequency","textalign":"bottom"}, 115 "Options": [{"OptionNumber": "A","OptionTitle": "Urgency","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "Frequency","textalign":"bottom"},
116 {"OptionNumber": "C","OptionTitle": "Retention","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "Incontinence","textalign":"bottom"}], 116 {"OptionNumber": "C","OptionTitle": "Retention","textalign":"bottom"},{"OptionNumber": "D","OptionTitle": "Incontinence","textalign":"bottom"}],
117 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}] 117 "correctResponse": [{"OptionBox": "T1","Answer": "A"},{"OptionBox": "T2","Answer": "B"},{"OptionBox": "T3","Answer": "C"},{"OptionBox": "T4","Answer": "D"}]