Merge pull request #36 from bjarnef/highlight-currentnode

warrenbuckley · warrenbuckley · commit 24c7513d7734 · 2015-03-20T07:51:52.000Z
Highlight current tree
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js
@@ -5,15 +5,14 @@
 app.requires.push('tableSort');
 
 app.controller("Analytics.BrowserController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
         // items list array
         $scope.items = [];
         $scope.itemSpecs = [];
 
-
         $scope.loadingViews = true;
         $scope.dateFilter = settingsResource.getDateFilter();
 
@@ -121,4 +120,6 @@ app.controller("Analytics.BrowserController",
                 }
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.CountryController",
-    function ($scope, $location, statsResource, settingsResource, assetsService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, assetsService, navigationService) {
 
         var profileID = "";
 
@@ -68,4 +68,6 @@
                 });
             });
         };
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.DeviceController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -114,4 +114,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.EcommerceController",
-    function ($scope, $location, statsResource, settingsResource) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) {
 
         var profileID = "";
 
@@ -94,4 +94,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.KeywordController",
-    function ($scope, $location, statsResource, settingsResource) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) {
 
         var profileID = "";
 
@@ -43,4 +43,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.LanguageController",
-    function ($scope, $location, statsResource, settingsResource) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) {
 
         var profileID = "";
 
@@ -41,4 +41,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.OSController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -113,4 +113,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.PageViewsController",
-    function ($scope, $location, statsResource, settingsResource, dateRangeService, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, dateRangeService, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -114,4 +114,6 @@
 
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.ProductPerformanceController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -96,4 +96,7 @@
 
             });
         });
+
+        // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.SalesPerformanceController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -96,4 +96,7 @@
 
             });
         });
+
+        // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.ScreenResController",
-    function ($scope, $location, statsResource, settingsResource) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) {
 
         var profileID = "";
 
@@ -40,4 +40,6 @@
                 });
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.SettingsController",
-    function ($scope, settingsResource, notificationsService, localizationService, navigationService) {
+    function ($scope, $routeParams, settingsResource, notificationsService, localizationService, navigationService) {
 
         //By default user has not authorised
         var hasUserAuthd = false;
@@ -43,8 +43,7 @@
 
             //Only load/fetch if showAuth is true
             if (hasUserAuthd === true) {
-
-                console.log("get accounts");
+                
                 //Get all accounts via settingsResource - does WebAPI GET call
                 settingsResource.getaccounts().then(function (response) {
                     $scope.accounts = response.data;
@@ -64,8 +63,6 @@
 
                 //When an account is selected
                 $scope.accountSelected = function (selectedAccount) {
-                    console.log(selectedAccount);
-
                     settingsResource.getprofiles(selectedAccount.Id).then(function (response) {
                         $scope.profiles = response.data;
                     });
@@ -109,9 +106,10 @@
                 notificationsService.success(localizationService.localize("analytics_profileDetailsSaved"));
 
                 //Sync ('refresh') the tree!
-                navigationService.syncTree({ tree: 'analyticsTree', path: [-1, -1], forceReload: true, activate: true });
+                navigationService.syncTree({ tree: 'analyticsTree', path: [-1, $routeParams.id], forceReload: true, activate: true });
             });
 
         };
 
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.SocialController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
         
         var profileID = "";
 
@@ -92,4 +92,6 @@
                 });
             });
         });
+
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false });
     });
diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js
@@ -1,5 +1,5 @@
 ﻿angular.module("umbraco").controller("Analytics.TransactionController",
-    function ($scope, $location, statsResource, settingsResource, localizationService) {
+    function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) {
 
         var profileID = "";
 
@@ -93,4 +93,7 @@
 
             });
         });
+
+        // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias
+        navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false });
     });
