diff --git a/RIGS/templates/RIGS/event_print_page.xml b/RIGS/templates/RIGS/event_print_page.xml index 850d0534..a9fa3a46 100644 --- a/RIGS/templates/RIGS/event_print_page.xml +++ b/RIGS/templates/RIGS/event_print_page.xml @@ -5,15 +5,19 @@ {% if invoice %} - - + + - {% endif %} +{% endif %} -

N{{ object.pk|stringformat:"05d" }}: '{{ object.name }}'

+

+ N{{ object.pk|stringformat:"05d" }}: + '{{ object.name }}' + +

-{{object.start_date|date:"D jS N Y"}} + {{ object.start_date|date:"D jS N Y" }} @@ -28,19 +32,25 @@ - Invoice Number + + Invoice Number + {{ invoice.pk|stringformat:"05d" }} - Invoice Date + + Invoice Date + {{ invoice.invoice_date|date:"d/m/Y" }} - PO Number + + PO Number + {{ object.purchase_order|default_if_none:"" }} @@ -48,94 +58,100 @@ - - + + {% endif %} - - -

Hirer

-

{{ object.person.name }}

-

{{ object.organisation.name|default_if_none:"" }}

- {% if invoice %} - - {% if object.organisation.address %} - {{ object.organisation.address|default_if_none:""|linebreaksbr }} - {% elif object.person.address %} - {{ object.person.address|default_if_none:""|linebreaksbr }} - {% endif %} - - {% endif %} - - {% if object.person.phone %} - {{ object.person.phone }} - {% elif object.organisation.phone %} - {{ object.organisation.phone }} - {% endif %} - - - {% if invoice %} - {% if object.organisation.email %} - {{ object.organisation.email }} - {% elif object.person.email %} - {{ object.person.email }} - {% endif %} - {% else %} - {% if object.person.email %} - {{ object.person.email }} - {% elif object.organisation.email %} - {{ object.organisation.email }} - {% endif %} - {% endif %} - - - -

Venue

-

{{ object.venue.name }}

- {% if not invoice %} + + +

Hirer

+

{{ object.person.name }}

+

{{ object.organisation.name|default_if_none:"" }}

+ {% if invoice %} - {{ object.venue.address|default_if_none:""|linebreaksbr }} + {% if object.organisation.address %} + {{ object.organisation.address|default_if_none:""|linebreaksbr }} + {% elif object.person.address %} + {{ object.person.address|default_if_none:""|linebreaksbr }} + {% endif %} + {% endif %} + + {% if object.person.phone %} + {{ object.person.phone }} + {% elif object.organisation.phone %} + {{ object.organisation.phone }} {% endif %} - - - -

Timings

- + + + {% if invoice %} + {% if object.organisation.email %} + {{ object.organisation.email }} + {% elif object.person.email %} + {{ object.person.email }} + {% endif %} + {% else %} + {% if object.person.email %} + {{ object.person.email }} + {% elif object.organisation.email %} + {{ object.organisation.email }} + {% endif %} + {% endif %} + + + +

Venue

+

{{ object.venue.name }}

+ {% if not invoice %} + + {{ object.venue.address|default_if_none:""|linebreaksbr }} + + {% endif %} + + + +

Timings

+ + + +

Start

+ + + {{ object.start_time|time:"H:i" }} + {{ object.start_date|date:"d/m/Y" }} + + + + + +

End

+ + + {{ object.end_time|default_if_none:""|time:"H:i" }} + {{ object.end_date|date:"d/m/Y" }} + + + + {% if object.access_at and not invoice %} -

Start

- - {{ object.start_time|time:"H:i" }} - {{ object.start_date|date:"d/m/Y" }} - + +

Access

- - -

End

- - {{ object.end_time|default_if_none:""|time:"H:i" }} - {{ object.end_date|date:"d/m/Y" }} - - - - {% if object.access_at and not invoice%} - -

Access

{{ object.access_at|time:"H:i" }} {{ object.access_at|date:"d/m/Y" }} - {% endif %} - - + {% endif %} + + - + @@ -173,12 +189,12 @@ {{ item.name }} {% if item.description %} - + {{ item.description|markdown:"rml" }} {% endif %} - + £ {{ item.cost|floatformat:2 }} {{ item.quantity }} @@ -187,7 +203,7 @@ {% endfor %} - + {% if not invoice %}VAT Registration Number: 116252989{% endif %} Total (ex. VAT) @@ -196,9 +212,9 @@ {% if not invoice %} - - The full hire fee is payable at least 10 days before the event. - + + The full hire fee is payable at least 10 days before the event. + {% endif %} VAT @ {{ object.vat_rate.as_percent|floatformat:2 }}% @@ -206,7 +222,7 @@ - + {% if invoice %} VAT Registration Number: 116252989 @@ -214,7 +230,7 @@ This contract is not an invoice. {% endif %} - + @@ -227,92 +243,100 @@ - + {% if not invoice %} - - - Bookings will - not - be confirmed until payment is received and the contract is signed. - - - - - 24 Hour Emergency Contacts: 07825 065681 and 07825 065678 - + + + Bookings will + not + be confirmed until payment is received and the contract is signed. + + + + + 24 Hour Emergency Contacts: 07825 065681 and 07825 065678 + - To be signed on booking: + To be signed on booking: {% if object.organisation.union_account %} - - I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, or - that I have provided written permission from either the President or Treasurer of the hirer stating that I can - sign for this invoice. - + + I agree that am authorised to sign this invoice. I agree that I am the President/Treasurer of the hirer, + or + that I have provided written permission from either the President or Treasurer of the hirer stating that + I can + sign for this invoice. + - - I have read, understood and fully accepted the current conditions of hire. I agree to return any dry hire - items to TEC PA & Lighting in the same condition at the end of the hire period. - + + I have read, understood and fully accepted the current conditions of hire. I agree to return any dry + hire + items to TEC PA & Lighting in the same condition at the end of the hire period. + - - Conditions of hire attached and available on the TEC PA & Lighting website. E&OE - + + Conditions of hire attached and available on the TEC PA & Lighting website. E&OE + - Please return this form directly to TEC PA & Lighting and not the Students' Union Finance Department. + Please return this form directly to TEC PA & Lighting and not the Students' Union Finance Department. - - Account Code - - - + + Account Code + + + {% else %} - - I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms a - binding contract between TEC PA & Lighting and the hirer, the aforementioned conditions of hire forming - an integral part of it. - + + I, the hirer, have read, understand and fully accept the current conditions of hire. This document forms + a + binding contract between TEC PA & Lighting and the hirer, the aforementioned conditions of hire + forming + an integral part of it. + - - Conditions of hire attached and available on the TEC PA & Lighting website. E&OE - + + Conditions of hire attached and available on the TEC PA & Lighting website. E&OE + {% include "RIGS/event_print_signature.xml" %} - To be signed on the day of the event/hire: + To be signed on the day of the event/hire: - - I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry hire - items to TEC PA & Lighting in a similar condition at the end of the hire period. - + + I, the hirer, have received the goods/services as requested and in good order. I agree to return any dry + hire + items to TEC PA & Lighting in a similar condition at the end of the hire period. + {% endif %} {% include "RIGS/event_print_signature.xml" %} - {% endif %} - +{% endif %} + + + diff --git a/RIGS/templatetags/markdown_tags.py b/RIGS/templatetags/markdown_tags.py index 1faf6fff..8bdf53e4 100644 --- a/RIGS/templatetags/markdown_tags.py +++ b/RIGS/templatetags/markdown_tags.py @@ -30,6 +30,20 @@ def markdown_filter(text, format='html'): bq.name = 'pre' bq.string = bq.text + for ul in soup('ul'): + ul['value'] = 'square' + ul['bulletFontSize'] = '8' + for li in ul.findAll('li'): + p = soup.new_tag('p') + p.string = li.text + li.string = '' + li.append(p) + indent = soup.new_tag('indent') + indent['left'] = '1.2cm' + + content = ul.replace_with(indent) + indent.append(content) + # Paragraphs have a different tag for p in soup('p'): p.name = 'para' diff --git a/db.sqlite3 b/db.sqlite3 index 4d191823..a7169448 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ