Skip to content

Commit

Permalink
started mydegrees(planner). fetch audit on login. started course page
Browse files Browse the repository at this point in the history
  • Loading branch information
ngokevin committed Jun 2, 2011
1 parent a08f068 commit 46307b8
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 2 deletions.
7 changes: 7 additions & 0 deletions course/templates/course/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "application.html" %}

{% block content %}

<h1>Courses</h1><br/><br/>

{% endblock %}
6 changes: 6 additions & 0 deletions course/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
from django.http import HttpResponseRedirect
import reglib

def index(request):

regclass = request.session['regclass']

return render_to_response('course/index.html', {})

def show(request, department, course_number):
regclass = request.session['regclass']

Expand Down
4 changes: 3 additions & 1 deletion main/templates/application.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
<div id="navigation" style="float: right;">
{% ifnotequal no_show_nav 1 %}
<a href="/main"><span>Home</span></a>
<a href="/course"><span>Courses</span></a>
<a href="/schedule"><span>Schedule</span></a>
<a href="/scheduler"><span>Scheduler</span></a>
<a href="/planner"><span>Planner</span></a>
<a href="/transcript"><span>Transcript</span></a>
<a href="/schedule"><span>Current Schedule</span></a>
<a href="/logout"><span>Logout</span></a>
{% endifnotequal %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion main/templates/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block content %}

<h2>Home</h2>
<h1>Home</h1><br/><br/>
<p>Eventually a dashboard will go here, where you can quickly see a overview of your past and present progress, as well as future suggestions.</p>

{% endblock %}
Expand Down
23 changes: 23 additions & 0 deletions main/templates/planner/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{% extends "application.html" %}

{% block content %}

<h1>Planner</h1><br/><br/>

<h3>Required Courses</h3>
<table>
<tr id="table headers">
<th>Course</th>
<th>Title</th>
<th>Credits</th>
</tr>
{% for course in required_courses %}
<tr>
<td><a href="/course/{{course.Disc}}{{course.Num}}">{{course.Disc}}{{course.Num}}</a></td>
<td>{{course.Title}}</td>
<td>{{course.Credits}}</td>
</tr>
{% endfor %}
</table>

{% endblock %}
15 changes: 15 additions & 0 deletions main/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ def login(request):

try:
regclass = reglib.infosu(username, password)
audit = regclass.get_major_requirements()
request.session['regclass'] = regclass
request.session['audit'] = audit
request.session.set_expiry(1200)
return HttpResponseRedirect('/main')
except:
Expand Down Expand Up @@ -56,3 +58,16 @@ def scheduler(request):

return render_to_response('scheduler/index.html', {'combinations':combinations, 'json':combinations_json, 'range':range(24), 'classes_possible':classes_possible})

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

regclass = request.session['regclass']
audit = request.session['audit']

required_courses = []
for instance in audit.required_classes:
for course in instance.courses:
required_courses.append(course)

return render_to_response('planner/index.html', {'required_courses':required_courses})
1 change: 1 addition & 0 deletions urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
(r'^schedule/$', include('schedule.urls')),
(r'^scheduler/$', 'main.views.scheduler'),
(r'^course/', include('course.urls')),
(r'^planner/', 'main.views.planner'),
)

0 comments on commit 46307b8

Please sign in to comment.