X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2Ftemplates%2Fscheduler.html;h=928b2da7e8495d1a856a5192fd7bbf09ab0180cb;hb=cb3a40dfdc1c79ca57458d1c18732334d58734fd;hp=d7cd16e6ad4d4d574b169372a792783c46a39e49;hpb=f96c4dccedd88193b7e273dc0a925ce5e76c44f1;p=unfold.git

diff --git a/plugins/scheduler2/templates/scheduler.html b/plugins/scheduler2/templates/scheduler.html
index d7cd16e6..928b2da7 100755
--- a/plugins/scheduler2/templates/scheduler.html
+++ b/plugins/scheduler2/templates/scheduler.html
@@ -6,78 +6,85 @@
     <img src="../../static/img/no-data.png" alt="no data found" style="width:100px;" />
     <h3>no data found...</h3>
 </div>
-<div id="plugin-{{ domid }}" class="" ng-app="myApp" style="display:none;">
+<div id="plugin-{{ domid }}" class="">
     <div class="row m-b">
-        <div class="col-md-1">
-            <label for="inputEmail3" class="col-sm-2 control-label">Date</label>
-        </div>
-        <div class="col-md-9">
-            <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date">
-            <span class="glyphicon glyphicon-calendar"></span>
-        </div>
-        <div class="col-md-2 text-center">
-            {% comment %}
-            <div id="TopologyModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                <div class="modal-dialog">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title" id="myModalLabel">Topology</h4>
-                    </div>
-                    <div class="modal-body">
-                        <img src="../../static/img/nitos_topo.png" alt="nitos topology" style="width:100%;" />
-                    </div>
-                </div><!-- /.modal-dialog -->
-            </div><!-- /.modal TopologyModal -->
-            <button type="button" class="btn btn-primary btn-md" data-toggle="modal" data-target="#TopologyModal">Topology</button>
-            {% endcomment  %}
-            <button id="btnSchedulerSubmit" type="button" class="btn btn-primary btn-md">Submit Leases</button>
-
-        </div>
+        <div class="col-md-4">
+        	<div class="row">
+        		<div class="col-md-1">
+            		<label for="inputEmail3" class="control-label">Day:</label>
+        		</div>
+				<div class="col-md-11">
+					<input id="DateToRes" type="text" placeholder="Reservation Date">
+					<span class="glyphicon glyphicon-calendar" style="position:absolute;margin-left:-20px;margin-top:4px;"></span>
+					<!-- <input id="DateToRes" type="text" class="form-control" placeholder="Reservation Date"> -->
+				</div>
+			</div>
+		</div>
+        <div class="col-md-8">
+        	<div class="row">
+        		<div class="col-md-2">
+            		<label for="inputEmail3" class="control-label">Time of day:</label>
+        		</div>
+		        <div class="col-md-10">
+					<div class="sliderContainer">
+						<div id="tblSlider"></div>
+					</div>
+				</div>
+			</div>
+		</div>
     </div>
-    <!--<div class="row m-b">
-        <div class="col-md-1">
-            <label for="inputEmail3" class="col-sm-1 control-label">Time</label>
-        </div>
-        <div class="col-md-9">
-            <div id="time-range"></div>
-        </div>
-        <div class="col-md-2">
-            <span id="lbltime" class="label label-primary"></span>
-        </div>
-    </div>-->
     <div id="SchedulerCtrl" ng-controller="SchedulerCtrl" class='query-editor-spacer'>
-        <div class="sliderContainer">
-            <div id="tblSlider"></div>
-        </div>
         <div class="table-responsive">
+
             <table id="scheduler-reservation-table" class="table table-bordered table-condensed">
                 <thead>
                     <tr>
-                        <th>#</th>
-                        <th ng-repeat="slot in slots">
+                        <th>Resource name</th>
+                        <th ng-repeat="slot in slots | offset: from | limitTo: num_visible_cells ">
                             {[{ slot.time }]}
                         </th>
                     </tr>
                 </thead>
                 <tbody>
-                    <tr ng-repeat="resource in resources" ng-class-odd="''" ng-class-even="'even'">
-                        <th data-resourceid="{[{ resource.id }]}" data-rowindex="{[{ $index }]}" data-resourceindex="{[{ resource.index }]}" style="word-wrap: break-word; word-break: break-all; ">{[{ resource.name }]}</th>
-                        <td ng-repeat="lease in resource.leases" data-slotid="{[{ lease.id }]}" data-groupid="{[{ lease.groupid }]}" ng-class="{{ 'lease.status' }}"></td>
+                    <tr ng-repeat="resource in resources | filter: filter_visible | offset: (current_page-1) * items_per_page | limitTo: items_per_page" 
+						ng-class-odd="''" 
+						ng-class-even="'even'">
+                        <th data-resourceid="{[{ resource.urn }]}" 
+							data-rowindex="{[{ $index }]}" 
+							data-resourceindex="{[{ resource.index }]}" 
+							style="word-wrap: break-word; word-break: break-all; ">
+							{[{ resource.hostname }]}
+						</th>
+                        <td ng-repeat="lease in resource.leases | offset: from / (resource.granularity / slot_length)  | limitTo: num_visible_cells / (resource.granularity / slot_length)"
+							data-slotid="{[{ lease.id }]}" 
+							data-groupid="{[{ lease.groupid }]}" 
+							ng-class="{{ 'lease.status' }}"
+							ng-class="{{ 'lease.success' }}"
+							colspan="{[{resource.granularity / slot_length}]}"
+							ng-click="select(from+$index, lease, $parent.resource)">
+						</td>
                     </tr>
                 </tbody>
             </table>
+
             <div class="row">
                 <div class="col-xs-5">
                     <div id="resources-list__table_length" class="dataTables_length">
-                        <label>total Pages : {[{totalPages}]}</label>
+                        <label>Total pages : {[{page_count()}]}</label>
                     </div>
                 </div>
                 <div class="col-xs-7">
                     <div class="dataTables_paginate paging_bootstrap">
                         <ul class="pagination">
-                            <li class="prev disabled"><a href="#">← Previous</a></li>
-                            <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>
-                            <li class="next disabled"><a href="#">Next → </a></li>
+							<li ng-class="prevPageDisabled()">
+							  <a href ng-click="prevPage()">« Prev</a>
+							</li>
+                            <li ng-repeat="n in range()" 
+							    ng-class="{active: n==current_page}" 
+								ng-click="setPage(n)"><a href="#">{[{n}]}</a></li>
+							<li ng-class="nextPageDisabled()">
+				              <a href ng-click="nextPage()">Next »</a>
+				            </li>
                         </ul>
                     </div>
                 </div>
@@ -116,10 +123,13 @@
 
             <div class="legend">
                 <ol>
-                    <li class="free">free</li>
-                    <li class="selected">selected</li>
-                    <li class="closed">reserved</li>
-                    <li class="maintenance">maintenance</li>
+                    <li class="free">Free</li>
+                    <li class="selected">Reserved</li>
+                    <li class="pendingin">Reservation pending</li>
+                    <li class="pendingout">Reservation cancellation pending</li>
+                    <li class="closed">Unavailable</li>
+					<li class="disabled">Forbidden</li>
+                    <li class="maintenance">Maintenance</li>
                 </ol>
             </div>
         </div><!-- / scheduler plugin -->