ADAM / AIAHTML5

Commit dec5c774bf7407a7caa45d615c40fabf5ec982c3

Authored by Amrita Vishnoi
2 parents 2d48ba4c 08947e16

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
Inline Side-by-side
Showing 3 changed files with 65 additions and 38 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @dec5c77
1 1 
2 2 'use strict';
3 3  
4   -AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService", "TermService", "AIAConstants",
5   - function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService,AIAConstants) {
  4 +AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService","AIAConstants",
  5 + function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService, AIAConstants) {
6 6  
7 7  
8 8 $scope.genderId = "";
... ... @@ -2645,11 +2645,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2645 2645  
2646 2646 }
2647 2647  
2648   - if ($scope.layerNumber == 224)
2649   - {
2650   - }
2651   - else {
2652   -
  2648 +
2653 2649 var worker = new Worker('term-number-wp.js');
2654 2650  
2655 2651 //push workers in array to further used the refernece to delete the workers
... ... @@ -2799,7 +2795,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2799 2795 worker.onerror = function (e) {
2800 2796 alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message);
2801 2797 };
2802   - }
  2798 +
2803 2799 }
2804 2800 }
2805 2801 }, 100)
... ... @@ -2809,6 +2805,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2809 2805  
2810 2806 $scope.HighlightBodyByTermListForBodySystem = function (TermList) {
2811 2807  
  2808 + //disable the background till the system gets highlighted.
  2809 + document.getElementById("daView").style.pointerEvents="none";
  2810 +
2812 2811 $("#btnTranparency").attr('disabled', 'disabled');
2813 2812 $scope.currentLayerNumber = $scope.layerNumber;
2814 2813  
... ... @@ -2859,6 +2858,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2859 2858 $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
2860 2859 $("#daMessageModal").modal('show');
2861 2860  
  2861 +
  2862 + $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
  2863 + $("#daMessageModal").modal('show');
  2864 + document.getElementById("daView").style.pointerEvents = "auto";
  2865 +
2862 2866 }
2863 2867 else {
2864 2868 console.log('1. HighlightBodyByTermListForBodySystem is called');
... ... @@ -3033,6 +3037,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3033 3037  
3034 3038 $('#spinner').css('visibility', 'hidden')
3035 3039 $rootScope.isLoading = false;
  3040 +
  3041 + document.getElementById("daView").style.pointerEvents = "auto";
  3042 +
3036 3043  
3037 3044 prevBRID = TermExistInBodyRegionId;
3038 3045 })
... ... @@ -3042,6 +3049,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3042 3049 else {
3043 3050 $('#spinner').css('visibility', 'hidden')
3044 3051 $rootScope.isLoading = false;
  3052 + document.getElementById("daView").style.pointerEvents = "auto";
  3053 +
3045 3054 }
3046 3055  
3047 3056 })
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @dec5c77
... ... @@ -335,7 +335,8 @@ AIA.constant("AdminConstants", {
335 335 "ERROR_IN_SENDING_MAIL": "Some internal error occured.",
336 336 "MAIL_SENT": "Mail sent.",
337 337 "MAIL_NOT_SENT": "Mail not sent.",
338   - "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon."
  338 + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon.",
  339 +
339 340 })
340 341 AIA.constant("UserTypeConstants", {
341 342 "SUPER_ADMIN": "Super Admin",
... ... @@ -425,7 +426,10 @@ AIA.constant("UserModules", [
425 426 "slug": "Link/aod"
426 427 }
427 428 ]);
  429 +AIA.constant("AIAConstants", {
428 430  
  431 + "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.",
  432 +})
429 433 AIA.config(function ($routeProvider, pages, $locationProvider) {
430 434  
431 435 $locationProvider.html5Mode(true);
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @dec5c77
... ... @@ -169,17 +169,17 @@
169 169 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
170 170 <li role="separator" class="divider"></li>
171 171 <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
172   - <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
173   - <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
174   - <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
175   - <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
176   - <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
177   - <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
178   - <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
179   - <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
180   - <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
181   - <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
182   - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
  172 + <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
  173 + <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
  174 + <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
  175 + <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
  176 + <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
  177 + <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
  178 + <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
  179 + <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
  180 + <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
  181 + <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
  182 + <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
183 183  
184 184 <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" onclick="OnBodySystemSelection(event)">Cardiovascular</a></li>
185 185 <li ng-class="Digestive"><a href="#" title="Digestive" id="2" onclick="OnBodySystemSelection(event)">Digestive</a></li>
... ... @@ -212,7 +212,7 @@
212 212 <a href="#" title="Female" onclick="OnGenderChange(event)">Female</a>
213 213  
214 214 <!--<a href="javascript:void(0)" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
215   - <li ng-class="female"><a href="javascript:void(0)" title="Female" ng-click="OnGenderChange($event)">Female</a></li>-->
  215 + <li ng-class="female"><a href="javascript:void(0)" title="Female" ng-click="OnGenderChange($event)">Female</a></li>-->
216 216 </li>
217 217 </ul>
218 218 </div>
... ... @@ -222,11 +222,11 @@
222 222 <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>
223 223 <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
224 224 <!--<li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
225   - <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
226   - <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
227   - <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
228   - <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
229   - <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>-->
  225 + <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
  226 + <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
  227 + <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
  228 + <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
  229 + <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>-->
230 230  
231 231 <li ng-class="AnteriorView"><a href="#" title="Anterior" onclick="OnViewChange(event)">Anterior</a></li>
232 232 <li ng-class="LateralView"><a href="#" title="Lateral" onclick="OnViewChange(event)">Lateral</a></li>
... ... @@ -242,20 +242,20 @@
242 242 <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>
243 243 </div>
244 244  
245   - </div>
  245 + </div>
246 246 <div class="">
247 247  
248 248  
249 249 <!--'x' button is displaying inside the input box in IE browser.-->
250 250 <div style="width:80px;margin:10px 0 0 15px;display:inline-block;">
251   -
252   - <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;">
253   -
254   -
  251 +
  252 + <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;">
  253 +
  254 +
255 255  
256 256 </div>
257 257  
258   -
  258 +
259 259 <!--<p>
260 260 <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)" />
261 261 </p>-->
... ... @@ -273,13 +273,13 @@
273 273  
274 274 <div id="backdrop" ng-show="IsSearchVisible">
275 275 <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
276   -
  276 +
277 277 </div>
278 278 </div>
279   -
  279 +
280 280 </div>
281 281 <div class="btn-group">
282   -
  282 +
283 283 <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)">
284 284 <img src="~/../content/images/DA/go-to.png" style="height: 30px;width:50px">
285 285 </button>
... ... @@ -291,8 +291,8 @@
291 291  
292 292 <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
293 293 <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
294   - <img id="navimg" alt=""/>
295   - <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()" >
  294 + <img id="navimg" alt="" />
  295 + <div id="draggable" class="draggable ui-widget-content dragdivposition" ng-mouseup="ScrollCanvasDiv()">
296 296 </div>
297 297 </div>
298 298  
... ... @@ -409,9 +409,23 @@
409 409  
410 410 </div>
411 411  
412   -</div>
413 412  
  413 + <div class="modal fade" id="daMessageModal" role="dialog">
  414 + <div class="modal-dialog">
414 415  
  416 + <div class="modal-content">
  417 + <!--<div class="modal-header">
  418 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
  419 + </div>
  420 + <div class="modal-title"></div>-->
  421 + <!--<div class="modal-body">"No body system"</div>-->
  422 + <div class="modal-body" data-ng-bind="message"></div>
  423 +
  424 + <div class="modal-footer"> <button type="button" class="btn btn-primary" data-dismiss="modal">OK</button></div>
  425 + </div>
  426 + </div>
  427 + </div>
  428 +</div>
415 429 <!--<script src="../../../libs/jquery/1.11.4/jquery-ui.js"></script>-->
416 430 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
417 431  
... ...