changed search usage

app/app.js

@@ -42,23 +42,13 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', '$locationP
     .run(['$rootScope', '$state', '$location', 'DataShareBusiness', 'GroupsBusiness', '$mdDateLocale', '$filter',
         function ($rootScope, $state, $location, DataShareBusiness, GroupsBusiness, $mdDateLocale, $filter) {
 
-            $rootScope.$watch(function(){ return Object.keys($location.search())[0] }, function(){
-                if (DataShareBusiness.Groups != null && $state.current.name == "home") {
-                    DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
-                }
-            });
 
             var promiseLoadGroups = {
                 id: "promiseLoadGroups",
                 loaderGroups: ["toolbar"],
                 groups: ["sidebar"]
             };
-            GroupsBusiness.loadAll(promiseLoadGroups).then(function(data)
-            {
-                if ($state.current.name == "home") {
-                    DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
-                }
-            });
+            GroupsBusiness.loadAll(promiseLoadGroups);
 
             $mdDateLocale.firstDayOfWeek = 1;
             $mdDateLocale.formatDate = function(date) {

app/controllers/home.controller.js

@@ -1,6 +1,6 @@
 angular.module('app')
-    .controller('HomeController', ['$scope', '$state', 'DataShareBusiness', 'WeeksBusiness', '$mdDialog',
-        function($scope, $state, DataShareBusiness, WeeksBusiness, $mdDialog) {
+    .controller('HomeController', ['$scope', '$state', 'DataShareBusiness', 'WeeksBusiness', '$mdDialog', '$location',
+        function($scope, $state, DataShareBusiness, WeeksBusiness, $mdDialog, $location) {
 
             $scope.DataShareBusiness = DataShareBusiness;
             $scope.dateFormat = DataShareBusiness.DateFormat;
@@ -140,6 +140,11 @@ angular.module('app')
                 return Math.round(($scope.getMonday(date1) - $scope.getMonday(date2)) / 604800000)
             };
 
+            $scope.$watch(function(){return DataShareBusiness.Groups}, function()
+            {
+                DataShareBusiness.setFromSearchString(Object.keys($location.search())[0]);
+            });
+
             $scope.$watch(function(){return DataShareBusiness.CurrentGroups}, $scope.loadWeeks);
 
             $scope.$watch(function(){return $scope.selectedDate}, function(newValue, oldValue)
@@ -153,6 +158,12 @@ angular.module('app')
                 }
             });
 
+            $scope.$watch(function(){ return $location.search().group }, function(){
+                if (DataShareBusiness.Groups != null) {
+                    DataShareBusiness.setFromSearchString($location.search().group);
+                }
+            });
+
             $scope.goToRelativeWeek = function(relativeWeek)
             {
                 $scope.selectedDate.setDate($scope.selectedDate.getDate() + (relativeWeek * 7));

app/views/freeroom.html

@@ -1,4 +1,12 @@
 <div layout="column" layout-fill layout-align="top center">
-    <input class="form-control" mdc-datetime-picker="" date="true" time="true" type="text" id="datetime"
-           placeholder="Begin date" min-date="date" ng-model="Search.Begin" class=" md-input">
+    <div>
+        <md-input-container class="md-input-has-placeholder">
+            <input mdc-datetime-picker="" date="true" time="true" type="text" id="datetime"
+                   placeholder="From" min-date="date" ng-model="Search.Begin" class=" md-input">
+        </md-input-container>
+        <md-input-container class="md-input-has-placeholder">
+            <input mdc-datetime-picker="" date="true" time="true" type="text" id="datetime"
+                   placeholder="To" min-date="date" ng-model="Search.End" class=" md-input">
+        </md-input-container>
+    </div>
 </div>

sdk/Business/DataShareBusiness.js

@@ -25,7 +25,8 @@
                     data.CurrentGroups.reverse();
 
                     $state.go('home').then(function() {
-                        $location.search(data.getSearchString(-1));
+                        var search = data.getSearchString(-1);
+                        $location.search({group: search.length == 0 ? undefined : search});
                     });
                 },
 
@@ -71,11 +72,14 @@
                 getGroupUrl: function(group)
                 {
                     var search = data.getSearchString(group);
-                    return $state.href('home') + $location.hash() + "?" + search;
+                    return $state.href('home') + $location.hash() + (search.length != 0 ? "?group=" + search : "");
                 },
 
                 setFromSearchString: function(string)
                 {
+                    if (data.Groups == null) {
+                        return;
+                    }
                     if (string == null) {
                         data.setCurrentGroup(null);
                         return;