ADAM / AIAHTML5

Commit e83630d0286efc3bbde7e697c52adb93ad8486a3

Authored by Nikita Kulshreshtha
1 parent 8ac9b026

fixed merging issues

Inline Side-by-side
Showing 8 changed files with 33 additions and 20 deletions
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
  View file @e83630d
... ... @@ -41,7 +41,7 @@ namespace AIAHTML5.API.Constants
41 41 public const string FORGOT_USERID_EMAIL_SUBJECT = "UserID recovery mail for:";
42 42 public const string FORGOT_PASSWORD_EMAIL_SUBJECT = "Password recovery mail for:";
43 43 public const string UNBLOCK_USER_EMAIL_SUBJECT = "Unblock user request mail for:";
44   - public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved successfully.";
  44 + public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved.";
45 45 public const string LAB_EXERCISE_SAVE_FAILURE = "We are unable to save your lab exercise attempt, please try again.";
46 46 public const string SAVED_LAB_EXERCISE_NOT_FOUND = "Saved Lab Exercise not found.";
47 47 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e83630d
... ... @@ -8486,7 +8486,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8486 8486  
8487 8487  
8488 8488 //body highlight options functinality
8489   - $scope.LoadBodySystemData = function () {
  8489 + $scope.LoadBodySystemData = function (event) {
8490 8490 event.stopPropagation();
8491 8491 $("#structureDropdown").toggle();
8492 8492 $("#genderChangeId").css("display", "none");
... ... @@ -9914,7 +9914,7 @@ function onListManagerTermSelection(id, isTermListOptionClicked) {
9914 9914  
9915 9915 }
9916 9916  
9917   -function genderChange(){
  9917 +function genderChange(event) {
9918 9918 event.stopPropagation();
9919 9919 $("#structureDropdown").css("display", "none");
9920 9920 $("#viewID").css("display", "none");
... ... @@ -9926,7 +9926,7 @@ function genderChange(){
9926 9926 }
9927 9927  
9928 9928  
9929   -function viewChange() {
  9929 +function viewChange(event) {
9930 9930 event.stopPropagation();
9931 9931 $("#structureDropdown").css("display", "none");
9932 9932 $("#genderChangeId").css("display", "none");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @e83630d
... ... @@ -400,7 +400,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
400 400 $scope.handleDragStart = function (e) {
401 401  
402 402 this.style.opacity = '0.4';
403   - if ($.browser.msie) {
  403 + var $ua = navigator.userAgent;
  404 + if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) {
404 405 localStorage.setItem("text", this.innerHTML);
405 406 }
406 407 else
... ... @@ -425,7 +426,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
425 426 .where('OptionTitle == ' + optionText)
426 427 .select();
427 428 var option = optionData[0].OptionNumber;
428   - $scope.dragableId = optionText + '-' + option;
  429 + // $scope.dragableId = optionText + '-' + option;
429 430 }
430 431  
431 432 //if user drag already selected answer from one blankbox to another than it gets id of blank box so need to get answer
... ... @@ -469,7 +470,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
469 470 //console.log($rootScope.selectedDivArray);
470 471  
471 472 var keywords = $location.search();
472   - if ($.browser.msie) {
  473 + var $ua = navigator.userAgent;
  474 + if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) {
473 475 dataText = localStorage.getItem("text");
474 476 localStorage.setItem("text", '');
475 477 }
... ... @@ -521,7 +523,6 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
521 523 )
522 524 }
523 525 else {
524   - if ($(this).css('background-color') == 'rgb(232, 232, 232)') {
525 526 var labExerciseModulePath = '~/../content/data/json/le/' + keywords.labexercise + '.json';
526 527 DataService.getAnotherJson(labExerciseModulePath).then(
527 528 function (result) {
... ... @@ -560,7 +561,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
560 561 console.log(error.statusText)
561 562 }
562 563 )
563   - }
  564 +
564 565 }
565 566 $scope.$apply();
566 567  
... ... @@ -572,14 +573,14 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter,
572 573  
573 574  
574 575 $scope.minLabExPanel = function () {
575   - $("#labExPanel").css("display", "none");
  576 + $("#questionHtml").css("display", "none");
576 577 $("#LabExPageHeading").css("display", "none");
577 578 $("#LabExMinimizedId").css("display", "block");
578 579  
579 580  
580 581 }
581 582 $scope.maxLabExPanel = function () {
582   - $("#labExPanel").css("display", "block");
  583 + $("#questionHtml").css("display", "block");
583 584 $("#LabExPageHeading").css("display", "block");
584 585 $("#LabExMinimizedId").css("display", "none");
585 586  
... ... @@ -1043,6 +1044,9 @@ AIA.directive('draggable', function () {
1043 1044 link: function ($scope, element, attrs) {
1044 1045 element[0].addEventListener('dragstart', $scope.handleDragStart, false);
1045 1046 element[0].addEventListener('dragend', $scope.handleDragEnd, false);
  1047 +
  1048 + element[0].addEventListener('touchstart', $scope.handleDragStart, false);
  1049 + element[0].addEventListener('touchend', $scope.handleDragEnd, false);
1046 1050 }
1047 1051 }
1048 1052 });
... ... @@ -1052,6 +1056,9 @@ AIA.directive('droppable', function () {
1052 1056 link: function ($scope, element, attrs) {
1053 1057 element[0].addEventListener('drop', $scope.handleDrop, false);
1054 1058 element[0].addEventListener('dragover', $scope.handleDragOver, false);
  1059 +
  1060 + element[0].addEventListener('touchmove', $scope.handleDragOver, false);
  1061 + element[0].addEventListener('touchend', $scope.handleDrop, false);
1055 1062 }
1056 1063 }
1057 1064 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @e83630d
... ... @@ -2155,7 +2155,7 @@ function onZoom(scope) {
2155 2155 }
2156 2156  
2157 2157  
2158   -function systemChange() {
  2158 +function systemChange(event) {
2159 2159 event.stopPropagation();
2160 2160 $("#bodySystemList").toggle();
2161 2161 var $ua = navigator.userAgent;
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
  View file @e83630d
... ... @@ -23,10 +23,13 @@
23 23 <div class="container-fluid main-full">
24 24 <div class="row">
25 25 <div class="panel panel-default" id="questionHtml">
26   - <div class="panel-heading">
27   - {{activityTitle}}<p style="margin:-20px 474px -1px;" class="text-primary">{{Title}}</p>
28   - <div class="pull-right" style="margin: -20px 20px;">
29   - <p>Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>
  26 + <div class="col-xs-12 panel-heading">
  27 + <div class="col-xs-3" style="padding-left:5px;">
  28 + {{activityTitle}}
  29 + </div>
  30 + <div class="col-xs-6 text-primary text-center">{{Title}}</div>
  31 + <div class="text-right col-xs-3" style="padding-right:5px;">
  32 + Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}
30 33 </div>
31 34 </div>
32 35 <div class="panel-body" style="padding:2px;overflow:scroll">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @e83630d
... ... @@ -76,7 +76,7 @@
76 76 <div class="col-sm-6"><button class="btn btn-primary btn-sm marginTop5 tooltip-custom" id="allPinBtn" onclick="showAllPins(event)" data-toggle="tooltip" data-placement="bottom" title="Show All Pins in System(s)"></button></div>
77 77 <div class="col-sm-6">
78 78 <div class="custom-tooltip">Select System</div>
79   - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" onclick="systemChange()"></button>
  79 + <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" onclick="systemChange(event)"></button>
80 80 <ul class="dropdown-menu" id="bodySystemList">
81 81 <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li>
82 82 <li role="separator" class="divider"></li>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @e83630d
... ... @@ -166,7 +166,7 @@
166 166  
167 167 <div class="col-xs-6 dropdown hover-tool">
168 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()"><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 170 <ul class="dropdown-menu" id="structureDropdown">
171 171 <li ng-class="CurrentStructure" ><a href="#" title="Current Structure"
172 172 ng-click="removeBodySyetemSelectionClass('CurrentStructure')">Current Structure</a></li>
... ... @@ -205,7 +205,7 @@
205 205 <div class="col-xs-12 pad0">
206 206 <div class="col-xs-6 hover-gender-tool" ng-init="switchGender()">
207 207 <div class=" custom-tooltip1">Gender</div>
208   - <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" onclick="genderChange()"> <i class=" fa fa-intersex font16"></i></button>
  208 + <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" onclick="genderChange(event)"> <i class=" fa fa-intersex font16"></i></button>
209 209 <ul class="dropdown-menu" id="genderChangeId">
210 210 <li ng-class="male">
211 211 <!--<button type="button" id="btnMale" onclick="OnGenderChange('Male')" class="btn btn-link" >Male</button>-->
... ... @@ -224,7 +224,7 @@
224 224  
225 225 <div class="col-xs-6 tooltip-View-custom">
226 226 <div class="custom-tooltip2">View</div>
227   - <button class="btn btn-black btn-sm pull-right marginTop5" type="button" id="dropdownMenu3" onclick="viewChange()"><img src="content/images/view.png" alt="" title=""></button>
  227 + <button class="btn btn-black btn-sm pull-right marginTop5" type="button" id="dropdownMenu3" onclick="viewChange(event)"><img src="content/images/view.png" alt="" title=""></button>
228 228 <ul class="dropdown-menu" id="viewID">
229 229 <!--<li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
230 230 <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @e83630d
... ... @@ -1254,6 +1254,9 @@
1254 1254 <div class="form-group" id="moduleDiv9">
1255 1255 <div class="col-sm-8">• IP 10</div>
1256 1256 </div>
  1257 + <div class="form-group" id="moduleDiv10">
  1258 + <div class="col-sm-8">• Lab Exercise</div>
  1259 + </div>
1257 1260 <div class="form-group" id="moduleDiv11">
1258 1261 <div class="col-sm-8">• In - Depth Reports</div>
1259 1262 </div>
... ...