git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove duplicate css file (onelab_marko) and group all common stuff in base.html
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
9eb4799
..
0c32b40
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-15,6
+15,7
@@
from plugins.querytable import QueryTable
from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
+from plugins.scheduler import Scheduler
from plugins.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
from plugins.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
@@
-30,6
+31,9
@@
tmp_default_slice='ple.upmc.myslicedemo'
#do_query_users=True
do_query_users=False
#do_query_users=True
do_query_users=False
+#do_query_leases=True
+do_query_leases=False
+
insert_messages=False
#insert_messages=True
insert_messages=False
#insert_messages=True
@@
-42,6
+46,7
@@
class SliceView (LoginRequiredAutoLogoutView):
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_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("sliceview: leases turned %s"); });'%("on" if do_query_leases else "off"))
config=Config()
page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
page.expose_js_metadata()
config=Config()
page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
page.expose_js_metadata()
@@
-59,10
+64,13
@@
class SliceView (LoginRequiredAutoLogoutView):
'slice_hrn',
'resource.hrn', 'resource.hostname', 'resource.type',
'resource.network_hrn',
'slice_hrn',
'resource.hrn', 'resource.hostname', 'resource.type',
'resource.network_hrn',
-
#
'lease.urn',
+ 'lease.urn',
'user.user_hrn',
#'application.measurement_point.counter'
)
'user.user_hrn',
#'application.measurement_point.counter'
)
+ # for internal use in the querytable plugin;
+ # needs to be a unique column present for each returned record
+ main_query_key = 'hrn'
query_resource_all = Query.get('resource').select(resource_fields)
if do_query_users:
query_resource_all = Query.get('resource').select(resource_fields)
if do_query_users:
@@
-156,6
+164,7
@@
class SliceView (LoginRequiredAutoLogoutView):
togglable = False,
query = sq_resource,
query_all = query_resource_all,
togglable = False,
query = sq_resource,
query_all = query_resource_all,
+ googlemap_api_key = Config().googlemap_api_key(),
checkboxes = True,
# center on Paris
latitude = 49.,
checkboxes = True,
# center on Paris
latitude = 49.,
@@
-178,6
+187,8
@@
class SliceView (LoginRequiredAutoLogoutView):
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
+ # safer to use 'hrn' as the internal unique key for this plugin
+ id_key = main_query_key,
checkboxes = True,
datatables_options = {
'iDisplayLength': 25,
checkboxes = True,
datatables_options = {
'iDisplayLength': 25,
@@
-186,18
+197,38
@@
class SliceView (LoginRequiredAutoLogoutView):
},
)
},
)
+ if do_query_leases:
+ resources_as_scheduler = Scheduler(
+ page = page,
+ title = 'Scheduler',
+ domid = 'scheduler',
+ query = sq_resource,
+ query_all_resources = query_resource_all,
+ query_lease = sq_lease,
+ )
+
# with the new 'Filter' stuff on top, no need for anything but the querytable
resources_as_list_area = resources_as_list
# with the new 'Filter' stuff on top, no need for anything but the querytable
resources_as_list_area = resources_as_list
+ resources_sons = [
+ resources_as_gmap,
+ resources_as_3dmap,
+ resources_as_scheduler,
+ resources_as_list_area,
+ ] if do_query_leases else [
+ resources_as_gmap,
+ resources_as_3dmap,
+ resources_as_list_area,
+ ]
+
resources_area = Tabs ( page=page,
domid="resources",
togglable=True,
title="Resources",
outline_complete=True,
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, ],
+ sons= resources_sons,
active_domid = 'resources-map',
active_domid = 'resources-map',
+ persistent_active=True,
)
main_stack.insert (resources_area)
)
main_stack.insert (resources_area)