X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fscheduler2%2F__init__.py;h=abe8eea9a44fdca505cba8b82cc205112027fc21;hb=07bad1e2f69df285d8764eb2d243b31d8e6c8e3d;hp=a1057a4cb3e3d6e29a9b631799e83c412aa280f2;hpb=e5354388102e18cab62274b8df884a25886e08c3;p=unfold.git diff --git a/plugins/scheduler2/__init__.py b/plugins/scheduler2/__init__.py index a1057a4c..abe8eea9 100755 --- a/plugins/scheduler2/__init__.py +++ b/plugins/scheduler2/__init__.py @@ -5,14 +5,15 @@ from datetime import timedelta class Scheduler2 (Plugin): - def __init__ (self, query, query_all_resources, query_lease = None, **settings): + def __init__ (self, query, query_lease, **settings): Plugin.__init__ (self, **settings) self.query=query - self.query_all_resources = query_all_resources - self.query_all_resources_uuid = query_all_resources.query_uuid + self.query_lease = query_lease - query_lease.query_uuid if query_lease else None + self.query_lease_uuid = query_lease.query_uuid + + #query_lease.query_uuid if query_lease else None #granularity in minutes granularity = 10 @@ -30,13 +31,12 @@ class Scheduler2 (Plugin): reqs = { 'js_files' : [ 'js/scheduler2.js', - 'js/slider/jquery-ui-1.10.3.slider.min.js', + #'js/slider/jquery-ui-1.10.3.slider.min.js', 'js/scheduler-helpers.js', - 'js/table-selector.js', ], 'css_files': [ 'css/scheduler2.css', - 'css/slider/jquery-ui-1.10.3.slider.min.css', + #'css/slider/jquery-ui-1.10.3.slider.min.css', ] } return reqs @@ -46,7 +46,7 @@ class Scheduler2 (Plugin): # query_uuid will pass self.query results to the javascript # and will be available as "record" in : # on_new_record: function(record) - return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid', 'query_all_resources_uuid'] + return ['plugin_uuid', 'domid', 'query_uuid', 'time_slots', 'nodes', 'query_lease_uuid'] def export_json_settings (self):