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

Rework of subhire list

Browse Source
This commit is contained in:
FreneticScribbler
2022-12-19 17:33:01 +00:00
parent 773f55ac84
commit 1615e27767
10 changed files with 182 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
RIGS/templates/event_archive.html
View File

@@ -15,36 +15,7 @@
{% endblock %}
{% block content %}
<div class="row">
<div class="col-sm-12 py-2">
<form class="form-inline" method="GET">
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">Start</span>
</div>
<input type="date" name="start" id="start" value="{{ start|default_if_none:'' }}" placeholder="Start" class="form-control" />
</div>
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">End</span>
</div>
<input type="date" name="end" id="end" value="{{ end|default_if_none:'' }}" placeholder="End" class="form-control" />
</div>
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">Keyword</span>
</div>
<input type="search" name="q" placeholder="Keyword" value="{{ request.GET.q }}" class="form-control" />
</div>
<select class="selectpicker pr-3" multiple data-actions-box="true" data-none-selected-text="Status" data-actions-box="true" id="status" name="status">
{% for status in statuses %}
<option value="{{status.0}}" {% if status.0|safe in request.GET|get_list:'status' %}selected=""{% endif %}>{{status.1}}</option>
{% endfor %}
</select>
{% button 'search' %}
</form>
</div>
</div>
{% include 'partials/archive_form.html' %}
<div class="row">
<div class="col-sm-12">
{% with object_list as events %}

32
RIGS/templates/partials/archive_form.html Normal file
View File

@@ -0,0 +1,32 @@
{% load get_list from filters %}
{% load button from filters %}
<div class="row">
<div class="col-sm-12 py-2">
<form class="form-inline" method="GET">
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">Start</span>
</div>
<input type="date" name="start" id="start" value="{{ start|default_if_none:'' }}" placeholder="Start" class="form-control" />
</div>
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">End</span>
</div>
<input type="date" name="end" id="end" value="{{ end|default_if_none:'' }}" placeholder="End" class="form-control" />
</div>
<div class="input-group mx-2">
<div class="input-group-prepend">
<span class="input-group-text">Keyword</span>
</div>
<input type="search" name="q" placeholder="Keyword" value="{{ request.GET.q }}" class="form-control" />
</div>
<select class="selectpicker pr-3" multiple data-actions-box="true" data-none-selected-text="Status" data-actions-box="true" id="status" name="status">
{% for status in statuses %}
<option value="{{status.0}}" {% if status.0|safe in request.GET|get_list:'status' %}selected=""{% endif %}>{{status.1}}</option>
{% endfor %}
</select>
{% button 'search' %}
</form>
</div>
</div>

84
RIGS/templates/partials/subhire_table.html Normal file
View File

@@ -0,0 +1,84 @@
{% load linked_name from filters %}
{% load markdown_tags %}
<div class="table-responsive">
<table class="table mb-0" id="event_table">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Dates & Times</th>
<th scope="col">Hire Details</th>
<th scope="col">Associated Event(s)</th>
{% if perms.RIGS.subhire_finance %}
<th scope="col">Insurance Value</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for event in events %}
<tr {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
<!---Number-->
<th scope="row" id="event_number">{{ event.display_id }}</th>
<!--Dates & Times-->
<td id="event_dates" style="text-align: justify;">
<span class="text-nowrap">Start: <strong>{{ event.start_date|date:"D d/m/Y" }}
{% if event.has_start_time %}
{{ event.start_time|date:"H:i" }}
{% endif %}</strong>
</span>
{% if event.end_date %}
<br>
<span class="text-nowrap">End: {% if event.end_date != event.start_date %}<strong>{{ event.end_date|date:"D d/m/Y" }}{% endif %}
{% if event.has_end_time %}
{{ event.end_time|date:"H:i" }}
{% endif %}</strong>
</span>
{% endif %}
</td>
<!---Details-->
<td id="event_details" class="w-100">
<h4>
<a href="{{event.get_absolute_url}}">
{{ event.name }}
</a>
</h4>
<h5>
Primary Contact: {{ event.person|linked_name }}
{% if event.organisation %}
({{ event.organisation|linked_name }})
{% endif %}
</h5>
{% if not event.cancelled and event.description %}
<p>{{ event.description|markdown }}</p>
{% endif %}
{% include 'partials/event_status.html' %}
</td>
<td class="p-0 text-nowrap">
<ul class="list-group">
{% for event in event.events.all %}
<li class="list-group-item"><a href="{{event.get_absolute_url}}">{{ event }}</a></li>
{% endfor %}
</ul>
</td>
{% if perms.RIGS.subhire_finance %}
<td id="insurance_value" class="text-nowrap">
£{{ event.insurance_value }}
</td>
{% endif %}
</tr>
{% empty %}
<tr class="bg-warning">
<td colspan="4">No events found</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr>
<td></td>
<td></td>
<td></td>
<td>Total Value:</td>
<td>£{{ total_value }}</td>
</tr>
</tfoot>
</table>
</div>

27
RIGS/templates/subhire_list.html Normal file
View File

@@ -0,0 +1,27 @@
{% extends 'base_rigs.html' %}
{% load paginator from filters %}
{% load static %}
{% block css %}
{{ block.super }}
<link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
{% endblock %}
{% block preload_js %}
{{ block.super }}
<script src="{% static 'js/selects.js' %}" async></script>
{% endblock %}
{% block content %}
{% include 'partials/archive_form.html' %}
<div class="row">
<div class="col-sm-12">
{% with object_list as events %}
{% include 'partials/subhire_table.html' %}
{% endwith %}
</div>
</div>
{% paginator %}
{% endblock %}

0
RIGS/templates/subhire_table.html
View File