1. after current structire selection, we click on highlight, call should not go …

…on the hoghlightbybodysystemselection. 2. need to check why ishighlight was false on line 3048

1. after current structire selection, we click on highlight, call should not go …
…on the hoghlightbybodysystemselection. 2. need to check why ishighlight was false on line 3048
Nikita Kulshreshtha
1 parent 3aec8ffb
Showing 1 changed file with 41 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -645,6 +645,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             console.log('currentBodyViewId just before sending: ' + currentBodyViewId);
             $scope.loadBodyViewData(currentBodyViewId);
+
+            $scope.GetBodySystemData(currentBodyViewId);
             //2. load bodyRegion data
             $rootScope.isLoading = true;
             $rootScope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
@@ -3023,17 +3025,27 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $scope.DisableUI();
             $('.ui-slider').slider('disable');
+           
+            if ($scope.isTransparencyActivated) {
+
+                $scope.layerNumber = $rootScope.currentLayerNumber;
+            }
+            else {
+                $scope.layerNumber = $('#txtlayerNumber').val();
+                $rootScope.currentLayerNumber = $scope.layerNumber;
+            }
+          
             $("#btnTranparency").attr('disabled', 'disabled');
-            $rootScope.currentLayerNumber = $scope.layerNumber;
+           
-            $scope.layerNumber = $('#txtlayerNumber').val();
+            
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             if ($rootScope.isHighLight == true) {
-                $rootScope.isHighLight = false;
+             //   $rootScope.isHighLight = false;
                 $scope.CloseTransparencyBox();
             }
@@ -3059,7 +3071,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                            //remove existing data and draw fresh data
                            $scope.removeCurrentHighlightedBodySystem();
-                           
                            $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
                            $("#daMessageModal").modal('show');
@@ -3292,7 +3303,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                    });
-            // }
+            
         }
@@ -7964,6 +7975,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 //5. change the search terms as per the selected bodyview
                 $rootScope.loadSearchData();
+                $scope.GetBodySystemData(currentBodyViewId);
                 //6.
                 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Female', 'Male');
@@ -7996,6 +8008,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 //5. change the search terms as per the selected bodyview
                 $rootScope.loadSearchData();
+                $scope.GetBodySystemData(currentBodyViewId);
                 //6.
                 $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = $rootScope.getLocalStorageValue("currentViewTitle").replace('Male', 'Female');
@@ -8241,6 +8254,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         //4. change the search terms as per the selected bodyview
                         $rootScope.loadSearchData();
+                        $scope.GetBodySystemData($rootScope.voId);
+
                         //5.Change the popup title next to search
                         $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle");
@@ -8487,7 +8502,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         //body highlight options functinality
         $scope.LoadBodySystemData = function (event) {
-            event.stopPropagation();
+           event.stopPropagation();
             $("#structureDropdown").toggle();
             $("#genderChangeId").css("display", "none");
             $("#viewID").css("display", "none");
@@ -8507,6 +8522,24 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             systemListHtml = systemListHtml + '</ul>';
             $('#bodySystem').append(systemListHtml);
+           
+           // var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
+           // DataService.getJson(bodySystemDataPath)
+           //.then(
+           // function (result) {
+
+           //     $rootScope.BodySystemData = result;
+
+           // },
+           // function (error) {
+           //     console.log(error.statusText)
+           // }
+           // )
+
+        }
+
+        $scope.GetBodySystemData = function (currentBodyViewId) {
+            //var currentBodyViewId = $rootScope.voId;
             var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
             DataService.getJson(bodySystemDataPath)
            .then(
@@ -8519,7 +8552,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 console.log(error.statusText)
             }
             )
-
         }
         angular.element(document).click(function () {
@@ -8547,11 +8579,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $rootScope.systemNumber = event.currentTarget.id;
+           
             if ($rootScope.systemNumber == 0) {
                 console.log("inside HighlightBodyByBodySystem ..came inside current structure");
                 //clear highlighted system
                 $scope.removeCurrentHighlightedBodySystem();
+                $rootScope.isHighlightBodyByBodySystem = false;
                 $scope.EnableUI();
             }