arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-03-03 02:28:23 +00:00
Code Issues Projects Releases Wiki Activity

Minor futzing with status display

Browse Source
This commit is contained in:
FreneticScribbler
2021-02-15 16:45:45 +00:00
parent e14e250896
commit f4a163f63c
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RIGS/templates/partials/event_status.html
View File

@@ -1,12 +1,14 @@
<h5> <div>
<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-{% if event.confirmed %}success{% elif event.cancelled %}dark{% else %}warning{% endif %}">Status: {{ event.get_status_display }}</span>
{% if event.is_rig %} {% if event.is_rig %}
{% if event.purchase_order %} {% if event.sum_total > 0 %}
<span class="badge badge-success">PO: {{ event.purchase_order }}</span> {% if event.purchase_order %}
{% elif event.authorised %} <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
<span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span> {% elif event.authorised %}
{% else %} <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
<span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span> {% else %}
<span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
{% endif %}
{% endif %} {% endif %}
{% if not event.dry_hire %} {% if not event.dry_hire %}
{% if event.riskassessment %} {% if event.riskassessment %}
@@ -14,8 +16,6 @@
{% else %} {% else %}
<span class="badge badge-danger">RA: <span class="fas fa-times"></span></span> <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
{% endif %} {% endif %}
{% else %}
<span class="badge badge-secondary">RA: N/A</span>
{% endif %} {% endif %}
{% if not event.dry_hire %} {% if not event.dry_hire %}
{% if event.hs_done %} {% if event.hs_done %}
@@ -24,8 +24,6 @@
{% else %} {% else %}
<span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span> <span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
{% endif %} {% endif %}
{% else %}
<span class="badge badge-secondary">Checklist: N/A</span>
{% endif %} {% endif %}
{% if perms.RIGS.view_invoice %} {% if perms.RIGS.view_invoice %}
{% if event.invoice %} {% if event.invoice %}
@@ -41,4 +39,4 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
</h5> </div>

2
RIGS/templates/partials/event_table.html
View File

@@ -25,7 +25,7 @@
{% endif %} {% endif %}
{% else %} {% else %}
table-warning table-warning
{% endif %}" id="event_row"> {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
<!---Number--> <!---Number-->
<th scope="row" id="event_number">{{ event.display_id }}</th> <th scope="row" id="event_number">{{ event.display_id }}</th>
<!--Dates & Times--> <!--Dates & Times-->

6
RIGS/templates/rigboard.html
View File

@@ -2,9 +2,9 @@
{% load button from filters %} {% load button from filters %}
{% block content %} {% block content %}
<div class="row align-items-center justify-content-between py-2"> <div class="row align-items-center justify-content-between py-2 align-middle">
<div class="col-sm-12 col-md"> <div class="col-sm-12 col-md align-middle">
Key: <span class="table-success mr-1 px-2">Ready</span><span class="table-warning mr-1 px-2">Action Required</span><span class="table-danger mr-1 px-2">Needs MIC</span><span class="table-secondary mr-1 px-2">Cancelled</span><span class="table-info px-2">Non-Rig</span> Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded">Action Required</span><span class="table-danger mr-1 px-2 rounded">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded">Non-Rig</span>
</div> </div>
{% if perms.RIGS.add_event %} {% if perms.RIGS.add_event %}
<div class="col text-right"> <div class="col text-right">

2
RIGS/tests/test_interaction.py
View File

@@ -757,10 +757,10 @@ def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0)) start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30)) end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
crew = page.crew[0] crew = page.crew[0]
crew.crewmember.search(admin_user.first_name)
crew.role.set_value(role) crew.role.set_value(role)
crew.start_time.set_value(start_time) crew.start_time.set_value(start_time)
crew.end_time.set_value(end_time) crew.end_time.set_value(end_time)
crew.crewmember.search(admin_user.first_name)
page.submit() page.submit()
assert page.success assert page.success
# Check data is correct # Check data is correct