X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=38c90fca4951a9d1d7bf2e5ac6685153364a9c02;hb=372b744255e44a58b5616874a9eea97b4f05ad23;hp=7d8aaf9f85e58771c0bbfbb70d468d5d785d3421;hpb=dadf82b73ca1616e64269a2641926d89c8aaf107;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 7d8aaf9f..38c90fca 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -11,8 +11,8 @@ from ui.topmenu import topmenu_items, the_user 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.querytable import QueryTable +from plugins.queryupdater import QueryUpdater from plugins.googlemap import GoogleMap from plugins.senslabmap import SensLabMap from plugins.querycode import QueryCode @@ -20,7 +20,7 @@ from plugins.query_editor import QueryEditor from plugins.active_filters import ActiveFilters from plugins.quickfilter import QuickFilter from plugins.messages import Messages -from plugins.slicestat import Slicestat +from plugins.slicestat import SliceStat from myslice.config import Config @@ -102,9 +102,9 @@ class SliceView (LoginRequiredAutoLogoutView): ) # -------------------------------------------------------------------------- - # ResourcesSelected (Pending Operations) + # QueryUpdater (Pending Operations) - main_stack.insert(ResourcesSelected( + main_stack.insert(QueryUpdater( page = page, title = 'Pending operations', query = main_query, @@ -145,7 +145,7 @@ class SliceView (LoginRequiredAutoLogoutView): # RESOURCES # the resources part is made of a Tabs (Geographic, List), - resources_as_map = GoogleMap( + resources_as_gmap = GoogleMap( page = page, title = 'Geographic view', domid = 'resources-map', @@ -160,7 +160,15 @@ class SliceView (LoginRequiredAutoLogoutView): zoom = 4, ) - resources_as_list = Hazelnut( + resources_as_3dmap = SensLabMap( + page = page, + title = '3D Map', + domid = 'senslabmap', + query = sq_resource, + query_all = query_resource_all, + ) + + resources_as_list = QueryTable( page = page, domid = 'resources-list', title = 'List view', @@ -175,7 +183,56 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - resources_stats_cpu = Slicestat( + # with the new 'Filter' stuff on top, no need for anything but the querytable + resources_as_list_area = resources_as_list + + resources_area = Tabs ( page=page, + domid="resources", + togglable=True, + title="Resources", + outline_complete=True, + sons=[ resources_as_gmap, + resources_as_3dmap, + 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 = 'users-list', + ) + main_stack.insert(tab_users) + + tab_users.insert(QueryTable( + page = page, + title = 'Users List', + domid = 'users-list', + # 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 = { + 'iDisplayLength' : 25, + 'bLengthChange' : True, + 'bAutoWidth' : True, + }, + )) + +# DEMO + # -------------------------------------------------------------------------- + # MEASUREMENTS + measurements_stats_cpu = SliceStat( title = "CPU Usage", domid = 'resources-stats-cpu', page = page, @@ -186,7 +243,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'cpu' ) - resources_stats_mem = Slicestat( + measurements_stats_mem = SliceStat( title = "Memory Usage", domid = 'resources-stats-mem', page = page, @@ -197,7 +254,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'mem' ) - resources_stats_asb = Slicestat( + measurements_stats_asb = SliceStat( title = "Traffic Sent", domid = 'resources-stats-asb', page = page, @@ -208,7 +265,7 @@ class SliceView (LoginRequiredAutoLogoutView): o = 'asb' ) - resources_stats_arb = Slicestat( + measurements_stats_arb = SliceStat( title = "Traffic Received", domid = 'resources-stats-arb', page = page, @@ -218,54 +275,18 @@ class SliceView (LoginRequiredAutoLogoutView): slicename = slicename, o = 'arb' ) - - # with the new 'Filter' stuff on top, no need for anything but the hazelnut - resources_as_list_area = resources_as_list - resources_area = Tabs ( page=page, - domid="resources", + tab_measurements = Tabs ( page=page, + domid="measurements", togglable=True, - title="Resources", + toggled = False, + title="Measurements", outline_complete=True, - sons=[ resources_as_map, resources_as_list_area, resources_stats_cpu, resources_stats_mem, resources_stats_asb, resources_stats_arb ], - active_domid = 'resources-map', + sons=[ measurements_stats_cpu, measurements_stats_mem, measurements_stats_asb, measurements_stats_arb ], + active_domid = 'measurements_stats_cpu', ) - 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 = 'users-list', -# ) -# main_stack.insert(tab_users) -# -# tab_users.insert(Hazelnut( -# page = page, -# title = 'Users List', -# domid = 'users-list', -# # 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 = { -# 'iDisplayLength' : 25, -# 'bLengthChange' : True, -# 'bAutoWidth' : True, -# }, -# )) - -# DEMO - # -------------------------------------------------------------------------- - # MEASUREMENTS + main_stack.insert (tab_measurements) + # tab_measurements = Tabs ( # page = page, # active_domid = 'measurements-list', @@ -276,7 +297,7 @@ class SliceView (LoginRequiredAutoLogoutView): # ) # main_stack.insert(tab_measurements) # -# tab_measurements.insert(Hazelnut( +# tab_measurements.insert(QueryTable( # page = page, # title = 'Measurements', # domid = 'measurements-list', @@ -313,8 +334,8 @@ class SliceView (LoginRequiredAutoLogoutView): # 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_stack.render(request) + # define 'unfold_main' to the template engine - the main contents + template_env [ 'unfold_main' ] = main_stack.render(request) # more general variables expected in the template template_env [ 'title' ] = '%(slicename)s'%locals()