Changeset dc17b01

Timestamp:

Mar 28, 2010, 6:35:41 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

a75ed9b

Parents:

3111c8a

git-author:

Alex Dehnert <adehnert@…> (03/28/10 06:35:41)

git-committer:

Alex Dehnert <adehnert@…> (03/28/10 06:35:41)

Message:

WIP WIP WIP: Start of doc upload

Location:

remit

Files:

• remit_templates/vouchers/ReimbursementRequest_review.html (modified) (2 diffs)
• vouchers/migrations/0002_documentation_support.py (added)
• vouchers/models.py (modified) (3 diffs)
• vouchers/views.py (modified) (6 diffs)

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -55 +55 @@
 </tr>
 <tr>
+    <th>Documentation</th>
+    <td>{{rr.documentation}}</td>
+</tr>
+<tr>
     <th>Request Time</th>
     <td>{{rr.request_time}}</td>
@@ -67 +71 @@
 </tr>
 </table>
+
+{% if doc_form %}
+<h3>(Optional) Upload Documentation</h3>
+
+<p>If you ordered online, you may wish to upload documentation instead of providing a physical copy.</p>
+
+<form enctype="multipart/form-data" method="post" action="">
+<table class='pretty-table'>
+{{ doc_form.as_table }}
+<tr><th colspan='2'><input type='submit' value='Upload Documentation' /></th></tr>
+</table>
+</form>
+{% endif %}
 
 {% if new %}

remit/vouchers/models.py

@@ -31 +31 @@
     name = models.CharField(max_length=50, verbose_name='short description', )
     description = models.TextField(blank=True, verbose_name='long description', )
+    documentation = models.ForeignKey('Documentation', null=True, )
 
     class Meta:
@@ -92 +93 @@
     gl = models.IntegerField()
     processed = models.BooleanField()
+    documentation = models.ForeignKey('Documentation', null=True, )
 
     def mailing_addr_lines(self):
@@ -116 +118 @@
             ('generate_vouchers', 'Can generate vouchers',),
         )
+
+
+class Documentation(models.Model):
+    backing_file = models.FileField(upload_to='documentation', verbose_name='File', help_text='PDF files only', )
+    label = models.CharField(max_length=50, )
+    submitter = models.CharField(max_length=10) # MIT username of submitter
+    upload_time = models.DateTimeField(default=datetime.datetime.now)
 
 

remit/vouchers/views.py

@@ -1 +1 @@
 import vouchers.models
-from vouchers.models import ReimbursementRequest
+from vouchers.models import ReimbursementRequest, Documentation
 from finance_core.models import BudgetTerm, BudgetArea
 
@@ -52 +52 @@
     term = ModelChoiceField(queryset = BudgetTerm.objects.all())
 
+class DocUploadForm(ModelForm):
+    class Meta:
+        model = Documentation
+        fields = (
+            'label',
+            'backing_file',
+        )
+
+
 @user_passes_test(lambda u: u.is_authenticated())
 def select_request_basics(http_request, ):
@@ -111 +120 @@
         form.fields['budget_area'] = CommitteeBudgetAreasField(comm_obj)
         form.fields['expense_area'] = ExpenseAreasField()
+
         if form.is_valid(): # All validation rules pass
             request_obj = form.save()
@@ -165 +175 @@
             new = False
 
+    # DOCUMENTATION #
+    if request_obj.documentation:
+        doc_upload_form = None
+    else:
+        new_docs = Documentation()
+        new_docs.submitter = http_request.user.username
+        if http_request.method == 'POST': # If the form has been submitted...
+            doc_upload_form = DocUploadForm(http_request.POST, http_request.FILES, instance=new_docs) # A form bound to the POST data
+
+            if doc_upload_form.is_valid(): # All validation rules pass
+                new_docs = doc_upload_form.save()
+
+                return HttpResponseRedirect(reverse(review_request, args=[object_id],)) # Redirect after POST
+        else:
+            doc_upload_form = DocUploadForm(instance=new_docs, ) # An unbound form
+
+    # SEND EMAILS
     show_email = http_request.user.has_perm('vouchers.can_email')
     if show_email:
@@ -181 +208 @@
                 })
 
+    # APPROVE VOUCHERS
     show_approve = (http_request.user.has_perm('vouchers.can_approve')
         and request_obj.approval_status == vouchers.models.APPROVAL_STATE_PENDING)
@@ -229 +257 @@
         'pagename':'request_reimbursement',
         'new': new,
+        'doc_form': doc_upload_form,
     }
     if show_approve: