Commit 965fef42 authored by Daniel W Bond's avatar Daniel W Bond
Browse files

compare trajectories template laid out nicely

parent fc799ec6
......@@ -58,11 +58,11 @@ To-do
* scraping of catalog.gmu.edu for the database (this also means that with a single command everyone can be working on the same database :3)
* Forms on the index and create pages need to submit information
* Forms on index and create pages also need to expand to an additional fields; also needs to take into consideration the max available
* does the create page need to reload in between submissions? ajax or a new page?
* does the create page need to reload in between submissions? ajax or a new page? **different page for now, that might actually be "better"**
* create ux-- timeline sidebar, countdown box indicating number of credits remaining
* LDAP auth/login
* compare trajectories (2 timeline | 5 classlist one | 5 classlist two)
* scraping the stie to populate the database
* scraping the site to populate the database
* moving over to mysql
* there's some design work that needs to be done, as well as polishing, like privacy
* Testing testing testing.
......
......@@ -32,10 +32,12 @@ urlpatterns = patterns('trajectories.views',
url(r'^user/(?P<username>\w+)/$', 'student', name = 'student'),
# creating the trajectory
# url(r'^user/(?P<username>\w+)/create/$', 'create', name = 'create'),
url(r'^create/$', 'create', name = 'create'),
# comparison page
url(r'^user/(?P<username>\w+)/compare/$', 'compare', name = 'compare'),
# url(r'^user/(?P<username>\w+)/compare/$', 'compare', name = 'compare'),
url(r'^compare/$', 'compare', name = 'compare'),
url(r'^admin/', include(admin.site.urls)),
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
......
......@@ -6,66 +6,102 @@ GMU Advisor | Compare
{% block content %}
<h3>Compare two trajectories.</h4>
<form class="form-horizontal" role="form">
<div class="form-group">
<label for "myTrajectories" class="col-sm-2">My Trajectories</label>
<div class="col-sm-4">
<select class="form-control">
<option>My Trajectory 1</option>
<option>My Trajectory 2</option>
<option>My Trajectory 3</option>
<option>My Trajectory 4</option>
</select>
</div>
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
</div>
<div class="page-header" id="banner">
<div class="row">
<div class="col-md-12 text-center">
<h2>Compare Trajectories</h2>
</div>
</div>
<div class="form-group">
<label for "myTrajectories" class="col-sm-2">Public Trajectories</label>
<div class="col-sm-4">
<input type"text" class="form-control" id="Trajectory" placeholder="dbond2">
<div class="row well">
<div class="col-md-12">
<div class="text-center"><h3>Choose up to three</h3></div>
<form class="form-horizontal" role="form">
<!-- why doesn't this have them next to each other? -->
<div class="form-group">
<label for "myTrajectories" class="col-md-2">My Trajectories</label>
<div class="col-md-3">
<select class="form-control">
<option>My Trajectory 1</option>
<option>My Trajectory 2</option>
<option>My Trajectory 3</option>
<option>My Trajectory 4</option>
</select>
</div>
<div class="col-md-1">
<button type="button" class="btn btn-primary">+</button>
</div>
</div>
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
<div class="form-group">
<label for "myTrajectories" class="col-md-2">Public Trajectories</label>
<div class="col-md-3">
<input type"text" class="form-control" id="Trajectory" placeholder="dbond2">
</div>
<div class="col-sm-1">
<button type="button" class="btn btn-primary">+</button>
</div>
</div>
<div class="form-group">
<div class="col-md-offset-11 col-md-">
<button type="submit" class="btn btn-primary" value="Submit">Submit</button>
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-5 col-sm-1">
<button type="submit" class="btn btn-primary" value="Submit">Submit</button>
</div>
</form>
</div>
</div>
</form>
<p> This is just what this lower part is going to look like-- it actually needs
to be loaded on submit with JavaScript ;_; </p>
<div class="row">
<div class="col-md-2">
<h2>Number of semesters</h2>
</div>
<div class="col-md-5">
<h2>Trajectory One's Name</h2>
<h3><p>Name(s) of the programs</p></h3>
<div class="col-md-4 well">
<h3>Trajectory One's Name</h3>
<h4><p>Name(s) of the programs</p></h4>
{% for trajectory in previousTrajectories %}
<div class="col-md-4">
{% for course in trajectory %}
{% endfor %}
</div>
{% endfor %}
</div>
<div class="col-md-5">
<h2>Trajectory Three's Name</h2>
<h3><p>Name(s) of the programs</p></h3>
<div>
</div>
<div class="row">
<div class="col-md-2">
<h3><p>Semesters ahead</p>
<div class="col-md-4 well">
<h3>Trajectory Two's Name</h3>
<h4><p>Name(s) of the programs</p></h4>
{% for trajectory in previousTrajectories %}
<div class="col-md-4">
{% for course in trajectory %}
<div class="col-md-4">
Information about the class
</div>
{% endfor %}
Information about the semester
</div>
{% endfor %}
</div>
<div class="col-md-5">
<h3><p>List of courses</p>
<p>Number of credits</p></h3>
<div class="col-md-4 well">
<h3>Trajectory Three's Name</h3>
<h4><p>Name(s) of the programs</p></h4>
{% for trajectory in previousTrajectories %}
<div class="col-md-4">
{% for course in trajectory %}
{% endfor %}
</div>
{% endfor %}
</div>
<div class="col-md-5">
<h3><p>List of courses</p>
<p>Number of credits</p></h3>
</div>
<div class="row well">
<div class="col-md-12">
Automatic analysis of the comparisons.
</div>
</div>
......
......@@ -24,7 +24,7 @@ GMU Advisor | Create
<div class="col-md-12">
{% for course in trajectory %}
<div class="col-md-4">
Your courses
Your courses
</div>
{% endfor %}
</div>
......
......@@ -7,7 +7,7 @@
<ul class="nav navbar-nav">
<li><a href="{% url 'student' 'studentID' %}">Me</a></li>
<li><a href="#unsure-important-info-on-homepage">New Trajectory</a></li>
<li><a href="{% url 'compare' 'studentID' %}">Compare</a></li>
<li><a href="url-compare-studentid">Compare</a></li>
<li><a href="#browse-courses">Courses</a>
</ul>
<ul class="nav navbar-nav navbar-right">
......
......@@ -132,6 +132,7 @@ def about(request):
)
# student creates trajectory
# def create(request, slug):
def create(request):
# needs to get list of programs from user
......@@ -168,7 +169,8 @@ def student(request, slug):
# compares saved trajectories
#@login_required
def compare(request, slug):
# def compare(request, slug):
def compare(request):
return render(request, 'compare.html', {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment