1. fixed the toggle button issue on main menu.

2. added dynamic title for modules and for views. 3. added constant for module names.

1. fixed the toggle button issue on main menu.
2. added dynamic title for modules and for views. 3. added constant for module names.
Nikita Kulshreshtha
1 parent ab5d8b3f
Showing 10 changed files with 95 additions and 26 deletions
300-PROTOTYPES/20160229/AIA/js/custom.js
300-PROTOTYPES/20160229/AIA/js/main.js
400-SOURCECODE/AIAHTML5.Web/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
400-SOURCECODE/AIAHTML5.Web/content/js/custom/custom.js
400-SOURCECODE/AIAHTML5.Web/content/js/custom/main.js
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.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'))
 		{
 /***
 CUSTOM.JS FUNCTION
 **/
-$(function(){
+$(function(){ alert('ggggggg')
 	"use strict";
 	/*** Sidebar Toggle ***/
 	var barPos=0;
-<div class="bodyWrap row">
-    <div class="col-sm-12 pageHeading">
+<div class="bodyWrap row" >
+    <div class="col-sm-12 col-md-12 pageHeading">
         <!--<button type="button" class="btn btn-success pull-left toggleBar btn-sm" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </button>-->
-        <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"> <i class="fa fa-bars"></i> </div>
-        <h4 class="pull-left">Welcome to A.D.A.M. Interactive Anatomy</h4>
-        <div class="clearfix"></div>
+        <div class=" pull-left toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar" style="padding-left: 15px; "> <i class="fa fa-bars"></i> </div>
+        <h4 class="pull-left" ng->{{currentActiveModuleTitle}}</h4>
+        <div class="clearfix" style=""></div>
     </div>
     <!--Sidebar-->
     <div class="sidebar pull-left">
@@ -29,6 +29,7 @@
     </div>
     <div class="main">
         <div class="col-sm-12">
+                <div align="center" id="MainImage"><img src="content/images/img1.png" alt="" title="" class="img-responsive"></div>
             <div ng-view></div>
         </div>
     </div>
@@ -69,4 +70,29 @@
     $(function () {
         $(".modal").draggable();
     });
+</script>
+<script>
+    $(function () {
+        "use strict";
+        /*** Sidebar Toggle ***/
+        var barPos = 0;
+        var bar = $('.sidebar');
+        var main = $('.main');
+        $('.toggleBar').click(function () {
+           // alert('kkkkkkkkkkkkkk')
+            /*barPos = parseInt($('.sidebar').css('left'));
+            if(barPos!==0 && !bar.hasClass('active'))
+            {
+                bar.addClass('active');
+                main.addClass('active');	
+            }
+            else
+            {
+                bar.removeClass('active');
+                main.removeClass('active');			
+            }*/
+            bar.toggleClass('active');
+            main.toggleClass('active');
+        });
+    });
 </script>
 \ No newline at end of file
 '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 = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" data-ng-click="openView($event)"><div class="thumbnail" >'
+                    var $el = $('<div id=' + value._id + ' class="col-sm-3 col-lg-2" title = ' + value._title + ' data-ng-click="openView($event)"><div class="thumbnail" >'
                                               + '<img class= "daImg" id="' + value._title + '" src="' + $scope.imagePath + '" alt="" title="" >'
                                               + '<div class="caption"><p>' + value._title + '</p></div></a></div></div>').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;
 '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
@@ -41,6 +41,27 @@ AIA.constant(&#39;DA&#39;, [
 ]);
+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);
@@ -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');			
 	});
@@ -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');
@@ -44,7 +44,7 @@
                     </button>
                     <a class="frameLogo navbar-brand" href="welcome.html"><img src="content/images/logo-main.png" class="img-responsive" alt=""></a>
                 </div>
-                <div ng-include="'TopMenu.html'"/>
+                <div ng-include="'TopMenu.html'"></div>
             </div>
         </nav>
         <div class="bodyWrap row">
@@ -52,7 +52,7 @@
             <!--Body-->
             <!--<div ng-include="'MainMenu.html'" />-->
-            <div ng-include="pageToOpen" />
+            <div ng-include="pageToOpen" ></div>
             <!--<div data-ng-include data-ng-src="' pageToOpen.name '"></div>-->
             <!-- Footer
             <footer>
+/// <reference path="../../../../../index.html" />
+/// <reference path="../../../../../index.html" />
 /* global console, MobileDetect, jQuery */
 /* jQuery Plugin jsPanel
     Dependencies:
@@ -313,6 +315,7 @@ var jsPanel = {
     // closes a jsPanel and removes it from the DOM
     close: function (panel) {
+        alert('jspanel closed')
         // get parent-element of jsPanel
         var context = panel.parent(),
             panelID = panel.attr('id');
@@ -1507,6 +1510,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
         };
         jsP.close = function () {
+            alert('1')
             jsPanel.close(jsP);
             // no need to return something
         };
@@ -1596,6 +1600,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
         // jsPanel close
         $('.jsPanel-btn-close', jsP).on('click', function (e) {
+            alert('2')
             e.preventDefault();
             if (!jsP.option.controls.confirmClose) {
                 jsPanel.close(jsP, jsP.parentElmtTagname);
@@ -1604,6 +1609,7 @@ console.log(&quot;jsPanel version: &quot; + jsPanel.version);
                     jsPanel.close(jsP, jsP.parentElmtTagname);
                 }
             }
+            window.location.href = "da-view-list";
         });
         // jsPanel minimize