From 12d8b46f8625456ab6c80656916d81f2a589972a Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Wed, 18 Mar 2020 01:39:21 +0000 Subject: [PATCH] First pass at reworked rigboard layout on mobile --- RIGS/templates/event_table.html | 24 ++------------ RIGS/templates/event_table_mobile.html | 38 +++++++++++++++++++++++ RIGS/templates/partials/event_status.html | 17 ++++++++++ RIGS/templates/rigboard.html | 13 +++++--- RIGS/views.py | 2 ++ templates/partials/generic_list.html | 9 +++--- 6 files changed, 73 insertions(+), 30 deletions(-) create mode 100644 RIGS/templates/event_table_mobile.html create mode 100644 RIGS/templates/partials/event_status.html diff --git a/RIGS/templates/event_table.html b/RIGS/templates/event_table.html index f0d8cdea..6deba94d 100644 --- a/RIGS/templates/event_table.html +++ b/RIGS/templates/event_table.html @@ -74,29 +74,9 @@ {% endif %} {% if not event.cancelled and event.description %} -
- {{ event.description|linebreaksbr }} -
+

{{ event.description|linebreaksbr }}

{% endif %} - - 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 %} - + {% include 'partials/event_status.html' %} diff --git a/RIGS/templates/event_table_mobile.html b/RIGS/templates/event_table_mobile.html new file mode 100644 index 00000000..affc12ee --- /dev/null +++ b/RIGS/templates/event_table_mobile.html @@ -0,0 +1,38 @@ +{% for event in events %} +
+
+ {{ event.pk }} | {{ event.name }} + {% if event.dry_hire %} + Dry Hire + {% endif %} +
+
+ {% include 'partials/event_status.html' %} +
{{ event.start_date|date:"D d/m/Y" }} + {% if event.end_date and event.end_date != event.start_date %} + ⁠– {{ event.end_date|date:"D d/m/Y" }}
+ {% else %} + + {% endif %} +
    +
  • Venue: {{ event.venue }}
    • +
  • Client: {{ event.person }}
    • +
  • Organisation: {{ event.organisation }}
    • +
+ {% if not event.cancelled and event.description %} +

{{ event.description|linebreaksbr }}

+ {% endif %} +
+
MIC: {% if event.mic %}

{{ event.mic.initials }}

{% elif event.is_rig %}{% endif %}
+
+{% endfor %} diff --git a/RIGS/templates/partials/event_status.html b/RIGS/templates/partials/event_status.html new file mode 100644 index 00000000..f2265b1a --- /dev/null +++ b/RIGS/templates/partials/event_status.html @@ -0,0 +1,17 @@ +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 %} diff --git a/RIGS/templates/rigboard.html b/RIGS/templates/rigboard.html index 7cc31478..40ef8e77 100644 --- a/RIGS/templates/rigboard.html +++ b/RIGS/templates/rigboard.html @@ -3,11 +3,16 @@ {% block title %}Rigboard{% endblock %} {% block content %} -
-

Rigboard

+
+

Rigboard

{% if perms.RIGS.add_event %} - New + New {% endif %}
- {% include 'event_table.html' %} +
+ {% include 'event_table.html' %} +
+
+ {% include 'event_table_mobile.html' %} +
{% endblock %} diff --git a/RIGS/views.py b/RIGS/views.py index b2132c28..e92fffa1 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -231,10 +231,12 @@ class VenueList(generic.ListView): class VenueDetail(generic.DetailView): + template_name = 'venue_detail.html' model = models.Venue class VenueCreate(generic.CreateView): + template_name = 'venue_form.html' model = models.Venue fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available'] diff --git a/templates/partials/generic_list.html b/templates/partials/generic_list.html index 8d75db38..f73afe1d 100644 --- a/templates/partials/generic_list.html +++ b/templates/partials/generic_list.html @@ -50,14 +50,15 @@ {% empty %} - - - Nothing found + + Nothing found {% endfor %}
{% if is_paginated %} -
{% paginator %}
+
+ {% paginator %} +
{% endif %}