arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Added paperwork generation date, user & versioning

Browse Source
This commit is contained in:
David Taylor
2015-07-29 22:06:44 +01:00
parent 72ecec8860
commit 6944d98c4e
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/finance.py
View File

@@ -55,6 +55,7 @@ class InvoicePrint(generic.View):
} }
}, },
'invoice':invoice, 'invoice':invoice,
'current_user':request.user,
}) })
rml = template.render(context) rml = template.render(context)

9
RIGS/models.py
View File

@@ -71,6 +71,15 @@ class RevisionMixin(object):
else: else:
return None return None
@property
def current_version_id(self):
versions = reversion.get_for_object(self)
if versions:
version = reversion.get_for_object(self)[0]
return "V{0} | R{1}".format(version.pk,version.revision.pk)
else:
return None
@reversion.register @reversion.register
@python_2_unicode_compatible @python_2_unicode_compatible
class Person(models.Model, RevisionMixin): class Person(models.Model, RevisionMixin):

3
RIGS/rigboard.py
View File

@@ -104,7 +104,8 @@ class EventPrint(generic.View):
'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF', 'bold': 'RIGS/static/fonts/OPENSANS-BOLD.TTF',
} }
}, },
'copy':copy 'copy':copy,
'current_user':request.user,
}) })
# context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3 # context['copy'] = copy # this is the way to do it once we upgrade to Django 1.8.3

4
RIGS/templates/RIGS/event_print.xml
View File

@@ -102,6 +102,8 @@
<setFont name="OpenSans" size="10" /> <setFont name="OpenSans" size="10" />
{% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %} {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
<drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString> <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
<setFont name="OpenSans" size="7" />
<drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
</pageGraphics> </pageGraphics>
<frame id="main" x1="50" y1="65" width="495" height="645"/> <frame id="main" x1="50" y1="65" width="495" height="645"/>
@@ -115,6 +117,8 @@
<setFont name="OpenSans" size="10"/> <setFont name="OpenSans" size="10"/>
{% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %} {% if not invoice %}<drawCenteredString x="302.5" y="50">[{{ copy }} Copy]</drawCenteredString>{% endif %}
<drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString> <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
<setFont name="OpenSans" size="7" />
<drawCenteredString x="302.5" y="26">[Paperwork generated by {{current_user.name}} | {% now "d/m/Y H:i" %} | {{object.current_version_id}}]</drawCenteredString>
</pageGraphics> </pageGraphics>
<frame id="main" x1="50" y1="65" width="495" height="727"/> <frame id="main" x1="50" y1="65" width="495" height="727"/>
</pageTemplate> </pageTemplate>