diff --git a/300-PROTOTYPES/20160229/AIA/js/custom.js b/300-PROTOTYPES/20160229/AIA/js/custom.js index 981626e..47a95a3 100644 --- a/300-PROTOTYPES/20160229/AIA/js/custom.js +++ b/300-PROTOTYPES/20160229/AIA/js/custom.js @@ -5,6 +5,7 @@ $(function(){ var bar = $('.sidebar'); var main = $('.main'); $('.toggleBar').click(function() { + alert('jjjj') /*barPos = parseInt($('.sidebar').css('left')); if(barPos!==0 && !bar.hasClass('active')) { @@ -27,7 +28,8 @@ $(function(){ var barPos=0; var bar = $('.tools'); var main = $('.main2'); - $('.toggleBar').click(function() { + $('.toggleBar').click(function() { + alert('hjh') /*barPos = parseInt($('.tools').css('left')); if(barPos!==0 && !bar.hasClass('active')) { @@ -51,7 +53,7 @@ $(function(){ var barPos=0; var bar = $('.treeview-left'); var main = $('.main-treeview'); - $('.toggleBar').click(function() { + $('.toggleBar').click(function() { alert('kkkk') /*barPos = parseInt($('.sidebar').css('left')); if(barPos!==0 && !bar.hasClass('active')) { diff --git a/300-PROTOTYPES/20160229/AIA/js/main.js b/300-PROTOTYPES/20160229/AIA/js/main.js index 63e5f44..471380d 100644 --- a/300-PROTOTYPES/20160229/AIA/js/main.js +++ b/300-PROTOTYPES/20160229/AIA/js/main.js @@ -1,7 +1,7 @@ /*** CUSTOM.JS FUNCTION **/ -$(function(){ +$(function(){ alert('ggggggg') "use strict"; /*** Sidebar Toggle ***/ var barPos=0; diff --git a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html index 32cdc90..fa47ff7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/MainMenu.html @@ -1,9 +1,9 @@ -
-
+
+
-
-

Welcome to A.D.A.M. Interactive Anatomy

-
+
+

{{currentActiveModuleTitle}}

+
@@ -29,6 +29,7 @@
+
@@ -69,4 +70,29 @@ $(function () { $(".modal").draggable(); }); + + \ 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 8c5444f..45d2974 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1,8 +1,8 @@  'use strict'; -AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "$routeParams", -function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$routeParam ) { +AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA","Modules", "$routeParams", +function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,Modules,$routeParam ) { $scope.genderId = ""; $scope.BodyViewData = null; @@ -17,12 +17,17 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route //view specific constants $scope.voId ; $scope.layerNo; + //get the DA body view list based on selected gender $scope.getDAViewList = function ($event) { - // debugger; + // debugger; + if ($('#MainImage') != null) { + $('#MainImage').remove(); + } + $rootScope.currentActiveModuleTitle = Modules[0].Name; $("#bodyViewList").empty(); //for default load if ($event == null) { @@ -54,9 +59,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route } $scope.imagePath = "~/../content/images/DA/BodyViews/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; - + // debugger; - var $el = $('
' + var $el = $('
' + '' + '

' + value._title + '

').appendTo('#bodyViewList'); @@ -93,9 +98,11 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route $scope.openView = function ($event) { - // debugger; + debugger; + $rootScope.currentBodyViewId = $event.currentTarget.id; + $rootScope.CurrentActiveView = $event.currentTarget.textContent; $rootScope.pageToOpen = 'app/views/da/da-body-view.html'; - $scope.voId = $event.currentTarget.id; + } @@ -160,7 +167,7 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route ajax: { url: 'app/views/da/da-view.html' }, - title: "Male Anterior", + title: $rootScope.CurrentActiveView, // bootstrap: 'columns large-10 medium-9', position: { top: 70, //50, @@ -215,9 +222,9 @@ function ($scope,$rootScope, $compile,$http, $log, $location, $timeout,DA,$route .error(function (data, status, headers, config) { console.log(data); }); + debugger; - - $scope.voId = 1; + $scope.voId = $rootScope.currentBodyViewId; $scope.layerNo = 0; $scope.skinTone = DA[0].ethnicity; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 2b6426e..de8b0fd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1,11 +1,14 @@ 'use strict'; -AIA.controller("HomeController", ["$rootScope", "$log", "$location", "$timeout", - function ($rootScope, $log, $location, $timeout) { +AIA.controller("HomeController", ["$rootScope","Modules", "$log", "$location", "$timeout", + function ($rootScope,Modules, $log, $location, $timeout) { //$scope.pageToOpen = { // name: 'MainMenu' //}; $rootScope.pageToOpen = 'MainMenu.html'; + $rootScope.currentBodyViewId = 1; + $rootScope.currentActiveModuleTitle = 'Welcome to A.D.A.M. Interactive Anatomy';//Modules[0].Name; + $rootScope.CurrentActiveView; }] ); \ 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 93b37de..f099fb2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -41,6 +41,27 @@ AIA.constant('DA', [ ]); +AIA.constant('Modules', [ + { + Id:1, + Name: 'Dissectible Anatomy', + }, + { + Id:2, + Name: 'Atlas Anatomy', + }, + { + Id:3, + Name: '3D Anatomy', + }, + { + Id:4, + Name: 'Clinical Illustrations', + }, + +]); + + AIA.config(function ($routeProvider, pages, $locationProvider) { $locationProvider.html5Mode(true); diff --git a/400-SOURCECODE/AIAHTML5.Web/content/js/custom/custom.js b/400-SOURCECODE/AIAHTML5.Web/content/js/custom/custom.js index 21bad27..831f383 100644 --- a/400-SOURCECODE/AIAHTML5.Web/content/js/custom/custom.js +++ b/400-SOURCECODE/AIAHTML5.Web/content/js/custom/custom.js @@ -4,7 +4,8 @@ $(function(){ var barPos=0; var bar = $('.sidebar'); var main = $('.main'); - $('.toggleBar').click(function() { + $('.toggleBar').click(function () { + alert('kkkkkkkkkkkkkk') /*barPos = parseInt($('.sidebar').css('left')); if(barPos!==0 && !bar.hasClass('active')) { @@ -27,7 +28,8 @@ $(function(){ var barPos=0; var bar = $('.tools'); var main = $('.main2'); - $('.toggleBar').click(function() { + $('.toggleBar').click(function () { + alert('hjh gjgvghg') /*barPos = parseInt($('.tools').css('left')); if(barPos!==0 && !bar.hasClass('active')) { @@ -63,6 +65,7 @@ $(function(){ bar.removeClass('active'); main.removeClass('active'); }*/ + alert('hjh') bar.toggleClass('active'); main.toggleClass('active'); }); diff --git a/400-SOURCECODE/AIAHTML5.Web/content/js/custom/main.js b/400-SOURCECODE/AIAHTML5.Web/content/js/custom/main.js index 1c48a8c..6bb09c3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/content/js/custom/main.js +++ b/400-SOURCECODE/AIAHTML5.Web/content/js/custom/main.js @@ -7,8 +7,9 @@ $(function(){ var barPos=0; var bar = $('.sidebar'); var main = $('.main'); - $('.toggleBar').click(function() { - barPos = parseInt($('.sidebar').css('left')); + $('.toggleBar').click(function () { + debugger; + barPos = parseInt($('.sidebar').css('left')); if(barPos!==0 && !bar.hasClass('active')) { bar.addClass('active'); diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index c14dd51..cea2df8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -44,7 +44,7 @@
-
+
@@ -52,7 +52,7 @@ -
+