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

Conflicts: 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Show/HideFunctionality
Conflicts: 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
unknown
2 parents e624aa21 acff4858
Showing 147 changed files with 175 additions and 39 deletions
400-SOURCECODE/AIAHTML5.API/Web.config
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/content/images/DA/ethnicity/body-views/9/B/thumbnails/da_tni_3343_B.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/A/navigator_images/da_oi_81.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/A/navigator_images/da_oi_82.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/A/thumbnails/da_tni_3335_AN.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/A/thumbnails/da_tni_3335_AY.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/B/navigator_images/da_oi_85.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/B/navigator_images/da_oi_86.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/B/thumbnails/da_tni_3335_BN.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/B/thumbnails/da_tni_3335_BY.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/L/navigator_images/da_oi_89.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/L/navigator_images/da_oi_94.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/L/thumbnails/da_tni_3335_LN.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/L/thumbnails/da_tni_3335_LY.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/da/ethnicity/body-views/1/W/navigator_images/da_oi_109.jpg
@@ -39,7 +39,7 @@
     <add key="EnableSSL" value="false" />
     <add key="Site_Url" value ="http://qa.beta.interactiveanatomy.com/"/>
     <add key ="HostAddress" value="10.100.12.13" />
-    <add key="isUserAuthenticated" value="true"/>
+    <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
   </appSettings>  
   <system.web>
@@ -71,6 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         else {
             $scope.setActiveTab(1);
             $scope.reRunSearchOnLoad();
+            $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') });
         }
  
  
@@ -449,7 +450,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
         localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
         localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
-
+        var CAGridViewScrollPosition = $($window).scrollTop();
+        localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition);
         var u = $location.url();
         $location.url('/clinical-animations-detail');
  
@@ -570,7 +572,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
  
                           $rootScope.currentSlug = 'clinical-animations-detail';
-
+                          $('html, body').animate({ scrollTop: 0 });
                           $rootScope.openViews.push(
                          {
                              "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId,
@@ -644,8 +646,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
                       var curCAListViewScroll = localStorage.getItem("CAListViewScroll");
                       if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') {
-
-                          $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
+                          if (typeof InstallTrigger !== 'undefined') {
+                              
+                              $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") });
+
+                          }
+                          else
+                          {
+                              $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll"));
+                          }
                       }
                       //else {
                       //    $('#ListViewDiv').scrollTop(0);
@@ -693,9 +693,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
                       var curCIListViewScroll = localStorage.getItem("CIListViewScroll");
                       if (typeof (curCIListViewScroll) !== "undefined" && curCIListViewScroll !== null && curCIListViewScroll !== '') {
-
+                          if (typeof InstallTrigger !== 'undefined')
+                          {
+                              
+                                    $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CIListViewScroll") });
+                          }
+                      else
+                          {
+                              
                           $('#ListViewDiv').scrollTop(localStorage.getItem("CIListViewScroll"));
                       }
+                          
+                      }
                       //else {
                       //    $('#ListViewDiv').scrollTop(0);
                       //}
@@ -618,6 +618,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $("#optionsListManagerTab").addClass("disableSubMenu");
             $rootScope.disableFileMenu = " ";
         }
         else if ($location.url() == "/module-item-view") {
@@ -633,10 +634,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.disableMenuoption = " ";
             $rootScope.disableSubMenu = "disableSubMenu";
             $("#annotationToolBarOptions").addClass("disableSubMenu");
+            $("#optionsListManagerTab").addClass("disableSubMenu");
             $rootScope.disableFileMenu = "disableFileMenu";
         }
         else {
             $("#annotationToolBarOptions").removeClass("disableSubMenu");
+            $("#optionsListManagerTab").removeClass("disableSubMenu");
             $rootScope.disableMenuannotation = "disableMenuannotation";
             $rootScope.disableMenuoption = "disableMenuoption";
             $rootScope.disableSubMenu = "";
@@ -1503,9 +1506,20 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $("#borderWidthCanvasElement").css({ "pointer-events": "none" });
                 $("#outlineColor").css({ "pointer-events": "none" });
             }
+            if ((isfilloptionChecked == false) && (isOutlineOptionChecked == false)) {
+                $(".setEnableDisableForEditShapeStyle").css({ "opacity": "1" });
+                $("#borderWidthCanvasElement").css({ "pointer-events": "auto" });
+                $("#outlineColor").css({ "pointer-events": "auto" });
+                $(".enableDisableOpacity label").css({ "cursor": "pointer" });
+                $(".enableDisableOpacity").css({ "opacity": "1" });
+                $("#edit-slider-3").css({ "pointer-events": "auto" });
+                $("#edit-slider-4").css({ "pointer-events": "auto" });
+                $("#editstylebackgroundcolor").css({ "pointer-events": "auto" });
+                document.getElementById("editStyleForm").reset();
+            }
             var previewBgColor = $("#shapeStyleDiv").css('background-color');
-            var previewBorderColor = $('#previewBorder').css('border-color');
-            var previewBorderWidth = $('#previewBorder').css('border-width');
+            var previewBorderColor = $('#previewBorder').css('border-top-color');
+            var previewBorderWidth = $('#previewBorder').css('border-top-width');
             var previewOpacity = $('#previewBorder').css('opacity');
             $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", previewBgColor);
             $("#imgOpacity").css("background-color", previewBgColor);
@@ -25,6 +25,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.AllImageType = [];
     $rootScope.speechBubbleDimaensions = [];
     $scope.runningSearchWorkers = [];
+    $scope.clickedPins = [];
  
     $scope.query = {
         selectedbodyregion: '',
@@ -436,13 +437,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
     $scope.showSelectedSystemPins = function (event) {
  
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.removeSpeechBubble();
         if (event.currentTarget.id == "0") {
  
             $scope.selectedSystemName = null;
             if ($scope.isHidePinBtnClicked) {
  
-                $scope.showAllPinsAfterHide($scope.aaPinData);
+               // $scope.showAllPinsAfterHide($scope.aaPinData);
+                $scope.showAllPinsAfterHide();
             }
             else {
                 $scope.showAllPins();
@@ -468,7 +473,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                      .where("_BodySystemName == " + $scope.selectedSystemName)
                                      .select();
                             if ($scope.isHidePinBtnClicked) {
-                                $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
+                               // $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
+                                $scope.showAllPinsAfterHide();
  
                             }
                             else
@@ -571,6 +577,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
         }
  
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
         // $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i])
     }
  
@@ -911,7 +919,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
                 // alert('pinId: ' + pinID);
                 //showAnnotation();
-                var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
+
+                var pinData = new jinqJs()
+                              .from($scope.aaPinData)
+                              .where("_PinId == " + pinID)
+                              .select();
+                
+               
+                var pinTermNumber = pinData[0]._TermId;
+                
+                var pinWithSameTerm = new jinqJs()
+                
+                                     .from($scope.aaPinData)
+                                     .where("_TermId == " + pinTermNumber)
+                                     .select();
+           
+                
+                  if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
+                    
+                        for (var i = 0; i < pinWithSameTerm.length; i++) {
+                    
+                             $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
+                         }
+                    
+                   }
+
                 var selectedPinData = new jinqJs()
                             .from($scope.aaPinData)
                             .where("_PinId == " + pinID)
@@ -1046,6 +1078,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
     $scope.hidePins = function () {
  
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.hideSpeechBubble();
  
         $scope.isHidePinBtnClicked = true;
@@ -1063,50 +1098,102 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }).drawLayers();
         })
  
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
     }
  
-    $scope.showAllPinsAfterHide = function (selectedSystemPinData) {
+    $scope.showAllPinsAfterHide = function (event) {
+
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
  
         $scope.isHidePinBtnClicked = false;
+
         if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
-            $scope.showSystemPins($scope.selectedSystemPinData);
+
+            $scope.showSystemPins($scope.selectedSystemPinData, false);
+
         } else {
-            $scope.showSystemPins($scope.aaPinData);
  
-            //angular.forEach($scope.aaPinData, function (aaPinDataValue, aaPinDataKey) {
+            $scope.showSystemPins($scope.aaPinData, false);
+        }
+        $scope.showSpeechBubble();
+    };
+
+
+    $scope.showSelectedPins = function () {
  
-            //    var pinName = 'Pin_' + aaPinDataValue._PinId;
-            //    var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
  
-            //    $('#aaDetailViewCanvas').setLayer(pinName, {
-            //        visible: true // set to true instead to show the layer again
-            //    }).drawLayers();
+        $scope.isHidePinBtnClicked = false;
+
+        if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
+
+            $scope.showSystemPins($scope.selectedSystemPinData, true);
+
+        }
+        else {
+            $scope.showSystemPins($scope.aaPinData, true);
  
-            //    $('#aaDetailViewCanvas').setLayer(pinArcName, {
-            //        visible: true // set to true instead to show the layer again
-            //    }).drawLayers();
-            //})
         }
         $scope.showSpeechBubble();
     };
  
-    $scope.showSystemPins = function (seletedSystemPinData) {
+   
+    $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) {
  
-        angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
+        if (isShowSelectedPins) {
  
-            var pinName = 'Pin_' + aaPinDataValue._PinId;
-            var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+            angular.forEach($scope.clickedPins, function (value, key) {
  
-            $('#aaDetailViewCanvas').setLayer(pinName, {
-                visible: true // set to true instead to show the layer again
-            }).drawLayers();
+                seletedSystemPinData = new jinqJs()
+                                     .from(seletedSystemPinData)
+                                     .where('_PinId != ' + value.id)
+                                     .select();
+            })
+                angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
  
-            $('#aaDetailViewCanvas').setLayer(pinArcName, {
-                visible: true // set to true instead to show the layer again
-            }).drawLayers();
-        })
-    }
+                   // if (aaPinDataValue._PinId != value.id) {
+                        var pinName = 'Pin_' + aaPinDataValue._PinId;
+                        var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+
+                        $('#aaDetailViewCanvas').setLayer(pinName, {
+                            visible: false // set to true instead to show the layer again
+                        }).drawLayers();
  
+                        $('#aaDetailViewCanvas').setLayer(pinArcName, {
+                            visible: false // set to true instead to show the layer again
+                        }).drawLayers();
+                   // }
+                })
+
+           // })
+            $scope.clickedPins = [];
+        }
+
+        else {
+            angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
+
+                var pinName = 'Pin_' + aaPinDataValue._PinId;
+                var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+
+                $('#aaDetailViewCanvas').setLayer(pinName, {
+                    visible: true // set to true instead to show the layer again
+                }).drawLayers();
+
+                $('#aaDetailViewCanvas').setLayer(pinArcName, {
+                    visible: true // set to true instead to show the layer again
+                }).drawLayers();
+            })
+        }
+
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
+
+
+    }
  
     $scope.showItemsForSearch = function () {
         console.log('showItemsForSearch is called');
@@ -1264,3 +1351,12 @@ function showHideAnnotation(event) {
         scope.ShowHideAnnotation(event);
     });
 }
+
+function showSelectedPins(event) {
+   
+    console.log('showSelectedPins is called')
+    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+    scope.$apply(function () {
+        scope.showSelectedPins(event);
+    });
+}
 \ No newline at end of file
@@ -30,7 +30,7 @@
         <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
         <div class="">
             <div class="col-sm-6" title="Hide Pins"><button onclick="hidePins(event)" class="btn btn-black btn-sm" > <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt="" title=""></button> </div>
-            <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div>
+            <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right" onclick="showSelectedPins(event)"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div>
             <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5" onclick="showAllPins(event)"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt="" title=""></button></div>
             <div class="col-sm-6" title="Select System">
                 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" title=""></button>
@@ -2855,8 +2855,16 @@ _html2canvas.Renderer.Canvas = function(options) {
         newCanvas.width = Math.ceil(bounds.width);
         newCanvas.height = Math.ceil(bounds.height);
         ctx = newCanvas.getContext("2d");
-
-        ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
+        if (/*@cc_on!@*/false || !!document.documentMode) {
+           
+            var imgData = canvas.getContext("2d").getImageData(bounds.left, bounds.top, bounds.width, bounds.height);
+            ctx.putImageData(imgData, 50, 0);
+        }
+        else {
+           
+            ctx.drawImage(canvas, bounds.left, bounds.top, bounds.width, bounds.height, 0, 0, bounds.width, bounds.height);
+        }
+      
         canvas = null;
         return newCanvas;
       }