Skip to content

Commit

Permalink
displays message if empty schedule, has link to next term's schedule …
Browse files Browse the repository at this point in the history
…from current term's schedule and vice-versa. BOSS
  • Loading branch information
ngokevin committed Jun 14, 2011
1 parent ef4c389 commit e0bb63e
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 8 deletions.
8 changes: 7 additions & 1 deletion schedule/templates/schedule/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ <h1>Schedule</h1><br/><br/>
<script type="text/javascript" src="/site_media/javascripts/schedule.js"></script>
{% endblock %}

{% if current_term %}
<h3><a href="next_term/">Next Term >></a></h3>
{% else %}
<h3><a href="/schedule/">&#060;&#060; Current Term</a></h3>
{% endif %}

<div class="span-24 last">
<div class="span-18">
<table>
Expand Down Expand Up @@ -74,6 +80,6 @@ <h1>Schedule</h1><br/><br/>
{% endfor %}

</table>

</div>

{% endblock %}
15 changes: 15 additions & 0 deletions schedule/templates/schedule/no_course.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% extends "application.html" %}

{% block content %}

<h1>Schedule</h1><br/><br/>

{% if current_term %}
<h4><a href="next_term/">Next Term >></a></h4>
{% else %}
<h4><a href="/schedule/">&#060;&#060; Current Term</a></h4>
{% endif %}

<h3>No courses registered for this term</h3>

{% endblock %}
6 changes: 3 additions & 3 deletions schedule/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.conf.urls.defaults import *

urlpatterns = patterns('schedule.views',
(r'^$', 'index')

)
(r'^$', 'index'),
(r'^next_term/$', 'next_term'),
)
25 changes: 24 additions & 1 deletion schedule/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,29 @@ def index(request):
schedule = regclass.schedule.current_classes
schedule_json = json.dumps(schedule)

return render_to_response('schedule/index.html', {'schedule':schedule, 'range':range(24), 'json':schedule_json})
no_courses = False
if len(schedule) is 0:
no_courses = True

if no_courses:
return render_to_response('schedule/no_course.html', {'current_term': True})
return render_to_response('schedule/index.html', {'schedule':schedule, 'range':range(24), 'json':schedule_json, 'current_term': True})

def next_term(request):
if not 'regclass' in request.session:
return HttpResponseRedirect('/')

regclass = request.session['regclass']
schedule = regclass.next_schedule.current_classes
schedule_json = json.dumps(schedule)

no_courses = False
if len(schedule) is 0:
no_courses = True

if no_courses:
return render_to_response('schedule/no_course.html', {'current_term': False})
return render_to_response('schedule/index.html', {'schedule':schedule, 'range':range(24), 'json':schedule_json, 'current_term': False})



6 changes: 3 additions & 3 deletions urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
(r'^login/$', 'main.views.login'),
(r'^logout/$', 'main.views.logout'),
(r'^main/$', 'main.views.main'),
(r'^transcript/$', include('transcript.urls')),
(r'^schedule/$', include('schedule.urls')),
(r'^scheduler/$', include('scheduler.urls')),
(r'^transcript/', include('transcript.urls')),
(r'^schedule/', include('schedule.urls')),
(r'^scheduler/', include('scheduler.urls')),
(r'^course/', include('course.urls')),
(r'^planner/', 'main.views.planner'),
)
Expand Down

0 comments on commit e0bb63e

Please sign in to comment.