diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index bfb0df9..52c2455 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -40,29 +40,43 @@ + + + + + + + + + + + + + + @@ -20972,8 +20986,8 @@ - + Web.config diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index ff1010b..b556d84 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -4,8 +4,16 @@ function ($scope, $rootScope, Modules, log) { $rootScope.currentActiveModuleTitle = Modules[2].Name; $scope.showme = true; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } + }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js index 45ddbd2..fd57fec 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js @@ -2,7 +2,14 @@ function ($scope, $rootScope, Modules, log) { $scope.showme = true; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } $rootScope.currentActiveModuleTitle = Modules[8].Name; }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMPID117Controller.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMPID117Controller.js new file mode 100644 index 0000000..8f07ee4 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMPID117Controller.js @@ -0,0 +1,26 @@ +AIA.controller("ADAMPID117Controller", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[10].Name; + $scope.showme = false; + $scope.myObj = { + "width": "100%", + "min-height": "750px" + } + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + + +); + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js index fc02e4b..ab6c6fc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -2,7 +2,14 @@ function ($scope, $rootScope, Modules, log) { $scope.showme = true; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } $rootScope.currentActiveModuleTitle = Modules[9].Name; }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js index 8831d48..c61ba9e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js @@ -2,7 +2,14 @@ function ($scope, $rootScope, Modules, log) { $scope.showme = false; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } $rootScope.currentActiveModuleTitle = Modules[6].Name; }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/BodyGuideController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/BodyGuideController.js new file mode 100644 index 0000000..fbd04ca --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/BodyGuideController.js @@ -0,0 +1,25 @@ +AIA.controller("BodyGuideController", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[14].Name; + $scope.myObj = { + "width": "100%", + "min-height": "1050px" + } + + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index c26b777..ee4c285 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -1,11 +1,18 @@ AIA.controller("CAController", ["$scope", "$rootScope", "Modules", "$log", function ($scope, $rootScope, Modules, log) { - + $rootScope.currentActiveModuleTitle = Modules[4].Name; $scope.showme = true; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + } + }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js index 9867100..d9e0b68 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js @@ -2,7 +2,14 @@ function ($scope, $rootScope, Modules, log) { $scope.showme = false; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } $rootScope.currentActiveModuleTitle = Modules[5].Name; }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 7843a95..3ca1956 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -1,11 +1,23 @@ -AIA.controller("CIController", ["$scope", "$rootScope", "Modules", "$log", -function ($scope, $rootScope, Modules, log) { +AIA.controller("CIController", ["$scope", "$window", "$rootScope", "Modules", "$log", +function ($scope, $window, $rootScope, Modules, log) { $rootScope.currentActiveModuleTitle = Modules[3].Name; + $scope.showme = true; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } + + + + }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CompAndAltMedController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CompAndAltMedController.js new file mode 100644 index 0000000..d76e819 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CompAndAltMedController.js @@ -0,0 +1,23 @@ +AIA.controller("CompAndAltMedController", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[13].Name; + $scope.myObj = { + "width": "100%", + "min-height": "750px" + } + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 53dd3b6..be02c9d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -40,11 +40,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.isBodyRegionDataLoaded = false; $scope.showme = false; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } //get the DA body view list based on selected gender + //get the DA body view list based on selected gender $scope.getDAViewList = function ($event) { // debugger; @@ -155,6 +163,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.loadDissectibleAnatomyData = function () { $rootScope.ClearIframe(); + //load bodyView data $http({ method: 'GET', url: '~/../content/data/json/da_dat_contentlist.json' }).success(function (data) { @@ -250,6 +259,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log(data); }); + //load vocabterm data + $http({ method: 'GET', url: '~/../content/data/json/cm_dat_vocabterm_1.json' }).success(function (data) { + $scope.VocabTermData = data; + }) + .error(function (data, status, headers, config) { + console.log(data); + }); + var openViews; @@ -1047,10 +1064,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $('layerChangeSlider').slider().on('slideStop', function (ev) { - alert('slide') + var newVal = $('.span2').data('slider').getValue(); if (originalVal != newVal) { - alert('Value Changed!'); + } }); @@ -1128,4 +1145,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }] + + ); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/IP10Controller.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/IP10Controller.js new file mode 100644 index 0000000..f97d015 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/IP10Controller.js @@ -0,0 +1,24 @@ +AIA.controller("IP10Controller", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[11].Name; + $scope.myObj = { + "width": "100%", + "min-height": "750px" + } + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/InDepthController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/InDepthController.js new file mode 100644 index 0000000..ef84070 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/InDepthController.js @@ -0,0 +1,23 @@ +AIA.controller("InDepthController", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[12].Name; + $scope.myObj = { + "width": "100%", + "min-height": "3000px" + } + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index c82188c..6fb9d98 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -2,7 +2,14 @@ function ($scope, $rootScope, Modules, log) { $scope.showme = false; $scope.IsVisible = function () { - $scope.showme = $scope.showme ? false : true; + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); } $rootScope.currentActiveModuleTitle = Modules[7].Name; }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/SymptNavController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/SymptNavController.js new file mode 100644 index 0000000..da12919 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/SymptNavController.js @@ -0,0 +1,24 @@ +AIA.controller("SymptNavController", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[15].Name; + $scope.myObj = { + "width": "100%", + "min-height": "1000px" + } + $scope.showme = false; + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + //alert("scroll"); + } + +}] + + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/WellToolsController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/WellToolsController.js new file mode 100644 index 0000000..104e5f4 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/WellToolsController.js @@ -0,0 +1,23 @@ +AIA.controller("WellToolsController", ["$scope", "$rootScope", "Modules", "$log", +function ($scope, $rootScope, Modules, log) { + + $rootScope.currentActiveModuleTitle = Modules[16].Name; + $scope.showme = false; + $scope.myObj = { + "width": "100%", + "min-height": "1500px" + } + $scope.IsVisible = function () { + $scope.scroll(); + + } + + $scope.scroll = function () { + // $window.scrollTo(0, 0); + $("html,body").scrollTop(0); + } + +}] + + +); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 12577cb..ad49c48 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -80,6 +80,55 @@ AIA.constant('pages', [ }, { + name: 'Encyclopedia', + pageSlug: 'ADAMPID117-view', + pageUrl: 'app/views/ADAMPID117/ADAMPID117-view.html', + pageController: 'ADAMPID117Controller' + + }, + { + name: 'IP 10', + pageSlug: 'IP10-view', + pageUrl: 'app/views/IP10/IP10-view.html', + pageController: 'IP10Controller' + + }, + { + name: 'In-Depth Reports', + pageSlug: 'InDepth-view', + pageUrl: 'app/views/InDepth/InDepth-view.html', + pageController: 'InDepthController' + + }, + { + name: 'Complementary and Alternative Medicine', + pageSlug: 'CompAndAltMed-view', + pageUrl: 'app/views/CompAndAltMed/CompAndAltMed-view.html', + pageController: 'CompAndAltMedController' + + }, + { + name: 'Body Guide', + pageSlug: 'BodyGuide-view', + pageUrl: 'app/views/BodyGuide/BodyGuide-view.html', + pageController: 'BodyGuideController' + + }, + { + name: 'Symptom Navigator', + pageSlug: 'SymptNav-view', + pageUrl: 'app/views/SymptNav/SymptNav-view.html', + pageController: 'SymptNavController' + + }, + { + name: 'The Wellness Tools', + pageSlug: 'WellTools-view', + pageUrl: 'app/views/WellTools/WellTools-view.html', + pageController: 'WellToolsController' + + }, + { name: 'home', pageSlug: 'home', pageUrl: 'app/widget/MainView.html', @@ -138,6 +187,35 @@ AIA.constant('Modules', [ Id: 10, Name: 'ADAM On Demand', }, + { + Id: 11, + Name: 'Encyclopedia', + }, + { + Id: 12, + Name: 'IP 10', + }, + + { + Id: 13, + Name: 'In-Depth Reports', + }, + { + Id: 14, + Name: 'Complementary and Alternative Medicine', + }, + { + Id: 15, + Name: 'Body Guide', + }, + { + Id: 16, + Name: 'Symptom Navigator', + }, + { + Id: 17, + Name: 'The Wellness Tools', + }, ]); AIA.constant('BodyViewws', [ diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/DataService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/DataService.js index 81a88cf..bf5a803 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/DataService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/DataService.js @@ -7,7 +7,7 @@ return $http.get(url) .then(function (response) { // promise is fulfilled - debugger; + //debugger; deferred.resolve(response.data); // promise is returned return deferred.promise; @@ -25,7 +25,7 @@ return $http.get(url1) .then(function (response1) { // promise is fulfilled - debugger; + // debugger; deferred1.resolve(response1.data); // promise is returned return deferred1.promise; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html index 05b49d9..cb9fb61 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/3dA/3dA-view.html @@ -1,9 +1,7 @@ 
- - -
+ - diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/BodyGuide/BodyGuide-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/BodyGuide/BodyGuide-view.html new file mode 100644 index 0000000..67a6036 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/BodyGuide/BodyGuide-view.html @@ -0,0 +1,10 @@ +
+
+
+
+
+ +
+
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/CompAndAltMed/CompAndAltMed-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/CompAndAltMed/CompAndAltMed-view.html new file mode 100644 index 0000000..e114be0 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/CompAndAltMed/CompAndAltMed-view.html @@ -0,0 +1,8 @@ +
+
+
+
+ +
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/IP10/IP10-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/IP10/IP10-view.html new file mode 100644 index 0000000..e628602 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/IP10/IP10-view.html @@ -0,0 +1,8 @@ +
+
+
+
+ +
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/InDepth/InDepth-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/InDepth/InDepth-view.html new file mode 100644 index 0000000..16b827b --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/InDepth/InDepth-view.html @@ -0,0 +1,8 @@ +
+
+
+
+ +
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/SymptNav/SymptNav-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/SymptNav/SymptNav-view.html new file mode 100644 index 0000000..4f7c254 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/SymptNav/SymptNav-view.html @@ -0,0 +1,8 @@ +
+
+
+
+ +
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/WellTools/WellTools-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/WellTools/WellTools-view.html new file mode 100644 index 0000000..7e7df99 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/WellTools/WellTools-view.html @@ -0,0 +1,8 @@ +
+
+
+
+ +
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html index 9671ff8..112e55d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html @@ -1,6 +1,6 @@ 
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html index 329cfee..a334c12 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html @@ -1,5 +1,5 @@ -