Changed from radio buttons to drop down lists, added new field for insitute information and a preliminary version of the complete page

2 files changed, 69 insertions, 26 deletions

diff --git a/template/allotter/apply.html b/template/allotter/apply.html
index e1c728d..a336306 100644
--- a/template/allotter/apply.html
+++ b/template/allotter/apply.html
@@ -2,18 +2,18 @@
 
 {% load range_filter %}
 
-{% block title %}Application form {% endblock %}
+{% block title %} Application form {% endblock %}
 
 {% block content %}
 
-<h2>Thank you for providing the details. You have been authenticated.</h2>
+<p> Welcome to JAM 2012 allotment! </p>
 
-<p> Welcome <strong>{{user.first_name.title}} {{user.last_name.title}}</strong>, 
-to JAM 2012 allotment! </p>
+<p>Read the following instructions carefully before continuing. </p>
 
+<hr/>
 Choose the options as per your preference
 
-<h3>You are in the merit list for {{first_paper}} 
+<h3>You are eligible for {{first_paper}} 
 
 {% comment %}
 Checking if there is second paper and displaying its name.
@@ -30,46 +30,77 @@ and {{second_paper}}
 <h4>For the paper(s) in which you are in the merit list, the following
 options are available to you. Please rank your choices.</h4>
 
-<p> Options will be given preference in the ascending order. Make sure it's 
-<b>None</b> for all options after your last option so that it is not considered. </p>
+<p> Preferences will be assigned to options in the ascending order. Make sure it's 
+<b>None</b> for all options after your last option(so that it is not considered).</p>
 
-<h3>Number of Options {{ oafl }} Number of subjects {{np}} </h3>
+<hr/>
 
 {% comment %}
+</h3>
 Listing the options for first test paper.
 {% endcomment %}
 
+<h3>Options available for {{first_paper}}</h3>
+
 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
 
 <form action="/allotter/{{user.username}}/submit/" method="post">
 {% csrf_token %}
 
-{% for option in options_available_first %} 
-    <p>{{ option.opt_name }}</p>
-    {% for i in oafl|get_range %}
-        <input name="{{option.opt_name}}" type="radio" value="{{option.id}}" /><br/>
+<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_available_first %}     
+    <tr> 
+    <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 %}
+        <option value="{{i}}" selected="selected">Preference {{i}}</option>
     {% endfor %}
-    <input name="{{option.opt_name}}" type="radio" value="None" />None<br/>
+    <option value="{{option.opt_code}}">None</option>
+    </select>
+    </td>
+    </tr>                
 {% endfor %}
-
-{% comment %}
-Listing the options for second test paper if it exists.
-{% endcomment %}
-
+</table>
 
 {% if np == 2  %}
 
-{% for option in options_available_second %} 
-    <p>{{ option.opt_name }}</p>
-    {% for i in oafl|get_range %}
-        <input name="option" type="radio" value="{{i}}"/><br/>
+<h3>Options available for {{second_paper}} </h3>
+
+<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_available_second %}     
+    <tr> 
+    <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 %}
+        <option value="{{i}}" selected="selected">Preference {{i}}</option>
     {% endfor %}
-    <input name="option" type="radio" value="None" />None<br/>
-{% endfor %} 
+    <option value="{{option.opt_code}}">None</option>
+    </select>
+    </td>
+    </tr>                
+{% endfor %}
+</table>
 
 {% endif %}
 
-
 <input type="submit" name="save" value="Save" />
 </form>
 
diff --git a/template/allotter/complete.html b/template/allotter/complete.html
index 1759c30..e235772 100644
--- a/template/allotter/complete.html
+++ b/template/allotter/complete.html
@@ -5,7 +5,19 @@
 
 {% block content %}
 
-<h2> Thank you, your options have been saved to the database </h2>
+<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>
+{% endfor %}
+
+{% if email %}
+
+An email with all the options has been to the following email address: {{email}}
+
+{% endif %}
 
 {% endblock content %}