ADAM / AIAHTML5

Commit 785253ad480efcd060bc7ee10d1dde30dd62bada

Authored by Nikita Kulshreshtha
2 parents 49eebfac 7fc35df6

Manulal merge Merge Request #880

Inline Side-by-side
Showing 3 changed files with 107 additions and 89 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @785253a
... ... @@ -175,8 +175,10 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
175 175 $scope.Title = result.LabExercise[index].Questions[index1].Title;
176 176 $scope.Imagepath = keywords.labexercise + "/" + result.LabExercise[index].Questions[index1].ImagePath;
177 177 }
178   - $scope.ShowHideDiv(result.LabExercise[index].Questions[index1].Options[0].textalign);
179   -
  178 + //$scope.ShowHideDiv(result.LabExercise[index].Questions[index1].Options[0].textalign);
  179 +
  180 + $scope.ShowHideDiv("bottom");
  181 +
180 182 }
181 183 });
182 184 $timeout(function ()
... ... @@ -398,7 +400,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
398 400  
399 401  
400 402 $scope.handleDragStart = function (e) {
401   -
  403 +
402 404 this.style.opacity = '0.4';
403 405  
404 406 if ($.browser.msie) {
... ... @@ -410,6 +412,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
410 412 }
411 413  
412 414 $scope.dragableId = $(this).attr("Id");
  415 + $scope.a = $scope.dragableId;
  416 +
413 417 console.log($scope.dragableId);
414 418 $scope.dragableText = $("#" + $scope.dragableId).text();
415 419 // alert($("#" + $scope.dragableId).text());
... ... @@ -451,12 +455,13 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
451 455 };
452 456  
453 457 $scope.handleDrop = function (e) {
  458 +
454 459 e.preventDefault();
455 460 e.stopPropagation();
456 461 var x = $("#droppable").offset();
457 462  
458 463 var id = $(this).attr("id");
459   -
  464 +
460 465 // $scope.dragableText = $("#" + $scope.dragableId).text();
461 466  
462 467 //$rootScope.selectedDivArray.push({
... ... @@ -481,30 +486,27 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
481 486  
482 487 if (id == "divoptions" || id == "divleft" || id == "divright") {
483 488  
484   - var item = $('#' + $scope.dragableId).html();
485   - var rindex = $scope.DraggedList.indexOf(item);
  489 + $scope.item = $('#' + $scope.dragableId).html();
  490 + var rindex = $scope.DraggedList.indexOf($scope.item);
  491 + console.log($scope.DraggedList);
486 492 var labExerciseModulePath = '~/../content/data/json/le/' + keywords.labexercise + '.json';
487 493 DataService.getAnotherJson(labExerciseModulePath).then(
488 494 function (result) {
489   -
490 495 $.each(result.LabExercise, function (index, value) {
491 496 if (result.LabExercise[index].Slug == keywords.labexercise) {
492 497 $.each(result.LabExercise[index].Questions, function (index1, value1) {
493 498 if (result.LabExercise[index].Questions[index1].Number == $scope.quiznumber) {
494 499 var Options = result.LabExercise[index].Questions[index1].Options;
495   -
496   -
497 500 $.each(Options, function (inx, value2) {
498   - if (Options[inx].OptionTitle == item) {
  501 + if (Options[inx].OptionTitle == $scope.item) {
499 502 if ($scope.DraggedList != null) {
500 503 $.each($scope.DraggedList, function (inx1, value3) {
501 504 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
502   - //var balnkBox=id.split('-')[1];
503   - //$scope.UserAttempt.push({balnkBox :+ $scope.dragableId.split('-')[1] });
504   - if ($scope.DraggedList[inx1].Value == item) {
  505 + if ($scope.DraggedList[inx1].id == $scope.a.split('-')[1]) {
  506 + $scope.b = $scope.DraggedList[inx1].blockID;
505 507 $scope.DraggedList.splice(inx1, 1);
506   - $('#block-' + Options[inx].OptionNumber).css("display", "block");
507   - $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important");
  508 + $('#' + $scope.b).css({ "display": "block", "color": "#000000!important" });
  509 + $('#blockans-' + $scope.b.split('-')[1]).css("background-color","transparent !important");
508 510 }
509 511 });
510 512 }
... ... @@ -526,7 +528,6 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
526 528 $(this).each(function (key, value) {
527 529  
528 530 var droppedID = $(this).attr("id").split("-");
529   -
530 531 if (droppedID[0] == 'blockbox') {
531 532 var labExerciseModulePath = '~/../content/data/json/le/' + keywords.labexercise + '.json';
532 533 DataService.getAnotherJson(labExerciseModulePath).then(
... ... @@ -551,7 +552,9 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
551 552 continue;
552 553 }
553 554  
554   - if ($scope.DraggedList[i].Value == dataText) {
  555 +
  556 + //if ($scope.DraggedList[i].Value == dataText) {
  557 + if ($scope.DraggedList[i].id == id.split('-')[1]) {
555 558 $scope.DraggedList.splice(i, 1);
556 559 }
557 560 }
... ... @@ -559,10 +562,10 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
559 562 // $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
560 563 //$scope.UserAttempt.push({ balnkBox: +$scope.dragableId.split('-')[1] });
561 564 $scope.UserAttempt.push({ "BlankBoxName": id.split('-')[1], "OptionName": $scope.dragableId.split('-')[1] });
562   - $scope.DraggedList.push({ "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord });
  565 + $scope.DraggedList.push({ "blockID": $scope.dragableId, "id": id.split('-')[1], "optionName": id.split('-')[1], "Value": dataText, "topcoord": Options[inx].topcoord, "leftcoord": Options[inx].leftcoord });
563 566 $('#' + $scope.dragableId).css("display", "none");
564 567 $('#blockans-' + Options[inx].OptionNumber).css("background-color", "transparent !important");
565   -
  568 + $scope.a = $scope.dragableId;
566 569 }
567 570 });
568 571 }
... ... @@ -1051,7 +1054,22 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
1051 1054 $rootScope.isLoading = false;
1052 1055 $('#spinner').css('visibility', 'hidden');
1053 1056  
  1057 + if (lastQuestion == $scope.TotalNumberofQuiz) {
  1058 + if ($scope.isReviewBtnSelected == true) {
  1059 + $("#quizSubmitBtn").css("display", "none");
  1060 + }
  1061 + else {
  1062 + $("#quizSubmitBtn").css("display", "block");
  1063 + }
  1064 +
1054 1065 }
  1066 + else {
  1067 + $("#quizSubmitBtn").css("display", "none");
  1068 + }
  1069 +
  1070 + }
  1071 +
  1072 +
1055 1073  
1056 1074 }]
1057 1075  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
  View file @785253a
... ... @@ -5,7 +5,7 @@
5 5 <div class="" ng-init="InitializeLabExercise()">
6 6 <div class="col-sm-12 pageHeading" id="LabExPageHeading">
7 7 <!--<button type="button" class="btn btn-default pull-left toggleBar hidden-lg"> <i class="fa fa-bars"></i> </button>
8   - <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
  8 + <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>-->
9 9 <h4 class="pull-left">Lab Exercise - {{LabExerciseName}}</h4>
10 10 <div class="pull-right btn-group paddTop4"> <a href="#" class="btn btn-xs btn-default" ng-click="minLabExPanel()"><i class="fa fa-minus"></i></a> <a href="#" class="btn btn-xs btn-default"><i class="fa fa-clone"></i></a> <a href="lab-exercises" ng-click="IsVisible()" class="btn btn-xs btn-default"><i class="fa fa-close"></i></a> </div>
11 11 <div class="clearfix"></div>
... ... @@ -22,7 +22,7 @@
22 22  
23 23 <div class="container-fluid main-full">
24 24 <div class="row">
25   - <div class="panel panel-default" id="questionHtml">
  25 + <div class="panel panel-default" id="questionHtml" style="margin-bottom:0;">
26 26 <div class="col-xs-12 panel-heading">
27 27 <div class="col-xs-3" style="padding-left:5px;">
28 28 {{activityTitle}}
... ... @@ -38,34 +38,34 @@
38 38 <div ng-bind-html="deliberatelyTrustDangerousSnippet(optionbox.QuizText)"></div>
39 39 </div>
40 40 <!--<ul>
41   - <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
42   - </ul>-->
  41 + <li ng-repeat="optionbox in LabExerciseModules.OptionBox" droppable="true" ng-bind-html="'{{optionbox.QuizText}}' | to_trusted"></li>
  42 + </ul>-->
43 43 </div>
44 44 <div align="center" class="dragger">
45   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true">
46   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index:9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
47   - </div>
48   - <div class="col-sm-9">
49   - <div style="position: relative; margin-left: 85px;" id="imgdiv">
  45 + <!--<div class="col-sm-2" style="padding-top: 150px; height: 500px; " id="divleft" droppable="true">
  46 + <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'left'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index:9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
  47 + </div>-->
  48 + <div class="col-sm-12">
  49 + <div style="position: relative;" id="imgdiv">
50 50 <div id="imgblock">
51   - <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" ondragstart="return false;" imageonload />
  51 + <img id="droppable" ng-src="content/images/LE/{{Imagepath}}" alt="" ng-click="onClick()" ondragstart="return false;" imageonload />
52 52 </div>
53 53  
54 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 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':'5px'}">{{ans.Value}}</div>
56 56 </div>
57 57  
58   - <div class="col-sm-12" style="margin-left: 215px; margin-top: 10px; height:80px;" id="divoptions" droppable="true">
59   - <!--<div class="col-sm-3 col-lg-3 ui-draggable" >-->
60   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'bottom'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
61   - <!--</div>-->
  58 + <div class="col-sm-12" style=" margin-top: 20px; min-height:100px;" id="divoptions" droppable="true">
  59 + <!--<div class="col-sm-3 col-lg-3 ui-draggable" >-->
  60 + <div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'5px !important','float':'{{option.textalign}}'} " style="margin-bottom: 5px !important; width: 180px;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
62 61 </div>
63 62 </div>
64   - <div class="col-sm-1" style="padding-top: 150px; height: 500px; " id="divright" droppable="true">
65   - <div draggable="true" ng-repeat="option in LabExerciseModules.Options | filter:{'textalign':'right'}" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index: 9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
66   - </div>
67 63 </div>
  64 + <!--<div class="col-sm-12" style="padding-top: 15px;min-height:100px;" id="divright" droppable="true">
  65 + <div draggable="true" ng-repeat="option in LabExerciseModules.Options" ng-style="{'width': '150px', 'height':'40px','font-size':'8px;','valign':'middle','text-align':'center', 'vertical-align:middle','background-color': '#808080','margin':'10px !important','float':'{{option.textalign}}'} " style="margin-bottom: 10px !important; width: 180px; z-index: 9;" class="thumbnail caption col-sm-2 col-lg-3 ui-draggable marginR5 " id="block-{{option.OptionNumber}}">{{option.OptionTitle}}</div>
  66 + </div>-->
68 67 </div>
  68 +
69 69 <div class="panel-footer">
70 70 <div class="pull-left">
71 71 <!--<p>Question <strong>{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>-->
... ... @@ -85,74 +85,74 @@
85 85 </div>
86 86 <div class="clearfix"></div>
87 87 </div>
88   -
89 88 </div>
  89 + </div>
90 90  
91 91  
92   - <div class="panel panel-default" id="submitResultHtml" style="display:none;">
93   - <div class="panel-heading">
94   - <div class="row">
95   - <div class="col-sm-4 text-left"><strong>Cardiovascula System</strong></div>
96   - <div class="col-sm-4 text-center">Performace Report</div>
97   - <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
98   - </div>
  92 + <div class="panel panel-default" id="submitResultHtml" style="display:none;">
  93 + <div class="panel-heading">
  94 + <div class="row">
  95 + <div class="col-sm-4 text-left"><strong>Cardiovascula System</strong></div>
  96 + <div class="col-sm-4 text-center">Performace Report</div>
  97 + <div class="col-sm-4 text-right">Score:{{scoreResult}}% </div>
99 98 </div>
100   - <div class="panel-body no-padding">
101   - <div class="row">
102   - <div class="col-sm-12 table-responsive ">
103   - <table class="table table-hover table-condensed bg-white">
104   - <thead>
105   - <tr class="active">
106   - <th class="text-center">Total Question</th>
107   - <th class="text-center">Correct Answers</th>
108   - <th class="text-center">Incorrect Answers</th>
109   - </tr>
110   - </thead>
111   - <tbody>
112   - <tr class="text-center">
113   - <td>{{TotalNumberofQuiz}}</td>
114   - <td>{{CorrectAnswer}}</td>
115   - <td>{{inCorrectAnswer}}</td>
116   - </tr>
117   - </tbody>
118   - </table>
  99 + </div>
  100 + <div class="panel-body no-padding">
  101 + <div class="row">
  102 + <div class="col-sm-12 table-responsive ">
  103 + <table class="table table-hover table-condensed bg-white">
  104 + <thead>
  105 + <tr class="active">
  106 + <th class="text-center">Total Question</th>
  107 + <th class="text-center">Correct Answers</th>
  108 + <th class="text-center">Incorrect Answers</th>
  109 + </tr>
  110 + </thead>
  111 + <tbody>
  112 + <tr class="text-center">
  113 + <td>{{TotalNumberofQuiz}}</td>
  114 + <td>{{CorrectAnswer}}</td>
  115 + <td>{{inCorrectAnswer}}</td>
  116 + </tr>
  117 + </tbody>
  118 + </table>
119 119  
120   - </div>
121   - <div class="col-sm-12 table-responsive">
122   - <table class="table table-hover table-condensed bg-white">
123   - <thead>
124   - <tr class="active">
125   - <th>Question</th>
126   - <th>Activity Title</th>
127   - <th>Status</th>
128   - <th>Action</th>
129   - </tr>
130   - </thead>
131   - <tbody id="resultLabData"></tbody>
132   - </table>
133   - </div>
134 120 </div>
135   - </div>
136   - <div class="panel-footer">
137   - <div class="text-center">
138   - <button class="btn btn-sm btn-primary">
139   - Email
140   - </button>
141   -
  121 + <div class="col-sm-12 table-responsive">
  122 + <table class="table table-hover table-condensed bg-white">
  123 + <thead>
  124 + <tr class="active">
  125 + <th>Question</th>
  126 + <th>Activity Title</th>
  127 + <th>Status</th>
  128 + <th>Action</th>
  129 + </tr>
  130 + </thead>
  131 + <tbody id="resultLabData"></tbody>
  132 + </table>
142 133 </div>
143   - <div class="clearfix"></div>
144 134 </div>
145   -
146 135 </div>
  136 + <div class="panel-footer">
  137 + <div class="text-center">
  138 + <button class="btn btn-sm btn-primary">
  139 + Email
  140 + </button>
147 141  
  142 + </div>
  143 + <div class="clearfix"></div>
  144 + </div>
148 145  
149 146 </div>
  147 +
  148 +
150 149 </div>
151 150 </div>
  151 + </div>
152 152  
153 153  
154 154  
155   - </div>
  155 +</div>
156 156 </div>
157 157  
158 158  
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/le/qz_dat_ca.json
  View file @785253a
... ... @@ -10,8 +10,8 @@
10 10 "Title": "Drag the labels to the correct location on the image.",
11 11 "activityTitle": "Heart & Great Vessels I",
12 12 "ImagePath":"CS-01.JPG",
13   - "OptionBox": [{"BoxName": "T1","topcoord":"121","leftcoord":"23","Answervalue":"","QuizText":""},{"BoxName": "T3","topcoord":"112","leftcoord":"960","Answervalue":"","QuizText":""},
14   - {"BoxName": "T4","topcoord":"194","leftcoord":"23","Answervalue":"","QuizText":""},{"BoxName": "T5","topcoord":"168","leftcoord":"960","Answervalue":"","QuizText":""},
  13 + "OptionBox": [{"BoxName": "T1","topcoord":"121","leftcoord":"23","Answervalue":"","QuizText":""},{"BoxName": "T4","topcoord":"112","leftcoord":"960","Answervalue":"","QuizText":""},
  14 + {"BoxName": "T2","topcoord":"194","leftcoord":"23","Answervalue":"","QuizText":""},{"BoxName": "T5","topcoord":"168","leftcoord":"960","Answervalue":"","QuizText":""},
15 15 {"BoxName": "T3","topcoord":"252","leftcoord":"23","Answervalue":"","QuizText":""},{"BoxName": "T6","topcoord":"210","leftcoord":"960","Answervalue":"","QuizText":""},
16 16 {"BoxName": "T7","topcoord":"250","leftcoord":"960","Answervalue":"","QuizText":""},{"BoxName": "T8","topcoord":"292","leftcoord":"960","Answervalue":"","QuizText":""}],
17 17 "Options": [{"OptionNumber": "A","OptionTitle": "Right brachiocephalic vein","textalign":"bottom"},{"OptionNumber": "B","OptionTitle": "Brachiocephalic artery","textalign":"bottom"},
... ...