ADAM / AIAHTML5

Commit 2d48ba4c528ef1a70741ed32a1e4a30850b7b019

Authored by Amrita Vishnoi
2 parents 4d8a6b47 57c00aa2

Merge branch 'Bug#22482_1' into QA

Inline Side-by-side
Showing 3 changed files with 44 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2d48ba4
1 1 
2 2 'use strict';
3 3  
4   -AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService",
5   - function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService) {
  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 = "";
... ... @@ -2856,6 +2856,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2856 2856 grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
2857 2857 }
2858 2858 }
  2859 + $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
  2860 + $("#daMessageModal").modal('show');
2859 2861  
2860 2862 }
2861 2863 else {
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @2d48ba4
... ... @@ -348,6 +348,13 @@ AIA.constant("UserTypeConstants", {
348 348 "TEST_ACCOUNT": "Test Account",
349 349 "SITE_USER": "Site User"
350 350 })
  351 +
  352 +AIA.constant("AIAConstants", {
  353 +
  354 + "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.",
  355 +
  356 +})
  357 +
351 358 AIA.constant("UserModules", [
352 359 {
353 360 "name": "Dissectible Anatomy",
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @2d48ba4
... ... @@ -376,6 +376,39 @@
376 376 </div>
377 377 </div>
378 378 </div>
  379 + <div class="modal fade" id="daMessageModal" role="dialog" style="top:20%;">
  380 +
  381 + <div class="modal-dialog modal-sm">
  382 +
  383 +
  384 +
  385 + <div class="modal-content">
  386 +
  387 +
  388 + <div class="modal-header">
  389 +
  390 + <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
  391 +
  392 + </div>
  393 +
  394 + <div class="modal-title"></div>
  395 +
  396 + <!--<div class="modal-body">"No body system"</div>-->
  397 +
  398 + <div class="modal-header"><p data-ng-bind ="message" style="font-size:15px;"></p></div>
  399 +
  400 +
  401 +
  402 + <div class="modal-footer"> <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">OK</button></div>
  403 +
  404 +
  405 + </div>
  406 +
  407 +
  408 + </div>
  409 +
  410 + </div>
  411 +
379 412 </div>
380 413  
381 414  
... ...