Changeset 587bb95 for remit/remit_templates

Timestamp:

Feb 3, 2010, 3:36:28 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

84b3640

Parents:

e2f2aa9

git-author:

Alex Dehnert <adehnert@…> (02/03/10 15:36:28)

git-committer:

Alex Dehnert <adehnert@…> (02/03/10 15:36:28)

Message:

Mostly done with the voucher approval workflow

File:

• remit/remit_templates/vouchers/ReimbursementRequest_review.html (modified) (3 diffs)

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load misc %}
 
 {% block title %}Review reimbursement request for "{{ rr.name }}"{% endblock %}
@@ -47 +48 @@
 </tr>
 <tr>
-    <th>Approval Time</th>
-    <td>{{rr.approval_time}}</td>
+    <th>Approval Status (Time)</th>
+    <td>{{ rr.approval_status|approval_status }} ({{ rr.approval_time }})</td>
 </tr>
 <tr>
@@ -56 +57 @@
 </table>
 
-{% if perms.vouchers.can_approve %}
-<form method="post">
-<input type="submit" name="approve" value="Approve" />
+{% if approve_form %}
+<h3>Request Approval</h3>
+{% if approve_message %}
+<p>{{ approve_message }}</p>
+{% endif %}
+<form method="post" action="">
+<table class='pretty-table'>
+{{ approve_form.as_table }}
+
+<tr>
+    <th colspan='2'><input type="submit" name="approve" value="Approve" /></td>
+</tr>
+</table>
 </form>
 {% endif %}