X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=2f22789dede54adec4a957bc9eb5f13830045694;hb=730273df1aae00c1c3c12b16d8447adee5da4bf9;hp=4f66dfdc37036e416b4a677526f623c9cb074307;hpb=15ca59cb1f80be244df33026add2cf97f2f87a62;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 4f66dfdc..2f22789d 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -6,7 +6,7 @@ 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 ui.topmenu import topmenu_items, the_user from plugins.raw import Raw from plugins.stack import Stack @@ -14,18 +14,19 @@ from plugins.tabs import Tabs from plugins.hazelnut import Hazelnut from plugins.resources_selected import ResourcesSelected from plugins.googlemap import GoogleMap -from plugins.senslabmap.senslabmap import SensLabMap +from plugins.senslabmap import SensLabMap from plugins.querycode import QueryCode from plugins.query_editor import QueryEditor from plugins.active_filters import ActiveFilters from plugins.quickfilter import QuickFilter from plugins.messages import Messages +from myslice.config import Config + tmp_default_slice='ple.upmc.myslicedemo' # temporary : turn off the users part to speed things up -#do_query_users=True -do_query_users=False +do_query_users=True class SliceView (LoginRequiredAutoLogoutView): @@ -34,8 +35,9 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') page.add_js_files ( [ "js/common.functions.js" ] ) - 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.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("manifold URL %s"); });'%(Config.manifold_url())) page.expose_js_metadata() metadata = page.get_metadata() @@ -49,7 +51,8 @@ class SliceView (LoginRequiredAutoLogoutView): main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename) main_query.select( 'slice_hrn', - 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn', + 'resource.hrn', 'resource.hostname', 'resource.type', + 'resource.network_hrn', #'lease.urn', 'user.user_hrn', #'application.measurement_point.counter' @@ -103,10 +106,38 @@ class SliceView (LoginRequiredAutoLogoutView): title = 'Pending operations', query = main_query, togglable = True, + # start turned off, it will open up itself when stuff comes in + toggled = False, domid = 'pending', outline_complete = True, )) - + + # -------------------------------------------------------------------------- + # Filter Resources + + 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, + title = "Active Filters", + ) + filters_area = Stack( + page = page, + title = 'Filter Resources', + domid = 'filters', + sons = [filter_query_editor, filter_active_filters], + togglable = True, + toggled = 'persistent', + outline_complete = True, + ) + main_stack.insert (filters_area) + # -------------------------------------------------------------------------- # RESOURCES # the resources part is made of a Tabs (Geographic, List), @@ -122,55 +153,28 @@ class SliceView (LoginRequiredAutoLogoutView): checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) resources_as_list = Hazelnut( page = page, domid = 'resources-list', + title = 'List view', # 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, 'bAutoWidth' : True, }, ) - resources_query_editor = QueryEditor( - page = page, - query = query_resource_all, - title = "Select Columns", - ) - resources_active_filters = ActiveFilters( - page = page, - query = sq_resource, - title = "Active Filters ?", - ) + # with the new 'Filter' stuff on top, no need for anything but the hazelnut + resources_as_list_area = resources_as_list - # 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, @@ -192,14 +196,14 @@ class SliceView (LoginRequiredAutoLogoutView): outline_complete = True, togglable = True, title = 'Users', - active_domid = 'checkboxes2', + active_domid = 'users-list', ) main_stack.insert(tab_users) tab_users.insert(Hazelnut( page = page, title = 'Users List', - domid = 'checkboxes2', + domid = 'users-list', # tab's sons preferably turn this off togglable = False, # this is the query at the core of the slice list @@ -217,7 +221,7 @@ class SliceView (LoginRequiredAutoLogoutView): # MEASUREMENTS tab_measurements = Tabs ( page = page, - active_domid = 'checkboxes3', + active_domid = 'measurements-list', outline_complete = True, togglable = True, title = 'Measurements', @@ -228,11 +232,13 @@ class SliceView (LoginRequiredAutoLogoutView): tab_measurements.insert(Hazelnut( page = page, title = 'Measurements', - domid = 'checkboxes3', + domid = 'measurements-list', # tab's sons preferably turn this off togglable = False, # this is the query at the core of the slice list query = sq_measurement, + # do NOT set checkboxes to False + # this table being otherwise empty, it just does not fly with dataTables checkboxes = True, datatables_options = { 'iDisplayLength' : 25,