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

HOTFIX: Version string broken on paperwork generation

Browse Source 
Why the hell didn't the tests catch that?
This commit is contained in:
FreneticScribbler
2022-01-25 12:30:37 +00:00
parent 7bc47b446c
commit 15ab626593
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/event_print.xml
View File

@@ -106,7 +106,7 @@
<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" /> <setFont name="OpenSans" size="7" />
<drawCenteredString x="302.5" y="26"> <drawCenteredString x="302.5" y="26">
[Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}] {{info_string}}
</drawCenteredString> </drawCenteredString>
</pageGraphics> </pageGraphics>
@@ -122,7 +122,7 @@
<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" /> <setFont name="OpenSans" size="7" />
<drawCenteredString x="302.5" y="26"> <drawCenteredString x="302.5" y="26">
[Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}] {{info_string}}
</drawCenteredString> </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"/>

6
RIGS/views/rigboard.py
View File

@@ -185,11 +185,15 @@ class EventPrint(generic.View):
merger = PdfFileMerger() merger = PdfFileMerger()
user_str = f"by {request.user.name} " if request.user is not None else ""
time = timezone.now().strftime('%d/%m/%Y %H:%I')
context = { context = {
'object': object, 'object': object,
'quote': True, 'quote': True,
'current_user': request.user, 'current_user': request.user,
'filename': 'Event_{}_{}_{}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date) 'filename': 'Event_{}_{}_{}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date),
'info_string': f"[Paperwork generated {user_str}on {time} - {object.current_version_id}]",
} }
rml = template.render(context) rml = template.render(context)

4
versioning/versioning.py
View File

@@ -9,12 +9,12 @@ from reversion.models import Version, VersionQuerySet
class RevisionMixin: class RevisionMixin:
@property @property
def is_first_version(self): def is_first_version(self):
versions = Version.objects.get_for_object(self) versions = RIGSVersion.objects.get_for_object(self)
return len(versions) == 1 return len(versions) == 1
@property @property
def current_version(self): def current_version(self):
version = Version.objects.get_for_object(self).select_related('revision').first() version = RIGSVersion.objects.get_for_object(self).select_related('revision').first()
return version return version
@property @property