Merge lp:~nigelbabu/summit/fix-today-link into lp:summit

Proposed by Nigel Babu
Status: Merged
Approved by: Michael Hall
Approved revision: 65
Merged at revision: 68
Proposed branch: lp:~nigelbabu/summit/fix-today-link
Merge into: lp:summit
Diff against target: 101 lines (+40/-10)
3 files modified
summit/schedule/templates/schedule/nosession.html (+18/-0)
summit/schedule/views.py (+21/-10)
summit/urls.py (+1/-0)
To merge this branch: bzr merge lp:~nigelbabu/summit/fix-today-link
Reviewer Review Type Date Requested Status
Summit Hackers Pending
Review via email: mp+49760@code.launchpad.net

Description of the change

Fresh branch after I messed up the old branch. This change will create a /today view which auto refreshes every 5 minutes so all the screens can point to one URL.

To post a comment you must log in.
lp:~nigelbabu/summit/fix-today-link updated
65. By Nigel Babu

Err, I'm supposed to delocalize, no localize inside by_date

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'summit/schedule/templates/schedule/nosession.html'
2--- summit/schedule/templates/schedule/nosession.html 1970-01-01 00:00:00 +0000
3+++ summit/schedule/templates/schedule/nosession.html 2011-02-15 15:53:44 +0000
4@@ -0,0 +1,18 @@
5+{% extends "base.html" %}
6+
7+{% block head %}
8+{{ block.super }}
9+<script language="JavaScript">
10+
11+function timedRefresh()
12+{
13+ var timeoutPeriod = 5*60*1000; // 5 minutes
14+ setTimeout("location.reload(true);", timeoutPeriod);
15+}
16+ window.onload = timedRefresh;
17+ </script>
18+{% endblock %}
19+
20+{% block content %}
21+There are no sessions scheduled for today.
22+{% endblock %}
23
24=== modified file 'summit/schedule/views.py'
25--- summit/schedule/views.py 2010-10-21 11:14:25 +0000
26+++ summit/schedule/views.py 2011-02-15 15:53:44 +0000
27@@ -15,6 +15,7 @@
28 # along with this program. If not, see <http://www.gnu.org/licenses/>.
29
30 from time import strftime
31+import datetime
32
33 from django.conf import settings
34 from django.contrib.auth import logout
35@@ -27,7 +28,7 @@
36 summit_only_required,
37 summit_attendee_required)
38
39-from summit.schedule.models import Summit
40+from summit.schedule.models import Summit, Slot
41
42 from summit.schedule.forms import AttendeeInterestForm
43
44@@ -40,6 +41,7 @@
45 'by_date',
46 'by_room',
47 'csv',
48+ 'today_view',
49 )
50
51
52@@ -102,19 +104,28 @@
53 if request.method == 'POST':
54 return schedule.save_change()
55 else:
56- schedule.calculate()
57-
58- context = {
59- 'summit': summit,
60- 'attendee': attendee,
61- 'schedule': schedule,
62- 'ical': '/%s.ical' % summit.name,
63- 'autoreload': 'reload' in request.GET,
64- }
65+ context = {
66+ 'summit': summit,
67+ 'attendee': attendee,
68+ 'schedule': schedule,
69+ 'ical': '/%s.ical' % summit.name,
70+ 'autoreload': 'reload' in request.GET,
71+ }
72+ converted_date = summit.delocalize(datetime.datetime.strptime(date, "%Y-%m-%d"))
73+ if Slot.objects.filter(summit=summit, start_utc__lte=converted_date, end_utc__gte=converted_date).count() > 0:
74+ schedule.calculate()
75+ else:
76+ return render_to_response("schedule/nosession.html", context,
77+ context_instance=RequestContext(request))
78 return render_to_response("schedule/schedule.html", context,
79 context_instance=RequestContext(request))
80
81 @summit_required
82+def today_view(request, summit, attendee):
83+ today = summit.localize(datetime.datetime.now()).date()
84+ return by_date(request, summit.name, today.strftime("%Y-%m-%d"))
85+
86+@summit_required
87 def next_session(request, summit, attendee):
88 schedule = Schedule(request, summit, attendee)
89 schedule.nextonly = True
90
91=== modified file 'summit/urls.py'
92--- summit/urls.py 2010-10-21 11:14:25 +0000
93+++ summit/urls.py 2011-02-15 15:53:44 +0000
94@@ -55,6 +55,7 @@
95
96 urlpatterns += patterns('summit.schedule.views',
97 (r'^(?P<summit_name>[\w-]+)/$', 'summit'),
98+ (r'^(?P<summit_name>[\w-]+)/today$', 'today_view'),
99 (r'^(?P<summit_name>[\w-]+)/interest/$', 'interest'),
100
101 (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),

Subscribers

People subscribed via source and target branches