Merge branch '3DAnatomyCode' into Develop

Amrita Vishnoi
2 parents d9ad3603 b8b21e2c
Showing 12 changed files with 52 additions and 51 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -39,7 +39,7 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="//52.2.38.120"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="false"/>
+    <add key="isUserAuthenticated" value="true"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
   </appSettings>  
   <system.web>
@@ -2,7 +2,7 @@
 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
     $rootScope.currentActiveModuleTitle = pages[5].name;
-    $scope.showme = false;
+    $scope.showTabButton = false;
     $scope.threeDAnatomyData;
     $scope.Id;
     $scope.$on('$viewContentLoaded', function (event) {
@@ -54,6 +54,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     }
     $scope.IsVisible = function () {
         //$scope.scroll();
+     
         $location.url("/3dAnatomy");
     }
@@ -146,7 +147,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
                               selector: '.threeDView',
                               theme: 'success',
                               currentController: '3dAController',
-                              parentSlug: '3dAnatomy',
+                              parentSlug: '3d-anatomy-list',
                               content: '<div class="col-sm-12">' +
                                       '<object data="' + $scope.Selected3DImagePath + '" width="100%" height="800px" type="image/svg+xml"></object>' +
                                       '</div>',
 AIA.controller("ADAMImgController", ["$scope", "$rootScope", "pages", "$log","$location",
 function ($scope, $rootScope, pages, log, $location) {
-    $scope.showme = true;
+    $scope.showTabButton = true;
     $scope.IsVisible = function () {
         $scope.scroll();
 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log","$location",
 function ($scope, $rootScope, pages, log, $location) {
-    //$scope.showme = true;
+    //$scope.showTabButton = true;
     //$scope.IsVisible = function () {
     //    $scope.scroll();
@@ -22,18 +22,18 @@ function ($scope, $rootScope, pages, log, $location) {
         // code that will be executed ... 
         // every time this view is loaded
-        //get current path
-        var currentURL = $location.path();
-        var selectedModuleName = '';
-        //set module title
-        angular.forEach($rootScope.userModules, function (value, key) {
-            if (value.slug === currentURL.replace('/', '')) {
-                selectedModuleName = value.name;
-            }
-            $rootScope.currentActiveModuleTitle = selectedModuleName;
+        //get current path
+        var currentURL = $location.path();
+        var selectedModuleName = '';
+        //set module title
+        angular.forEach($rootScope.userModules, function (value, key) {
+            if (value.slug === currentURL.replace('/', '')) {
+                selectedModuleName = value.name;
+            }
+            $rootScope.currentActiveModuleTitle = selectedModuleName;
         })
-        $scope.showme = true;
+        $scope.showTabButton = true;
         $scope.IsVisible = function () {
             $scope.scroll();
 AIA.controller("AnatTestController", ["$scope", "$rootScope", "pages", "$log", "$location",
 function ($scope, $rootScope, pages, log, $location) {
-    $scope.showme = false;
+    $scope.showTabButton = false;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -16,15 +16,15 @@ function ($scope, $rootScope, pages, log, $location) {
         // code that will be executed ... 
         // every time this view is loaded
-        //get current path
-        var currentURL = $location.path();
-        var selectedModuleName = '';
-        //set module title
-        angular.forEach($rootScope.userModules, function (value, key) {
-            if (value.slug === currentURL.replace('/', '')) {
-                selectedModuleName = value.name;
-            }
-            $rootScope.currentActiveModuleTitle = selectedModuleName;
+        //get current path
+        var currentURL = $location.path();
+        var selectedModuleName = '';
+        //set module title
+        angular.forEach($rootScope.userModules, function (value, key) {
+            if (value.slug === currentURL.replace('/', '')) {
+                selectedModuleName = value.name;
+            }
+            $rootScope.currentActiveModuleTitle = selectedModuleName;
         })
     })
 AIA.controller("CAController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "MedicalSpecialties", "DataService",
 function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, MedicalSpecialties, DataService) {
  //   $rootScope.currentActiveModuleTitle = pages[4].name;
-    $scope.showme = true;
+    $scope.showTabButton = true;
     $scope.AnimationData;
     $scope.CAAllBodyRegion = [];
     $scope.CAAllBodySystem = [];
@@ -30,15 +30,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         // code that will be executed ... 
         // every time this view is loaded
-        //get current path
-        var currentURL = $location.path();
-        var selectedModuleName = '';
-        //set module title
-        angular.forEach($rootScope.userModules, function (value, key) {
-            if (value.slug === currentURL.replace('/', '')) {
-                selectedModuleName = value.name;
-            }
-            $rootScope.currentActiveModuleTitle = selectedModuleName;
+        //get current path
+        var currentURL = $location.path();
+        var selectedModuleName = '';
+        //set module title
+        angular.forEach($rootScope.userModules, function (value, key) {
+            if (value.slug === currentURL.replace('/', '')) {
+                selectedModuleName = value.name;
+            }
+            $rootScope.currentActiveModuleTitle = selectedModuleName;
         })
 AIA.controller("CIController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "pages", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "MedicalSpecialties", "DataService",
 function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, pages, BodyRegions, BodySystems, ViewOrientations, ImageTypes, MedicalSpecialties, DataService) {
     // $rootScope.currentActiveModuleTitle = pages[3].name;
-    $scope.showme = true;
+    $scope.showTabButton = true;
     $scope.IllustrationData;
     $scope.CIAllBodyRegion = [];
     $scope.CIAllBodySystem = [];
@@ -2,7 +2,7 @@
 function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
    // $rootScope.currentActiveModuleTitle = pages[6].name;
-    $scope.showme = false;
+    $scope.showTabButton = false;
     $scope.listCurriculumBuilder = null;
     $scope.dataPopup = null;
     $scope.countLeftlist;
@@ -143,7 +143,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.isBodyRegionDataLoaded = false;
     //currentTitleFromJson shows the current BodyView Title 
     $scope.currentTitleFromJson;
-    $scope.showme = false;
+    $scope.showTabButton = false;
     $scope.IsVisible = function () {
         $scope.scroll();
@@ -16,18 +16,18 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
         // code that will be executed ... 
         // every time this view is loaded
-        //get current path
-        var currentURL = $location.path();
-        var selectedModuleName = '';
-        //set module title
-        angular.forEach($rootScope.userModules, function (value, key) {
-            if (value.slug === currentURL.replace('/', '')) {
-                selectedModuleName = value.name;
-            }
-            $rootScope.currentActiveModuleTitle = selectedModuleName;
+        //get current path
+        var currentURL = $location.path();
+        var selectedModuleName = '';
+        //set module title
+        angular.forEach($rootScope.userModules, function (value, key) {
+            if (value.slug === currentURL.replace('/', '')) {
+                selectedModuleName = value.name;
+            }
+            $rootScope.currentActiveModuleTitle = selectedModuleName;
         })
-        $scope.showme = false;
+        $scope.showTabButton = false;
         $rootScope.currentActiveModuleTitle = pages[8].name;
         $scope.getLabExerciseModules();
@@ -43,7 +43,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     });
-    // $scope.showme = false;
+    // $scope.showTabButton = false;
     $scope.IsVisible = function () {
         // $scope.scroll();
@@ -30,7 +30,7 @@ function ($scope, $rootScope, log, pages, $routeParams) {
         }
     });
-    $scope.showme = false;
+    $scope.showTabButton = false;
     $scope.IsVisible = function () {
     $scope.scroll();
@@ -6,7 +6,7 @@
         <h4 class="pull-left" data-ng-bind="currentActiveModuleTitle"><!--{{currentActiveModuleTitle}}--></h4>
         <div class="pull-right paddTop4 ">
             <!--<div class="pull-right paddTop4 ">-->
-            <div role="group" ng-show="showme" class="btn-group">
+            <div role="group" ng-show="showTabButton" class="btn-group">
                 <ul class="listgrid-view" role="tablist">
                     <!--<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>
                     <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>-->