mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-02-12 01:29:42 +00:00
Add fields to rig info for additional access requirements (#611)
* Add fields to rig info for additional access requirements * Add form field for additional access requirements * Display access requirements in rig info * Make access requirements field non-required Oops... * Add event access field to risk assessment * Allow for modification and display risk assessment venue access item * Correct tests for RAs with new parking fields * Add note to new venue access component of RA * Correct div boundaries for non-rig access requirements * Fill parking and access field in sample data generator * Set parking and access field to false in RA creation test * Hopefully the final correction of the RA test suite
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if object.organisation %}
|
||||
<div class="card card-default">
|
||||
<div class="card card-default mb-3">
|
||||
<div class="card-header">Organisation Details</div>
|
||||
<div class="card-body">
|
||||
<dl class="row">
|
||||
@@ -44,4 +44,4 @@
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
@@ -11,6 +11,7 @@
|
||||
{{ object.venue|namewithnotes:'venue_detail' }}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if object.parking_and_access or object.riskassessment.parking_and_access %}<span class="badge badge-warning">Additional Access Requirements</span>{% endif %}
|
||||
</dd>
|
||||
{% if object.venue %}
|
||||
<dt class="col-sm-6">Venue Notes</dt>
|
||||
|
||||
@@ -44,5 +44,8 @@
|
||||
<span class="badge badge-info">Invoice: Not Generated</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if event.parking_and_access %}
|
||||
<span class="badge badge-warning">Addititional Access Requirements</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
22
RIGS/templates/partials/parking_and_access.html
Normal file
22
RIGS/templates/partials/parking_and_access.html
Normal file
@@ -0,0 +1,22 @@
|
||||
<div class="card card-default">
|
||||
<div class="card-header">Parking and Access</div>
|
||||
<div class="card-body">
|
||||
<p>This venue has additional parking and/or access requirements.</p>
|
||||
|
||||
<p>Ensure the MIC has:</p>
|
||||
<ul>
|
||||
<li>Details of where to park</li>
|
||||
<li>Details of how to access the venue</li>
|
||||
<li>Details of any access restrictions</li>
|
||||
<li>If on campus, sorted parking permits</li>
|
||||
</ul>
|
||||
|
||||
{% if object.parking_and_access and object.riskassessment.parking_and_access %}
|
||||
<small>Additional parking marked on both rig details and risk assessment.</small>
|
||||
{% elif object.parking_and_access %}
|
||||
<small>Additional parking marked on rig details.</small>
|
||||
{% elif object.riskassessment.parking_and_access %}
|
||||
<small>Additional parking marked on risk assessment.</small>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user