Changeset 587bb95

Timestamp:

Feb 3, 2010, 3:36:28 PM (16 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

Location:

remit

Files:

• remit_templates/vouchers/ReimbursementRequest_review.html (modified) (3 diffs)
• vouchers/models.py (modified) (4 diffs)
• vouchers/views.py (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 %}

remit/vouchers/models.py

@@ -31 +31 @@
         permissions = (
             ('can_list', 'Can list requests',),
+            ('can_approve', 'Can approve requests',),
         )
 
@@ -43 +44 @@
         )
 
-    def convert(self, signatory):
+    def convert(self, signatory, signatory_email=settings.SIGNATORY_EMAIL):
         voucher = Voucher()
-        voucher.group_name = settings.group_name
+        voucher.group_name = settings.GROUP_NAME
         voucher.account = self.budget_area.get_account_number()
         voucher.signatory = signatory
+        voucher.signatory_email = signatory_email
         voucher.first_name = self.check_to_first_name
         voucher.last_name = self.check_to_last_name
@@ -56 +58 @@
         voucher.gl = self.expense_area.get_account_number()
         voucher.save()
+        self.approval_status = 1
+        self.approval_date = datetime.datetime.now()
+        self.save()
 
 class Voucher(models.Model):
@@ -61 +66 @@
     account = models.IntegerField()
     signatory = models.CharField(max_length=50)
+    signatory_email = models.EmailField()
     first_name = models.CharField(max_length=20)
     last_name = models.CharField(max_length=20)

remit/vouchers/views.py

@@ -7 +7 @@
 from django.template import RequestContext
 from django.http import Http404, HttpResponseRedirect
+import django.forms
 from django.forms import Form
 from django.forms import ModelForm
 from django.forms import ModelChoiceField
 from django.core.urlresolvers import reverse
+
+import settings
 
 class RequestForm(ModelForm):
@@ -127 +130 @@
     return render_to_response('vouchers/submit.html', context, context_instance=RequestContext(http_request), )
 
+class VoucherizeForm(Form):
+    name = django.forms.CharField(max_length=100)
+    email = django.forms.EmailField(max_length=100)
+
+
 @user_passes_test(lambda u: u.is_authenticated())
 def review_request(http_request, object_id):
     request_obj = get_object_or_404(ReimbursementRequest, pk=object_id)
+
+    if http_request.user.has_perm('vouchers.can_approve'):
+        # Voucherize form
+        # Prefill from certs / config
+        initial = {}
+        try:
+            name = http_request.META['SSL_CLIENT_S_DN_CN']
+            initial['name'] = name
+        except KeyError:
+            pass
+        if settings.SIGNATORY_EMAIL:
+            initial['email'] = settings.SIGNATORY_EMAIL
+        else:
+            try:
+                initial['email'] = http_request.META['SSL_CLIENT_S_DN_Email']
+            except KeyError:
+                pass
+
+        approve_message = ''
+        if http_request.method == 'POST' and 'approve' in http_request.REQUEST:
+            approve_form = VoucherizeForm(http_request.POST)
+            if approve_form.is_valid():
+                voucher = request_obj.convert(
+                    approve_form.cleaned_data['name'],
+                    signatory_email=approve_form.cleaned_data['email'],)
+                approve_message = 'Created new voucher from request'
+        else:
+            approve_form = VoucherizeForm(initial=initial)
+
+    # Display the content
     if not (http_request.user.has_perm('vouchers.view_requests')
         or http_request.user.username == request_obj.submitter):
@@ -140 +178 @@
         'rr':request_obj,
     }
+    if http_request.user.has_perm('vouchers.can_approve'):
+        context['approve_form'] = approve_form
+        context['approve_message'] = approve_message
     return render_to_response('vouchers/ReimbursementRequest_review.html', context, context_instance=RequestContext(http_request), )