Changeset 6b8d891

Timestamp:

Jan 7, 2010, 3:38:24 AM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

42d0bf6

Parents:

169d7b5

git-author:

Alex Dehnert <adehnert@…> (01/07/10 03:38:24)

git-committer:

Alex Dehnert <adehnert@…> (01/07/10 03:38:24)

Message:

Reimbursement submission workflow mostly works

Location:

treasury

Files:

• templates/vouchers/ReimbursementRequest_review.html (added)
• templates/vouchers/submit.html (modified) (1 diff)
• vouchers/models.py (modified) (1 diff)
• vouchers/urls.py (modified) (1 diff)
• vouchers/views.py (modified) (1 diff)

treasury/templates/vouchers/submit.html

@@ -3 +3 @@
 {% block title %}Submit reimbursement request{% endblock %}
 {% block content %}
-<p>Term: {{term}}</p>
-<p>Committee: {{comm}}</p>
+
+<h2>UA Reimbursement Request Form</h2>
+
+<form method="post">
+<table>
+<tr>
+    <td></td>
+    <th>You are requesting a reimbursement from:</th>
+</tr>
+<tr>
+    <th>Term</th>
+    <td>{{term}}</td>
+</tr>
+<tr>
+    <th>Committee</th>
+    <td>{{comm}}</td>
+</tr>
+
+<tr>
+    <td></td>
+    <th>Request details:</th>
+</tr>
+{{ form.as_table }}
+<tr><td></td><td><input type='submit' value='Request Reimbursement' /></td></tr>
+</table>
+</form>
+
 {% endblock %}

treasury/vouchers/models.py

@@ -11 +11 @@
     check_to_email = models.EmailField(verbose_name="email address for check pickup")
     check_to_addr = models.TextField(blank=True, verbose_name="address for check mailing", help_text="For most requests, this should be blank for pickup in SAO (W20-549)")
-    amount = models.DecimalField(max_digits=7, decimal_places=2)
+    amount = models.DecimalField(max_digits=7, decimal_places=2, help_text='Do not include "$"')
     budget_area = models.ForeignKey(BudgetArea)
     budget_term = models.ForeignKey(BudgetTerm)
     request_time = models.DateTimeField(default=datetime.datetime.now)
-    approval_time = models.DateTimeField(blank=True)
-    printing_time = models.DateTimeField(blank=True)
-    name = models.CharField(max_length=50,)
-    description = models.TextField(blank=True)
+    approval_time = models.DateTimeField(blank=True, null=True,)
+    printing_time = models.DateTimeField(blank=True, null=True,)
+    name = models.CharField(max_length=50, verbose_name='short description', )
+    description = models.TextField(blank=True, verbose_name='long description', )
 
     def __unicode__(self, ):

treasury/vouchers/urls.py

@@ -3 +3 @@
 
 urlpatterns = patterns('',
-    (r'submit/(?P<term>[\d\w-]+)/(?P<committee>[\d\w-]+)/', 'treasury.vouchers.views.submit_request', )
+    (r'submit/(?P<term>[\d\w-]+)/(?P<committee>[\d\w-]+)/', 'vouchers.views.submit_request', ),
+    (r'review/(?P<object_id>\d+)/', 'vouchers.views.review_request', ),
 )

treasury/vouchers/views.py

@@ -1 +1 @@
 import vouchers.models
 from finance_core.models import BudgetTerm, BudgetArea
+from vouchers.models import ReimbursementRequest
 
-from django.shortcuts import render_to_response
-from django.http import Http404
+from django.contrib.auth.decorators import user_passes_test
+from django.shortcuts import render_to_response, get_object_or_404
+from django.http import Http404, HttpResponseRedirect
+from django.forms import ModelForm
+from django.forms import ModelChoiceField
+from django.core.urlresolvers import reverse
 
-def submit_request(request, term, committee):
-    try:
-        term_obj = BudgetTerm.objects.get(slug=term)
-    except BudgetTerm.DoesNotExist:
-        raise Http404
-    try:
-        comm_obj = BudgetArea.objects.get(pk=committee)
-    except BudgetArea.DoesNotExist:
-        raise Http404
+class RequestForm(ModelForm):
+    class Meta:
+        model = ReimbursementRequest
+        fields = (
+            'name',
+            'description',
+            'amount',
+            'budget_area',
+            'check_to_name',
+            'check_to_email',
+            'check_to_addr',
+        )
+
+class BudgetAreaField(ModelChoiceField):
+    def __init__(self, base_area, *args, **kargs):
+        self.strip_levels = base_area.depth
+        areas = base_area.get_descendants()
+        ModelChoiceField.__init__(self, queryset=areas,
+            help_text='In general, this should be a fully indented budget area, not one with children',
+            *args, **kargs)
+
+    def label_from_instance(self, obj,):
+        return obj.indented_name(strip_levels=self.strip_levels)
+
+@user_passes_test(lambda u: u.is_authenticated())
+def submit_request(http_request, term, committee):
+    term_obj = get_object_or_404(BudgetTerm, slug=term)
+    comm_obj = get_object_or_404(BudgetArea, pk=committee)
+
+    new_request = ReimbursementRequest()
+    new_request.submitter = http_request.user.username
+    new_request.budget_term = term_obj
+
+    if http_request.method == 'POST': # If the form has been submitted...
+        form = RequestForm(http_request.POST, instance=new_request) # A form bound to the POST data
+        form.fields['budget_area'] = BudgetAreaField(comm_obj)
+        if form.is_valid(): # All validation rules pass
+            form.save()
+            return HttpResponseRedirect(reverse(review_request, args=[new_request.pk],)) # Redirect after POST
+    else:
+        form = RequestForm(instance=new_request) # An unbound form
+        form.fields['budget_area'] = BudgetAreaField(comm_obj)
 
     context = {
         'term':term_obj,
         'comm':comm_obj,
+        'form':form,
     }
     return render_to_response('vouchers/submit.html', context)
+
+@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 not (http_request.user.has_perm('vouchers.view_requests')
+        or http_request.user.username == request_obj.submitter):
+        # I'd probably use a 403, but that requires like writing
+        # a new template and stuff
+        # So I'm going to call this "don't leak information"
+        # and let it be
+        raise Http404
+    context = {
+        'rr':request_obj,
+    }
+    return render_to_response('vouchers/ReimbursementRequest_review.html', context)
+