fixed merging issues

Nikita Kulshreshtha
1 parent 8ac9b026
Showing 8 changed files with 33 additions and 20 deletions
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/LabExerc/lab-exercises-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -41,7 +41,7 @@ namespace AIAHTML5.API.Constants
         public const string FORGOT_USERID_EMAIL_SUBJECT = "UserID recovery mail for:";
         public const string FORGOT_PASSWORD_EMAIL_SUBJECT = "Password recovery mail for:";
         public const string UNBLOCK_USER_EMAIL_SUBJECT = "Unblock user request mail for:";
-        public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved successfully.";
+        public const string LAB_EXERCISE_SAVE_SUCCESS = "Your lab exercise attempt is saved.";
         public const string LAB_EXERCISE_SAVE_FAILURE = "We are unable to save your lab exercise attempt, please try again.";
         public const string SAVED_LAB_EXERCISE_NOT_FOUND = "Saved Lab Exercise not found.";
     }
@@ -8486,7 +8486,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         //body highlight options functinality
-        $scope.LoadBodySystemData = function () {
+        $scope.LoadBodySystemData = function (event) {
             event.stopPropagation();
             $("#structureDropdown").toggle();
             $("#genderChangeId").css("display", "none");
@@ -9914,7 +9914,7 @@ function onListManagerTermSelection(id, isTermListOptionClicked) {
 }
-function genderChange(){
+function genderChange(event) {
     event.stopPropagation();
     $("#structureDropdown").css("display", "none");
     $("#viewID").css("display", "none");
@@ -9926,7 +9926,7 @@ function genderChange(){
 }
-function viewChange() {
+function viewChange(event) {
     event.stopPropagation();
     $("#structureDropdown").css("display", "none");
     $("#genderChangeId").css("display", "none");
@@ -400,7 +400,8 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.handleDragStart = function (e) {
         this.style.opacity = '0.4';
-        if ($.browser.msie) {
+        var $ua = navigator.userAgent;
+        if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) {
             localStorage.setItem("text", this.innerHTML);
         }
         else
@@ -425,7 +426,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                        .where('OptionTitle == ' + optionText)
                        .select();
             var option = optionData[0].OptionNumber;
-            $scope.dragableId = optionText + '-' + option;
+           // $scope.dragableId = optionText + '-' + option;
         }
         //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, 
         //console.log($rootScope.selectedDivArray);
         var keywords = $location.search();
-        if ($.browser.msie) {
+        var $ua = navigator.userAgent;
+        if ($.browser.msie || ($ua.match(/(iPod|iPhone|iPad|android)/i))) {
             dataText = localStorage.getItem("text");
             localStorage.setItem("text", '');
         }
@@ -521,7 +523,6 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
             )
         }
         else {
-            if ($(this).css('background-color') == 'rgb(232, 232, 232)') {
                 var labExerciseModulePath = '~/../content/data/json/le/' + keywords.labexercise + '.json';
                 DataService.getAnotherJson(labExerciseModulePath).then(
                 function (result) {
@@ -560,7 +561,7 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
                     console.log(error.statusText)
                 }
                 )
-            }
+            
         }
         $scope.$apply();
@@ -572,14 +573,14 @@ function ($scope, $rootScope, pages, log, $http,$timeout, DataService, $filter, 
     $scope.minLabExPanel = function () {
-        $("#labExPanel").css("display", "none");
+        $("#questionHtml").css("display", "none");
         $("#LabExPageHeading").css("display", "none");
         $("#LabExMinimizedId").css("display", "block");
     }
     $scope.maxLabExPanel = function () {
-        $("#labExPanel").css("display", "block");
+        $("#questionHtml").css("display", "block");
         $("#LabExPageHeading").css("display", "block");
         $("#LabExMinimizedId").css("display", "none");
@@ -1043,6 +1044,9 @@ AIA.directive(&#39;draggable&#39;, function () {
         link: function ($scope, element, attrs) {
             element[0].addEventListener('dragstart', $scope.handleDragStart, false);
             element[0].addEventListener('dragend', $scope.handleDragEnd, false);
+
+           element[0].addEventListener('touchstart', $scope.handleDragStart, false);
+           element[0].addEventListener('touchend', $scope.handleDragEnd, false);
         }
     }
 });
@@ -1052,6 +1056,9 @@ AIA.directive(&#39;droppable&#39;, function () {
         link: function ($scope, element, attrs) {
             element[0].addEventListener('drop', $scope.handleDrop, false);
             element[0].addEventListener('dragover', $scope.handleDragOver, false);
+
+            element[0].addEventListener('touchmove', $scope.handleDragOver, false);
+            element[0].addEventListener('touchend', $scope.handleDrop, false);
         }
     }
 });
@@ -2155,7 +2155,7 @@ function onZoom(scope) {
 }
-function systemChange() {
+function systemChange(event) {
     event.stopPropagation();
     $("#bodySystemList").toggle();
     var $ua = navigator.userAgent;
@@ -23,10 +23,13 @@
             <div class="container-fluid main-full">
                 <div class="row">
                     <div class="panel panel-default" id="questionHtml">
-                        <div class="panel-heading">
-                            {{activityTitle}}<p style="margin:-20px 474px -1px;" class="text-primary">{{Title}}</p>
-                            <div class="pull-right" style="margin: -20px 20px;">
-                                <p>Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}</p>
+                        <div class="col-xs-12 panel-heading">
+                            <div class="col-xs-3" style="padding-left:5px;">
+                                {{activityTitle}}
+                            </div>
+                            <div class="col-xs-6 text-primary text-center">{{Title}}</div>
+                            <div class="text-right col-xs-3" style="padding-right:5px;">
+                                Question <strong id="quizNo">{{quiznumber}}</strong> of {{TotalNumberofQuiz}}
                             </div>
                         </div>
                         <div class="panel-body" style="padding:2px;overflow:scroll">
@@ -76,7 +76,7 @@
             <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>
             <div class="col-sm-6">
                 <div class="custom-tooltip">Select System</div>
-                <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" onclick="systemChange()"></button>
+                <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" onclick="systemChange(event)"></button>
                 <ul class="dropdown-menu" id="bodySystemList">
                     <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li>
                     <li role="separator" class="divider"></li>
@@ -166,7 +166,7 @@
                 <div class="col-xs-6 dropdown hover-tool">
                     <div class="custom-tooltip">Highlight Options</div>
-                    <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>
+                    <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>
                     <ul class="dropdown-menu" id="structureDropdown">
                         <li ng-class="CurrentStructure" ><a href="#" title="Current Structure" 
                     ng-click="removeBodySyetemSelectionClass('CurrentStructure')">Current Structure</a></li>
@@ -205,7 +205,7 @@
             <div class="col-xs-12 pad0">
                 <div class="col-xs-6 hover-gender-tool" ng-init="switchGender()">
                     <div class=" custom-tooltip1">Gender</div>
-                    <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" onclick="genderChange()"> <i class=" fa fa-intersex font16"></i></button>
+                    <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>
                     <ul class="dropdown-menu" id="genderChangeId">
                         <li ng-class="male">
                             <!--<button type="button" id="btnMale" onclick="OnGenderChange('Male')" class="btn btn-link" >Male</button>-->
@@ -224,7 +224,7 @@
                 <div class="col-xs-6 tooltip-View-custom">
                     <div class="custom-tooltip2">View</div>
-                    <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>
+                    <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>
                     <ul class="dropdown-menu" id="viewID">
                         <!--<li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
                         <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
@@ -1254,6 +1254,9 @@
                                 <div class="form-group" id="moduleDiv9">
                                     <div class="col-sm-8">• IP 10</div>
                                 </div>
+                                <div class="form-group" id="moduleDiv10">
+                                    <div class="col-sm-8">• Lab Exercise</div>
+                                </div>
                                 <div class="form-group" id="moduleDiv11">
                                     <div class="col-sm-8">• In - Depth Reports</div>
                                 </div>