From 9a2eda2c99f7c542c3397b79f88c31224af791f5 Mon Sep 17 00:00:00 2001 From: tr4ck3ur Date: Fri, 27 Nov 2015 11:39:22 +0100 Subject: [PATCH] Add Live page --- jm2l/__init__.py | 1 + jm2l/templates/Live.mako | 36 ++++++++++++++++++++++++++++++++++++ jm2l/views.py | 14 +++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 jm2l/templates/Live.mako diff --git a/jm2l/__init__.py b/jm2l/__init__.py index 6769e3d..db7a649 100644 --- a/jm2l/__init__.py +++ b/jm2l/__init__.py @@ -108,6 +108,7 @@ def main(global_config, **settings): config.add_route('vote_logo', '/vote_logo/{num:\d+}') # HTML Routes - Staff + config.add_route('Live', '/Live') config.add_route('list_task', '/Staff') config.add_route('handle_pole', '/Staff/poles{sep:/*}{pole_id:(\d+)?}') config.add_route('handle_task', '/Staff/tasks{sep:/*}{task_id:(\d+)?}') diff --git a/jm2l/templates/Live.mako b/jm2l/templates/Live.mako new file mode 100644 index 0000000..204a35e --- /dev/null +++ b/jm2l/templates/Live.mako @@ -0,0 +1,36 @@ +<%inherit file="jm2l:templates/layout.mako"/> +<%namespace name="helpers" file="jm2l:templates/helpers.mako"/> +<%def name="jsAddOn_head()"> + + +<%def name="cssAddOn()"> + + + + +
+ + +

Live JM2L

+

+Voici les liens vers les conférences Live: +

En ce moment:

+

+

+ % for ev in events: + Live Vidéo - + ${ev.event_type} - ${ev.name} +
+ % endfor +

+

+ Réalisé avec le concours des admins réseau Polytech'Nice. Encore merci pour leur disponibilité ..
+ Rechargez la page pour voir les évenements en cours en fonction de l'heure...
+ Vous avez le droit de vous plaindre, c'est du Do It Yourself ;) +

+ +
\ No newline at end of file diff --git a/jm2l/views.py b/jm2l/views.py index da268fe..2aa9925 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -11,7 +11,7 @@ from .forms import * # Database access imports from .models import * from .helpers import Orga_helpers -from sqlalchemy import func, or_, text +from sqlalchemy import func, or_, text, and_ from os import path, makedirs, listdir # Usefull tools from slugify import slugify @@ -43,6 +43,18 @@ def embeed_video(mime_type, link): return Container +@view_config(route_name='Live', renderer="jm2l:templates/Live.mako") +def Live(request): + year = int(request.matchdict.get('year', CurrentYear)) + tz = timezone('Europe/Paris') + curtime = datetime.datetime.now().replace(tzinfo=tz, day=28) #, hour=10, minute=00 ) + Events = DBSession.query(Event)\ + .filter(Event.for_year == year)\ + .filter(Event.event_type != 'Stand')\ + .filter(and_(Event.start_time <= curtime, Event.end_time >= curtime) )\ + .order_by(Event.start_time) + return {'year': year, "DisplayYear": year, 'events':Events, "logged_in":request.authenticated_userid } + ## =-=- Here, We handle ICal requests -=-= @view_config(route_name='progr_iCal', renderer="string") def ICal_Progamme_Request(request):