git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c816d0
)
updated scheduler
author
Jordan Augé
<jordan.auge@lip6.fr>
Wed, 23 Jul 2014 11:54:40 +0000
(13:54 +0200)
committer
Jordan Augé
<jordan.auge@lip6.fr>
Wed, 23 Jul 2014 11:54:40 +0000
(13:54 +0200)
plugins/scheduler2/static/js/scheduler2.js
patch
|
blob
|
history
diff --git
a/plugins/scheduler2/static/js/scheduler2.js
b/plugins/scheduler2/static/js/scheduler2.js
index
9890251
..
56d4399
100755
(executable)
--- a/
plugins/scheduler2/static/js/scheduler2.js
+++ b/
plugins/scheduler2/static/js/scheduler2.js
@@
-234,13
+234,13
@@
var SCHEDULER_COLWIDTH = 50;
{
\r
var data, resource_granularity;
\r
\r
{
\r
var data, resource_granularity;
\r
\r
- resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;
\r
+
//
resource_granularity = model_resource.granularity === undefined ? RESOURCE_DEFAULT_GRANULARITY : model_resource.granularity;
\r
\r
console.log("Selected", index, model_lease, model_resource);
\r
\r
var day_timestamp = SchedulerDateSelected.getTime() / 1000;
\r
\r
console.log("Selected", index, model_lease, model_resource);
\r
\r
var day_timestamp = SchedulerDateSelected.getTime() / 1000;
\r
- var start_time = day_timestamp + index *
resource_granularity;
\r
- var end_time = day_timestamp + (index + 1) *
resource_granularity;
\r
+ var start_time = day_timestamp + index *
model_resource.granularity; // XXX resource_granularity
\r
+ var end_time = day_timestamp + (index + 1) *
model_resource.granularity; //
\r
var start_date = new Date(start_time * 1000);
\r
var end_date = new Date(end_time * 1000);
\r
\r
var start_date = new Date(start_time * 1000);
\r
var end_date = new Date(end_time * 1000);
\r
\r
@@
-578,7
+578,9
@@
var SCHEDULER_COLWIDTH = 50;
var resource = jQuery.extend(true, {}, record);
\r
\r
// Fix granularity
\r
var resource = jQuery.extend(true, {}, record);
\r
\r
// Fix granularity
\r
- resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;
\r
+ //resource_granularity = ((resource.granularity === undefined) || (typeof(resource.granularity) != "number")) ? RESOURCE_DEFAULT_GRANULARITY : resource.granularity;
\r
+ if (typeof(resource.granularity) != "number")
\r
+ resource.granularity = RESOURCE_DEFAULT_GRANULARITY;
\r
resource.leases = []; // a list of occupied timeslots
\r
\r
self.scope_resources_by_key[resource['urn']] = resource;
\r
resource.leases = []; // a list of occupied timeslots
\r
\r
self.scope_resources_by_key[resource['urn']] = resource;
\r