arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 08:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Improvements to event table mobile

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-24 22:53:47 +00:00
parent 7a08f2d889
commit 0271840f4d
6 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/templates/event_form.html
View File

@@ -179,8 +179,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-12 text-right form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %} my-3"> <div class="col-sm-12 text-right form-hws form-non_rig my-3">
<div class="btn-group btn-page"> <div class="btn-group">
<button type="submit" class="btn btn-primary" title="Save"><i <button type="submit" class="btn btn-primary" title="Save"><i
class="fas fa-save"></i> Save class="fas fa-save"></i> Save
</button> </button>

39
RIGS/templates/event_table.html
View File

@@ -1,15 +1,16 @@
<div class="table-responsive"> <div class="d-none d-md-block">
<table class="table mb-0"> <div class="table-responsive">
<thead class="thead-dark"> <table class="table mb-0">
<tr> <thead class="thead-dark">
<th scope="col">#</th> <tr>
<th scope="col">Event Date</th> <th scope="col">#</th>
<th scope="col">Event Details</th> <th scope="col">Event Date</th>
<th scope="col">MIC</th> <th scope="col">Event Details</th>
</tr> <th scope="col">MIC</th>
</thead> </tr>
<tbody> </thead>
{% for event in events %} <tbody>
{% for event in events %}
<tr {% include 'partials/event_table_colour.html' %}> <tr {% include 'partials/event_table_colour.html' %}>
<!---Number--> <!---Number-->
<th scope="row">{{ event.pk }}</th> <th scope="row">{{ event.pk }}</th>
@@ -89,7 +90,15 @@
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
{% endfor %} {% empty %}
</tbody> <tr class="bg-warning">
</table> <td colspan="6">No events found</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="d-xs-block d-sm-block d-md-none">
{% include 'event_table_mobile.html' %}
</div> </div>

17
RIGS/templates/event_table_mobile.html
View File

@@ -1,16 +1,15 @@
<div class="card">
{% for event in events %} {% for event in events %}
<div class="card my-1 <div class="card-header {% if event.cancelled %}
{% if event.cancelled %} text-muted bg-secondary
text-muted border-secondary
{% elif event.authorised and event.risk_assessment_edit_url and event.mic %} {% elif event.authorised and event.risk_assessment_edit_url and event.mic %}
border-success bg-success
{% elif not event.is_rig %} {% elif not event.is_rig %}
border-info bg-info
{% else %} {% else %}
border-warning bg-warning
{% endif %} {% endif %}
"> ">
<div class="card-header">
<a href="{% url 'event_detail' event.pk %}">{{ event.pk }} | {{ event.name }}</a> <a href="{% url 'event_detail' event.pk %}">{{ event.pk }} | {{ event.name }}</a>
{% if event.dry_hire %} {% if event.dry_hire %}
<span class="badge badge-pill badge-secondary">Dry Hire</span> <span class="badge badge-pill badge-secondary">Dry Hire</span>
@@ -34,5 +33,9 @@
{% endif %} {% endif %}
</div> </div>
<div class="card-footer">MIC: {% if event.mic %}<p>{{ event.mic.initials }}</p>{% elif event.is_rig %}<i class="fas fa-exclamation"></i>{% endif %}</div> <div class="card-footer">MIC: {% if event.mic %}<p>{{ event.mic.initials }}</p>{% elif event.is_rig %}<i class="fas fa-exclamation"></i>{% endif %}</div>
{% empty %}
<div class="card-body bg-warning">
<p>No events found</p>
</div> </div>
{% endfor %} {% endfor %}
</div>

49
RIGS/templates/organisation_detail.html
View File

@@ -6,19 +6,12 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
{% if not request.is_ajax %} {% if not request.is_ajax %}
<div class="col-sm-12"> <div class="col-sm-12">
<h1>Organisation | {{ object.name }}</h1> <h1>Organisation | {{ object.name }}</h1>
</div> </div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="fas fa-pencil"></span> Edit</a>
</div>
</div>
{% endif %} {% endif %}
<div class="col-sm-6"> <div class="col-sm">
<div class="card card-info"> <div class="card bg-info">
<div class="card-header">Organisation Details</div> <div class="card-header">Organisation Details</div>
<div class="card-body"> <div class="card-body">
<dl class="dl-horizontal"> <dl class="dl-horizontal">
@@ -43,9 +36,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm">
<div class="col-sm-6"> <div class="card">
<div class="card card-default">
<div class="card-header">Associated People</div> <div class="card-header">Associated People</div>
<div class="card-body"> <div class="card-body">
<div class="list-group"> <div class="list-group">
@@ -57,16 +49,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row my-2">
<div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="card card-default"> <div class="card">
<div class="card-header">Associated Events</div> <div class="card-header">Associated Events</div>
<div class="card-body"> {% with object.latest_events as events %}
{% with object.latest_events as events %} {% include 'event_table.html' %}
{% include 'event_table.html' %} {% endwith %}
{% endwith %}
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -75,9 +64,9 @@
{% if not request.is_ajax %} {% if not request.is_ajax %}
<div class="row"> <div class="row">
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">
<div class="btn-group btn-page"> <div class="btn-group">
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span <a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span
class="fas fa-pencil"></span> Edit</a> class="fas fa-edit"></span> Edit</a>
</div> </div>
{% include 'partials/last_edited.html' with target="organisation_history" %} {% include 'partials/last_edited.html' with target="organisation_history" %}
</div> </div>
@@ -90,11 +79,11 @@
{% block footer %} {% block footer %}
<div class="row"> <div class="row">
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">
<div class="btn-group btn-page"> <div class="btn-group">
<a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default"><span <a href="{% url 'organisation_detail' object.pk %}" class="btn btn-primary"><span
class="fas fa-eye-open"></span> Open Page</a> class="fas fa-eye"></span> Open Page</a>
<a href="{% url 'organisation_update' object.pk %}" class="btn btn-default"><span <a href="{% url 'organisation_update' object.pk %}" class="btn btn-warning"><span
class="fas fa-pencil"></span> Edit</a> class="fas fa-edit"></span> Edit</a>
</div> </div>
{% include 'partials/last_edited.html' with target="organisation_history" %} {% include 'partials/last_edited.html' with target="organisation_history" %}
</div> </div>

4
RIGS/templates/partials/contact_details_form.html
View File

@@ -1,5 +1,5 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<div class="col-md-6 my-3"> <div class="col-md-6 mt-3">
<div class="card form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}"> <div class="card form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
<div class="card-header">Contact Details</div> <div class="card-header">Contact Details</div>
<div class="card-body"> <div class="card-body">
@@ -58,7 +58,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card form-hws form-non_rig my-3"> <div class="card form-hws form-non_rig mb-3">
<div class="card-header">Event Description</div> <div class="card-header">Event Description</div>
<div class="card-body"> <div class="card-body">
<div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork"> <div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">

9
RIGS/templates/rigboard.html
View File

@@ -7,10 +7,7 @@
{% if perms.RIGS.add_event %} {% if perms.RIGS.add_event %}
<a href="{% url 'event_create' %}" class="btn btn-success my-3 float-right">New <i class="fas fa-plus"></i></a> <a href="{% url 'event_create' %}" class="btn btn-success my-3 float-right">New <i class="fas fa-plus"></i></a>
{% endif %} {% endif %}
<div class="d-none d-md-block">
{% include 'event_table.html' %} {% include 'event_table.html' %}
</div>
<div class="d-xs-block d-sm-block d-md-none">
{% include 'event_table_mobile.html' %}
</div>
{% endblock %} {% endblock %}