switched nav to ng-href

app/app.js

@@ -15,24 +15,21 @@ var app = angular.module('app', [
 app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
     function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
 
-        /*$stateProvider.state('root', {
-            abstract: true,
-            template: '<div ui-view=""></div>',
-            resolve: {
-                groups: ['GroupsBusiness', function (GroupsBusiness) {
-                    return GroupsBusiness.loadAll();
-                }]
-            }
-        });*/
 
         //$locationProvider.html5Mode(true);
 
         $stateProvider.state('home',{
             url:'/',
-            //parent: 'root',
+            reloadOnSearch: false,
+            templateUrl:'views/home.html',
+            controller:'HomeController'
+        });
+
+        $stateProvider.state('thisweek',{
+            url:'/thisweek',
+            reloadOnSearch: false,
             templateUrl:'views/home.html',
-            controller:'HomeController',
-            revolve:{}
+            controller:'HomeController'
         });
 
         $urlRouterProvider.otherwise('/');

app/controllers/sidebar.controller.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('app')
-    .controller('SideBarController', ['$scope', '$state', 'DataShareBusiness', 'GroupsBusiness',
-        function($scope, $state, DataShareBusiness, GroupsBusiness) {
+    .controller('SideBarController', ['$scope', '$state', 'DataShareBusiness', 'GroupsBusiness', '$location',
+        function($scope, $state, DataShareBusiness, GroupsBusiness, $location) {
 
             $scope.DataShareBusiness = DataShareBusiness;
 
@@ -12,7 +12,7 @@ angular.module('app')
             {
                 if (DataShareBusiness.CurrentGroups.length != 0) {
                     var e = DataShareBusiness.CurrentGroups[DataShareBusiness.CurrentGroups.length - 1];
-                    if (e.Groups.length == 0) {
+                    if (e.Groups == null || e.Groups.length == 0) {
                         return e.Parent.Groups;
                     }
                     return e.Groups;
@@ -20,6 +20,12 @@ angular.module('app')
                 return DataShareBusiness.Groups;
             };
 
+            $scope.$watch(function(){ return Object.keys($location.search())[0] }, function(){
+                if (DataShareBusiness.Groups != null) {
+                    DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
+                }
+            });
+
             var promiseLoadGroups = {
                 id: "promiseLoadGroups",
                 loaderGroups: ["sidebar", "toolbar"]
@@ -27,5 +33,6 @@ angular.module('app')
             GroupsBusiness.loadAll(promiseLoadGroups).then(function(data)
             {
                 $scope.groups = data;
+                DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
             });
         }]);

app/views/sidebar.html

@@ -12,12 +12,14 @@
         </p>-->
         <ul class="col-sm-12" lu-busy="sidebar">
             <li ng-show="DataShareBusiness.CurrentGroups.length != 0">
-                <md-button class="md-primary md-hue-1 md-group-button col-xs-12" ng-click="DataShareBusiness.upCurrentGroup()">
+                <md-button class="md-primary md-hue-1 md-group-button col-xs-12"
+                           ng-href="{{DataShareBusiness.getGroupUrl(DataShareBusiness.getCurrentGroup().Parent)}}">
                     ..
                 </md-button>
             </li>
             <li ng-repeat="group in getCurrentGroups()">
-                <md-button class="md-primary md-hue-1 md-group-button col-xs-12" ng-click="DataShareBusiness.setCurrentGroup(group)">
+                <md-button class="md-primary md-hue-1 md-group-button col-xs-12"
+                           ng-href="{{DataShareBusiness.getGroupUrl(group)}}">
                     {{ group.Name }}
                 </md-button>
             </li>

app/views/toolbar.html

@@ -4,8 +4,10 @@
             <md-icon md-svg-icon="img/menu.svg"></md-icon>
         </md-button>
         <h2>
-            <span ng-click="DataShareBusiness.setCurrentGroup(null)">/ </span>
-            <a href="" ng-click="DataShareBusiness.setCurrentGroup(group)" ng-repeat="group in DataShareBusiness.CurrentGroups">{{ group.Name }}{{ $last ? "" : " / " }}</a>
+            <a ng-href="{{DataShareBusiness.getGroupUrl(null)}}">{{ DataShareBusiness.SearchSeparator }} </a>
+            <a ng-href="{{DataShareBusiness.getGroupUrl(group)}}" ng-repeat="group in DataShareBusiness.CurrentGroups">
+                {{ group.Name }}{{ $last ? "" : " " + DataShareBusiness.SearchSeparator + " " }}
+            </a>
         </h2>
         <span flex></span>
         <!--<md-button class="md-icon-button" aria-label="Favorite">

sdk/Business/DataShareBusiness.js

@@ -1,11 +1,15 @@
 (function()
 {
     angular.module('appSdk')
-        .factory('DataShareBusiness', [function () {
+        .factory('DataShareBusiness', ['$location', function ($location) {
 
             var data = {
                 Groups: null,
+
+                SearchSeparator: "~",
+
                 CurrentGroups: [],
+
                 setCurrentGroup: function(group)
                 {
                     data.CurrentGroups = [];
@@ -14,7 +18,61 @@
                         group = group.Parent;
                     }
                     data.CurrentGroups.reverse();
+
+                    $location.search(data.getSearchString(-1));
+                },
+
+                getCurrentGroup: function()
+                {
+                    if (data.CurrentGroups.length == 0) {
+                        return null;
+                    }
+                    return data.CurrentGroups[data.CurrentGroups.length - 1];
+                },
+
+                getSearchString: function(group)
+                {
+                    if (group == -1 && data.CurrentGroups.length != 0) {
+                        group = data.CurrentGroups[data.CurrentGroups.length - 1];
+                    }
+                    if (group == null) {
+                        return "";
+                    }
+                    var search = [];
+                    while (group != null){
+                        search.push(group.Name);
+                        group = group.Parent;
+                    }
+                    return search.reverse().join(data.SearchSeparator);
+                },
+
+                getGroupUrl: function(group)
+                {
+                    var search = data.getSearchString(group);
+                    return "#" + $location.path() + $location.hash() + "?" + search;
                 },
+
+                setFromSearchString: function(string)
+                {
+                    if (string == null) {
+                        data.setCurrentGroup(null);
+                        return;
+                    }
+                    var group = {Groups: data.Groups};
+                    var names = string.split(data.SearchSeparator);
+                    names.forEach(function(name)
+                    {
+                        var g = group.Groups.find(function(g)
+                        {
+                            return g.Name == name;
+                        });
+                        if (g != null) {
+                            group = g;
+                        }
+                    });
+                    data.setCurrentGroup(group);
+                },
+
                 upCurrentGroup: function()
                 {
                     if (data.CurrentGroups.length > 1) {