integrated scheduler in slice page

diff --git a/plugins/scheduler/__init__.py b/plugins/scheduler/__init__.py
index b44e28e..3a7771f 100644 (file)
--- a/plugins/scheduler/__init__.py
+++ b/plugins/scheduler/__init__.py
@@ -9,8 +9,8 @@ class Scheduler(Plugin):
     def __init__ (self, query, query_all = None, **settings):
         Plugin.__init__ (self, **settings)
         self.query=query
     def __init__ (self, query, query_all = None, **settings):
         Plugin.__init__ (self, **settings)
         self.query=query

-        self.query_all = query_all
-        self.query_all_uuid = query_all.query_uuid if query_all else None
+        self.query_lease = query_lease
+        self.query_lease_uuid = query_lease.query_uuid if query_lease else None

 
     def template_file (self):
         return "scheduler.html"
 
     def template_file (self):
         return "scheduler.html"


@@ -37,4 +37,4 @@ class Scheduler(Plugin):
 
     # the list of things passed to the js plugin
     def json_settings_list (self): 
 
     # the list of things passed to the js plugin
     def json_settings_list (self): 

-        return ['plugin_uuid','query_uuid', 'query_all_uuid', ]
+        return ['plugin_uuid','query_uuid', 'query_lease_uuid', ]

diff --git a/plugins/scheduler/static/js/scheduler.js b/plugins/scheduler/static/js/scheduler.js
index 709380f..79292e5 100644 (file)
--- a/plugins/scheduler/static/js/scheduler.js
+++ b/plugins/scheduler/static/js/scheduler.js
@@ -47,7 +47,7 @@ var txt_otherslice = {"font": '"Trebuchet MS", Verdana, Arial, Helvetica, sans-s
         {
             this._super(options, element);
 
         {
             this._super(options, element);
 

-                /* Member variables */
+            /* Member variables */

             this.options = options;
             this.canvas_id = 'leases_area-' + options.plugin_uuid;
 
             this.options = options;
             this.canvas_id = 'leases_area-' + options.plugin_uuid;
 


@@ -79,8 +79,8 @@ var txt_otherslice = {"font": '"Trebuchet MS", Verdana, Arial, Helvetica, sans-s
             /* XXX Keys */
 
             /* Listening to queries */
             /* XXX Keys */
 
             /* Listening to queries */

-            this.listen_query(options.resource_query_uuid);
-            this.listen_query(options.lease_query_uuid);
+            this.listen_query(options.query_uuid);
+            this.listen_query(options.query_lease_uuid);

 
             /* XXX GUI setup and event binding */
             jQuery("#datepicker").datetimepicker({
 
             /* XXX GUI setup and event binding */
             jQuery("#datepicker").datetimepicker({

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 9eb4799..948eef9 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -15,6 +15,7 @@ from plugins.querytable              import QueryTable
 from plugins.queryupdater            import QueryUpdater
 from plugins.googlemap               import GoogleMap
 from plugins.senslabmap              import SensLabMap
 from plugins.queryupdater            import QueryUpdater
 from plugins.googlemap               import GoogleMap
 from plugins.senslabmap              import SensLabMap

+from plugins.scheduler               import Scheduler

 from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
 from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters


@@ -186,6 +187,14 @@ class SliceView (LoginRequiredAutoLogoutView):
                 },
             )
 
                 },
             )
 

+        resources_as_scheduler = Scheduler(
+            page        = page,
+            title       = 'Scheduler',
+            domid       = 'scheduler',
+            query       = sq_resource,
+            query_lease = query_lease,
+        )
+

        # with the new 'Filter' stuff on top, no need for anything but the querytable
         resources_as_list_area = resources_as_list 
 
        # with the new 'Filter' stuff on top, no need for anything but the querytable
         resources_as_list_area = resources_as_list 
 


@@ -196,6 +205,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 outline_complete=True,
                                 sons=[ resources_as_gmap, 
                                        resources_as_3dmap,
                                 outline_complete=True,
                                 sons=[ resources_as_gmap, 
                                        resources_as_3dmap,

+                                       resources_as_scheduler,

                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
                                 )
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
                                 )