diff --git a/.gitignore b/.gitignore index c8f9f67..db8eca7 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ $tf*/ 400-SOURCECODE/AIAHTML5.Web/index.html.orig 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb + +400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj index 75def72..5f014a3 100644 --- a/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj +++ b/400-SOURCECODE/AIAHTML5.API/AIAHTML5.API.csproj @@ -106,10 +106,11 @@ - + + @@ -143,7 +144,6 @@ - 10.0 diff --git a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs index d23a28a..93891e5 100644 --- a/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs +++ b/400-SOURCECODE/AIAHTML5.API/Constants/AIAConstants.cs @@ -1,28 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; - -namespace AIAHTML5.API.Constants -{ - public class AIAConstants - { - public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details."; - public const string USER_NOT_FOUND = "User not found."; - public const string MAIL_NOT_SENT = "Mail not sent."; - public const string MAIL_SENT = "Mail sent."; - - public const string KEY_ID = "id"; - public const string KEY_TITLE = "title"; - public const string KEY_NAME = "name"; - public const string KEY_SLUG = "slug"; - - public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully"; - public const string PASSWORD_UPDATE_FAILED = "Password update failed"; - - public const string INVALID_USER = "Invalid UserID"; - - public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully."; - public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed."; - } +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace AIAHTML5.API.Constants +{ + public class AIAConstants + { + public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details."; + public const string USER_NOT_FOUND = "User not found."; + public const string MAIL_NOT_SENT = "Mail not sent."; + public const string MAIL_SENT = "Mail sent."; + + public const string KEY_ID = "id"; + public const string KEY_TITLE = "title"; + public const string KEY_NAME = "name"; + public const string KEY_SLUG = "slug"; + + public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully"; + public const string PASSWORD_UPDATE_FAILED = "Password update failed"; + + public const string INVALID_USER = "Invalid UserID"; + + public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully."; + public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed."; + + public const string KEY_CONTENT = "content"; + } } \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.API/content/AIAConstants.cs b/400-SOURCECODE/AIAHTML5.API/content/AIAConstants.cs deleted file mode 100644 index 93891e5..0000000 --- a/400-SOURCECODE/AIAHTML5.API/content/AIAConstants.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; - -namespace AIAHTML5.API.Constants -{ - public class AIAConstants - { - public const string ERROR_IN_FECTHING_DETAILS = "Error in fecthing details."; - public const string USER_NOT_FOUND = "User not found."; - public const string MAIL_NOT_SENT = "Mail not sent."; - public const string MAIL_SENT = "Mail sent."; - - public const string KEY_ID = "id"; - public const string KEY_TITLE = "title"; - public const string KEY_NAME = "name"; - public const string KEY_SLUG = "slug"; - - public const string PASSWORD_UPDATE_SUCCESS = "Password updated successfully"; - public const string PASSWORD_UPDATE_FAILED = "Password update failed"; - - public const string INVALID_USER = "Invalid UserID"; - - public const string LICENSE_TERM_CONDITION_UPDATE_SUCCESS = "License Term Accepted field updated successfully."; - public const string LICENSE_TERM_CONDITION_UPDATE_FAILED = "License Term Accepted field update failed."; - - public const string KEY_CONTENT = "content"; - } -} \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 6c83fcd..7eca9c1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -6,9 +6,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.threeDAnatomyData; $scope.Id; $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + $scope.scroll(); var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') promise.then( @@ -89,9 +87,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location } $scope.Open3DModelBody = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); //alert(localStorage.getItem("currentBodyViewId")); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js index d44bcaf..57ce916 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js @@ -12,9 +12,7 @@ function ($scope, $rootScope, pages, log, $location) { //alert("scroll"); } $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js index 981a878..4760324 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, $location) { //$rootScope.currentActiveModuleTitle = pages[10].name; $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js index 0f90b7d..f6ef555 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $location) { } $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 33cf1da..cfea5d5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -27,9 +27,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }; $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded @@ -464,9 +462,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $scope.openBodyView = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + if ($rootScope.disableAnnotationTB == true) { $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index f2600fe..aaa185e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -32,9 +32,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }; $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded @@ -533,9 +531,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } $scope.openBodyView = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.voId = localStorage.getItem("currentBodyViewId"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 35d4e9b..abf8109 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { } //load json data $scope.loadCurriculumBuiderData = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + //get current path var currentURL = $location.path(); var selectedModuleName = ''; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index c0c1995..6e2b55e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -376,9 +376,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //load json data for body view $scope.loadDissectibleAnatomyData = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + //get current path var currentURL = $location.path(); var selectedModuleName = ''; @@ -2853,6 +2851,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + //remove existing data and draw fresh data + for (var i = 0; i < $rootScope.grayImageDataList.length; i++) { + var grayCanvasID = 'imageCanvas' + parseInt(i + 1); + var grayCanvas = document.getElementById(grayCanvasID); + + if (grayCanvas != null) { + var grayCanvasContext = grayCanvas.getContext("2d"); + + var canvasHeight = grayCanvas.height; + var canvasWidth = grayCanvas.width; + grayCanvasContext.clearRect(0, 0, canvasHeight, canvasWidth) + grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0); + } + } + } else { console.log('1. HighlightBodyByTermListForBodySystem is called'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index e1e571a..4f15a9b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -132,7 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.userModules = UserModules; $rootScope.isVisibleLogin = false; - $location.path('/'); + } else { if (result == LoginConstants.USER_NOT_FOUND) { @@ -167,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.haveRoleAdmin = false; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); $('#dvUserModulesInfo').modal('show'); - $location.path('/'); + } //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) {} @@ -177,11 +177,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.userData = result; $rootScope.userModules = result.Modules; $rootScope.isVisibleLogin = false; - $rootScope.haveRoleAdmin = true; + $rootScope.haveRoleAdmin = true; $rootScope.licenseeAccountNumber = result.License.AccountNumber; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); $('#dvUserModulesInfo').modal('show'); - $location.path('/'); + } else { if ($('#dvTerms').length > 0) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 467b1bb..5587841 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.dragableId = ""; $scope.blReviewAttempt = false; $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded @@ -91,9 +89,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.GetQuizByTopic = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + var keywords = $location.search(); $scope.LabExerciseName = keywords.labexercise; $scope.LabExerciseModules = null; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 6669f06..36df995 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -1,6 +1,6 @@ 'use strict'; -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "pages", "$routeParams", function ($scope, $rootScope, log, $location, pages, $routeParams) { //$rootScope.currentActiveModuleTitle = Modules[10].Name; @@ -18,9 +18,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { $scope.$on('$viewContentLoaded', function (event) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + // code that will be executed ... // every time this view is loaded diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 48bbd55..6f16da1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -105,9 +105,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }; $scope.loadForModuleById = function (moduleId) { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + $scope.moduleId = moduleId; $scope.activeTab = 1; console.log('loadForModuleById is called') @@ -207,9 +205,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.openModuleItem = function () { - if ($rootScope.refreshcheck == null) { - $location.path('/'); - } + var jsContentURL; var moduleItemViewDivId; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig deleted file mode 100644 index 338f017..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html.orig +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Highlight Options - - - Current Structure - - Cardiovascular - Digestive - Endocrine - Immune - Integumentary - Lymphatic - Muscular - Nervous - Reproductive - Respiratory - Skeletal - Urinary - - - - Gender - - - Male - Female - - - - View - - - Anterior - Lateral - Medial - Posterior - Lateral Arm - Medial Arm - - - - - - - - - - - - - - - - - - - - - - - - - - - {{item._TermText}} - - - - - - - - - - - - - {{currentTitleFromJson}} - - All - - - - - - - - - - - - - - - - - - - - - - -<<<<<<< HEAD - -======= - ->>>>>>> 98e905fcd7730a4ac9a42c79fa962809bae7bc88 - - - - - - - - - - - - - - - - - - × - Transparency - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -