arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-04 14:18:22 +00:00
Code Issues Projects Releases Wiki Activity

Bring colours back to the rigboard

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-16 23:12:21 +00:00
parent fe0e4063d7
commit 8fbe9f9026
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/management/commands/generateSampleRIGSData.py
View File

@@ -177,7 +177,7 @@ class Command(BaseCommand):
def setupEvents(self): 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", 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"] "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!"] 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}, itemOptions = [{'name': 'Speakers', 'description': 'Some really really big speakers \n these are very loud', 'quantity': 2, 'cost': 200.00},

41
RIGS/templates/event_table.html
View File

@@ -2,23 +2,26 @@
<table class="table"> <table class="table">
<thead class="thead-dark"> <thead class="thead-dark">
<tr> <tr>
<td>#</td> <th scope="col">#</th>
<td>Event Date</td> <th scope="col">Event Date</th>
<td>Event Details</td> <th scope="col">Event Details</th>
<td>MIC</td> <th scope="col">MIC</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for event in events %} {% for event in events %}
<!---TODO: Red if all chips are red, amber if mixed, green if good to go + MIC...--->
<tr class=" <tr class="
{% if event.cancelled %} {% if event.cancelled %}
text-muted table-secondary text-muted table-secondary
{% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
table-success
{% elif not event.is_rig %} {% elif not event.is_rig %}
info table-info
{% else %}
table-warning
{% endif %}"> {% endif %}">
<!---Number--> <!---Number-->
<td>{{ event.pk }}</td> <th scope="row">{{ event.pk }}</th>
<!--Dates--> <!--Dates-->
<td> <td>
<div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div> <div><strong>{{ event.start_date|date:"D d/m/Y" }}</strong></div>
@@ -75,13 +78,25 @@
{{ event.description|linebreaksbr }} {{ event.description|linebreaksbr }}
</div> </div>
{% endif %} {% endif %}
<span class="badge badge-{% if event.confirmed %}success{%else%}warning{%endif%}">{{ event.get_status_display }}</span> <!---Overall status at a glance--->
{% if event.is_rig and perms.RIGS.view_event and event.authorised %} <span class="badge badge-{% if event.confirmed %}success{% elif event.cancelled %}dark{% else %}warning{% endif %}">Status: {{ event.get_status_display }}</span>
<span class="badge badge-success">Authorised <i class="fas fa-check"></i></span> {% if event.is_rig %}
{% endif %} {% if event.purchase_order %}
{% if event.is_rig and perms.RIGS.view_event and event.risk_assessment_edit_url %} <span class="badge badge-success">PO: {{ event.purchase_order }}</i></span>
<span class="badge badge-success">RA <i class="fas fa-check"></i></span> {% elif event.authorised %}
<span class="badge badge-success">Payment: Authorised <i class="fas fa-check"></i></span>
{% else %}
<span class="badge badge-danger">Payment: <i class="fas fa-times"></i></span>
{% endif %}
<!-- TODO show invoice stuff here -->
{% if event.risk_assessment_edit_url %}
<span class="badge badge-success">RA: <i class="fas fa-check"></i></span>
{% else %}
<span class="badge badge-danger">RA: <i class="fas fa-times"></i></span>
{% endif %}
{% endif %} {% endif %}
</td> </td>
<!---MIC--> <!---MIC-->
<td> <td>