From 2b16f48ba1fe64613ff9067bfa5a793c7d2db490 Mon Sep 17 00:00:00 2001
From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 23 Jul 2014 15:42:44 +0200
Subject: [PATCH] updated scheduler
---
plugins/scheduler2/static/js/scheduler2.js | 90 +++++++++++-----------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/plugins/scheduler2/static/js/scheduler2.js b/plugins/scheduler2/static/js/scheduler2.js
index 56d43992..04665c66 100755
--- a/plugins/scheduler2/static/js/scheduler2.js
+++ b/plugins/scheduler2/static/js/scheduler2.js
@@ -739,53 +739,53 @@ var SCHEDULER_COLWIDTH = 50;
/* Limit the display to the current day */
id_end = this._all_slots.length / colspan_lease
}
+ lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);
+ // the same slots might be affected multiple times.
+ // PENDING_IN + PENDING_OUT => IN
+ //
+ // RESERVED vs SELECTED !
+ //
+ // PENDING !!
+ switch(lease_status) {
+ case STATE_SET_IN:
+ lease_class = 'selected'; // my leases
+ lease_success = '';
+ break;
+ case STATE_SET_IN_SUCCESS:
+ lease_class = 'selected'; // my leases
+ lease_success = 'success';
+ case STATE_SET_OUT_FAILURE:
+ lease_class = 'selected'; // my leases
+ lease_success = 'failure';
+ break;
+ case STATE_SET_OUT:
+ lease_class = 'reserved'; // other leases
+ lease_success = '';
+ break;
+ case STATE_SET_OUT_SUCCESS:
+ lease_class = 'free'; // other leases
+ lease_success = 'success';
+ break;
+ case STATE_SET_IN_FAILURE:
+ lease_class = 'free'; // other leases
+ lease_success = 'failure';
+ break;
+ case STATE_SET_IN_PENDING:
+ lease_class = 'pendingin';
+ lease_success = '';
+ break;
+ case STATE_SET_OUT_PENDING:
+ // pending_in & pending_out == IN == replacement
+ if (resource.leases[i].status == 'pendingin')
+ lease_class = 'pendingin'
+ else
+ lease_class = 'pendingout';
+ lease_success = '';
+ break;
+
+ }
for (i = id_start; i < id_end; i++) {
- // the same slots might be affected multiple times.
- // PENDING_IN + PENDING_OUT => IN
- //
- // RESERVED vs SELECTED !
- //
- // PENDING !!
- lease_status = manifold.query_store.get_record_state(this.options.query_lease_uuid, lease_key, STATE_SET);
- switch(lease_status) {
- case STATE_SET_IN:
- lease_class = 'selected'; // my leases
- lease_success = '';
- break;
- case STATE_SET_IN_SUCCESS:
- lease_class = 'selected'; // my leases
- lease_success = 'success';
- case STATE_SET_OUT_FAILURE:
- lease_class = 'selected'; // my leases
- lease_success = 'failure';
- break;
- case STATE_SET_OUT:
- lease_class = 'reserved'; // other leases
- lease_success = '';
- break;
- case STATE_SET_OUT_SUCCESS:
- lease_class = 'free'; // other leases
- lease_success = 'success';
- break;
- case STATE_SET_IN_FAILURE:
- lease_class = 'free'; // other leases
- lease_success = 'failure';
- break;
- case STATE_SET_IN_PENDING:
- lease_class = 'pendingin';
- lease_success = '';
- break;
- case STATE_SET_OUT_PENDING:
- // pending_in & pending_out == IN == replacement
- if (resource.leases[i].status == 'pendingin')
- lease_class = 'pendingin'
- else
- lease_class = 'pendingout';
- lease_success = '';
- break;
-
- }
resource.leases[i].status = lease_class;
resource.leases[i].success = lease_success;
}
--
2.47.0