fixed OUT leases after pending

[myslice.git] / plugins / scheduler2 / static / js / scheduler2.js

diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index b8c761a..0b294b4 100755 (executable)
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -595,15 +595,20 @@ var SCHEDULER_COLWIDTH = 50;
 \r
             _scope_set_leases: function()\r
             {\r
+                    var status;\r
                 var self = this;\r
                 var scope = this._get_scope();\r
             \r
                 manifold.query_store.iter_records(this.options.query_lease_uuid, function(lease_key, lease) {\r
-\r
                     console.log("SET LEASES", lease.resource, new Date(lease.start_time* 1000), new Date(lease.end_time* 1000));\r
                     // XXX We should ensure leases are correctly merged, otherwise our algorithm won't work\r
 \r
                     // Populate leases by resource array: this will help us merging leases later\r
+\r
+                    // let's only put _our_ leases\r
+                    lease_status = manifold.query_store.get_record_state(self.options.query_lease_uuid, lease_key, STATE_SET);\r
+                    if (lease_status != STATE_SET_IN)\r
+                        return true; // ~continue\r
                     if (!(lease.resource in scope._leases_by_resource))\r
                         scope._leases_by_resource[lease.resource] = [];\r
                     scope._leases_by_resource[lease.resource].push(lease);\r
@@ -741,11 +746,11 @@ var SCHEDULER_COLWIDTH = 50;
                             lease_success = '';\r
                             break;\r
                         case STATE_SET_OUT_SUCCESS:\r
-                            lease_class = 'reserved'; // other leases\r
+                            lease_class = 'free'; // other leases\r
                             lease_success = 'success';\r
                             break;\r
                         case STATE_SET_IN_FAILURE:\r
-                            lease_class = 'reserved'; // other leases\r
+                            lease_class = 'free'; // other leases\r
                             lease_success = 'failure';\r
                             break;\r
                         case STATE_SET_IN_PENDING:\r
@@ -798,7 +803,7 @@ var SCHEDULER_COLWIDTH = 50;
                     SchedulerDateSelected = new Date(ev.date);\r
                     SchedulerDateSelected.setHours(0,0,0,0);\r
                     // Set slider to origin\r
-                    $('#tblSlider').slider('setValue', 0); // XXX\r
+                    //$('#tblSlider').slider('setValue', 0); // XXX\r
                     // Refresh leases\r
                     self._scope_clear_leases();\r
                     self._set_all_lease_slots();\r