Correct handling of spaces in paperwork filenames

Also normalises display of Invoice IDs. Partial fix for #391.

RIGS/finance.py

@@ -57,6 +57,11 @@ class InvoiceDetail(generic.DetailView):
     model = models.Invoice
     template_name = 'invoice_detail.html'
 
+    def get_context_data(self, **kwargs):
+        context = super(InvoiceDetail, self).get_context_data(**kwargs)
+        context['page_title'] = "Invoice {} ({})".format(self.object.display_id, self.object.invoice_date.strftime("%d/%m/%Y"))
+        return context
+
 
 class InvoicePrint(generic.View):
     def get(self, request, pk):
@@ -74,6 +79,7 @@ class InvoicePrint(generic.View):
             },
             'invoice': invoice,
             'current_user': request.user,
+            'filename': 'Invoice {} for {} {}.pdf'.format(invoice.display_id, object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name))
         }
 
         rml = template.render(context)
@@ -82,11 +88,8 @@ class InvoicePrint(generic.View):
 
         pdfData = buffer.read()
 
-        escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
-
         response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = "filename=Invoice %05d - N%05d | %s.pdf" % (
-            invoice.pk, invoice.event.pk, escapedEventName)
+        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
         response.write(pdfData)
         return response
 

RIGS/models.py

@@ -580,11 +580,15 @@ class Invoice(models.Model, RevisionMixin):
 
     @property
     def activity_feed_string(self):
-        return "#{} for Event {}".format(self.pk, "N%05d" % self.event.pk)
+        return "#{} for Event {}".format(self.display_id, "N%05d" % self.event.pk)
 
     def __str__(self):
         return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)
 
+    @property
+    def display_id(self):
+        return "{:05d}".format(self.pk)
+
     class Meta:
         ordering = ['-invoice_date']
 

RIGS/rigboard.py

@@ -195,6 +195,7 @@ class EventPrint(generic.View):
             },
             'quote': True,
             'current_user': request.user,
+            'filename': 'Event {} {} {}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date)
         }
 
         rml = template.render(context)
@@ -209,10 +210,7 @@ class EventPrint(generic.View):
         merger.write(merged)
 
         response = HttpResponse(content_type='application/pdf')
-
-        escapedEventName = re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name)
-
-        response['Content-Disposition'] = "filename=N%05d | %s.pdf" % (object.pk, escapedEventName)
+        response['Content-Disposition'] = 'filename="{}"'.format(context['filename'])
         response.write(merged.getvalue())
         return response
 

RIGS/templates/event_print.xml

@@ -3,7 +3,7 @@
 {% load static %}
 <!DOCTYPE document SYSTEM "rml.dtd">
 
-<document filename="Event {{ object.id }} - {{ object.name }} - {{ object.start_date }}.pdf">
+<document filename="{{filename}}">
     <docinit>
         <registerTTFont faceName="OpenSans" fileName="{{ fonts.opensans.regular }}"/>
         <registerTTFont faceName="OpenSans-Bold" fileName="{{ fonts.opensans.bold }}"/>
@@ -97,8 +97,6 @@
                     <drawString x="265" y="746">info@nottinghamtec.co.uk</drawString>
                     <drawString x="137" y="732">Phone: (0115) 846 8720</drawString>
 
-
-
                     <setFont name="OpenSans" size="10" />
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />

RIGS/templates/invoice_detail.html

@@ -1,27 +1,20 @@
 {% extends 'base_rigs.html' %}
-
-{% block title %}Invoice {{ object.pk }}{% endblock %}
+{% load button from filters %}
 
 {% block content %}
     <div class="col-sm-12">
-        <div class="row">
-            <div class="col-sm-8">
-                <h2>Invoice {{ object.pk }} ({{ object.invoice_date|date:"d/m/Y"}})</h2>
-            </div>
-
+        <div class="row justify-content-end py-3">
             <div class="col-sm-4 text-right">
                 <div class="btn-group btn-page">
-                <a href="{% url 'invoice_delete' object.pk %}" class="btn btn-danger" title="Delete Invoice">
-                    <span class="fas fa-times"></span> <span
-                            class="hidden-xs">Delete</span>
-                </a>
-                <a href="{% url 'invoice_void' object.pk %}" class="btn btn-warning" title="Void Invoice">
-                    <span class="fas fa-ban"></span> <span
-                            class="hidden-xs">Void</span>
-                </a>
-                <a href="{% url 'invoice_print' object.pk %}" target="_blank" title="Print Invoice" class="btn btn-primary"><span
-                            class="fas fa-print"></span> <span
-                            class="hidden-xs">Print</span></a>
+                    <a href="{% url 'invoice_delete' object.pk %}" class="btn btn-danger" title="Delete Invoice">
+                        <span class="fas fa-times"></span> <span
+                                class="hidden-xs">Delete</span>
+                    </a>
+                    <a href="{% url 'invoice_void' object.pk %}" class="btn btn-warning" title="Void Invoice">
+                        <span class="fas fa-ban"></span> <span
+                                class="hidden-xs">Void</span>
+                    </a>
+                    {% button 'print' url='invoice_print' pk=object.pk %}
                 </div>
             </div>
         </div>

RIGS/templates/invoice_list.html

@@ -23,7 +23,7 @@
                 <tbody>
                 {% for invoice in invoice_list %}
                     <tr class="table-{% if invoice.is_closed %}success{% else %}warning{% endif %}">
-                        <th scope="row">{{ invoice.pk }}<br>
+                        <th scope="row">{{ invoice.display_id }}<br>
                         <span class="text-muted">{% if invoice.void %}(VOID){% elif invoice.is_closed %}(PAID){% else %}(O/S){% endif %}</span></th>
                         <td><a href="{% url 'event_detail' invoice.event.pk %}">N{{ invoice.event.pk|stringformat:"05d" }}</a>: {{ invoice.event.name }} <br>
                             <span class="text-muted">{{ invoice.event.get_status_display }}{% if not invoice.event.mic %}, No MIC{% endif %}

templates/partials/button.html

@@ -1,7 +1,7 @@
 {% if submit %}
 <button type="submit" class="btn {{ class }}" title="{{ text }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }}"></span> <span class="d-none d-sm-inline">{{ text }}</span></button>
 {% elif pk %}
-<a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }}"></span> <span class="d-none d-sm-inline">{{ text }}</span></a>
+<a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%} {% if text == 'Print' %}target="_blank"{%endif%}><span class="fas {{ icon }}"></span> <span class="d-none d-sm-inline">{{ text }}</span></a>
 {% else %}
 <a href="{% url target %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }}"></span> <span class="d-none d-sm-inline">{{ text }}</span></a>
 {% endif %}