fixed sidebar and app.js

app/app.js

@@ -43,7 +43,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationP
         function ($rootScope, $state, $location, DataShareBusiness, GroupsBusiness, $mdDateLocale, $filter) {
 
             $rootScope.$watch(function(){ return Object.keys($location.search())[0] }, function(){
-                if (DataShareBusiness.Groups != null) {
+                if (DataShareBusiness.Groups != null && $state.current.name == "home") {
                     DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
                 }
             });
@@ -55,7 +55,9 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationP
             };
             GroupsBusiness.loadAll(promiseLoadGroups).then(function(data)
             {
-                DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
+                if ($state.current.name == "home") {
+                    DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
+                }
             });
 
             $mdDateLocale.firstDayOfWeek = 1;

app/controllers/freeroom.controller.js

@@ -3,18 +3,14 @@
  */
 
 angular.module('app')
-    .controller('FreeRoomController', ['$scope', '$mdDialog', 'DataShareBusiness',
-        function($scope, $mdDialog, DataShareBusiness) {
+    .controller('FreeRoomController', ['$scope', 'DataShareBusiness',
+        function($scope, DataShareBusiness) {
 
             $scope.dateFormat = DataShareBusiness.DateFormat;
             $scope.timeFormat = DataShareBusiness.TimeFormat;
+
             $scope.Search = {
                 Begin: new Date(),
                 End: new Date()
             };
-
-            $scope.close = function()
-            {
-                $mdDialog.cancel();
-            };
         }]);

app/controllers/sidebar.controller.js

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

sdk/Business/DataShareBusiness.js

@@ -16,6 +16,7 @@
 
                 setCurrentGroup: function(group)
                 {
+                    var g = group;
                     data.CurrentGroups = [];
                     while (group != null) {
                         data.CurrentGroups.push(group);
@@ -23,7 +24,9 @@
                     }
                     data.CurrentGroups.reverse();
 
-                    $location.search(data.getSearchString(-1));
+                    $state.go('home').then(function() {
+                        $location.search(data.getSearchString(-1));
+                    });
                 },
 
                 getCurrentGroup: function()