ADAM / AIAHTML5

Commit be7d8a74d48230bf6d72a43e28388bb3f4fa86c5

Authored by Mitali Srivastava
1 parent 9681f399

removed dependency on Modules from controllers

Inline Side-by-side
Showing 13 changed files with 95 additions and 81 deletions
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @be7d8a7
... ... @@ -45,7 +45,7 @@
45 45 <Content Include="app\controllers\AODController.js" />
46 46 <Content Include="app\controllers\AuthenticationController.js" />
47 47 <Content Include="app\controllers\CAController.js" />
48   - <Content Include="app\controllers\CBuildController.js" />
  48 + <Content Include="app\controllers\CurrBuildController.js" />
49 49 <Content Include="app\controllers\CIController.js" />
50 50 <Content Include="app\controllers\DAController.js" />
51 51 <Content Include="app\controllers\HomeController.js" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @be7d8a7
1   -AIA.controller("3dAController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
3 3  
4   - $rootScope.currentActiveModuleTitle = Modules[2].Name;
  4 + $rootScope.currentActiveModuleTitle = pages[5].name;
5 5 $scope.showme = true;
6 6 $scope.IsVisible = function () {
7 7 $scope.scroll();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
  View file @be7d8a7
1   -AIA.controller("ADAMImgController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
3 3 $scope.showme = true;
4 4 $scope.IsVisible = function () {
5 5 $scope.scroll();
... ... @@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
11 11 $("html,body").scrollTop(0);
12 12 //alert("scroll");
13 13 }
14   - $rootScope.currentActiveModuleTitle = Modules[8].Name;
  14 + $rootScope.currentActiveModuleTitle = pages[9].name;
15 15 }]
16 16  
17 17  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @be7d8a7
1   -AIA.controller("AODController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
3 3 $scope.showme = true;
4 4 $scope.IsVisible = function () {
5 5 $scope.scroll();
... ... @@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
11 11 $("html,body").scrollTop(0);
12 12 //alert("scroll");
13 13 }
14   - $rootScope.currentActiveModuleTitle = Modules[9].Name;
  14 + $rootScope.currentActiveModuleTitle = pages[10].name;
15 15 }]
16 16  
17 17  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @be7d8a7
1   -AIA.controller("AnatTestController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("AnatTestController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
3 3 $scope.showme = false;
4 4 $scope.IsVisible = function () {
5 5 $scope.scroll();
... ... @@ -11,7 +11,7 @@ function ($scope, $rootScope, Modules, log) {
11 11 $("html,body").scrollTop(0);
12 12 //alert("scroll");
13 13 }
14   - $rootScope.currentActiveModuleTitle = Modules[6].Name;
  14 + $rootScope.currentActiveModuleTitle = pages[7].name;
15 15 }]
16 16  
17 17 );
18 18 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @be7d8a7
1   -AIA.controller("CAController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("CAController", ["$scope", "$rootScope", "$log","pages",
  2 +function ($scope, $rootScope, log,pages) {
3 3  
4   - $rootScope.currentActiveModuleTitle = Modules[4].Name;
  4 + $rootScope.currentActiveModuleTitle = pages[4].name;
5 5 $scope.showme = true;
6 6 $scope.IsVisible = function () {
7 7 $scope.scroll();
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @be7d8a7
1   -AIA.controller("CIController", ["$scope", "$window", "$rootScope", "Modules", "$log",
2   -function ($scope, $window, $rootScope, Modules, log) {
  1 +AIA.controller("CIController", ["$scope", "$window", "$rootScope", "Modules", "$log","pages",
  2 +function ($scope, $window, $rootScope, Modules, log,pages) {
3 3  
4   - $rootScope.currentActiveModuleTitle = Modules[3].Name;
  4 + $rootScope.currentActiveModuleTitle = pages[3].name;
5 5  
6 6 $scope.showme = true;
7 7 $scope.IsVisible = function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CBuildController.js renamed to 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @be7d8a7
1   -AIA.controller("CBuildController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
  1 +AIA.controller("CurrBuildController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
  3 +
  4 + $rootScope.currentActiveModuleTitle = pages[6].name;
3 5 $scope.showme = false;
4 6 $scope.IsVisible = function () {
5 7 $scope.scroll();
... ... @@ -11,7 +13,7 @@ function ($scope, $rootScope, Modules, log) {
11 13 $("html,body").scrollTop(0);
12 14 //alert("scroll");
13 15 }
14   - $rootScope.currentActiveModuleTitle = Modules[5].Name;
  16 +
15 17 }]
16 18  
17 19  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @be7d8a7
1   -AIA.controller("LabExercController", ["$scope", "$rootScope", "Modules", "$log",
2   -function ($scope, $rootScope, Modules, log) {
3   - $scope.showme = false;
4   - $scope.IsVisible = function () {
  1 +AIA.controller("LabExercController", ["$scope", "$rootScope", "pages", "$log",
  2 +function ($scope, $rootScope, pages, log) {
  3 +
  4 + $scope.$on('$viewContentLoaded', function (event) {
  5 + // code that will be executed ...
  6 + // every time this view is loaded
  7 + $scope.showme = false;
  8 + $rootScope.currentActiveModuleTitle = pages[8].name;
5 9 $scope.scroll();
  10 + });
  11 +
  12 + // $scope.showme = false;
  13 + $scope.IsVisible = function () {
  14 + // $scope.scroll();
6 15  
7 16 }
8 17  
... ... @@ -11,7 +20,7 @@ function ($scope, $rootScope, Modules, log) {
11 20 $("html,body").scrollTop(0);
12 21 //alert("scroll");
13 22 }
14   - $rootScope.currentActiveModuleTitle = Modules[7].Name;
  23 + // $rootScope.currentActiveModuleTitle = pages[8].Name;
15 24 }]
16 25  
17 26 );
18 27 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @be7d8a7
1 1 'use strict';
2 2  
3   -AIA.controller("LinkController", ["$scope", "$rootScope", "Modules", "$log", "pages", "$routeParams",
4   -function ($scope, $rootScope, Modules, log, pages, $routeParams) {
  3 +AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams",
  4 +function ($scope, $rootScope, log, pages, $routeParams) {
5 5  
6 6 //$rootScope.currentActiveModuleTitle = Modules[10].Name;
7 7 //$rootScope.currentActiveModuleTitle = $routeParams.modname;
8 8 $scope.links = [
9   - new link("Encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
  9 + new link("encyclopedia", "Encyclopedia", 'http://aia5.adam.com/content.aspx?productId=117', "100%", "750px"),
10 10 new link("IP-10", "IP 10", "http://182.19.10.91:92/IPWeb10/index.aspx", "100%", "750px"),
11   - new link("InDepth-Reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
12   - new link("Complementary-and-Alternate-Medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"),
13   - new link("BodyGuide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
14   - new link("Symptom-Navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
15   - new link("Wellness-Tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px")
  11 + new link("indepth-reports", "InDepth Reports", "http://aia5.adam.com/content.aspx?productId=10", "100%", "4000px"),
  12 + new link("complementary-and-alternate-medicine", "Complementary and Alternative Medicine", "http://182.19.10.91:92/CAMHome.aspx", "100%", "750px"),
  13 + new link("bodyguide", "Body Guide", "http://aia5.adam.com/content.aspx?productId=25", "100%", "1050px"),
  14 + new link("symptom-navigator", "Symptom Navigator", "http://aia5.adam.com/content.aspx?productId=44", "100%", "1000px"),
  15 + new link("wellness-tools", "The Wellness Tools", "http://aia5.adam.com/content.aspx?productId=20", "100%", "1500px")
16 16 ];
17 17  
18 18 $scope.$on('$viewContentLoaded', function (event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @be7d8a7
... ... @@ -6,87 +6,89 @@ var AIA = angular.module(&#39;AIA&#39;, [&#39;ngSanitize&#39;, &#39;ngRoute&#39;, &#39;ngStorage&#39;]);
6 6  
7 7 AIA.constant('pages', [
8 8 {
  9 + // id:0,
9 10 name: 'Login',
10 11 pageSlug: 'login',
11 12 pageUrl: 'login.html',
12 13 pageController: 'AuthenticationController'
13 14 },
14   - {
  15 + { // id:1,
15 16 name: 'Dissectible Anatomy Views List',
16 17 pageSlug: 'da-view-list',
17 18 pageUrl: 'app/views/da/da-body-view-list.html',
18 19 pageController: 'DAController'
19 20 },
20   - {
  21 + { //id:2,
21 22 name: 'Dissectible Anatomy Body View',
22 23 pageSlug: 'da-body-view',
23 24 pageUrl: 'app/views/da/da-body-view.html',
24 25 pageController: 'DAController'
25 26 },
26   - {
  27 + { // id:3,
27 28 name: 'Clinical Illustrations',
28   - pageSlug: 'CI-view',
  29 + pageSlug: 'clinical-illustrations',
29 30 pageUrl: 'app/views/ci/ci-view.html',
30 31 pageController: 'CIController'
31 32  
32 33 },
33 34 {
34   - name: 'Clinical Animationa',
35   - pageSlug: 'CA-view',
  35 + // id:4,
  36 + name: 'Clinical Animations',
  37 + pageSlug: 'clinical-animations',
36 38 pageUrl: 'app/views/ca/ca-view.html',
37 39 pageController: 'CAController'
38 40  
39 41 },
40   - {
  42 + { // id:5,
41 43 name: '3D Anatomy',
42   - pageSlug: '3dAnatomy-view',
  44 + pageSlug: '3dAnatomy',
43 45 pageUrl: 'app/views/3dA/3dA-view.html',
44 46 pageController: '3dAController'
45 47  
46 48 },
47   - {
  49 + { //id:6,
48 50 name: 'Curriculum Builder',
49   - pageSlug: 'Curriculum-Builder',
  51 + pageSlug: 'curriculum-builder',
50 52 pageUrl: 'app/views/CBuild/CBuild-view.html',
51   - pageController: 'CBuildController'
  53 + pageController: 'CurrBuildController'
52 54  
53 55 },
54   - {
  56 + { //id:7,
55 57 name: 'Anatomy Tests',
56   - pageSlug: 'Anatomy-Test',
  58 + pageSlug: 'anatomy-test',
57 59 pageUrl: 'app/views/AnatTest/AnatTest-view.html',
58 60 pageController: 'AnatTestController'
59 61  
60 62 },
61   - {
  63 + { //id:8,
62 64 name: 'Lab Exercises',
63   - pageSlug: 'Lab-Exercises',
  65 + pageSlug: 'lab-exercises',
64 66 pageUrl: 'app/views/LabExerc/LabExerc-view.html',
65 67 pageController: 'LabExercController'
66 68  
67 69 },
68   - {
  70 + { //id:9,
69 71 name: 'ADAM Images',
70   - pageSlug: 'ADAM-Images',
  72 + pageSlug: 'ADAM-images',
71 73 pageUrl: 'app/views/ADAMImg/ADAMImg-view.html',
72 74 pageController: 'ADAMImgController'
73 75  
74 76 },
75   - {
  77 + { //id:10,
76 78 name: 'ADAM On Demand',
77   - pageSlug: 'ADAM-On-Demand',
  79 + pageSlug: 'ADAM-on-demand',
78 80 pageUrl: 'app/views/AOD/AOD-view.html',
79 81 pageController: 'AODController'
80 82  
81 83 },
82   - {
  84 + { //id:11,
83 85 name: 'Encyclopedia',
84   - pageSlug: 'Link/Encyclopedia',
  86 + pageSlug: 'Link/encyclopedia',
85 87 pageUrl: 'app/views/Link/Link-view.html',
86 88 pageController: 'LinkController'
87 89  
88 90 },
89   - {
  91 + { //id:12,
90 92 name: 'IP 10',
91 93 pageSlug: 'Link/IP-10',
92 94 pageUrl: 'app/views/Link/Link-view.html',
... ... @@ -94,41 +96,42 @@ AIA.constant(&#39;pages&#39;, [
94 96  
95 97 },
96 98 {
  99 + //id:13,
97 100 name: 'In-Depth Reports',
98   - pageSlug: 'Link/InDepth-Reports',
  101 + pageSlug: 'Link/indepth-reports',
99 102 pageUrl: 'app/views/Link/Link-view.html',
100 103 pageController: 'LinkController'
101 104  
102 105 },
103   - {
  106 + { //id:14,
104 107 name: 'Complementary and Alternative Medicine',
105   - pageSlug: 'Link/Complementary-and-Alternate-Medicine',
  108 + pageSlug: 'Link/complementary-and-alternate-medicine',
106 109 pageUrl: 'app/views/Link/Link-view.html',
107 110 pageController: 'LinkController'
108 111  
109 112 },
110   - {
  113 + { //id:15,
111 114 name: 'Body Guide',
112   - pageSlug: 'Link/BodyGuide',
  115 + pageSlug: 'Link/bodyguide',
113 116 pageUrl: 'app/views/Link/Link-view.html',
114 117 pageController: 'LinkController'
115 118  
116 119 },
117   - {
  120 + { //id:16,
118 121 name: 'Symptom Navigator',
119   - pageSlug: 'Link/Symptom-Navigator',
  122 + pageSlug: 'Link/symptom-navigator',
120 123 pageUrl: 'app/views/Link/Link-view.html',
121 124 pageController: 'LinkController'
122 125  
123 126 },
124   - {
  127 + { //id:17,
125 128 name: 'The Wellness Tools',
126   - pageSlug: 'Link/Wellness-Tools',
  129 + pageSlug: 'Link/wellness-tools',
127 130 pageUrl: 'app/views/Link/Link-view.html',
128 131 pageController: 'LinkController'
129 132  
130 133 },
131   - {
  134 + { //id:18,
132 135 name: 'home',
133 136 pageSlug: 'home',
134 137 pageUrl: 'app/widget/MainView.html',
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @be7d8a7
... ... @@ -19,29 +19,29 @@
19 19 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
20 20 <li><a href="da-view-list" ng-click="IsVisible()">Dissectible Anatomy</a></li>
21 21 <!--<li><a href="atlas-anatomy.html">Atlas Anatomy</a></li>-->
22   - <li><a href="3dAnatomy-view" ng-click="IsVisible()">3D Anatomy</a></li>
23   - <li><a href="CI-view" ng-click="IsVisible()">Clinical Illustrations</a></li>
24   - <li><a href="CA-view" ng-click="IsVisible()">Clinical Animations</a></li>
  22 + <li><a href="3dAnatomy" ng-click="IsVisible()">3D Anatomy</a></li>
  23 + <li><a href="clinical-illustrations" ng-click="IsVisible()">Clinical Illustrations</a></li>
  24 + <li><a href="clinical-animations" ng-click="IsVisible()">Clinical Animations</a></li>
25 25 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=117&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Encyclopedia</a></li>-->
26   - <li><a href="Link/Encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
27   - <li><a href="Curriculum-Builder" ng-click="IsVisible()">Curriculum Builder</a></li>
28   - <li><a href="Anatomy-Test" ng-click="IsVisible()">Anatomy Tests</a></li>
  26 + <li><a href="Link/encyclopedia" ng-click="IsVisible()">Encyclopedia</a></li>
  27 + <li><a href="curriculum-builder" ng-click="IsVisible()">Curriculum Builder</a></li>
  28 + <li><a href="anatomy-test" ng-click="IsVisible()">Anatomy Tests</a></li>
29 29 <!--<li><a href="http://182.19.10.91:92/IPWeb10/index.aspx" target="_blank">IP 10</a></li>-->
30 30 <!--<li><a href="IP10-view" ng-click="IsVisible()">IP 10</a></li>-->
31 31 <li><a href="Link/IP-10" ng-click="IsVisible()">IP 10</a></li>
32   - <li><a href="Lab-Exercises" ng-click="IsVisible()">Lab Exercises</a></li>
  32 + <li><a href="lab-exercises" ng-click="IsVisible()">Lab Exercises</a></li>
33 33 <!--<li><a href="http://182.19.10.91:92/IndepthHome.aspx" target="_blank">In-Depth Reports</a></li>-->
34   - <li><a href="Link/InDepth-Reports" ng-click="IsVisible()">In-Depth Reports</a></li>
  34 + <li><a href="Link/indepth-reports" ng-click="IsVisible()">In-Depth Reports</a></li>
35 35 <!--<li><a href="http://182.19.10.91:92/CAMHome.aspx" target="_blank">Complementary and Alternative Medicine</a></li>-->
36   - <li><a href="Link/Complementary-and-Alternate-Medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
  36 + <li><a href="Link/complementary-and-alternate-medicine" ng-click="IsVisible()">Complementary and Alternative Medicine</a></li>
37 37 <li><a href="ADAM-Images" ng-click="IsVisible()">A.D.A.M Images</a></li>
38 38 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=25&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Body Guide</a></li>-->
39   - <li><a href="Link/BodyGuide" ng-click="IsVisible()">Body Guide</a></li>
  39 + <li><a href="Link/bodyguide" ng-click="IsVisible()">Body Guide</a></li>
40 40 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=44&pid=44&gid=000001&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">Symptom Navigator</a></li>-->
41   - <li><a href="Link/Symptom-Navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
  41 + <li><a href="Link/symptom-navigator" ng-click="IsVisible()">Symptom Navigator</a></li>
42 42 <!--<li><a href="http://aia5.adam.com/content.aspx?productId=20&ref=www.interactiveanatomy.com&url=aia5.adam.com" target="_blank">The Wellness Tools</a></li>-->
43   - <li><a href="Link/Wellness-Tools" ng-click="IsVisible()">The Wellness Tools</a></li>
44   - <li><a href="ADAM-On-Demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
  43 + <li><a href="Link/wellness-tools" ng-click="IsVisible()">The Wellness Tools</a></li>
  44 + <li><a href="ADAM-on-demand" ng-click="IsVisible()">A.D.A.M OnDemand</a></li>
45 45 </ul>
46 46 </div>
47 47  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @be7d8a7
... ... @@ -153,7 +153,7 @@
153 153 <script src="app/controllers/CIController.js"></script>
154 154 <script src="app/controllers/CAController.js"></script>
155 155 <script src="app/controllers/3dAController.js"></script>
156   - <script src="app/controllers/CBuildController.js"></script>
  156 + <script src="app/controllers/CurrBuildController.js"></script>
157 157 <script src="app/controllers/AnatTestController.js"></script>
158 158 <script src="app/controllers/LabExercController.js"></script>
159 159 <script src="app/controllers/ADAMImgController.js"></script>
... ...