X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=97802f6048be223b6afc152e4c05ec775bbb6c03;hb=4dfd873aec658a5f2a22983c7221f8b7006aa475;hp=c9e41b90ac3daad1adef83a4ad41d45f0b4a99d3;hpb=2e02ce3947cb83f38406c2e67a3d4cac3f93ce6c;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index c9e41b90..97802f60 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -1,31 +1,31 @@ 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 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 tmp_default_slice='ple.upmc.myslicedemo' # temporary : turn off the users part to speed things up -do_query_users=True +#do_query_users=True +do_query_users=False class SliceView (LoginRequiredAutoLogoutView): @@ -33,8 +33,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("users turned %s"); });'%("on" if do_query_users else "off")) + page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) page.expose_js_metadata() metadata = page.get_metadata() @@ -95,8 +96,8 @@ class SliceView (LoginRequiredAutoLogoutView): ) # -------------------------------------------------------------------------- - # ResourcesSelected - # + # ResourcesSelected (Pending Operations) + main_stack.insert(ResourcesSelected( page = page, title = 'Pending operations', @@ -106,17 +107,28 @@ class SliceView (LoginRequiredAutoLogoutView): 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 + # the resources part is made of a Tabs (Geographic, List), + + resources_as_map = GoogleMap( + page = page, + title = 'Geographic view', + domid = 'resources-map', + # tab's sons preferably turn this off + togglable = False, + query = sq_resource, + query_all = query_resource_all, + checkboxes = True, + # center on Paris + latitude = 49., + longitude = 2.2, + zoom = 3, + ) + resources_as_list = Hazelnut( page = page, - title = 'Resources as a List', - domid = 'resources_list', + domid = 'resources-list', # this is the query at the core of the slice list query = sq_resource, query_all = query_resource_all, @@ -131,24 +143,9 @@ class SliceView (LoginRequiredAutoLogoutView): }, ) - resources_as_map = GoogleMaps( - page = page, - title = 'Geographic view', - domid = 'gmap', - # tab's sons preferably turn this off - togglable = False, - query = sq_resource, - query_all = query_resource_all, - checkboxes = True, - # center on Paris - latitude = 49., - longitude = 2.2, - zoom = 3, - ) - resources_query_editor = QueryEditor( page = page, - query = sq_resource, + query = query_resource_all, title = "Select Columns", ) resources_active_filters = ActiveFilters( @@ -157,62 +154,36 @@ class SliceView (LoginRequiredAutoLogoutView): title = "Active Filters ?", ) - 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, ] , - active_domid = 'gmap', - ), - Tabs ( page=page, - title="Customize Resources layout", - togglable=True, - toggled='persistent', - domid="customize-resources", - outline_complete=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( @@ -244,6 +215,8 @@ class SliceView (LoginRequiredAutoLogoutView): }, )) + # -------------------------------------------------------------------------- + # MEASUREMENTS tab_measurements = Tabs ( page = page, active_domid = 'checkboxes3', @@ -272,6 +245,8 @@ class SliceView (LoginRequiredAutoLogoutView): }, )) + # -------------------------------------------------------------------------- + # MESSAGES (we use transient=False for now) main_stack.insert(Messages( page = page, title = "Runtime messages for slice %s"%slicename,