Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/dmsm/DibTeX
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmsm
dmsm committed Nov 15, 2014
2 parents 6f0f3ec + f124c6e commit edfe5df
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 52 deletions.
2 changes: 1 addition & 1 deletion website/package_problems.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def problem_answer_pairings(asgt):

solution_file = open("SOLUTIONS" + "-" + a_n + "-" + name, 'a')
print(r"\begin{solution}", file=solution_file)
print(asgt.problems[i].solution)
print(asgt.problems[i].solution, file=solution_file)
print(r"\end{solution}", file=solution_file)
problem_pairings.append(problem_file, solution_file)

Expand Down
101 changes: 51 additions & 50 deletions website/templates/grader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,60 @@

{% block content %}

{% for assignment in assignments %}
<div class = "bg">
<nav class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">DibTeX</a>
<div class = "bg">
<nav class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">DibTeX</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> </ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Logout</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

<div class = "container">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
47%
</div>
</div>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> </ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Logout</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

<div class = "container">
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 60%;">
47%
<div class="container">
<div class = "row">
<div id = "picturecontainer">
<div class = "col-md-6" id="left">
<object data= {{problem_solution_pair_list_list[0][0][0]}}></object>
</div>
<div class = "col-md-6 " id="right">
<object data={{problem_solution_pair_list_list[0][0][1]}}></object>
</div>
</div>
</div>

<div class = "ratingscontainer">
<textarea class="form-control" placeholder="Comments" id = "comment" rows="3"></textarea>
<textarea class="form-control" placeholder="Grade"id = "rating" rows="1"></textarea>
<button type="submit" class="btn btn-primary" id="next">NEXT</button>
</div>
</div>
</div>

<div class="container">
<div class = "row">
<div id = "picturecontainer">
<div class = "col-md-6" id="left">
<object data= {{solutions}}></object>
</div>
<div class = "col-md-6 " id="right">
<object data={{submission}}></object>
</div>
</div>
</div>

<div class = "ratingscontainer">
<textarea class="form-control" placeholder="Comments" id = "comment" rows="3"></textarea>
<textarea class="form-control" placeholder="Grade"id = "rating" rows="1"></textarea>
<button type="submit" class="btn btn-primary" id="next">NEXT</button>
</div>


</div>


</div>
{% endfor %}
{% endfor %}
{% endblock %}


2 changes: 1 addition & 1 deletion website/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def grader(request):
problems = package_problems.problem_answer_pairings(a)
list_of_list_of_problems.append(problems)

return render(request, "grader.html", {'problem_solution_pair_list': list_of_list_of_problems})
return render(request, "grader.html", {'problem_solution_pair_list_list': list_of_list_of_problems})


def process_prof_file(file):
Expand Down

0 comments on commit edfe5df

Please sign in to comment.