X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=b265e796ca1217a61ae87103d3fd71983f7c0098;hb=31540dd504798e0aca69e10d8144fbedc5b16af8;hp=78d5fb8821443262f3b0466c060870e2244751f2;hpb=ceaa4271ec96d47dc4e8d1eb727d82364a9032aa;p=myslice.git
diff --git a/portal/sliceview.py b/portal/sliceview.py
index 78d5fb88..b265e796 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -1,36 +1,39 @@
from django.template import RequestContext
from django.shortcuts import render_to_response
-from portal.templateviews import LoginRequiredAutoLogoutView
+from unfold.loginrequired import LoginRequiredAutoLogoutView
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
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.raw import Raw
+from plugins.stack import Stack
+from plugins.tabs import Tabs
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.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
-from plugins.quickfilter.quickfilter import QuickFilter
-from plugins.messages.messages import Messages
-#from plugins.updater import Updater
+from plugins.quickfilter import QuickFilter
+from plugins.messages import Messages
tmp_default_slice='ple.upmc.myslicedemo'
+# temporary : turn off the users part to speed things up
+do_query_users=True
+
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()
@@ -51,18 +54,20 @@ 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_resource = aq.subquery('resource')
+ sq_user = aq.subquery('user')
+ sq_lease = aq.subquery('lease')
sq_measurement = aq.subquery('measurement')
@@ -88,34 +93,26 @@ class SliceView (LoginRequiredAutoLogoutView):
html=" Slice %s
"%slicename)
)
-# main_stack.insert(
-# Raw (page=page,togglable=False, toggled=True,html='Description: TODO')
-# )
+ # --------------------------------------------------------------------------
+ # ResourcesSelected (Pending Operations)
+
+ main_stack.insert(ResourcesSelected(
+ page = page,
+ title = 'Pending operations',
+ query = main_query,
+ togglable = True,
+ domid = 'pending',
+ outline_complete = True,
+ ))
- # the resources part is made of a Stack,
- # with first a Tabs (List, Geographic),
- # and second the QueryEditor to tweak the set of attributes to show
- resources_as_list = Hazelnut(
- page = page,
- title = 'Resources as a 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,
- },
- )
+ # --------------------------------------------------------------------------
+ # RESOURCES
+ # the resources part is made of a Tabs (Geographic, List),
- resources_as_map = GoogleMaps(
+ 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,
@@ -127,97 +124,97 @@ class SliceView (LoginRequiredAutoLogoutView):
zoom = 3,
)
+ resources_as_list = Hazelnut(
+ page = page,
+ domid = 'resources-list',
+ # 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,
+ '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 ?",
)
- resources_area = Stack (
- page=page,
- domid="resources",
- togglable=True,
- title="Resources",
- outline_complete=True,
- sons = [
- Tabs ( page=page,
- sons=[ resources_as_list, resources_as_map, ]
- ),
- Stack ( page=page,
- title="Customize",
- togglable=True,
- sons = [ resources_query_editor, resources_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)
-# sq_plugin = Tabs (
-# page=page,
-# title="Slice view for %s"%slicename,
-# togglable=True,
-# sons=[],
-# )
-
-
- ############################################################################
- # RESOURCES
- #
- # A stack inserted in the subquery tab that will hold all operations
- # related to resources
- #
-
-# stack_resources = Stack(
-# page = page,
-# title = 'Resources',
-# sons=[],
-# )
-
-# stack_resources.insert(resource_active_filters)
-#
-#
-# stack_resources.insert(tab_resource_plugins)
-
-# sq_plugin.insert(stack_resources)
-
- ############################################################################
+ # --------------------------------------------------------------------------
# USERS
- #
- tab_users = Tabs(
- page = page,
- domid = 'users',
- outline_complete = True,
- togglable = True,
- title = 'Users',
- active_domid = 'checkboxes2',
- )
- main_stack.insert(tab_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,
- },
- ))
+ 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,
active_domid = 'checkboxes3',
@@ -246,33 +243,20 @@ class SliceView (LoginRequiredAutoLogoutView):
},
))
-# main_stack.insert(sq_plugin)
-
# --------------------------------------------------------------------------
- # ResourcesSelected
- #
- main_stack.insert(ResourcesSelected(
- page = page,
- title = 'Pending operations',
- query = main_query,
- togglable = True,
- domid = 'pending',
- outline_complete = True,
- ))
-
+ # 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_stack.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