X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=9b96d4f413149431c28bd81e6036bb51c121841c;hb=4a99831db81024d5d25869d4c475d381fd39f75a;hp=d27d67757cff96a058d478e68bb6caf9fb0a058f;hpb=506d53313a317ac1af631a15f489ef6f73bfc8a4;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index d27d6775..9b96d4f4 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 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 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.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 + +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("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' @@ -95,45 +99,53 @@ class SliceView (LoginRequiredAutoLogoutView): ) # -------------------------------------------------------------------------- - # ResourcesSelected - # + # ResourcesSelected (Pending Operations) + main_stack.insert(ResourcesSelected( page = page, 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, )) - -# main_stack.insert( -# Raw (page=page,togglable=False, toggled=True,html='Description: TODO') -# ) - - # 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, - }, + + # -------------------------------------------------------------------------- + # Filter Resources + + filter_query_editor = QueryEditor( + page = page, + query = 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_as_map = 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, @@ -141,71 +153,54 @@ class SliceView (LoginRequiredAutoLogoutView): checkboxes = True, # center on Paris latitude = 49., - longitude = 2.2, - zoom = 3, + longitude = 9, + zoom = 4, ) - resources_query_editor = QueryEditor( - page = page, - query = sq_resource, - ) - resources_active_filters = ActiveFilters( - page = page, - query = sq_resource, + 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 = { + 'iDisplayLength': 25, + 'bLengthChange' : True, + 'bAutoWidth' : True, + }, ) - 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 - # if do_query_users: tab_users = Tabs( @@ -214,14 +209,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 @@ -229,17 +224,17 @@ 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, }, )) + # -------------------------------------------------------------------------- + # MEASUREMENTS tab_measurements = Tabs ( page = page, - active_domid = 'checkboxes3', + active_domid = 'measurements-list', outline_complete = True, togglable = True, title = 'Measurements', @@ -250,21 +245,23 @@ 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, }, )) + # -------------------------------------------------------------------------- + # MESSAGES (we use transient=False for now) main_stack.insert(Messages( page = page, title = "Runtime messages for slice %s"%slicename,