2 files changed, 53 insertions, 19 deletions
diff --git a/template/allotter/apply.html b/template/allotter/apply.html
index a336306..201e1f2 100644
--- a/template/allotter/apply.html
+++ b/template/allotter/apply.html
@@ -2,7 +2,7 @@
 
 {% load range_filter %}
 
-{% block title %} Application form {% endblock %}
+{% block title %} JAM 2012 Application form {% endblock %}
 
 {% block content %}
 
@@ -60,11 +60,11 @@ Listing the options for first test paper.
     <td><p> {{ option.opt_code }} </p></td>
     <td><p> {{option.opt_name }} </p></td>
     <td><p> {{option.opt_location }} </p></td>
-    <td><select name="{{option.opt_name}}">
-    {% for i in oafl_range %}
+    <td><select name="{{option.opt_code}}">
+    {% for i in options_range %}
         <option value="{{i}}" selected="selected">Preference {{i}}</option>
     {% endfor %}
-    <option value="{{option.opt_code}}">None</option>
+    <option value="0" selected="selected">None</option>
     </select>
     </td>
     </tr>                
@@ -88,11 +88,11 @@ Listing the options for first test paper.
     <td><p> {{option.opt_code }} </p></td>
     <td><p> {{option.opt_name }} </p></td>
     <td><p> {{option.opt_location }} </p></td>
-    <td><select name="{{option.opt_name}}">
-    {% for i in oasl_range %}
+    <td><select name="{{option.opt_code}}">
+    {% for i in options_range %}
         <option value="{{i}}" selected="selected">Preference {{i}}</option>
     {% endfor %}
-    <option value="{{option.opt_code}}">None</option>
+    <option value="0" selected="selected">None</option>
     </select>
     </td>
     </tr>                
@@ -101,12 +101,9 @@ Listing the options for first test paper.
 
 {% endif %}
 
+<p><label for="check">I am responsible for my own choices.</label> 
+<input type="checkbox" name="check" id="check" /></p>
 <input type="submit" name="save" value="Save" />
 </form>
 
-<form action="/allotter/logout/" method="post">
-{% csrf_token %}
-<input type="submit" name="logout" value="Quit Allotment" />
-</form>
-
 {% endblock content %}
diff --git a/template/allotter/complete.html b/template/allotter/complete.html
index e235772..799d965 100644
--- a/template/allotter/complete.html
+++ b/template/allotter/complete.html
@@ -5,20 +5,57 @@
 
 {% block content %}
 
-<h2> Thank you, your following options have been saved to the database </h2>
-
-{{first_paper}}
-
-{% for option in options_available_first %}
-    <p>{{ option.opt_name }}</p>
+<h2> The following options have been saved. Please verify them before logging out.</h2>
+
+<h3> Please keep in mind that, the next time you login you will be redirected to this page straightaway.</h3>
+
+{% if options_chosen %}
+<table>
+<tr>
+<td><p>Programme Code </p></td>
+<td><p>Programme Name </p></td>
+<td><p>Insitute </p></td>
+<td><p>Preference </p></td>
+</tr>
+
+{% for option in options_chosen %}
+    <tr> 
+    <td><p> {{ forloop.counter }} </p></td>
+    <td><p> {{ option.opt_code }} </p></td>
+    <td><p> {{ option.opt_name }} </p></td>
+    <td><p> {{ option.opt_location }} </p></td>
+    </tr>
 {% endfor %}
 
+</table>
+
 {% if email %}
 
-An email with all the options has been to the following email address: {{email}}
+An email with the list of options has been sent {{ email }} for book-keeping purposes.
+
+{% endif %}
+
+{% else %}
+
+<h3> No Options were chosen, Press Edit Options to go back and select options otherwise Press logout to exit the allotment process </h3>
 
 {% endif %}
 
+<form action="/allotter/apply/" method="post">
+{% csrf_token %}
+<input type="submit" name="apply" value="Edit Options" />
+</form>
+
+<form action="/allotter/get_pdf/" method="post">
+{% csrf_token %}
+<input type="submit" name="get_pdf" value="Generate PDF" />
+</form>
+
+<form action="/allotter/logout/" method="post">
+{% csrf_token %}
+<input type="submit" name="logout" value="Quit Allotment" />
+</form>
+
 {% endblock content %}