added rooms calendar

app/app.js

@@ -21,6 +21,13 @@ app.config(['$stateProvider', '$urlRouterProvider',
             controller:'HomeController'
         });
 
+        $stateProvider.state('rooms',{
+            url:'/rooms?group',
+            reloadOnSearch: false,
+            templateUrl:'views/home.html',
+            controller:'HomeController'
+        });
+
         $stateProvider.state('freeroom',{
             url:'/freeroom',
             templateUrl:'views/freeroom.html',

app/controllers/home.controller.js

@@ -18,6 +18,8 @@ angular.module('app')
             $scope.selectedDate = new Date();
             $scope.selectedDate.setHours(0, 0, 0, 0);
 
+            DataShareBusiness.EntitiesType = ($state.current.name == "rooms" ? "Rooms" : "Groups");
+
             for (var i = 0; i < 48; ++i) {
                 var d = new Date();
                 d.setHours(i / 2, 30 * (i % 2), 0, 0);
@@ -35,15 +37,20 @@ angular.module('app')
             {
                 var sheetCount = function(group)
                 {
-                    var c = (group.Groups == null || group.Groups.length == 0) ? 1 : 0;
-                    if (group.Groups != null) {
-                        group.Groups.forEach(function (group) {
+                    var c = (group[DataShareBusiness.EntitiesType] == null || group[DataShareBusiness.EntitiesType].length == 0) ? 1 : 0;
+                    if (group[DataShareBusiness.EntitiesType] != null) {
+                        group[DataShareBusiness.EntitiesType].forEach(function (group) {
                             c += sheetCount(group);
                         });
                     }
                     return c;
                 };
-                return sheetCount(DataShareBusiness.getCurrentGroupOrRoot())
+                var g = DataShareBusiness.getCurrentGroup();
+                if (g == null) {
+                    g = {};
+                    g[DataShareBusiness.EntitiesType] = DataShareBusiness[DataShareBusiness.EntitiesType];
+                }
+                return sheetCount(g)
             };
 
             $scope.getMonday = function(d)
@@ -141,7 +148,7 @@ angular.module('app')
                 return Math.round(($scope.getMonday(date1) - $scope.getMonday(date2)) / 604800000)
             };
 
-            $scope.$watch(function(){return DataShareBusiness.Groups}, function()
+            $scope.$watch(function(){return DataShareBusiness[DataShareBusiness.EntitiesType]}, function()
             {
                 DataShareBusiness.setFromSearchString($state.params.group);
             });
@@ -160,7 +167,7 @@ angular.module('app')
             });
 
             $scope.$watch(function(){ return $state.params.group }, function(){
-                if (DataShareBusiness.Groups != null) {
+                if (DataShareBusiness[DataShareBusiness.EntitiesType] != null) {
                     DataShareBusiness.setFromSearchString($state.params.group);
                 }
             });

app/controllers/sidebar.controller.js

@@ -13,16 +13,24 @@ angular.module('app')
                 selected: null
             };
 
+            $scope.getStateName = function()
+            {
+                if ($state.current.name.length == 0) {
+                    return "home";
+                }
+                return $state.current.name;
+            };
+
             $scope.getCurrentGroups = function()
             {
                 if (DataShareBusiness.CurrentGroups.length != 0) {
                     var e = DataShareBusiness.CurrentGroups[DataShareBusiness.CurrentGroups.length - 1];
-                    if (e.Groups == null || e.Groups.length == 0) {
-                        return e.Parent.Groups;
+                    if (e[DataShareBusiness.EntitiesType] == null || e[DataShareBusiness.EntitiesType].length == 0) {
+                        return e.Parent[DataShareBusiness.EntitiesType];
                     }
-                    return e.Groups;
+                    return e[DataShareBusiness.EntitiesType];
                 }
-                return DataShareBusiness.Groups;
+                return DataShareBusiness[DataShareBusiness.EntitiesType];
             };
 
             $scope.search = function()
@@ -33,11 +41,11 @@ angular.module('app')
                     if (group.Name.toLowerCase().indexOf($scope.Search.value.toLowerCase()) > -1) {
                         groups.push(group);
                     }
-                    if (group.Groups != null) {
-                        group.Groups.forEach(searchRec);
+                    if (group[DataShareBusiness.EntitiesType] != null) {
+                        group[DataShareBusiness.EntitiesType].forEach(searchRec);
                     }
                 }
-                DataShareBusiness.Groups.forEach(searchRec);
+                DataShareBusiness[DataShareBusiness.EntitiesType].forEach(searchRec);
                 return groups;
             };
 

app/controllers/toolbar.controller.js

@@ -17,4 +17,12 @@ angular.module('app')
                 {
                         return $state.current.name == state;
                 };
+
+                $scope.getStateName = function()
+                {
+                        if ($state.current.name.length == 0) {
+                                return "home";
+                        }
+                        return $state.current.name;
+                };
         }]);

app/views/sidebar.html

@@ -4,46 +4,62 @@
     </md-toolbar>
     <md-content layout-padding ng-controller="SideBarController">
         <div lu-busy="sidebar">
-            <form ng-submit="goToFirstMatch()">
-                <md-autocomplete
-                        md-selected-item="Search.selected"
-                        md-search-text="Search.value"
-                        md-selected-item-change="goTo(item)"
-                        md-items="item in search(ctrl.searchText)"
-                        md-item-text="item.Name"
-                        md-min-length="1"
-                        placeholder="Type a group name...">
-                    <md-item-template>
-                        <span md-highlight-text="ctrl.searchText" md-highlight-flags="^i">{{item.Name}}</span>
-                    </md-item-template>
-                    <md-not-found>
-                        No groups matching "{{Search.value}}" were found.
-                    </md-not-found>
-                </md-autocomplete>
-            </form>
+            <div ng-show="isInState('home') || isInState('rooms')">
+                <form ng-submit="goToFirstMatch()">
+                    <md-autocomplete
+                            md-selected-item="Search.selected"
+                            md-search-text="Search.value"
+                            md-selected-item-change="goTo(item)"
+                            md-items="item in search(ctrl.searchText)"
+                            md-item-text="item.Name"
+                            md-min-length="1"
+                            placeholder="Type a name...">
+                        <md-item-template>
+                            <span md-highlight-text="ctrl.searchText" md-highlight-flags="^i">{{item.Name}}</span>
+                        </md-item-template>
+                        <md-not-found>
+                            No groups matching "{{Search.value}}" were found.
+                        </md-not-found>
+                    </md-autocomplete>
+                </form>
 
-            <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"
-                               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}"
-                               ui-sref="home({group: DataShareBusiness.getSearchString(group)})">
-                        {{ group.Name }}
-                    </md-button>
-                </li>
-            </ul>
+                <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"
+                                   ui-sref="{{getStateName()}}({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}"
+                                   ui-sref="{{getStateName()}}({group: DataShareBusiness.getSearchString(group)})">
+                            {{ group.Name }}
+                        </md-button>
+                    </li>
+                </ul>
+            </div>
 
             <div ng-hide="isInState('freeroom')">
-                <span>Need a room ?</span>
+                <span>Need a room?</span>
                 <md-button class="md-primary md-group-button col-xs-12" ui-sref="freeroom">
                     Find a free room!
                 </md-button>
             </div>
+
+            <div ng-hide="isInState('home')">
+                <span>Want your courses?</span>
+                <md-button class="md-primary md-group-button col-xs-12" ui-sref="home">
+                    Go to your courses
+                </md-button>
+            </div>
+
+            <div ng-hide="isInState('rooms')">
+                <span>Is there people here?</span>
+                <md-button class="md-primary md-group-button col-xs-12" ui-sref="rooms">
+                    Show all rooms
+                </md-button>
+            </div>
         </div>
     </md-content>
 </md-sidenav>

app/views/toolbar.html

@@ -3,9 +3,9 @@
         <md-button class="md-icon-button" aria-label="Groupes" ng-click="toggleSideBar()" hide-gt-md>
             <md-icon md-svg-icon="img/menu.svg"></md-icon>
         </md-button>
-        <h2 ng-show="isInState('home')">
-            <a ng-href="{{DataShareBusiness.getGroupUrl(null)}}">{{ DataShareBusiness.SearchSeparator }} </a>
-            <a ng-href="{{DataShareBusiness.getGroupUrl(group)}}" ng-repeat="group in DataShareBusiness.CurrentGroups">
+        <h2 ng-show="isInState('home') || isInState('rooms')">
+            <a ui-sref="{{getStateName()}}">{{ DataShareBusiness.SearchSeparator }} </a>
+            <a ui-sref="{{getStateName()}}({group: DataShareBusiness.getSearchString(group)})" ng-repeat="group in DataShareBusiness.CurrentGroups">
                 {{ group.Name }}{{ $last ? "" : " " + DataShareBusiness.SearchSeparator + " " }}
             </a>
         </h2>

sdk/Business/DataShareBusiness.js

@@ -10,7 +10,7 @@
 
                 Rooms: null,
 
-                SearchSeparator: "~",
+                SearchSeparator: "|",
 
                 CurrentGroups: [],
 
@@ -20,12 +20,14 @@
 
                 DateTimeFormat: "DD MMM YYYY HH[h]mm",
 
-                makeParents: function(group)
+                EntitiesType: "Rooms",
+
+                makeParents: function(group, type)
                 {
-                    if (group.Groups != null) {
-                        group.Groups.forEach(function (g) {
+                    if (group[type] != null) {
+                        group[type].forEach(function (g) {
                             g.Parent = group;
-                            data.makeParents(g);
+                            data.makeParents(g, type);
                         });
                     }
                 },
@@ -33,7 +35,7 @@
                 goToGroup: function(group)
                 {
                     var search = data.getSearchString(group);
-                    $state.go('home', {group: search.length == 0 ? undefined : search});
+                    $state.go(data.EntitiesType == "Groups" ? 'home' : 'rooms', {group: search.length == 0 ? undefined : search});
                 },
 
                 setCurrentGroup: function(group)
@@ -54,21 +56,6 @@
                     return data.CurrentGroups[data.CurrentGroups.length - 1];
                 },
 
-                getCurrentGroupOrRoot: function()
-                {
-                    var group = data.getCurrentGroup();
-                    if (group == null) {
-                        return {
-                            Id: null,
-                            Groups: data.Groups,
-                            Name: "Root",
-                            Type: 1,
-                            ParentId: -1
-                        }
-                    }
-                    return group;
-                },
-
                 getSearchString: function(group)
                 {
                     if (group == -1 && data.CurrentGroups.length != 0) {
@@ -86,15 +73,9 @@
                     return str;
                 },
 
-                getGroupUrl: function(group)
-                {
-                    var search = data.getSearchString(group);
-                    return $state.href('home', {group:  (search.length != 0 ? search : undefined)});
-                },
-
                 setFromSearchString: function(string)
                 {
-                    if (data.Groups == null) {
+                    if (data[data.EntitiesType] == null) {
                         return;
                     }
                     if (string == null) {
@@ -105,7 +86,7 @@
                     var names = string.split(data.SearchSeparator);
                     names.forEach(function(name)
                     {
-                        var g = (group || data).Groups.find(function(g)
+                        var g = (group || data)[data.EntitiesType].find(function(g)
                         {
                             return g.Name == name;
                         });

sdk/Business/GroupsBusiness.js

@@ -14,7 +14,7 @@
                 {
                     data.forEach(function(group)
                     {
-                        DataShareBusiness.makeParents(group);
+                        DataShareBusiness.makeParents(group, "Groups");
                         group.parent = null;
                     });
                     defer.resolve(data);

sdk/Business/RoomsBusiness.js

@@ -17,7 +17,7 @@
                 {
                     data.forEach(function(group)
                     {
-                        DataShareBusiness.makeParents(group);
+                        DataShareBusiness.makeParents(group, "Rooms");
                         group.parent = null;
                     });
                     defer.resolve(data);