ADAM / AIAHTML5

Commit c6a1294e53ce445b72800e7dc6fd33333f76f056

Authored by Amrita Vishnoi
2 parents d9ad3603 b8b21e2c

Merge branch '3DAnatomyCode' into Develop

Inline Side-by-side
Showing 12 changed files with 52 additions and 51 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
  View file @c6a1294
... ... @@ -39,7 +39,7 @@
39 39 <add key="EnableSSL" value="false" />
40 40 <add key="Site_Url" value ="//52.2.38.120"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42   - <add key="isUserAuthenticated" value="false"/>
  42 + <add key="isUserAuthenticated" value="true"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
44 44 </appSettings>
45 45 <system.web>
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @c6a1294
... ... @@ -2,7 +2,7 @@
2 2 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
3 3  
4 4 $rootScope.currentActiveModuleTitle = pages[5].name;
5   - $scope.showme = false;
  5 + $scope.showTabButton = false;
6 6 $scope.threeDAnatomyData;
7 7 $scope.Id;
8 8 $scope.$on('$viewContentLoaded', function (event) {
... ... @@ -54,6 +54,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
54 54 }
55 55 $scope.IsVisible = function () {
56 56 //$scope.scroll();
  57 +
57 58 $location.url("/3dAnatomy");
58 59  
59 60 }
... ... @@ -146,7 +147,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
146 147 selector: '.threeDView',
147 148 theme: 'success',
148 149 currentController: '3dAController',
149   - parentSlug: '3dAnatomy',
  150 + parentSlug: '3d-anatomy-list',
150 151 content: '<div class="col-sm-12">' +
151 152 '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' +
152 153 '</div>',
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
  View file @c6a1294
1 1 AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log","$location",
2 2 function ($scope, $rootScope, pages, log, $location) {
3   - $scope.showme = true;
  3 + $scope.showTabButton = true;
4 4 $scope.IsVisible = function () {
5 5 $scope.scroll();
6 6  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @c6a1294
1 1 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log","$location",
2 2 function ($scope, $rootScope, pages, log, $location) {
3   - //$scope.showme = true;
  3 + //$scope.showTabButton = true;
4 4 //$scope.IsVisible = function () {
5 5 // $scope.scroll();
6 6  
... ... @@ -22,18 +22,18 @@ function ($scope, $rootScope, pages, log, $location) {
22 22 // code that will be executed ...
23 23 // every time this view is loaded
24 24  
25   - //get current path
26   - var currentURL = $location.path();
27   - var selectedModuleName = '';
28   - //set module title
29   - angular.forEach($rootScope.userModules, function (value, key) {
30   - if (value.slug === currentURL.replace('/', '')) {
31   - selectedModuleName = value.name;
32   - }
33   - $rootScope.currentActiveModuleTitle = selectedModuleName;
  25 + //get current path
  26 + var currentURL = $location.path();
  27 + var selectedModuleName = '';
  28 + //set module title
  29 + angular.forEach($rootScope.userModules, function (value, key) {
  30 + if (value.slug === currentURL.replace('/', '')) {
  31 + selectedModuleName = value.name;
  32 + }
  33 + $rootScope.currentActiveModuleTitle = selectedModuleName;
34 34 })
35 35  
36   - $scope.showme = true;
  36 + $scope.showTabButton = true;
37 37 $scope.IsVisible = function () {
38 38 $scope.scroll();
39 39  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @c6a1294
1 1 AIA.controller("AnatTestController", ["$scope", "$rootScope", "pages", "$log", "$location",
2 2 function ($scope, $rootScope, pages, log, $location) {
3   - $scope.showme = false;
  3 + $scope.showTabButton = false;
4 4 $scope.IsVisible = function () {
5 5 $scope.scroll();
6 6  
... ... @@ -16,15 +16,15 @@ function ($scope, $rootScope, pages, log, $location) {
16 16 // code that will be executed ...
17 17 // every time this view is loaded
18 18  
19   - //get current path
20   - var currentURL = $location.path();
21   - var selectedModuleName = '';
22   - //set module title
23   - angular.forEach($rootScope.userModules, function (value, key) {
24   - if (value.slug === currentURL.replace('/', '')) {
25   - selectedModuleName = value.name;
26   - }
27   - $rootScope.currentActiveModuleTitle = selectedModuleName;
  19 + //get current path
  20 + var currentURL = $location.path();
  21 + var selectedModuleName = '';
  22 + //set module title
  23 + angular.forEach($rootScope.userModules, function (value, key) {
  24 + if (value.slug === currentURL.replace('/', '')) {
  25 + selectedModuleName = value.name;
  26 + }
  27 + $rootScope.currentActiveModuleTitle = selectedModuleName;
28 28 })
29 29 })
30 30  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @c6a1294
1 1 AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",
2 2 function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) {
3 3 // $rootScope.currentActiveModuleTitle = pages[4].name;
4   - $scope.showme = true;
  4 + $scope.showTabButton = true;
5 5 $scope.AnimationData;
6 6 $scope.CAAllBodyRegion = [];
7 7 $scope.CAAllBodySystem = [];
... ... @@ -30,15 +30,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
30 30 // code that will be executed ...
31 31 // every time this view is loaded
32 32  
33   - //get current path
34   - var currentURL = $location.path();
35   - var selectedModuleName = '';
36   - //set module title
37   - angular.forEach($rootScope.userModules, function (value, key) {
38   - if (value.slug === currentURL.replace('/', '')) {
39   - selectedModuleName = value.name;
40   - }
41   - $rootScope.currentActiveModuleTitle = selectedModuleName;
  33 + //get current path
  34 + var currentURL = $location.path();
  35 + var selectedModuleName = '';
  36 + //set module title
  37 + angular.forEach($rootScope.userModules, function (value, key) {
  38 + if (value.slug === currentURL.replace('/', '')) {
  39 + selectedModuleName = value.name;
  40 + }
  41 + $rootScope.currentActiveModuleTitle = selectedModuleName;
42 42 })
43 43  
44 44  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @c6a1294
1 1 AIA.controller("CIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "MedicalSpecialties", "DataService",
2 2 function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, ViewOrientations, ImageTypes, MedicalSpecialties, DataService) {
3 3 // $rootScope.currentActiveModuleTitle = pages[3].name;
4   - $scope.showme = true;
  4 + $scope.showTabButton = true;
5 5 $scope.IllustrationData;
6 6 $scope.CIAllBodyRegion = [];
7 7 $scope.CIAllBodySystem = [];
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @c6a1294
... ... @@ -2,7 +2,7 @@
2 2 function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
3 3  
4 4 // $rootScope.currentActiveModuleTitle = pages[6].name;
5   - $scope.showme = false;
  5 + $scope.showTabButton = false;
6 6 $scope.listCurriculumBuilder = null;
7 7 $scope.dataPopup = null;
8 8 $scope.countLeftlist;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c6a1294
... ... @@ -143,7 +143,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
143 143 $scope.isBodyRegionDataLoaded = false;
144 144 //currentTitleFromJson shows the current BodyView Title
145 145 $scope.currentTitleFromJson;
146   - $scope.showme = false;
  146 + $scope.showTabButton = false;
147 147 $scope.IsVisible = function () {
148 148 $scope.scroll();
149 149  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @c6a1294
... ... @@ -16,18 +16,18 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
16 16 // code that will be executed ...
17 17 // every time this view is loaded
18 18  
19   - //get current path
20   - var currentURL = $location.path();
21   - var selectedModuleName = '';
22   - //set module title
23   - angular.forEach($rootScope.userModules, function (value, key) {
24   - if (value.slug === currentURL.replace('/', '')) {
25   - selectedModuleName = value.name;
26   - }
27   - $rootScope.currentActiveModuleTitle = selectedModuleName;
  19 + //get current path
  20 + var currentURL = $location.path();
  21 + var selectedModuleName = '';
  22 + //set module title
  23 + angular.forEach($rootScope.userModules, function (value, key) {
  24 + if (value.slug === currentURL.replace('/', '')) {
  25 + selectedModuleName = value.name;
  26 + }
  27 + $rootScope.currentActiveModuleTitle = selectedModuleName;
28 28 })
29 29  
30   - $scope.showme = false;
  30 + $scope.showTabButton = false;
31 31 $rootScope.currentActiveModuleTitle = pages[8].name;
32 32 $scope.getLabExerciseModules();
33 33  
... ... @@ -43,7 +43,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
43 43  
44 44 });
45 45  
46   - // $scope.showme = false;
  46 + // $scope.showTabButton = false;
47 47 $scope.IsVisible = function () {
48 48 // $scope.scroll();
49 49  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
  View file @c6a1294
... ... @@ -30,7 +30,7 @@ function ($scope, $rootScope, log, pages, $routeParams) {
30 30 }
31 31 });
32 32  
33   - $scope.showme = false;
  33 + $scope.showTabButton = false;
34 34 $scope.IsVisible = function () {
35 35 $scope.scroll();
36 36  
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @c6a1294
... ... @@ -6,7 +6,7 @@
6 6 <h4 class="pull-left" data-ng-bind="currentActiveModuleTitle"><!--{{currentActiveModuleTitle}}--></h4>
7 7 <div class="pull-right paddTop4 ">
8 8 <!--<div class="pull-right paddTop4 ">-->
9   - <div role="group" ng-show="showme" class="btn-group">
  9 + <div role="group" ng-show="showTabButton" class="btn-group">
10 10 <ul class="listgrid-view" role="tablist">
11 11 <!--<li role="presentation" class="active" title="Image View"><a href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab" class="" ><i class=" fa fa-image"></i></a></li>
12 12 <li role="presentation" title="List View"><a href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab" class="" ><i class="fa fa-list-alt"></i></a></li>-->
... ...