X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=e28ef01865664b697609c3072a783a69beef3806;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hp=60a95d396c33a16a2a77941e3e9d9bdafa8e3561;hpb=342a0ee5c88219bd359b111fe371386e3104458e;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
old mode 100644
new mode 100755
index 60a95d39..e28ef018
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -18,18 +18,19 @@ from plugins.querygrid               import QueryGrid
 from plugins.queryupdater            import QueryUpdater
 from plugins.googlemap               import GoogleMap
 from plugins.senslabmap              import SensLabMap
-from plugins.scheduler               import Scheduler
+#from plugins.scheduler               import Scheduler
+from plugins.scheduler2              import Scheduler2
 from plugins.querycode               import QueryCode
 # Thierry
 # stay away from query editor for now as it seems to make things go very slow
 # see https://lists.myslice.info/pipermail/devel-myslice/2013-December/000221.html 
-#from plugins.query_editor            import QueryEditor
+from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
 from plugins.quickfilter             import QuickFilter
 from plugins.messages                import Messages
 from plugins.slicestat               import SliceStat
 
-from myslice.config                  import Config
+from myslice.configengine            import ConfigEngine
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
@@ -56,8 +57,7 @@ class SliceView (LoginRequiredAutoLogoutView):
         page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
         page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
         page.add_js_chunks ('$(function() { messages.debug("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
-        config=Config()
-        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
+        page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(ConfigEngine().manifold_url()))
 
         metadata = page.get_metadata()
         resource_md = metadata.details_by_object('resource')
@@ -162,13 +162,13 @@ class SliceView (LoginRequiredAutoLogoutView):
         # Filter Resources
        
 # turn off for now -- see above
-#        filter_query_editor = QueryEditor(
-#            page  = page,
-#            query = sq_resource, 
-#            query_all = query_resource_all,
-#            title = "Select Columns",
-#            domid = 'select-columns',
-#            )
+        filter_query_editor = QueryEditor(
+            page  = page,
+            query = sq_resource, 
+            query_all = query_resource_all,
+            title = "Select Columns",
+            domid = 'select-columns',
+            )
         filter_active_filters = ActiveFilters(
             page  = page,
             query = sq_resource,
@@ -178,7 +178,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             page                = page,
             title               = 'Filter Resources',
             domid               = 'filters',
-            sons                = [# filter_query_editor, 
+            sons                = [filter_query_editor, 
                                    filter_active_filters],
             togglable           = True,
             toggled             = 'persistent',
@@ -199,7 +199,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             query      = sq_resource,
             query_all  = query_resource_all,
             # this key is the one issued by google
-            googlemap_api_key = Config().googlemap_api_key(),
+            googlemap_api_key = ConfigEngine().googlemap_api_key(),
             # the key to use at init-time
             init_key   = main_query_init_key,
             checkboxes = True,
@@ -245,15 +245,29 @@ class SliceView (LoginRequiredAutoLogoutView):
                 checkboxes = True,
                 )
 
-        if do_query_leases:
-            resources_as_scheduler = Scheduler(
-                page        = page,
-                title       = 'Scheduler',
-                domid       = 'scheduler',
-                query       = sq_resource,
-                query_all_resources = query_resource_all,
-                query_lease = sq_lease,
-                )
+        
+
+        #if do_query_leases:
+        #    resources_as_scheduler = Scheduler(
+
+        #        page        = page,
+        #        title       = 'Scheduler',
+        #        domid       = 'scheduler',
+        #        query       = sq_resource,
+        #        query_all_resources = query_resource_all,
+        #        query_lease = sq_lease,
+
+        #        )
+
+        resources_as_scheduler2 = Scheduler2( 
+            page       = page,
+            domid      = 'scheduler',
+            title      = 'Scheduler',
+            # this is the query at the core of the slice list
+            query = sq_resource,
+            query_all_resources = query_resource_all,
+            query_lease = sq_lease,
+            )
 
        # with the new 'Filter' stuff on top, no need for anything but the querytable
         resources_as_list_area = resources_as_list 
@@ -261,12 +275,13 @@ class SliceView (LoginRequiredAutoLogoutView):
         resources_sons = [
             resources_as_gmap, 
             resources_as_3dmap,
-            resources_as_scheduler,
+            resources_as_scheduler2,
             resources_as_list_area,
             ] if do_query_leases else [
             resources_as_gmap, 
             resources_as_3dmap,
             resources_as_list_area,
+            resources_as_scheduler2,
             ]
         if insert_grid:
             resources_sons.append(resources_as_grid)
@@ -277,7 +292,8 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 title="Resources",
                                 outline_complete=True,
                                 sons= resources_sons,
-                                active_domid = 'resources-map',
+
+                                active_domid = 'scheduler',
                                 persistent_active=True,
                                 )
         main_stack.insert (resources_area)
@@ -361,13 +377,14 @@ class SliceView (LoginRequiredAutoLogoutView):
         )
 
         tab_measurements = Tabs ( page=page,
-                                domid="measurements",
-                                togglable=True,
-                                toggled  = False,
-                                title="Measurements",
+                                domid = "measurements",
+                                togglable = True,
+                                toggled = 'persistent',
+                                title = "Measurements",
                                 outline_complete=True,
-                                sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
-                                active_domid = 'measurements_stats_cpu',
+                                sons = [ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ],
+                                active_domid = 'resources-stats-cpu',
+                                persistent_active = True,
                                 )
         main_stack.insert (tab_measurements)