Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into ipadExportImageIssue

unknown
2 parents 8d4080cb 1f6f64e9
Showing 9 changed files with 51 additions and 24 deletions
150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
 AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile",
 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
  
-    $rootScope.currentActiveModuleTitle = pages[5].name;
+  
     $scope.showTabButton = false;
     $scope.threeDAnatomyData;
     $scope.Id;
     $scope.$on('$viewContentLoaded', function (event) {
-
+        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;
+        })
         if ($rootScope.refreshcheck == null) {
             $location.path('/');
         }
@@ -605,9 +605,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
                       if (clickedCIImage.length > 0 && clickedCISummary.length > 0) {
  
-                          $rootScope.isLoading = false;
-                          $('#spinner').css('visibility', 'hidden');
-
                           $.jsPanel({
                               id: 'ciImagePanel',
                               selector: '.ciView',
@@ -633,6 +630,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
                           });
  
+
+                          $('#canvasDiv img').load(function () {
+                             
+                              $rootScope.isLoading = false;
+                              $('#spinner').css('visibility', 'hidden');
+                          });
+
                           $rootScope.currentSlug = 'clinical-illustrations-detail';
  
                           $rootScope.openViews.push(
@@ -4944,7 +4944,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 canvasModesty.style.left = X + 'px';
                 canvasModesty.style.top = Y + 'px';
                 canvasModesty.style.visibility = 'visible';
-                if($rootScope.currentBodyViewId=="11"){
+                if ($rootScope.voId == "11") {
  
                     canvasModesty.style.zIndex = 11000;
                 }
@@ -7828,7 +7828,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.OnViewChange = function (event) {
         //  alert(event.target.title);
         //   alert($("[title*='" + event.target.title + "']").parent().hasClass("active"));
-        if ($("[title*='" + event.target.title + "']").parent().hasClass("active") == true) {
+        if ($("[title='" + event.target.title + "']").parent().hasClass("active") == true) {
  
  
  
@@ -4377,6 +4377,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     function OpenJSPanel() {
         $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
+        $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
         $.jsPanel({
             id: 'jsPanel-1',
             selector: '#dvPrintPreview',
@@ -4427,34 +4428,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $(document).on('change', '#printPSOptions', function () {
         var option = $('#printPSOptions').find(":selected").text();
         switch (option) {
-            case (option = "10%"):
+            case ("10%"):
                 ResizeImage(0.1);
                 break;
-            case (option = "25%"):
+            case ("25%"):
                 ResizeImage(0.25);
                 break;
-            case (option = "50%"):
+            case ("50%"):
                 ResizeImage(0.5);
                 break;
-            case (option = "75%"):
+            case ("75%"):
                 ResizeImage(.75);
                 break;
-            case (option = "65%"):
+            case ("65%"):
                 ResizeImage(0.65);
                 break;
-            case (option = "100%"):
+            case ("100%"):
                 ResizeImage(1);
                 break;
-            case (option = "150%"):
+            case ("150%"):
                 ResizeImage(1.5);
                 break;
-            case (option = "200%"):
+            case ("200%"):
                 ResizeImage(2);
                 break;
-            case (option = "500%"):
+            case ("500%"):
                 ResizeImage(5);
                 break;
-            case (option = "Auto"):
+            case ("Auto"):
                 ResizeImage(0);
                 break;
             default:
@@ -4504,6 +4505,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
         $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
+        $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
         $("#annotationButton").parent().removeClass("disableMenuannotation");
         $("#annotationToolBarOptions").removeClass("disableMenuoption");
         $("#optionsListManagerTab").removeClass("disableMenuoption");
@@ -1358,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $rootScope.hidePins = function () {
-        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
+        $("#dropdownMenu221").addClass("aaSystemDisable");
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.hideSpeechBubble();
@@ -1387,6 +1387,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $scope.showAllPinsAfterHide = function (event) {
+        if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
+            $("#dropdownMenu221").removeClass("aaSystemDisable");
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.isHidePinBtnClicked = false;
@@ -1413,7 +1416,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
  
     $scope.showSelectedPins = function () {
-        $rootScope.isshowAllPinsBtnAfterHideClicked = false;
+        if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
+            $("#dropdownMenu221").removeClass("aaSystemDisable");
+        }
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
  
@@ -26,7 +26,7 @@
     <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
         <!--{{name}}-->
         <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
-            <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10"><!--{{module.name}}--></a></li>
+            <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10 || module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10 || module.id==13"><!--{{module.name}}--></a></li>
         </ul>
     </div>
  
@@ -1272,9 +1272,7 @@
                                 <div class="form-group" id="moduleDiv12">
                                     <div class="col-sm-8">• Complementary and Alternative Medicine</div>
                                 </div>
-                                <div class="form-group" id="moduleDiv13">
-                                    <div class="col-sm-8">• A.D.A.M Images</div>
-                                </div>
+                               
                                 <div class="form-group" id="moduleDiv14">
                                     <div class="col-sm-8">• Body Guide</div>
                                 </div>
@@ -1301,6 +1299,9 @@
                                 <div class="form-group" id="moduleDiv10">
                                     <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
                                 </div>
+                                <div class="form-group" id="moduleDiv13">
+                                    <div class="col-sm-8">• A.D.A.M Images</div>
+                                </div>
                             </div>
                             <div class="form-group">
                                 <div style="text-align: center">
@@ -1104,4 +1104,11 @@ li[disabled], a[disabled] {
 }
 a[disabled] {
     color: #aaa !important; 
-}
 \ No newline at end of file
+}
+
+		
+.aaSystemDisable
+ {
+    pointer-events : none;
+    opacity : 0.5;
+}