diff --git a/RIGS/management/commands/generateSampleRIGSData.py b/RIGS/management/commands/generateSampleRIGSData.py index 6b543971..a46394c2 100644 --- a/RIGS/management/commands/generateSampleRIGSData.py +++ b/RIGS/management/commands/generateSampleRIGSData.py @@ -177,7 +177,7 @@ class Command(BaseCommand): def setupEvents(self): names = ["Outdoor Concert", "Hall Open Mic Night", "Festival", "Weekend Event", "Magic Show", "Society Ball", "Evening Show", "Talent Show", "Acoustic Evening", "Hire of Things", "SU Event", "End of Term Show", "Theatre Show", "Outdoor Fun Day", "Summer Carnival", "Open Days", "Magic Show", "Awards Ceremony", "Debating Event", "Club Night", "DJ Evening", "Building Projection", "Choir Concert"] - descriptions = ["A brief desciption of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"] + descriptions = ["A brief description of the event", "This event is boring", "Probably wont happen", "Warning: this has lots of kit"] notes = ["The client came into the office at some point", "Who knows if this will happen", "Probably should check this event", "Maybe not happening", "Run away!"] itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00}, diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html index c4f0216f..f0d8cdea 100644 --- a/RIGS/templates/event_table.html +++ b/RIGS/templates/event_table.html @@ -2,23 +2,26 @@ - - - - + + + + {% for event in events %} - - +
#Event DateEvent DetailsMIC#Event DateEvent DetailsMIC
{{ event.pk }}{{ event.pk }}
{{ event.start_date|date:"D d/m/Y" }}
@@ -75,13 +78,25 @@ {{ event.description|linebreaksbr }} {% endif %} - {{ event.get_status_display }} - {% if event.is_rig and perms.RIGS.view_event and event.authorised %} - Authorised - {% endif %} - {% if event.is_rig and perms.RIGS.view_event and event.risk_assessment_edit_url %} - RA + + Status: {{ event.get_status_display }} + {% if event.is_rig %} + {% if event.purchase_order %} + PO: {{ event.purchase_order }} + {% elif event.authorised %} + Payment: Authorised + {% else %} + Payment: + {% endif %} + + + {% if event.risk_assessment_edit_url %} + RA: + {% else %} + RA: + {% endif %} {% endif %} +