From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 15 Jul 2014 10:36:10 +0000 (+0200)
Subject: fixed scheduler to display past slots as disabled
X-Git-Tag: myslice-1.0~57^2~2^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=eb536974d70c23b2dcac40a78b6a5a76d7f3150d;p=unfold.git

fixed scheduler to display past slots as disabled
---

diff --git a/plugins/scheduler2/static/css/scheduler2.css b/plugins/scheduler2/static/css/scheduler2.css
index b16eb801..2fcf0634 100755
--- a/plugins/scheduler2/static/css/scheduler2.css
+++ b/plugins/scheduler2/static/css/scheduler2.css
@@ -215,6 +215,11 @@
     cursor: not-allowed;
 }
 
+#scheduler-reservation-table tbody tr td.disabled {
+    background: url("../img/forbidden.png") no-repeat scroll 50% 50%; /* #DD4444;*/
+    cursor: not-allowed;
+}
+
 #scheduler-reservation-table tbody tr td.success {
 	content: "✓";
 }
diff --git a/plugins/scheduler2/static/img/forbidden.png b/plugins/scheduler2/static/img/forbidden.png
new file mode 100644
index 00000000..fba5664c
Binary files /dev/null and b/plugins/scheduler2/static/img/forbidden.png differ
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index fbfcfa00..b8c761aa 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -495,6 +495,7 @@ var SCHEDULER_COLWIDTH = 50;
             do_resize: function()
             {
                 var scope = this._get_scope();
+                var num_hidden_cells, new_max;
 
                 $('#' + schedulerTblId + ' thead tr th:eq(0)').css("width", SCHEDULER_FIRST_COLWIDTH);
                 //self get width might need fix depending on the template 
@@ -511,12 +512,15 @@ var SCHEDULER_COLWIDTH = 50;
                 scope.lcm_colspan = this._lcm_colspan;
 
                 // Slider max value
-
                 if ($('#tblSlider').data('slider') != undefined) {
-                    var new_max = (this._all_slots.length - this._num_visible_cells) / this._lcm_colspan;
-                    $('#tblSlider').slider('setAttribute', 'max', new_max);
+                    num_hidden_cells = this._all_slots.length - this._num_visible_cells;
+
+                    $('#tblSlider').slider('setAttribute', 'max', num_hidden_cells);
+                    $('#tblSlider').slider('setValue', scope.from, true);
+                    this._get_scope().$apply();
                 }
 
+
             },
 
             on_show: function(e)
@@ -567,18 +571,23 @@ var SCHEDULER_COLWIDTH = 50;
 
             _scope_clear_leases: function()
             {
+                var time, now;
                 var self = this;
                 var scope = this._get_scope();
 
+                now = new Date().getTime();
+
                 // Setup leases with a default free status...
                 $.each(this.scope_resources_by_key, function(resource_key, resource) {
                     resource.leases = [];
                     var colspan_lease = resource.granularity / self._granularity; //eg. 3600 / 1800 => 2 cells
+                    time = SchedulerDateSelected.getTime();
                     for (i=0; i < self._all_slots.length / colspan_lease; i++) { // divide by granularity
                         resource.leases.push({
                             id:     'coucou',
-                            status: 'free', // 'selected', 'reserved', 'maintenance' XXX pending ??
+                            status: (time < now) ? 'disabled':  'free', // 'selected', 'reserved', 'maintenance' XXX pending ??
                         });
+                        time += resource.granularity * 1000;
                     }
                 });
 
@@ -777,6 +786,9 @@ var SCHEDULER_COLWIDTH = 50;
             _initUI: function() 
             {
                 var self = this;
+                var scope = self._get_scope();
+
+                var num_hidden_cells;
 
                 $("#DateToRes").datepicker({
                     onRender: function(date) {
@@ -795,15 +807,22 @@ var SCHEDULER_COLWIDTH = 50;
                 }).datepicker('setValue', SchedulerDateSelected); //.data('datepicker');
 
                 //init Slider
+                num_hidden_cells = self._all_slots.length - self._num_visible_cells;
+                init_cell = (new Date().getHours() - 1) * 3600 / self._granularity;
+                if (init_cell > num_hidden_cells)
+                    init_cell = num_hidden_cells;
+                
                 $('#tblSlider').slider({
                     min: 0,
-                    max: (self._all_slots.length - self._num_visible_cells) / self._lcm_colspan,
-                    value: 0,
+                    max: num_hidden_cells, // / self._lcm_colspan,
+                    value: init_cell,
                 }).on('slide', function(ev) {
                     var scope = self._get_scope();
                     scope.from = ev.value * self._lcm_colspan;
                     scope.$apply();
                 });
+                scope.from = init_cell;
+                scope.$apply();
 
                 $("#plugin-scheduler-loader").hide();
                 $("#plugin-scheduler").show();