Revised version of the resource page + related plugins

[unfold.git] / plugins / scheduler2 / templates / scheduler.html

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index d7cd16e..95c6ba7 100755 (executable)
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -50,34 +50,55 @@
             <div id="tblSlider"></div>\r
         </div>\r
         <div class="table-responsive">\r
+\r
             <table id="scheduler-reservation-table" class="table table-bordered table-condensed">\r
                 <thead>\r
                     <tr>\r
                         <th>#</th>\r
-                        <th ng-repeat="slot in slots">\r
+                        <th ng-repeat="slot in slots | offset: from | limitTo: num_visible_cells ">\r
                             {[{ slot.time }]}\r
                         </th>\r
                     </tr>\r
                 </thead>\r
                 <tbody>\r
-                    <tr ng-repeat="resource in resources" ng-class-odd="''" ng-class-even="'even'">\r
-                        <th data-resourceid="{[{ resource.id }]}" data-rowindex="{[{ $index }]}" data-resourceindex="{[{ resource.index }]}" style="word-wrap: break-word; word-break: break-all; ">{[{ resource.name }]}</th>\r
-                        <td ng-repeat="lease in resource.leases" data-slotid="{[{ lease.id }]}" data-groupid="{[{ lease.groupid }]}" ng-class="{{ 'lease.status' }}"></td>\r
+                    <tr ng-repeat="resource in resources | filter: filter_visible | offset: (current_page-1) * items_per_page | limitTo: items_per_page" \r
+                                               ng-class-odd="''" \r
+                                               ng-class-even="'even'">\r
+                        <th data-resourceid="{[{ resource.urn }]}" \r
+                                                       data-rowindex="{[{ $index }]}" \r
+                                                       data-resourceindex="{[{ resource.index }]}" \r
+                                                       style="word-wrap: break-word; word-break: break-all; ">\r
+                                                       {[{ resource.hostname }]}\r
+                                               </th>\r
+                        <td ng-repeat="lease in resource.leases | offset: from / lcm_colspan  | limitTo: num_visible_cells / lcm_colspan"\r
+                                                       data-slotid="{[{ lease.id }]}" \r
+                                                       data-groupid="{[{ lease.groupid }]}" \r
+                                                       ng-class="{{ 'lease.status' }}"\r
+                                                       colspan="{[{resource.granularity / granularity}]}"\r
+                                                       ng-click="select(from+$index, lease, $parent.resource)">\r
+                                               </td>\r
                     </tr>\r
                 </tbody>\r
             </table>\r
+\r
             <div class="row">\r
                 <div class="col-xs-5">\r
                     <div id="resources-list__table_length" class="dataTables_length">\r
-                        <label>total Pages : {[{totalPages}]}</label>\r
+                        <label>Total pages : {[{page_count()}]}</label>\r
                     </div>\r
                 </div>\r
                 <div class="col-xs-7">\r
                     <div class="dataTables_paginate paging_bootstrap">\r
                         <ul class="pagination">\r
-                            <li class="prev disabled"><a href="#">← Previous</a></li>\r
-                            <li ng-cloak ng-repeat="t in getPageNumbers() track by $index" ng-class="{active: t==curPage+1}"><a href="#" ng-click="setPage(t-1)">{[{t}]}</a></li>\r
-                            <li class="next disabled"><a href="#">Next → </a></li>\r
+                                                       <li ng-class="prevPageDisabled()">\r
+                                                         <a href ng-click="prevPage()">« Prev</a>\r
+                                                       </li>\r
+                            <li ng-repeat="n in range()" \r
+                                                           ng-class="{active: n==current_page}" \r
+                                                               ng-click="setPage(n)"><a href="#">{[{n}]}</a></li>\r
+                                                       <li ng-class="nextPageDisabled()">\r
+                                             <a href ng-click="nextPage()">Next »</a>\r
+                                           </li>\r
                         </ul>\r
                     </div>\r
                 </div>\r