ADAM / AIAHTML5

Commit ffcfd7432aa2eb00ff2aeedced1f473d7eb00e1a

Authored by unknown
2 parents a8db167a cf84a672

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_sp1

Inline Side-by-side
Showing 7 changed files with 169 additions and 60 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ffcfd74
... ... @@ -4388,20 +4388,50 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4388 4388 var isMirror;
4389 4389 var width;
4390 4390 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
4391   - $.each(BodyRegionDictionary, function (index, value) {
4392   -
4393   - var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
4394   - var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
4395   - if (actulalX <= bodyRegionRight && value.X <= actulalX && actualY <= bodyRegionBottom && value.Y <= actualY) {
4396   -
4397   - clickedBodyRegion = value.bodyRegionId;
4398   - x = value.X;
4399   - y = value.Y;
4400   - width = value.Width;
4401   - isMirror = value.IsMirror;
4402   - return false;
  4391 + if ($rootScope.viewOrientationId == 5) {
  4392 +
  4393 + var clickedBodyRegionData = new jinqJs()
  4394 + .from(BodyRegionDictionary)
  4395 + .where('bodyRegionId == 6')
  4396 + .select();
  4397 +
  4398 +
  4399 + // clickedBodyRegion = clickedBodyRegionData[0].bodyRegionId;
  4400 + x = clickedBodyRegionData[0].X;
  4401 + y = clickedBodyRegionData[0].Y;
  4402 + width = clickedBodyRegionData[0].Width;
  4403 + var height = clickedBodyRegionData[0].Height;
  4404 + isMirror = clickedBodyRegionData[0].IsMirror;
  4405 + var bodyRegionRight = parseInt(x) + parseInt(width);
  4406 + var bodyRegionBottom = parseInt(y) + parseInt(height);
  4407 + if (actulalX <= bodyRegionRight && x <= actulalX && actualY <= bodyRegionBottom && y <= actualY) {
  4408 +
  4409 + clickedBodyRegion = clickedBodyRegionData[0].bodyRegionId;
  4410 + x = clickedBodyRegionData[0].X;
  4411 + y = clickedBodyRegionData[0].Y;
  4412 + width = clickedBodyRegionData[0].Width;
  4413 + var height = clickedBodyRegionData[0].Height;
  4414 + isMirror = clickedBodyRegionData[0].IsMirror;
  4415 + }
  4416 +
  4417 + }
  4418 + else {
  4419 + $.each(BodyRegionDictionary, function (index, value) {
  4420 +
  4421 + var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
  4422 + var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
  4423 + if (actulalX <= bodyRegionRight && value.X <= actulalX && actualY <= bodyRegionBottom && value.Y <= actualY) {
  4424 +
  4425 + clickedBodyRegion = value.bodyRegionId;
  4426 + x = value.X;
  4427 + y = value.Y;
  4428 + width = value.Width;
  4429 + isMirror = value.IsMirror;
  4430 + return false;
  4431 + }
  4432 + })
4403 4433 }
4404   - })
  4434 +
4405 4435  
4406 4436 if (isMirror == "Yes") {
4407 4437  
... ... @@ -4868,6 +4898,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4868 4898 $("#btnTranparency").removeClass("disabled");
4869 4899 $rootScope.isTransparencyBoxActivated = false;
4870 4900 $rootScope.isNormalMode = false;
  4901 +
  4902 +
4871 4903 //if listanager is visisble then close it
4872 4904  
4873 4905 $rootScope.CloseListManager();
... ... @@ -7652,37 +7684,52 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7652 7684  
7653 7685  
7654 7686 $scope.HighlightBodyOnListManagerSelection = function (event) {
  7687 + // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
  7688 + if ($rootScope.prevId == event.currentTarget.id) {
7655 7689  
7656   - $scope.terminateCurrentlyRunningWPs();
7657   - //debugger
7658   - $rootScope.isListManagerSelected = true;
7659   - //---
7660   - if ($rootScope.isListManagerSelected == true) {
7661   - $("#btnHighLight").addClass("btn-primary");
7662   - $("#btnHighLight").removeClass("btn-black");
7663   - if (!$("#btnNormalMode").hasClass("btn-black")) {
7664   - $("#btnNormalMode").addClass("btn-black");
7665   - }
  7690 + $rootScope.isLoading = false;
  7691 + $('#spinner').css('visibility', 'hidden');
  7692 + }
  7693 + else {
  7694 + $rootScope.prevId = event.currentTarget.id;
  7695 + $("#termList").find("option").attr('selected', false);
  7696 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  7697 + $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  7698 + $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
  7699 + $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  7700 + $scope.terminateCurrentlyRunningWPs();
  7701 + //debugger
  7702 + $rootScope.isListManagerSelected = true;
  7703 + //---
  7704 + if ($rootScope.isListManagerSelected == true) {
  7705 + $("#btnHighLight").addClass("btn-primary");
  7706 + $("#btnHighLight").removeClass("btn-black");
  7707 + if (!$("#btnNormalMode").hasClass("btn-black")) {
  7708 + $("#btnNormalMode").addClass("btn-black");
  7709 + }
7666 7710  
7667   - if ($("#btnNormalMode").hasClass("btn-primary")) {
7668   - $("#btnNormalMode").removeClass("btn-primary");
  7711 + if ($("#btnNormalMode").hasClass("btn-primary")) {
  7712 + $("#btnNormalMode").removeClass("btn-primary");
  7713 + }
7669 7714 }
7670   - }
7671   - //---
7672   - $rootScope.isLoading = true;
  7715 + //---
  7716 + $rootScope.isLoading = true;
7673 7717  
7674   - $('#spinner').css('visibility', 'visible');
  7718 + $('#spinner').css('visibility', 'visible');
7675 7719  
7676   - $rootScope.isHighlightBodyByBodySystem = false;
  7720 + $rootScope.isHighlightBodyByBodySystem = false;
7677 7721  
7678   - //1.
7679   - $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
7680   - console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
  7722 + //1.
  7723 + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
  7724 + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
7681 7725  
7682   - //2.
  7726 + //2.
  7727 +
  7728 + $scope.setLayerNumberAndHighlightByTermList();
7683 7729  
7684   - $scope.setLayerNumberAndHighlightByTermList();
7685 7730  
  7731 + }
  7732 +
7686 7733  
7687 7734 }
7688 7735  
... ... @@ -8221,6 +8268,9 @@ function OnIdentityClick() {
8221 8268  
8222 8269 function OnZoom()
8223 8270 {
  8271 + //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
  8272 + $(".com").remove();
  8273 + $("#bord").remove();
8224 8274 console.log('OnZoom is called outside ');
8225 8275 var scope = angular.element(document.getElementById("daView")).scope();
8226 8276 scope.$apply(function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ffcfd74
... ... @@ -43,9 +43,43 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
43 43 $rootScope.isModestyOn;
44 44 $rootScope.isModestyOff;
45 45 $rootScope.SetSettingActiveTab;
  46 + $rootScope.disableMenuannotation = "disableMenuannotation";
  47 + $rootScope.disableMenuoption = "disableMenuoption";
  48 + $rootScope.menuLabExer;
  49 + $rootScope.menuLabExer = 0;
  50 +
  51 + $rootScope.$on("$locationChangeSuccess", function () {
  52 +
  53 + if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) {
  54 + $rootScope.disableMenuannotation = " ";
  55 + $rootScope.disableMenuoption = " ";
  56 +
  57 +
  58 + }
  59 + else {
  60 +
  61 + $rootScope.disableMenuannotation = "disableMenuannotation";
  62 + $rootScope.disableMenuoption = "disableMenuoption";
  63 + $rootScope.CloseAnnotationTool();
  64 + $rootScope.CloseListManager();
  65 + angular.element('#modal-settings').modal('hide');
  66 + if ($location.url() == "/lab-exercises") {
  67 +
  68 + $rootScope.menuLabExer = 0;
  69 + }
  70 + if($rootScope.menuLabExer==1)
  71 + {
  72 + $rootScope.disableMenuoption = " ";
  73 + }
  74 +
  75 + }
  76 +
  77 + });
46 78  
47 79 //jspanel functionality..
48 80  
  81 +
  82 +
49 83 $rootScope.openParent = function (slug) {
50 84 // debugger;
51 85 var openViews = $rootScope.openViews;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @ffcfd74
... ... @@ -35,6 +35,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
35 35 $scope.IsVisible = function () {
36 36 // $scope.scroll();
37 37  
  38 +
38 39 }
39 40  
40 41 $scope.scroll = function () {
... ... @@ -63,7 +64,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
63 64 }
64 65  
65 66 $scope.getLabExerciseTitle = function (title) {
66   -
  67 + $rootScope.menuLabExer = 1;
67 68  
68 69 if (title != null) {
69 70 $scope.LabExerciseQuiz = title;
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @ffcfd74
... ... @@ -74,42 +74,46 @@
74 74 $('[data-toggle="tooltip"]').tooltip();
75 75 })
76 76  
77   - var appPath = window.location.pathname.split("/")[1];
78   - if (window.location.pathname == "/" + appPath + "/da-view-list") {
  77 + var appPath = window.location.pathname;
  78 +
  79 + var appPathvalue = appPath.substring(appPath.lastIndexOf('/') + 1);
  80 +
  81 +
  82 + if (appPathvalue == "da-view-list") {
79 83  
80 84 $(".nav-sidebar li a").removeClass('active');
81 85 $(".nav-sidebar li:first-child a").addClass('active');
82 86  
83 87 }
84 88  
85   - else if (window.location.pathname == "/" + appPath + "/3dAnatomy") {
  89 + else if (appPathvalue == "3dAnatomy") {
86 90  
87 91 $(".nav-sidebar li a").removeClass('active');
88 92 $(".nav-sidebar li:nth-child(2) a").addClass('active');
89 93  
90 94 }
91   - else if (window.location.pathname == "/" + appPath + "/clinical-illustrations") {
  95 + else if (appPathvalue == "clinical-illustrations") {
92 96  
93 97 $(".nav-sidebar li a").removeClass('active');
94 98 $(".nav-sidebar li:nth-child(3) a").addClass('active');
95 99  
96 100  
97 101 }
98   - else if (window.location.pathname == "/" + appPath + "/clinical-animations") {
  102 + else if (appPathvalue == "clinical-animations") {
99 103  
100 104 $(".nav-sidebar li a").removeClass('active');
101 105 $(".nav-sidebar li:nth-child(4) a").addClass('active');
102 106  
103 107  
104 108 }
105   - else if (window.location.pathname == "/" + appPath + "/Link/encyclopedia") {
  109 + else if (appPathvalue == "encyclopedia") {
106 110  
107 111 $(".nav-sidebar li a").removeClass('active');
108 112 $(".nav-sidebar li:nth-child(5) a").addClass('active');
109 113  
110 114  
111 115 }
112   - else if (window.location.pathname == "/" + appPath + "/curriculum-builder") {
  116 + else if (appPathvalue == "curriculum-builder") {
113 117  
114 118 $(".nav-sidebar li a").removeClass('active');
115 119 $(".nav-sidebar li:nth-child(6) a").addClass('active');
... ... @@ -117,7 +121,7 @@
117 121  
118 122 }
119 123  
120   - else if (window.location.pathname == "/" + appPath + "/anatomy-test") {
  124 + else if (appPathvalue == "anatomy-test") {
121 125  
122 126 $(".nav-sidebar li a").removeClass('active');
123 127 $(".nav-sidebar li:nth-child(7) a").addClass('active');
... ... @@ -125,63 +129,62 @@
125 129  
126 130 }
127 131  
128   - else if (window.location.pathname == "/" + appPath + "/Link/IP-10") {
  132 + else if (appPathvalue == "IP-10") {
129 133  
130 134 $(".nav-sidebar li a").removeClass('active');
131 135 $(".nav-sidebar li:nth-child(8) a").addClass('active');
132 136  
133 137 }
134   - else if (window.location.pathname == "/" + appPath + "/lab-exercises") {
  138 + else if (appPathvalue == "lab-exercises") {
135 139  
136 140 $(".nav-sidebar li a").removeClass('active');
137 141 $(".nav-sidebar li:nth-child(9) a").addClass('active');
138 142  
139 143 }
140   - else if (window.location.pathname == "/" + appPath + "/Link/indepth-reports") {
  144 + else if (appPathvalue == "indepth-reports") {
141 145  
142 146 $(".nav-sidebar li a").removeClass('active');
143 147 $(".nav-sidebar li:nth-child(10) a").addClass('active');
144 148  
145 149 }
146   - else if (window.location.pathname == "/" + appPath + "/Link/complementary-and-alternate-medicine") {
  150 + else if (appPathvalue == "complementary-and-alternate-medicine") {
147 151  
148 152 $(".nav-sidebar li a").removeClass('active');
149 153 $(".nav-sidebar li:nth-child(11) a").addClass('active');
150 154  
151 155 }
152   - else if (window.location.pathname == "/" + appPath + "/ADAM-Images") {
  156 + else if (appPathvalue == "ADAM-Images") {
153 157  
154 158 $(".nav-sidebar li a").removeClass('active');
155 159 $(".nav-sidebar li:nth-child(12) a").addClass('active');
156 160  
157 161 }
158 162  
159   - else if (window.location.pathname == "/" + appPath + "/Link/bodyguide") {
  163 + else if (appPathvalue == "bodyguide") {
160 164  
161 165 $(".nav-sidebar li a").removeClass('active');
162 166 $(".nav-sidebar li:nth-child(13) a").addClass('active');
163 167  
164 168 }
165   - else if (window.location.pathname == "/" + appPath + "/Link/symptom-navigator") {
  169 + else if (appPathvalue == "symptom-navigator") {
166 170  
167 171 $(".nav-sidebar li a").removeClass('active');
168 172 $(".nav-sidebar li:nth-child(14) a").addClass('active');
169 173  
170 174 }
171   - else if (window.location.pathname == "/" + appPath + "/Link/wellness-tools") {
  175 + else if (appPathvalue == "wellness-tools") {
172 176  
173 177 $(".nav-sidebar li a").removeClass('active');
174 178 $(".nav-sidebar li:nth-child(15) a").addClass('active');
175 179  
176 180 }
177   - else if (window.location.pathname == "/"+ appPath + "/ADAM-on-demand") {
  181 + else if (appPathvalue == "ADAM-on-demand") {
178 182  
179 183 $(".nav-sidebar li a").removeClass('active');
180 184 $(".nav-sidebar li:nth-child(16) a").addClass('active');
181 185  
182 186 }
183 187  
184   -
185 188 });
186 189 </script>
187 190 <script>
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @ffcfd74
... ... @@ -23,13 +23,13 @@
23 23 </ul>
24 24 </li>
25 25 <!--#7904-->
26   - <li><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
  26 + <li ng-class="disableMenuannotation"><a href="#" data-toggle="modal" id="annotationButton" data-target=".bs-example-modal-sm" ng-click="ShowAnnotationWindow()">Annotation</a></li>
27 27  
28   - <li class="dropdown">
  28 + <li class="dropdown" ng-class="disableMenuoption">
29 29 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Options<span class="caret"></span></a>
30 30 <ul class="dropdown-menu">
31 31 <!--<li><a href="#" ng-click="ShowListManager()">List Manager</a></li>-->
32   -
  32 +
33 33 <li><a href="#" ng-click="ShowListManager()">List Manager</a></li>
34 34 <!--#7904-->
35 35 <li><a href="#" id="annotationToolBarOptions" ng-click="ShowAnnotationWindow()">Annotation Toolbar</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ffcfd74
... ... @@ -45,7 +45,15 @@
45 45 /*.ActiveDefaultColorAnnotation {
46 46 background-color: #000000!important;
47 47 }*/
48   - .ActiveFormattingButtonClass {
  48 +
  49 +
  50 + #termList option:hover {
  51 + background-color: #3399FF;
  52 + color:#fff;
  53 + }
  54 +
  55 +
  56 + .ActiveFormattingButtonClass {
49 57 background-color: #1B92D0 !important;
50 58 }
51 59  
... ... @@ -708,9 +716,9 @@
708 716 </div>
709 717  
710 718  
711   -
  719 + <!--DA > List Manager > Multiple structure selection should not be available.-->
712 720 <div class="form-group">
713   - <select id="termList" class="form-control" multiple="" size="10"></select>
  721 + <select id="termList" class="form-control" size="10"></select>
714 722 </div>
715 723  
716 724 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @ffcfd74
... ... @@ -863,4 +863,17 @@ cursor:pointer;
863 863 .annotationtoolbartab
864 864 {
865 865 background:#626c34 !important;
  866 +}
  867 +
  868 +.disableMenuannotation
  869 +{
  870 + pointer-events:none;
  871 + opacity:0.6;
  872 +
  873 +}
  874 +.disableMenuoption
  875 +{
  876 + pointer-events:none;
  877 + opacity:0.6;
  878 +
866 879 }
867 880 \ No newline at end of file
... ...