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

Add subhire link to new event page

Browse Source
This commit is contained in:
FreneticScribbler
2022-11-18 14:58:59 +00:00
parent 948a41f43a
commit 418219940b
3 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Pipfile
View File

@@ -22,8 +22,7 @@ dj-static = "~=0.0.6"
Django = "~=3.2" Django = "~=3.2"
django-debug-toolbar = "~=3.2" django-debug-toolbar = "~=3.2"
django-filter = "~=2.4.0" django-filter = "~=2.4.0"
django-ical = "~=1.7.1" django-ical = "~=1.8.3"
django-recurrence = "~=1.10.3"
django-registration-redux = "~=2.9" django-registration-redux = "~=2.9"
django-reversion = "~=3.0.9" django-reversion = "~=3.0.9"
django-toolbelt = "~=0.0.1" django-toolbelt = "~=0.0.1"

4
RIGS/templates/event_form.html
View File

@@ -106,6 +106,10 @@
title="Things that aren't service-based, like training, meetings and site visits."> title="Things that aren't service-based, like training, meetings and site visits.">
<button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button> <button type="button" class="btn btn-info w-25" data-is_rig="0">Non-Rig</button>
</span> </span>
<span data-toggle="tooltip"
title="Record equipment hired in from other companies">
<a href="{% url 'subhire_create' %}" class="btn bg-warning w-25">Subhire</a>
</span>
</div> </div>
</div> </div>
</div> </div>

58
RIGS/templates/subhire_form.html
View File

@@ -40,7 +40,7 @@
{% include 'form_errors.html' %} {% include 'form_errors.html' %}
</div> </div>
{# Contact details #} {# Contact details #}
<div class="col-md-6"> <div class="col-md-6 mb-2">
<div class="card"> <div class="card">
<div class="card-header">Contact Details</div> <div class="card-header">Contact Details</div>
<div class="card-body"> <div class="card-body">
@@ -93,6 +93,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6 mb-2">
<div class="card">
<div class="card-header">Associated Event(s)</div>
<div class="card-body">
<div class="form-group">
<select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}"></select>
</div>
</div>
</div>
</div>
{# Event details #} {# Event details #}
<div class="col-md-6 mb-2"> <div class="col-md-6 mb-2">
<div class="card card-default"> <div class="card card-default">
@@ -150,33 +160,27 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card"> <div class="col-md-6 mb-2">
<div class="card-header">Associated Event(s)</div> <div class="card">
<div class="card-body"> <div class="card-header">Equipment Information</div>
<div class="form-group"> <div class="card-body">
<select multiple name="events" id="events_id" class="selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='event' %}"></select> <div class="form-group">
</div> <label for="{{ form.description.id_for_label }}"
</div> class="col-sm-4 col-form-label">{{ form.description.label }}</label>
</div> <div class="col-sm-12">
<div class="card"> {% render_field form.description class+="form-control" %}
<div class="card-header">Equipment Information</div> </div>
<div class="card-body">
<div class="form-group">
<label for="{{ form.description.id_for_label }}"
class="col-sm-4 col-form-label">{{ form.description.label }}</label>
<div class="col-sm-12">
{% render_field form.description class+="form-control" %}
</div> </div>
</div> <div class="form-group">
<div class="form-group"> <label for="{{ form.insurance_value.id_for_label }}"
<label for="{{ form.insurance_value.id_for_label }}" class="col-sm-6 col-form-label">{{ form.insurance_value.label }}</label>
class="col-sm-6 col-form-label">{{ form.insurance_value.label }}</label> <div class="col-sm-8 input-group">
<div class="col-sm-8 input-group"> <div class="input-group-prepend"><span class="input-group-text">£</span></div>
<div class="input-group-prepend"><span class="input-group-text">£</span></div> {% render_field form.insurance_value class+="form-control" %}
{% render_field form.insurance_value class+="form-control" %} </div>
</div> <div class="border border-info p-2 rounded mt-1 font-weight-bold" style="border-width: thin thin thin thick !important;">
<div class="border border-info p-2 rounded mt-1" style="border-width: thin thin thin thick !important;"> If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements
If this value is greater than £50,000 then please email productions@nottinghamtec.co.uk in addition to complete the additional insurance requirements </div>
</div> </div>
</div> </div>
</div> </div>