ADAM / AIAHTML5

Commit c80c88f8b6d896ddc2c613c46034ec13262c0675

Authored by Amrita Vishnoi
2 parents 3bf57ca9 585ecfac

Merge branch 'resetrefreshissue' into Develop

Inline Side-by-side
Showing 17 changed files with 69 additions and 577 deletions
.gitignore
  View file @c80c88f
... ... @@ -38,3 +38,5 @@ $tf*/
38 38 400-SOURCECODE/AIAHTML5.Web/index.html.orig
39 39 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
40 40 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
  41 +
  42 +400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig
41 43 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj
  View file @c80c88f
... ... @@ -106,10 +106,11 @@
106 106 </ItemGroup>
107 107 <ItemGroup>
108 108 <Compile Include="App_Start\WebApiConfig.cs" />
109   - <Compile Include="content\AIAConstants.cs" />
  109 + <Compile Include="Constants\AIAConstants.cs" />
110 110 <Compile Include="Controllers\AdminAccessController.cs" />
111 111 <Compile Include="Controllers\AuthenticateController.cs" />
112 112 <Compile Include="Controllers\ForgotUserController.cs" />
  113 + <Compile Include="Controllers\LicenseTermConditionController.cs" />
113 114 <Compile Include="Controllers\PixelLocationsController.cs" />
114 115 <Compile Include="Controllers\ResetPasswordController.cs" />
115 116 <Compile Include="Global.asax.cs">
... ... @@ -143,7 +144,6 @@
143 144 </ItemGroup>
144 145 <ItemGroup>
145 146 <Folder Include="App_Data\" />
146   - <Folder Include="Constants\" />
147 147 </ItemGroup>
148 148 <PropertyGroup>
149 149 <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
... ...
400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs
  View file @c80c88f
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Linq;
4   -using System.Web;
5   -
6   -namespace AIAHTML5.API.Constants
7   -{
8   - public class AIAConstants
9   - {
10   - public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
11   - public const string USER_NOT_FOUND = "User not found.";
12   - public const string MAIL_NOT_SENT = "Mail not sent.";
13   - public const string MAIL_SENT = "Mail sent.";
14   -
15   - public const string KEY_ID = "id";
16   - public const string KEY_TITLE = "title";
17   - public const string KEY_NAME = "name";
18   - public const string KEY_SLUG = "slug";
19   -
20   - public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully";
21   - public const string PASSWORD_UPDATE_FAILED = "Password update failed";
22   -
23   - public const string INVALID_USER = "Invalid UserID";
24   -
25   - public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully.";
26   - public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed.";
27   - }
  1 +using System;
  2 +using System.Collections.Generic;
  3 +using System.Linq;
  4 +using System.Web;
  5 +
  6 +namespace AIAHTML5.API.Constants
  7 +{
  8 + public class AIAConstants
  9 + {
  10 + public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
  11 + public const string USER_NOT_FOUND = "User not found.";
  12 + public const string MAIL_NOT_SENT = "Mail not sent.";
  13 + public const string MAIL_SENT = "Mail sent.";
  14 +
  15 + public const string KEY_ID = "id";
  16 + public const string KEY_TITLE = "title";
  17 + public const string KEY_NAME = "name";
  18 + public const string KEY_SLUG = "slug";
  19 +
  20 + public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully";
  21 + public const string PASSWORD_UPDATE_FAILED = "Password update failed";
  22 +
  23 + public const string INVALID_USER = "Invalid UserID";
  24 +
  25 + public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully.";
  26 + public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed.";
  27 +
  28 + public const string KEY_CONTENT = "content";
  29 + }
28 30 }
29 31 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.API/content/AIAConstants.cs deleted
View file @3bf57ca
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Linq;
4   -using System.Web;
5   -
6   -namespace AIAHTML5.API.Constants
7   -{
8   - public class AIAConstants
9   - {
10   - public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details.";
11   - public const string USER_NOT_FOUND = "User not found.";
12   - public const string MAIL_NOT_SENT = "Mail not sent.";
13   - public const string MAIL_SENT = "Mail sent.";
14   -
15   - public const string KEY_ID = "id";
16   - public const string KEY_TITLE = "title";
17   - public const string KEY_NAME = "name";
18   - public const string KEY_SLUG = "slug";
19   -
20   - public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully";
21   - public const string PASSWORD_UPDATE_FAILED = "Password update failed";
22   -
23   - public const string INVALID_USER = "Invalid UserID";
24   -
25   - public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully.";
26   - public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed.";
27   -
28   - public const string KEY_CONTENT = "content";
29   - }
30   -}
31 0 \ No newline at end of file
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @c80c88f
... ... @@ -6,9 +6,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
6 6 $scope.threeDAnatomyData;
7 7 $scope.Id;
8 8 $scope.$on('$viewContentLoaded', function (event) {
9   - if ($rootScope.refreshcheck == null) {
10   - $location.path('/');
11   - }
  9 +
12 10 $scope.scroll();
13 11 var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json')
14 12 promise.then(
... ... @@ -89,9 +87,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
89 87 }
90 88  
91 89 $scope.Open3DModelBody = function () {
92   - if ($rootScope.refreshcheck == null) {
93   - $location.path('/');
94   - }
  90 +
95 91 $rootScope.isLoading = true;
96 92 $('#spinner').css('visibility', 'visible');
97 93 //alert(localStorage.getItem("currentBodyViewId"));
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
  View file @c80c88f
... ... @@ -12,9 +12,7 @@ function ($scope, $rootScope, pages, log, $location) {
12 12 //alert("scroll");
13 13 }
14 14 $scope.$on('$viewContentLoaded', function (event) {
15   - if ($rootScope.refreshcheck == null) {
16   - $location.path('/');
17   - }
  15 +
18 16 // code that will be executed ...
19 17 // every time this view is loaded
20 18  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @c80c88f
... ... @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, $location) {
19 19 //$rootScope.currentActiveModuleTitle = pages[10].name;
20 20  
21 21 $scope.$on('$viewContentLoaded', function (event) {
22   - if ($rootScope.refreshcheck == null) {
23   - $location.path('/');
24   - }
  22 +
25 23 // code that will be executed ...
26 24 // every time this view is loaded
27 25  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @c80c88f
... ... @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $location) {
13 13 }
14 14  
15 15 $scope.$on('$viewContentLoaded', function (event) {
16   - if ($rootScope.refreshcheck == null) {
17   - $location.path('/');
18   - }
  16 +
19 17 // code that will be executed ...
20 18 // every time this view is loaded
21 19  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @c80c88f
... ... @@ -27,9 +27,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
27 27 };
28 28  
29 29 $scope.$on('$viewContentLoaded', function (event) {
30   - if ($rootScope.refreshcheck == null) {
31   - $location.path('/');
32   - }
  30 +
33 31  
34 32 // code that will be executed ...
35 33 // every time this view is loaded
... ... @@ -464,9 +462,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
464 462 }
465 463  
466 464 $scope.openBodyView = function () {
467   - if ($rootScope.refreshcheck == null) {
468   - $location.path('/');
469   - }
  465 +
470 466 if ($rootScope.disableAnnotationTB == true)
471 467 {
472 468 $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @c80c88f
... ... @@ -32,9 +32,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
32 32 };
33 33  
34 34 $scope.$on('$viewContentLoaded', function (event) {
35   - if ($rootScope.refreshcheck == null) {
36   - $location.path('/');
37   - }
  35 +
38 36 // code that will be executed ...
39 37 // every time this view is loaded
40 38  
... ... @@ -533,9 +531,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
533 531 }
534 532  
535 533 $scope.openBodyView = function () {
536   - if ($rootScope.refreshcheck == null) {
537   - $location.path('/');
538   - }
  534 +
539 535 $rootScope.isLoading = true;
540 536 $('#spinner').css('visibility', 'visible');
541 537 $scope.voId = localStorage.getItem("currentBodyViewId");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @c80c88f
... ... @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
19 19 }
20 20 //load json data
21 21 $scope.loadCurriculumBuiderData = function () {
22   - if ($rootScope.refreshcheck == null) {
23   - $location.path('/');
24   - }
  22 +
25 23 //get current path
26 24 var currentURL = $location.path();
27 25 var selectedModuleName = '';
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c80c88f
... ... @@ -376,9 +376,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
376 376  
377 377 //load json data for body view
378 378 $scope.loadDissectibleAnatomyData = function () {
379   - if ($rootScope.refreshcheck == null) {
380   - $location.path('/');
381   - }
  379 +
382 380 //get current path
383 381 var currentURL = $location.path();
384 382 var selectedModuleName = '';
... ... @@ -2853,6 +2851,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2853 2851 $rootScope.isLoading = false;
2854 2852 $('#spinner').css('visibility', 'hidden');
2855 2853  
  2854 + //remove existing data and draw fresh data
  2855 + for (var i = 0; i < $rootScope.grayImageDataList.length; i++) {
  2856 + var grayCanvasID = 'imageCanvas' + parseInt(i + 1);
  2857 + var grayCanvas = document.getElementById(grayCanvasID);
  2858 +
  2859 + if (grayCanvas != null) {
  2860 + var grayCanvasContext = grayCanvas.getContext("2d");
  2861 +
  2862 + var canvasHeight = grayCanvas.height;
  2863 + var canvasWidth = grayCanvas.width;
  2864 + grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth)
  2865 + grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
  2866 + }
  2867 + }
  2868 +
2856 2869 }
2857 2870 else {
2858 2871 console.log('1. HighlightBodyByTermListForBodySystem is called');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c80c88f
... ... @@ -132,7 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
132 132  
133 133 $rootScope.userModules = UserModules;
134 134 $rootScope.isVisibleLogin = false;
135   - $location.path('/');
  135 +
136 136 }
137 137 else {
138 138 if (result == LoginConstants.USER_NOT_FOUND) {
... ... @@ -167,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
167 167 $rootScope.haveRoleAdmin = false;
168 168 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
169 169 $('#dvUserModulesInfo').modal('show');
170   - $location.path('/');
  170 +
171 171 }
172 172 //else if ((!result.IsSubscriptionExpired) && (result.UserType== UserTypeConstants.CLIENT_ADMIN || result.UserType== UserTypeConstants.DISTRICT_ADMIN || result.UserType== UserTypeConstants.SINGLE_USER ||result.UserType== UserTypeConstants.RESELLER) && result.License.IsTermAccepted) {}
173 173  
... ... @@ -177,11 +177,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
177 177 $rootScope.userData = result;
178 178 $rootScope.userModules = result.Modules;
179 179 $rootScope.isVisibleLogin = false;
180   - $rootScope.haveRoleAdmin = true;
  180 + $rootScope.haveRoleAdmin = true;
181 181 $rootScope.licenseeAccountNumber = result.License.AccountNumber;
182 182 localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
183 183 $('#dvUserModulesInfo').modal('show');
184   - $location.path('/');
  184 +
185 185 }
186 186 else {
187 187 if ($('#dvTerms').length > 0) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @c80c88f
... ... @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
13 13 $scope.dragableId = "";
14 14 $scope.blReviewAttempt = false;
15 15 $scope.$on('$viewContentLoaded', function (event) {
16   - if ($rootScope.refreshcheck == null) {
17   - $location.path('/');
18   - }
  16 +
19 17 // code that will be executed ...
20 18 // every time this view is loaded
21 19  
... ... @@ -91,9 +89,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
91 89  
92 90  
93 91 $scope.GetQuizByTopic = function () {
94   - if ($rootScope.refreshcheck == null) {
95   - $location.path('/');
96   - }
  92 +
97 93 var keywords = $location.search();
98 94 $scope.LabExerciseName = keywords.labexercise;
99 95 $scope.LabExerciseModules = null;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @c80c88f
1 1 'use strict';
2 2  
3   -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",
  3 +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "pages", "$routeParams",
4 4 function ($scope, $rootScope, log, $location, pages, $routeParams) {
5 5  
6 6 //$rootScope.currentActiveModuleTitle = Modules[10].Name;
... ... @@ -18,9 +18,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) {
18 18  
19 19 $scope.$on('$viewContentLoaded', function (event) {
20 20  
21   - if ($rootScope.refreshcheck == null) {
22   - $location.path('/');
23   - }
  21 +
24 22 // code that will be executed ...
25 23 // every time this view is loaded
26 24  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @c80c88f
... ... @@ -105,9 +105,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
105 105 };
106 106  
107 107 $scope.loadForModuleById = function (moduleId) {
108   - if ($rootScope.refreshcheck == null) {
109   - $location.path('/');
110   - }
  108 +
111 109 $scope.moduleId = moduleId;
112 110 $scope.activeTab = 1;
113 111 console.log('loadForModuleById is called')
... ... @@ -207,9 +205,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
207 205  
208 206  
209 207 $scope.openModuleItem = function () {
210   - if ($rootScope.refreshcheck == null) {
211   - $location.path('/');
212   - }
  208 +
213 209 var jsContentURL;
214 210 var moduleItemViewDivId;
215 211  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig deleted
View file @3bf57ca
1   -<!--<style>
2   - .slider label {
3   - position: absolute;
4   - width: 20px;
5   - margin-left: -10px;
6   - text-align: center;
7   - margin-top: 20px;
8   - }
9   -
10   - /* below is not necessary, just for style */
11   - .slider {
12   - width: 50%;
13   - margin: 2em auto;
14   - }
15   -</style>-->
16   -<style>
17   - /*Dated:22-07-2016 Issue#4958:In Open body view, the side buttons are getting disturbed on layer change. */
18   - .btn-resize {
19   - padding: 6px 11px;
20   - border: 0px solid #000;
21   - border-radius: 1px;
22   - }
23   -</style>
24   -<style>
25   - /*Dated:22-07-2016 Issue#4958:In Open body view, the side buttons are getting disturbed on layer change. */
26   - .btn-resize {
27   - padding: 6px 11px;
28   - border: 0px solid #000;
29   - border-radius: 1px;
30   - }
31   -</style>
32   -
33   -<style>
34   - #draggable { opacity: 0.2;border:solid;position:absolute;}
35   - #wrapper {
36   - position: relative;
37   - width: 100%;
38   - height: 100%;
39   - margin: 20px auto;
40   - }
41   -
42   - .tooltip-custom + .tooltip > .tooltip-inner {
43   - background-color: #fff;
44   - border: 1px solid #000;
45   - color: #000;
46   - border-radius: 0;
47   - }
48   -
49   - .tooltip-custom + .tooltip > .tooltip-arrow {
50   - display: none;
51   - }
52   -
53   - .custom-tooltip {
54   - background-color: #fff;
55   - border: 0 none;
56   - color: #000;
57   - left: -52px;
58   - opacity: 0.9;
59   - padding: 3px 0;
60   - position: absolute;
61   - text-align: center;
62   - top: 45px;
63   - width: 120px;
64   - display: none;
65   - z-index: 10000;
66   - border: 1px solid #000;
67   - color: #000;
68   - border-radius: 0;
69   - }
70   -
71   - .custom-tooltip1 {
72   - background-color: #fff;
73   - border: 0 none;
74   - color: #000;
75   - left: 52px;
76   - opacity: 0.9;
77   - padding: 3px 0;
78   - position: absolute;
79   - text-align: center;
80   - top: 45px;
81   - width: 70px;
82   - display: none;
83   - z-index: 10000;
84   - border: 1px solid #000;
85   - color: #000;
86   - border-radius: 0;
87   - }
88   -
89   - .custom-tooltip2 {
90   - background-color: #fff;
91   - border: 0 none;
92   - color: #000;
93   - right: 10px;
94   - opacity: 0.9;
95   - padding: 3px 0;
96   - position: absolute;
97   - text-align: center;
98   - top: 45px;
99   - width: 60px;
100   - display: none;
101   - z-index: 10000;
102   - border: 1px solid #000;
103   - color: #000;
104   - border-radius: 0;
105   - }
106   -</style>
107   - <!--Annotation Toolbar: Jcanvas-->
108   -<style>
109   - .canvas-annotationStyle {
110   - display: none;
111   - background-color: transparent;
112   - z-index: 12000;
113   - position: absolute;
114   - left: 0;
115   - right: 0;
116   - }
117   -</style>
118   -<div class=" " id="daView" ng-controller="DAController">
119   - <div class="pos-relative leftToolBar tools pull-left">
120   - <div class="toggle-icon toggleBar toggleHeadingButton" title="Show/Hide Sidebar" style="top:20px;"></div>
121   - <div class="" style="top:20px">
122   - <div class="col-sm-6">
123   - <button id="btnIdentity" class="btn btn-primary btn-sm tooltip-custom" ng-click="OnIdentityClick()" data-toggle="tooltip" data-placement="bottom" title="Identify"> <img src="content/images/icon-identity.png" alt="" title=""></button>
124   - </div>
125   - <div class="col-sm-6 pull-right">
126   - <button class="btn btn-black btn-sm pull-right tooltip-custom" ng-click="enableZoom()" data-toggle="tooltip" data-placement="bottom" title="Zoom-in/Zoom-out">
127   - <img src="content/images/icon-zoom.png" alt="" title="">
128   - </button>
129   - </div>
130   - <div class="col-sm-12">
131   - <button id="btnTranparency" class="btn btn-black btn-sm btn-block marginTop5 tooltip-custom" ng-click="createTransparencyBox()" data-toggle="tooltip" data-placement="bottom" title="Transparency Box"><img src="content/images/icon-transparency.png" alt="" title=""></button>
132   - </div>
133   - <div class="col-sm-6">
134   - <button ng-class="Normal" class="btn btn-black btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle=" tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt="" title=""></button>
135   - </div>
136   - <div class="col-sm-6">
137   - <button ng-class="Extract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt="" title=""></button>
138   - </div>
139   - <div class="col-sm-6">
140   - <button ng-class="Highlight" id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" ng-click="enableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt="" title=""></button>
141   - </div>
142   - <div class="col-sm-6 dropdown hover-tool">
143   - <div class="custom-tooltip">Highlight Options</div>
144   - <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()" ><img src="content/images/icon-highlight.png" alt="" title=""></button>
145   - <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
146   - <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
147   - <li role="separator" class="divider"></li>
148   - <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodysystem($event)">Cardiovascular</a></li>
149   - <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)">Digestive</a></li>
150   - <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)">Endocrine</a></li>
151   - <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)">Immune</a></li>
152   - <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)">Integumentary</a></li>
153   - <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)">Lymphatic</a></li>
154   - <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)">Muscular</a></li>
155   - <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)">Nervous</a></li>
156   - <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)">Reproductive</a></li>
157   - <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)">Respiratory</a></li>
158   - <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)">Skeletal</a></li>
159   - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li>
160   - </ul>
161   - </div>
162   - <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
163   - <div class=" custom-tooltip1">Gender</div>
164   - <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <i class=" fa fa-intersex font16"></i></button>
165   - <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
166   - <li ng-class="male"><a href="#" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
167   - <li ng-class="female"><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li>
168   - </ul>
169   - </div>
170   - <div class="col-sm-6 tooltip-View-custom">
171   - <div class="custom-tooltip2">View</div>
172   - <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>
173   - <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
174   - <li ng-class="AnteriorView"><a href="#" title="Anterior" ng-click="OnViewChange($event)">Anterior</a></li>
175   - <li ng-class="LateralView"><a href="#" title="Lateral" ng-click="OnViewChange($event)">Lateral</a></li>
176   - <li ng-class="MedialView"><a href="#" title="Medial" ng-click="OnViewChange($event)">Medial</a></li>
177   - <li ng-class="PosteriorView"><a href="#" title="Posterior" ng-click="OnViewChange($event)">Posterior</a></li>
178   - <li ng-class="LateralArmView"><a href="#" title="Lateral Arm" ng-click="OnViewChange($event)">Lateral Arm</a></li>
179   - <li ng-class="MedialArmView"><a href="#" title="Medial Arm" ng-click="OnViewChange($event)">Medial Arm</a></li>
180   - </ul>
181   - </div>
182   - <div class="col-sm-12">
183   - <button id="btnStrutureBox" ng-click="enableShowHideStructureBox()" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt="" title=""></button>
184   - </div>
185   - </div>
186   - <div class="">
187   - <p>
188   - <input type="number" id="txtlayerNumber" value="0" step="1" min="0" style="width:80px; margin:10px 0 0 15px;" ng-model="layerNumber" ng-change="LayerChange()" />
189   - </p>
190   - <div id="layerChangeSlider" style="height:140px;" class="vert_slider " ng-model="layerNumber"></div>
191   - </div>
192   - </div>
193   -
194   - <div class="main2">
195   - <div class="col-sm-12 stickey-area">
196   - <div class="breadcrumb ">
197   - <div class="">
198   - <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
199   -
200   - <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" ng-click="ShowSearch()" ng-dblclick="ShowSearch()" ng-model="searchFilter" ng-change="textChange(searchFilter)" placeholder="Search...">
201   -
202   - <div id="backdrop" ng-show="IsSearchVisible">
203   - <div class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
204   - <ul id="termlistfilter" class="form-control dropdown-menu" style="height:100px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:1000;">
205   - <li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">
206   - <a id="{{item._ActualTermNumber}}" href="" ng-click="jumpToTerm($event)">{{item._TermText}}</a>
207   - </li>
208   - </ul>
209   - </div>
210   - </div>
211   - <!--</div>-->
212   -
213   - </div>
214   - <div class="btn-group">
215   - <button type="button" style="padding-left:15px;padding-right:15px;" class="btn btn-success dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
216   - <i class="fa fa-arrow-circle-right"></i>
217   - </button>
218   - <ul class="dropdown-menu" style="width:100%;">
219   - <li><a href="#">{{currentTitleFromJson}}</a></li>
220   - <li role="separator" class="divider"></li>
221   - <li><a href="#">All</a></li>
222   - </ul>
223   - </div>
224   - <div class="btn-group open" id="da-body-nav">
225   - <button type="button" style="padding-left:15px;padding-right:15px;" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
226   - <i class="fa fa-male"></i>
227   - </button>
228   -
229   - <div class="dropdown-menu active" id="navigatorDiv" style="min-height:auto; min-width:auto; ">
230   - <div id="containment-wrapper" align="center" style="min-width:auto;height:119px; ">
231   - <img id="navimg" src="{{navimgsrc}}" alt=""></img>
232   - <div id="draggable" class="draggable ui-widget-content" ng-mouseup="ScrollCanvasDiv()" ng-style="dragdivposition">
233   - </div>
234   - </div>
235   - </div>
236   - </div>
237   - </div>
238   - </div>
239   - </div>
240   - <div class=" canavsParent col-sm-12 " id="cp">
241   - <div class="container-fluid">
242   - <div class="row">
243   - <div id="canvasDiv" class="col-sm-12 img-thumbnail" align="center">
244   -<<<<<<< HEAD
245   - <canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" style="display:none;background-color:transparent;z-index:12000;position:absolute;left:0;right:0;"></canvas>
246   -=======
247   - <canvas id="canvas" ng-click="doClick($event)" width="2277" height="3248" class="canvas-annotationStyle"></canvas>
248   ->>>>>>> 98e905fcd7730a4ac9a42c79fa962809bae7bc88
249   - </div>
250   - <!--<div id="canvasDiv" style=" width: 95% !important;top:0px;overflow:scroll;background-color:white;">-->
251   - <!--<div id="daLoaderLabel">Loading....</div>-->
252   -
253   - </div>
254   - <div class="clearfix"></div>
255   - </div>
256   - </div>
257   - </div>
258   - <div class="clearfix"></div>
259   - <!--to prevent transparency scale from closing on click anywhere outside set data-backdrop="static" data-keyboard="false" -->
260   - <!--<div class="modal fade bs-example-modal-sm" tabindex="-1" aria-labelledby="mySmallModalLabel" id="transparencyScale" data-backdrop="static" data-keyboard="false">
261   - <div class="modal-dialog modal-sm">
262   - <div class="modal-content">
263   - <div class="modal-header annotation-modal-header">
264   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseTransparencyBox()"><span aria-hidden="true">&times;</span></button>
265   - <h4 class="modal-title">Transparency</h4>
266   - </div>
267   - <div class="modal-body">
268   - <div class="row">
269   - <div class="col-sm-12">
270   - <div class="padded25">
271   - <div class="slider"></div>
272   - </div>
273   - </div>
274   - </div>
275   - </div>
276   - </div>
277   - </div>
278   - </div>-->
279   - <!--<div class="ui-widget-content" id="transparencyScale" style="width: 350px; height: 130px;visibility:hidden;display:block;float:left">
280   - <div class="modal-dialog modal-sm">
281   - <div class="modal-content">
282   - <div class="modal-header annotation-modal-header">
283   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseTransparencyBox()"><span aria-hidden="true">&times;</span></button>
284   - <h4>Transparency</h4>
285   - </div>
286   - <div>
287   - <div class="row">
288   - <div class="col-sm-12">
289   - <div class="padded25">
290   - <div class="slider"></div>
291   - </div>
292   - </div>
293   - </div>
294   - </div>
295   - </div>
296   - </div>
297   - </div>-->
298   - <div class="ui-widget-content" id="transparencyScale" style="width: 350px; height: 150px;visibility:hidden;display:block;float:left">
299   - <div>
300   - <div>
301   - <div class="modal-header annotation-modal-header">
302   - <button type="button" class="close" data-dismiss="modal" aria-label="Close" ng-click="CloseTransparencyBox()"><span aria-hidden="true">&times;</span></button>
303   - <h4>Transparency</h4>
304   - </div>
305   - <div>
306   - <div class="row">
307   - <div class="col-sm-12">
308   - <div class="padded25">
309   - <!--<div class="slider" id="sliderScale"></div>-->
310   - <div class="slider"></div>
311   - </div>
312   - </div>
313   - </div>
314   - </div>
315   - </div>
316   - </div>
317   - </div>
318   -</div>
319   -
320   -
321   -<!--<script src="../../../libs/jquery/1.11.4/jquery-ui.js"></script>-->
322   -<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
323   -
324   -<script>
325   - $(window).load(function () {
326   - $(".stickey-area").sticky();
327   - });</script>
328   -<script>
329   - $(function () {
330   - $("#layerChangeSlider").slider({
331   - orientation: "vertical",
332   - range: "max", // <--- needed...
333   - min: 0,
334   - // max: 100,
335   - //value: 0,
336   - slide: function (event, ui) {
337   - // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
338   -
339   - // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
340   - },
341   - stop: function (event, ui) {
342   - var la;
343   - var rootScope = angular.element(document.getElementById("bo")).scope();
344   - rootScope.$apply(function () {
345   - rootScope.isLoading = true;
346   - })
347   - var scope = angular.element(document.getElementById("daView")).scope();
348   - scope.$apply(function () {
349   - if (scope.isTransparencyActivated) {
350   - rootScope.isLoading = false;
351   - }
352   - la = parseInt(scope.totalLayers) //- parseInt(scope.layerNumber);
353   - // $('#layerChangeSlider').slider("option", "value", la - ui.value);
354   - var slideVal = la - ui.value;
355   - $("#txtlayerNumber").val(slideVal);
356   - scope.layerNumber = slideVal;
357   - scope.LayerChange();
358   - });
359   - },
360   -
361   - })
362   - });
363   -
364   -</script>
365   -<!--<script>
366   - $(function () {
367   - $('#layerChangeSlider').slider().on('slideStop', function () {
368   - alert('fjkjksdbgjkgjkfgk')
369   - })
370   -</script>
371   - });-->
372   -
373   -<script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
374   -<script>
375   - $(function () {
376   - $("#transparencyScale").draggable();
377   - $("#draggable").draggable({ containment: "#containment-wrapper", scroll: false });
378   - });
379   -</script>
380   -<script>
381   - $(function () {
382   -
383   - $("#dropdownMenu2").mouseover(function () {
384   - $(".custom-tooltip").css("display", "block");
385   - });
386   - $("#dropdownMenu2").mouseout(function () {
387   - $(".custom-tooltip").css("display", "none");
388   - });
389   -
390   - $("#dropdownMenu4").mouseover(function () {
391   - $(".custom-tooltip1").css("display", "block");
392   - });
393   - $("#dropdownMenu4").mouseout(function () {
394   - $(".custom-tooltip1").css("display", "none");
395   - });
396   -
397   - $("#dropdownMenu3").mouseover(function () {
398   - $(".custom-tooltip2").css("display", "block");
399   - });
400   - $("#dropdownMenu3").mouseout(function () {
401   - $(".custom-tooltip2").css("display", "none");
402   - });
403   -
404   -
405   -
406   - $("#slider-range-min-2").slider({
407   - range: "min",
408   - min: 1,
409   - max: 60,
410   - value: 10,
411   - slide: function (event, ui) {
412   - $("#amount-2").val(ui.value);
413   - }
414   - });
415   - $("#amount-2").val($("#slider-vertical-2").slider("value"));
416   - });
417   -</script>
418   -<script>
419   - $(".slider")
420   - .slider({
421   - min: 0,
422   - max: 100,
423   - value: 50,
424   - range: "min",
425   - orientation: "horizontal",
426   - stop: function (event, ui) {
427   - //alert('trans changed')
428   - var scope = angular.element(document.getElementById("daView")).scope();
429   - scope.$apply(function () {
430   - scope.onTransparencyChange(event, ui);
431   - });
432   - }
433   - })
434   - .slider("pips", {
435   - rest: "label",
436   - step: "10"
437   - });
438   -
439   -</script>
440   -<script>
441   - $(document).ready(function () {
442   - $('[data-toggle="tooltip"]').tooltip({ trigger: 'hover', 'placement': 'bottom' });
443   - });
444   -</script>
445   -<script>
446   - $(function () {
447   - $(".modal").draggable();
448   - });
449   -</script>
450   -<script>
451   - $(function () {
452   - "use strict";
453   - /*** Sidebar Toggle ***/
454   - var barPos = 0;
455   - var bar = $('.tools');
456   - var main = $('.main2');
457   - $('.toggleBar').click(function () {
458   -
459   - bar.toggleClass('active');
460   - main.toggleClass('active');
461   - });
462   - });
463   -</script>
464   -
465   -