X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=24567f3862fbef72e8e7ec348b2e816233b62c9a;hb=3ca7ddcaea07557767696dd2a622059a5c2078f8;hp=53a77e1e72b5d8051ce07a4567a241e0fd115152;hpb=1aea42c3668602aacfe22bc762ee939672129f53;p=myslice.git
diff --git a/portal/sliceview.py b/portal/sliceview.py
index 53a77e1e..24567f38 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -11,10 +11,9 @@ from myslice.viewutils import topmenu_items, the_user
from plugins.raw.raw import Raw
from plugins.stack.stack import Stack
from plugins.tabs.tabs import Tabs
-from plugins.lists.slicelist import SliceList
from plugins.hazelnut import Hazelnut
from plugins.resources_selected import ResourcesSelected
-from plugins.googlemaps import GoogleMaps
+from plugins.googlemap import GoogleMap
from plugins.senslabmap.senslabmap import SensLabMap
from plugins.querycode.querycode import QueryCode
from plugins.query_editor import QueryEditor
@@ -25,14 +24,17 @@ from plugins.messages.messages import Messages
tmp_default_slice='ple.upmc.myslicedemo'
-class SliceView (LoginRequiredAutoLogoutView):
+# temporary : turn off the users part to speed things up
+do_query_users=True
-# def __init__ (self, slicename=None):
-# self.slicename = slicename or tmp_default_slice
+class SliceView (LoginRequiredAutoLogoutView):
def get (self,request, slicename=tmp_default_slice):
page = Page(request)
+ page.add_css_files ('css/slice-view.css')
+ page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
+ page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
page.expose_js_metadata()
metadata = page.get_metadata()
@@ -53,12 +55,22 @@ class SliceView (LoginRequiredAutoLogoutView):
)
query_resource_all = Query.get('resource').select(resource_fields)
- query_user_all = Query.get('user').select(user_fields)
+ if do_query_users:
+ query_user_all = Query.get('user').select(user_fields)
aq = AnalyzedQuery(main_query, metadata=metadata)
page.enqueue_query(main_query, analyzed_query=aq)
page.enqueue_query(query_resource_all)
- page.enqueue_query(query_user_all)
+ if do_query_users:
+ page.enqueue_query(query_user_all)
+
+ # ... and for the relations
+ # XXX Let's hardcode resources for now
+ sq_resource = aq.subquery('resource')
+ sq_user = aq.subquery('user')
+ sq_lease = aq.subquery('lease')
+ sq_measurement = aq.subquery('measurement')
+
# Prepare the display according to all metadata
# (some parts will be pending, others can be triggered by users).
@@ -66,93 +78,42 @@ class SliceView (LoginRequiredAutoLogoutView):
# For example slice measurements will not be requested by default...
# Create the base layout (Stack)...
- main_plugin = Stack (
+ main_stack = Stack (
page=page,
- title="Slice !!view for %s"%slicename,
+ title="Slice %s"%slicename,
sons=[],
)
# ... responsible for the slice properties...
-
- main_plugin.insert (
- Raw (page=page,togglable=False, toggled=True,html=" Slice page for %s
"%slicename)
- )
-
- main_plugin.insert(
- Raw (page=page,togglable=False, toggled=True,html='Description: TODO')
- )
-
- sq_plugin = Tabs (
- page=page,
- title="Slice view for %s"%slicename,
- togglable=False,
- sons=[],
+ # a nice header
+ main_stack.insert (
+ Raw (page=page,
+ togglable=False,
+ toggled=True,
+ html=" Slice %s
"%slicename)
)
-
- # ... and for the relations
- # XXX Let's hardcode resources for now
- sq_resource = aq.subquery('resource')
- sq_user = aq.subquery('user')
- sq_lease = aq.subquery('lease')
- sq_measurement = aq.subquery('measurement')
-
-
- ############################################################################
- # RESOURCES
- #
- # A stack inserted in the subquery tab that will hold all operations
- # related to resources
- #
-
- stack_resources = Stack(
- page = page,
- title = 'Resources',
- sons=[],
- )
-
- resource_query_editor = QueryEditor(
- page = page,
- query = sq_resource,
- )
- stack_resources.insert(resource_query_editor)
-
- resource_active_filters = ActiveFilters(
- page = page,
- query = sq_resource,
- )
- stack_resources.insert(resource_active_filters)
-
# --------------------------------------------------------------------------
- # Different displays = DataTables + GoogleMaps
- #
- tab_resource_plugins = Tabs(
- page = page,
- sons = []
- )
-
- tab_resource_plugins.insert(Hazelnut(
- page = page,
- title = 'List',
- domid = 'checkboxes',
- # this is the query at the core of the slice list
- query = sq_resource,
- query_all = query_resource_all,
- checkboxes = True,
- datatables_options = {
- # for now we turn off sorting on the checkboxes columns this way
- # this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
- 'iDisplayLength' : 25,
- 'bLengthChange' : True,
- },
+ # ResourcesSelected (Pending Operations)
+
+ main_stack.insert(ResourcesSelected(
+ page = page,
+ title = 'Pending operations',
+ query = main_query,
+ togglable = True,
+ domid = 'pending',
+ outline_complete = True,
))
- tab_resource_plugins.insert(GoogleMaps(
+ # --------------------------------------------------------------------------
+ # RESOURCES
+ # the resources part is made of a Tabs (Geographic, List),
+
+ resources_as_map = GoogleMap(
page = page,
title = 'Geographic view',
- domid = 'gmap',
+ domid = 'resources-map',
# tab's sons preferably turn this off
togglable = False,
query = sq_resource,
@@ -162,56 +123,112 @@ class SliceView (LoginRequiredAutoLogoutView):
latitude = 49.,
longitude = 2.2,
zoom = 3,
- ))
-
- stack_resources.insert(tab_resource_plugins)
-
- sq_plugin.insert(stack_resources)
-
- ############################################################################
- # USERS
- #
-
- tab_users = Tabs(
- page = page,
- title = 'Users',
- domid = 'thetabs2',
- # activeid = 'checkboxes',
- active_domid = 'checkboxes2',
)
- sq_plugin.insert(tab_users)
-
- tab_users.insert(Hazelnut(
- page = page,
- title = 'List',
- domid = 'checkboxes2',
- # tab's sons preferably turn this off
- togglable = False,
+
+ resources_as_list = Hazelnut(
+ page = page,
+ domid = 'resources-list',
# this is the query at the core of the slice list
- query = sq_user,
- query_all = query_user_all,
- checkboxes = True,
+ query = sq_resource,
+ query_all = query_resource_all,
+ checkboxes = True,
datatables_options = {
# for now we turn off sorting on the checkboxes columns this way
# this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
- 'iDisplayLength' : 25,
- 'bLengthChange' : True,
- },
- ))
+ 'aoColumns' : [None, None, None, None, {'bSortable': False}],
+ 'iDisplayLength': 25,
+ 'bLengthChange' : True,
+ 'bAutiWidth' : True,
+ },
+ )
+
+ resources_query_editor = QueryEditor(
+ page = page,
+ query = sq_resource,
+ title = "Select Columns",
+ )
+ resources_active_filters = ActiveFilters(
+ page = page,
+ query = sq_resource,
+ title = "Active Filters ?",
+ )
+
+ # List area itself is a Stack with hazelnut on top,
+ # and a togglable tabs for customization plugins
+ resources_as_list_area = Stack(
+ page = page,
+ title = 'Resources as a List',
+ domid = 'resources-list-area',
+ sons= [ resources_as_list,
+ Tabs ( page=page,
+ title="Customize Resources layout",
+ togglable=True,
+ toggled='persistent',
+ domid="customize-resources",
+ outline_complete=True,
+ sons = [ resources_query_editor, resources_active_filters, ],
+ ),
+ ],
+ )
+ resources_area = Tabs ( page=page,
+ domid="resources",
+ togglable=True,
+ title="Resources",
+ outline_complete=True,
+ sons=[ resources_as_map, resources_as_list_area, ],
+ active_domid = 'resources-map',
+ )
+ main_stack.insert (resources_area)
+
+
+ # --------------------------------------------------------------------------
+ # USERS
+ if do_query_users:
+ tab_users = Tabs(
+ page = page,
+ domid = 'users',
+ outline_complete = True,
+ togglable = True,
+ title = 'Users',
+ active_domid = 'checkboxes2',
+ )
+ main_stack.insert(tab_users)
+
+ tab_users.insert(Hazelnut(
+ page = page,
+ title = 'Users List',
+ domid = 'checkboxes2',
+ # tab's sons preferably turn this off
+ togglable = False,
+ # this is the query at the core of the slice list
+ query = sq_user,
+ query_all = query_user_all,
+ checkboxes = True,
+ datatables_options = {
+ # for now we turn off sorting on the checkboxes columns this way
+ # this of course should be automatic in hazelnut
+ 'aoColumns' : [None, None, None, None, {'bSortable': False}],
+ 'iDisplayLength' : 25,
+ 'bLengthChange' : True,
+ },
+ ))
+
+ # --------------------------------------------------------------------------
+ # MEASUREMENTS
tab_measurements = Tabs (
- page = page,
- title = 'Measurements',
- domid = 'thetabs3',
- # activeid = 'checkboxes',
- active_domid = 'checkboxes3',
+ page = page,
+ active_domid = 'checkboxes3',
+ outline_complete = True,
+ togglable = True,
+ title = 'Measurements',
+ domid = 'measurements',
)
- sq_plugin.insert(tab_measurements)
+ main_stack.insert(tab_measurements)
tab_measurements.insert(Hazelnut(
page = page,
- title = 'List',
+ title = 'Measurements',
domid = 'checkboxes3',
# tab's sons preferably turn this off
togglable = False,
@@ -227,38 +244,27 @@ class SliceView (LoginRequiredAutoLogoutView):
},
))
- main_plugin.insert(sq_plugin)
-
# --------------------------------------------------------------------------
- # ResourcesSelected
- #
- main_plugin.insert(ResourcesSelected(
- page = page,
- title = 'Pending operations',
- query = main_query,
- togglable = True,
- ))
-
- main_plugin.insert(Messages(
+ # MESSAGES (we use transient=False for now)
+ main_stack.insert(Messages(
page = page,
title = "Runtime messages for slice %s"%slicename,
domid = "msgs-pre",
levels = "ALL",
+ # plain messages are probably less nice for production but more reliable for development for now
+ transient = False,
+ # these make sense only in non-transient mode..
+ togglable = True,
+ toggled = 'persistent',
+ outline_complete = True,
))
- # main_plugin.insert(Updater(
- # page = page,
- # title = "wont show up as non togglable by default",
- # query = main_query,
- # label = "Update slice",
- # ))
-
# variables that will get passed to the view-unfold1.html template
template_env = {}
# define 'unfold1_main' to the template engine - the main contents
- template_env [ 'unfold1_main' ] = main_plugin.render(request)
+ template_env [ 'unfold1_main' ] = main_stack.render(request)
# more general variables expected in the template
template_env [ 'title' ] = '%(slicename)s'%locals()