fixed search/params

app/app.js

@@ -11,13 +11,11 @@ var app = angular.module('app', [
     'appSdk'
 ]);
 
-app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationProvider',
-    function($stateProvider, $urlRouterProvider, $httpProvider, $locationProvider) {
-
-        //$locationProvider.html5Mode(true);
+app.config(['$stateProvider', '$urlRouterProvider',
+    function($stateProvider, $urlRouterProvider) {
 
         $stateProvider.state('home',{
-            url:'/',
+            url:'/?group',
             reloadOnSearch: false,
             templateUrl:'views/home.html',
             controller:'HomeController'
@@ -39,8 +37,8 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationP
             }
         };
     }])
-    .run(['$rootScope', '$state', '$location', 'DataShareBusiness', 'GroupsBusiness', '$mdDateLocale', '$filter',
-        function ($rootScope, $state, $location, DataShareBusiness, GroupsBusiness, $mdDateLocale, $filter) {
+    .run(['$rootScope', '$state', 'DataShareBusiness', 'GroupsBusiness', '$mdDateLocale', '$filter',
+        function ($rootScope, $state, DataShareBusiness, GroupsBusiness, $mdDateLocale, $filter) {
 
 
             var promiseLoadGroups = {

app/controllers/home.controller.js

@@ -1,6 +1,6 @@
 angular.module('app')
-    .controller('HomeController', ['$scope', '$state', 'DataShareBusiness', 'WeeksBusiness', '$mdDialog', '$location',
-        function($scope, $state, DataShareBusiness, WeeksBusiness, $mdDialog, $location) {
+    .controller('HomeController', ['$scope', '$state', 'DataShareBusiness', 'WeeksBusiness', '$mdDialog',
+        function($scope, $state, DataShareBusiness, WeeksBusiness, $mdDialog) {
 
             $scope.DataShareBusiness = DataShareBusiness;
             $scope.dateFormat = DataShareBusiness.DateFormat;
@@ -142,7 +142,8 @@ angular.module('app')
 
             $scope.$watch(function(){return DataShareBusiness.Groups}, function()
             {
-                DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
+                console.log($state.params.group);
+                DataShareBusiness.setFromSearchString($state.params.group);
             });
 
             $scope.$watch(function(){return DataShareBusiness.CurrentGroups}, $scope.loadWeeks);
@@ -158,9 +159,10 @@ angular.module('app')
                 }
             });
 
-            $scope.$watch(function(){ return $location.search().group }, function(){
+            $scope.$watch(function(){ return $state.params.group }, function(){
                 if (DataShareBusiness.Groups != null) {
-                    DataShareBusiness.setFromSearchString($location.search().group);
+                    console.log($state.params.group);
+                    DataShareBusiness.setFromSearchString($state.params.group);
                 }
             });
 

app/controllers/sidebar.controller.js

@@ -45,8 +45,7 @@ angular.module('app')
             {
                 if (group != null) {
                     $scope.Search.value = "";
-                    console.log(group);
-                    DataShareBusiness.setCurrentGroup(group);
+                    DataShareBusiness.goToGroup(group);
                 }
             };
 

app/views/sidebar.html

@@ -30,14 +30,14 @@
             <ul class="col-sm-12 sidebar-group-list">
                 <li ng-show="DataShareBusiness.CurrentGroups.length != 0" class="col-xs-12">
                     <md-button class="md-primary md-hue-1 md-group-button col-xs-12"
-                               ng-href="{{DataShareBusiness.getGroupUrl(DataShareBusiness.getCurrentGroup().Parent)}}">
+                               ui-sref="home({group: DataShareBusiness.getSearchString(DataShareBusiness.getCurrentGroup().Parent)})">
                         ..
                     </md-button>
                 </li>
                 <li ng-repeat="group in getCurrentGroups()" class="col-xs-12">
                     <md-button class="md-primary md-hue-1 md-group-button col-xs-12"
                                ng-class="{'md-group-button-checked': DataShareBusiness.getCurrentGroup().Id == group.Id}"
-                               ng-href="{{DataShareBusiness.getGroupUrl(group)}}">
+                               ui-sref="home({group: DataShareBusiness.getSearchString(group)})">
                         {{ group.Name }}
                     </md-button>
                 </li>

sdk/Business/DataShareBusiness.js

@@ -14,20 +14,22 @@
 
                 TimeFormat: "HH'h'mm",
 
+                DateTimeFormat: "dd MMM yyyy HH'h'mm",
+
+                goToGroup: function(group)
+                {
+                    var search = data.getSearchString(group);
+                    $state.go('home', {group: search.length == 0 ? undefined : search});
+                },
+
                 setCurrentGroup: function(group)
                 {
-                    var g = group;
                     data.CurrentGroups = [];
                     while (group != null) {
                         data.CurrentGroups.push(group);
                         group = group.Parent;
                     }
                     data.CurrentGroups.reverse();
-
-                    $state.go('home').then(function() {
-                        var search = data.getSearchString(-1);
-                        $location.search({group: search.length == 0 ? undefined : search});
-                    });
                 },
 
                 getCurrentGroup: function()
@@ -66,13 +68,14 @@
                         search.push(group.Name);
                         group = group.Parent;
                     }
-                    return search.reverse().join(data.SearchSeparator);
+                    var str = search.reverse().join(data.SearchSeparator);
+                    return str;
                 },
 
                 getGroupUrl: function(group)
                 {
                     var search = data.getSearchString(group);
-                    return $state.href('home') + $location.hash() + (search.length != 0 ? "?group=" + search : "");
+                    return $state.href('home', {group:  (search.length != 0 ? search : undefined)});
                 },
 
                 setFromSearchString: function(string)
@@ -84,11 +87,11 @@
                         data.setCurrentGroup(null);
                         return;
                     }
-                    var group = {Groups: data.Groups};
+                    var group = null;
                     var names = string.split(data.SearchSeparator);
                     names.forEach(function(name)
                     {
-                        var g = group.Groups.find(function(g)
+                        var g = (group || data).Groups.find(function(g)
                         {
                             return g.Name == name;
                         });