X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceresourceview.py;h=b02b0cacd54d19ef122dd697c932b92c34d8f0b0;hb=d27d2d82220df49410d61d4b07d6e81f34856709;hp=7d4ab089ba3d6b36420a9cedb2cdcb69fb781c8d;hpb=be718e3336ee7ad98e90b0b3c97b58b37a467788;p=myslice.git

diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py
index 7d4ab089..b02b0cac 100644
--- a/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@ -18,6 +18,7 @@ from plugins.googlemap               import GoogleMap
 from plugins.queryupdater            import QueryUpdater
 from plugins.testbeds                import TestbedsPlugin
 from plugins.scheduler2              import Scheduler2
+from plugins.columns_editor          import ColumnsEditor
 
 from myslice.theme import ThemeView
 
@@ -49,7 +50,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
                 'resource.hostname', 'resource.type',
                 'resource.network_hrn',
                 'lease.urn',
-                'user.user_hrn',
+                #'user.user_hrn',
                 #'application.measurement_point.counter'
         )
         # for internal use in the querytable plugin;
@@ -70,10 +71,8 @@ class SliceResourceView (LoginRequiredView, ThemeView):
         query_all_lease = Query.get('lease').select(lease_fields)
         page.enqueue_query(query_all_lease)
 
-        print "!!!!!!!!!!   query leases = ",query_all_lease
-
         # --------------------------------------------------------------------------
-        # RESOURCES LIST
+        # ALL RESOURCES LIST
         # resources as a list using datatable plugin
  
         list_resources = QueryTable(
@@ -91,6 +90,39 @@ class SliceResourceView (LoginRequiredView, ThemeView):
                 },
         )
 
+
+        # --------------------------------------------------------------------------
+        # RESERVED RESOURCES LIST
+        # resources as a list using datatable plugin
+ 
+        list_reserved_resources = QueryTable(
+            page       = page,
+            domid      = 'resources-reserved-list',
+            title      = 'List view',
+            query      = sq_resource,
+            query_all  = sq_resource,
+            init_key   = "urn",
+            checkboxes = True,
+            datatables_options = {
+                'iDisplayLength': 25,
+                'bLengthChange' : True,
+                'bAutoWidth'    : True,
+                },
+        )
+
+        # --------------------------------------------------------------------------
+        # COLUMNS EDITOR
+        # list of fields to be applied on the query 
+        # this will add/remove columns in QueryTable plugin
+ 
+        filter_column_editor = ColumnsEditor(
+            page  = page,
+            query = sq_resource, 
+            query_all = query_resource_all,
+            title = "Select Columns",
+            domid = 'select-columns',
+        )
+
         # --------------------------------------------------------------------------
         # RESOURCES MAP
         # the resources part is made of a Tabs (Geographic, List), 
@@ -111,7 +143,7 @@ class SliceResourceView (LoginRequiredView, ThemeView):
             # center on Paris
             latitude   = 49.,
             longitude  = 9,
-            zoom       = 4,
+            zoom       = 8,
         )
 
         # --------------------------------------------------------------------------
@@ -170,6 +202,10 @@ class SliceResourceView (LoginRequiredView, ThemeView):
 
         template_env = {}
         template_env['list_resources'] = list_resources.render(self.request)
+#         template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
+
+        template_env['columns_editor'] = filter_column_editor.render(self.request)
+
         template_env['filter_testbeds'] = filter_testbeds.render(self.request)
         template_env['map_resources'] = map_resources.render(self.request)
         template_env['scheduler'] = resources_as_scheduler2.render(self.request)