X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=1ff92d3e6acf10a75c9990bfd9128fa9bb0aa28b;hb=d384e4b10bf9ba67f610bef72cf0e5b2dd747baf;hp=762e64a26a979f99f01a8903af120e0630361b00;hpb=18e2193c02477ab0b948f0748848e8bf190b6e7e;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 762e64a2..1ff92d3e 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -1,26 +1,27 @@ from django.template import RequestContext from django.shortcuts import render_to_response -from views.loginrequired 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 ui.topmenu 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.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.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 + +from myslice.config import Config tmp_default_slice='ple.upmc.myslicedemo' @@ -33,8 +34,10 @@ class SliceView (LoginRequiredAutoLogoutView): 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.add_js_files ( [ "js/common.functions.js" ] ) + 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() @@ -48,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' @@ -102,10 +106,39 @@ 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, + # start turned off, it will open up itself when stuff comes in + toggled = False, + outline_complete = True, + ) + main_stack.insert (filters_area) + # -------------------------------------------------------------------------- # RESOURCES # the resources part is made of a Tabs (Geographic, List), @@ -121,8 +154,8 @@ class SliceView (LoginRequiredAutoLogoutView): checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) resources_as_list = Hazelnut( @@ -133,26 +166,12 @@ class SliceView (LoginRequiredAutoLogoutView): 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, + 'bAutoWidth' : 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( @@ -166,7 +185,7 @@ class SliceView (LoginRequiredAutoLogoutView): toggled='persistent', domid="customize-resources", outline_complete=True, - sons = [ resources_query_editor, resources_active_filters, ], + #sons = [ resources_query_editor, resources_active_filters, ], ), ], ) @@ -191,14 +210,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 @@ -206,11 +225,9 @@ class SliceView (LoginRequiredAutoLogoutView): 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, + 'bAutoWidth' : True, }, )) @@ -218,7 +235,7 @@ class SliceView (LoginRequiredAutoLogoutView): # MEASUREMENTS tab_measurements = Tabs ( page = page, - active_domid = 'checkboxes3', + active_domid = 'measurements-list', outline_complete = True, togglable = True, title = 'Measurements', @@ -229,18 +246,18 @@ 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 = { - # 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, }, ))