Changeset a75ed9b

Timestamp:

Mar 28, 2010, 1:56:25 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

72a92e0

Parents:

dc17b01

git-author:

Alex Dehnert <adehnert@…> (03/28/10 13:56:25)

git-committer:

Alex Dehnert <adehnert@…> (03/28/10 13:56:25)

Message:

Finish documentation support? (Trac: #1)

Location:

remit

Files:

• remit_templates/vouchers/vouchers.tex (modified) (2 diffs)
• vouchers/migrations/0003_documentation_support_part2.py (added)
• vouchers/models.py (modified) (2 diffs)
• vouchers/views.py (modified) (2 diffs)

remit/remit_templates/vouchers/vouchers.tex

@@ -4 +4 @@
 
 \signatoryemail{esp-treasurer@mit.edu}
+\usepackage{pdfpages}
+\newcommand{\documentationpath}{%templatetag openbrace%}{{MEDIA_ROOT}}{%templatetag closebrace%}
 
 \begin{document}
@@ -42 +44 @@
 \gl{ {{f.gl|texescape}} }
 \end{voucher}
+
+{% if f.documentation %}
+\includepdf[pages=-]{\documentationpath/{{f.documentation.backing_file}}}
+{% endif %}
 {% endfor %}
 

remit/vouchers/models.py

@@ -63 +63 @@
         voucher.description = self.label() + ': ' + self.name
         voucher.gl = self.expense_area.get_account_number()
+        voucher.documentation = self.documentation
         voucher.save()
         finance_core.models.make_transfer(
@@ -122 +123 @@
 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
+    label = models.CharField(max_length=50, default="")
+    submitter = models.CharField(max_length=10, null=True, ) # MIT username of submitter
     upload_time = models.DateTimeField(default=datetime.datetime.now)
+
+    def __unicode__(self, ):
+        return "%s; uploaded at %s" % (self.label, self.upload_time, )
 
 

remit/vouchers/views.py

@@ -186 +186 @@
             if doc_upload_form.is_valid(): # All validation rules pass
                 new_docs = doc_upload_form.save()
+                request_obj.documentation = new_docs
+                request_obj.save()
 
                 return HttpResponseRedirect(reverse(review_request, args=[object_id],)) # Redirect after POST
@@ -286 +288 @@
         lst = lst.filter(processed=False)
 
-    context = {'vouchers': lst }
+    context = {
+        'vouchers': lst,
+        'MEDIA_ROOT': settings.MEDIA_ROOT,
+    }
     response = render_to_response('vouchers/vouchers.tex', context, context_instance=RequestContext(http_request), )