Merge branch 'Bug#22485' of http://52.6.196.163/ADAM/AIAHTML5 into QA

# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html

Merge branch 'Bug#22485' of http://52.6.196.163/ADAM/AIAHTML5 into QA
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
Amrita Vishnoi
2 parents 2d48ba4c 08947e16
Showing 3 changed files with 65 additions and 38 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
 'use strict';
-AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService", "TermService", "AIAConstants",
-    function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService,AIAConstants) {
+AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService","AIAConstants",
+    function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService, AIAConstants) {
     $scope.genderId = "";
@@ -2645,11 +2645,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     }
-                    if ($scope.layerNumber == 224)
-                    {
-                    }
-                    else {
-
+                   
                         var worker = new Worker('term-number-wp.js');
                         //push workers in array to further used the refernece to delete the workers
@@ -2799,7 +2795,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         worker.onerror = function (e) {
                             alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
                         };
-                    }
+                    
                 }
             }
         }, 100)
@@ -2809,6 +2805,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.HighlightBodyByTermListForBodySystem = function (TermList) {
+   //disable the background till the system gets highlighted.     
+       document.getElementById("daView").style.pointerEvents="none";
+
         $("#btnTranparency").attr('disabled', 'disabled');
         $scope.currentLayerNumber = $scope.layerNumber;
@@ -2859,6 +2858,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                            $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
                            $("#daMessageModal").modal('show');
+
+                           $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
+                           $("#daMessageModal").modal('show');
+                           document.getElementById("daView").style.pointerEvents = "auto";
+
                        }
                        else {
                            console.log('1. HighlightBodyByTermListForBodySystem is called');
@@ -3033,6 +3037,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                                    $('#spinner').css('visibility', 'hidden')
                                                    $rootScope.isLoading = false;
+                                                   
+                                                   document.getElementById("daView").style.pointerEvents = "auto";
+
                                                    prevBRID = TermExistInBodyRegionId;
                                                })
@@ -3042,6 +3049,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                    else {
                                        $('#spinner').css('visibility', 'hidden')
                                        $rootScope.isLoading = false;
+                                       document.getElementById("daView").style.pointerEvents = "auto";
+
                                    }
                                })
@@ -335,7 +335,8 @@ AIA.constant(&quot;AdminConstants&quot;, {
     "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
     "MAIL_SENT": "Mail sent.",
     "MAIL_NOT_SENT": "Mail not sent.",
-    "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon."
+    "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon.",
+   
 })
 AIA.constant("UserTypeConstants", {
     "SUPER_ADMIN": "Super Admin",
@@ -425,7 +426,10 @@ AIA.constant(&quot;UserModules&quot;, [
         "slug": "Link/aod"
     }
 ]);
+AIA.constant("AIAConstants", {
+    "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.",
+})
 AIA.config(function ($routeProvider, pages, $locationProvider) {
     $locationProvider.html5Mode(true);
@@ -169,17 +169,17 @@
                         <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
                         <li role="separator" class="divider"></li>
                         <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
-            <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
-            <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
-            <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
-            <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
-            <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
-            <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
-            <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
-            <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
-            <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
-            <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
-            <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
+                        <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
+                        <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
+                        <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
+                        <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
+                        <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
+                        <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
+                        <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
+                        <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
+                        <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
+                        <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
+                        <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
                         <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" onclick="OnBodySystemSelection(event)">Cardiovascular</a></li>
                         <li ng-class="Digestive"><a href="#" title="Digestive" id="2" onclick="OnBodySystemSelection(event)">Digestive</a></li>
@@ -212,7 +212,7 @@
                             <a href="#" title="Female" onclick="OnGenderChange(event)">Female</a>
                             <!--<a href="javascript:void(0)" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
-                <li ng-class="female"><a href="javascript:void(0)" title="Female" ng-click="OnGenderChange($event)">Female</a></li>-->
+                            <li ng-class="female"><a href="javascript:void(0)" title="Female" ng-click="OnGenderChange($event)">Female</a></li>-->
                         </li>
                     </ul>
                 </div>
@@ -222,11 +222,11 @@
                     <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="content/images/view.png" alt="" title=""></button>
                     <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
                         <!--<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>
-            <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
-            <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
-            <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
-            <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>-->
+                        <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
+                        <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
+                        <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
+                        <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
+                        <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>-->
                         <li ng-class="AnteriorView"><a href="#" title="Anterior" onclick="OnViewChange(event)">Anterior</a></li>
                         <li ng-class="LateralView"><a href="#" title="Lateral" onclick="OnViewChange(event)">Lateral</a></li>
@@ -242,20 +242,20 @@
                 <button id="btnStrutureBox" onclick="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
             </div>
-            </div>
+        </div>
         <div class="">
             <!--'x' button is displaying inside the input box in IE browser.-->
             <div style="width:80px;margin:10px 0 0 15px;display:inline-block;">
-               
-                    <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keyup="LayerValueChangeBasedOnKeyUp($event)" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;text-align:center;">
-                
-               
+
+                <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keyup="LayerValueChangeBasedOnKeyUp($event)" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;text-align:center;">
+
+
             </div>
-            
+
             <!--<p>
                 <input class="item" type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" ng-click="LayerChangeOnMouseUpDown($event)" />
             </p>-->
@@ -273,13 +273,13 @@
                         <div id="backdrop" ng-show="IsSearchVisible">
                             <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
-                       
+
                             </div>
                         </div>
-                     
+
                     </div>
                     <div class="btn-group">
-            
+
                         <button type="button" id="btnDATermSearch" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-success btn-sm" ng-mousedown="OnSearchBtnClick($event)">
                             <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
                         </button>
@@ -291,8 +291,8 @@
                         <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
                             <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
-                                <img id="navimg" alt=""/>
-                                <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()" >
+                                <img id="navimg" alt="" />
+                                <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()">
                                 </div>
                             </div>
@@ -409,9 +409,23 @@
     </div>
-</div>
+    <div class="modal fade" id="daMessageModal" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <!--<div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
+                </div>
+                <div class="modal-title"></div>-->
+                <!--<div class="modal-body">"No body system"</div>-->
+                <div class="modal-body" data-ng-bind="message"></div>
+
+                <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
+            </div>
+        </div>
+    </div>
+</div>
 <!--<script src="../../../libs/jquery/1.11.4/jquery-ui.js"></script>-->
 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>