Compare commits

...

3 Commits

Author SHA1 Message Date
7c38af66f6 May fix windows/chrome RA name chooser issue
No idea tbh
2021-08-31 19:47:49 +01:00
f1a624ec8f Improve RA detail layout slightly 2021-08-31 19:39:24 +01:00
ab01beb2cd Add title links to ra/ec detail 2021-08-31 19:33:03 +01:00
3 changed files with 64 additions and 56 deletions

View File

@@ -70,6 +70,11 @@ class EventRiskAssessmentDetail(generic.DetailView):
model = models.RiskAssessment model = models.RiskAssessment
template_name = 'risk_assessment_detail.html' template_name = 'risk_assessment_detail.html'
def get_context_data(self, **kwargs):
context = super(EventRiskAssessmentDetail, self).get_context_data(**kwargs)
context['page_title'] = "Risk Assessment for Event <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), self.object.event.display_id, self.object.event.name)
return context
class EventRiskAssessmentList(generic.ListView): class EventRiskAssessmentList(generic.ListView):
paginate_by = 20 paginate_by = 20
@@ -107,7 +112,7 @@ class EventChecklistDetail(generic.DetailView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(EventChecklistDetail, self).get_context_data(**kwargs) context = super(EventChecklistDetail, self).get_context_data(**kwargs)
context['page_title'] = "Event Checklist for Event {} {}".format(self.object.event.display_id, self.object.event.name) context['page_title'] = "Event Checklist for Event <a href='{}'>{} {}</a>".format(self.object.event.get_absolute_url(), self.object.event.display_id, self.object.event.name)
return context return context

View File

@@ -1,5 +1,4 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %} {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
{% block title %}Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
{% load help_text from filters %} {% load help_text from filters %}
{% load yesnoi from filters %} {% load yesnoi from filters %}
{% load linkornone from filters %} {% load linkornone from filters %}
@@ -7,7 +6,6 @@
{% block content %} {% block content %}
<div class="row py-3"> <div class="row py-3">
<div class="col-12"> <div class="col-12">
<h3>Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}</h3>
<div class="card card-default mb-3"> <div class="card card-default mb-3">
<div class="card-header">General</div> <div class="card-header">General</div>
<div class="card-body"> <div class="card-body">
@@ -97,58 +95,64 @@
</dl> </dl>
</div> </div>
</div> </div>
<div class="card card-default mb-3"> <div class="row">
<div class="card-header">Site Details</div> <div class="col-lg-6 col-12">
<div class="card-body"> <div class="card card-default mb-3">
<dl class="row"> <div class="card-header">Site Details</div>
<dt class="col-sm-6">{{ object|help_text:'known_venue' }}</dt> <div class="card-body">
<dd class="col-sm-6"> <dl class="row">
{{ object.known_venue|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'known_venue' }}</dt>
</dd> <dd class="col-2">
<dt class="col-sm-6">{{ object|help_text:'safe_loading'|safe }}</dt> {{ object.known_venue|yesnoi:'invert' }}
<dd class="col-sm-6"> </dd>
{{ object.safe_loading|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'safe_loading'|safe }}</dt>
</dd> <dd class="col-2">
<dt class="col-sm-6">{{ object|help_text:'safe_storage' }}</dt> {{ object.safe_loading|yesnoi:'invert' }}
<dd class="col-sm-6"> </dd>
{{ object.safe_storage|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'safe_storage' }}</dt>
</dd> <dd class="col-2">
<dt class="col-sm-6">{{ object|help_text:'area_outside_of_control' }}</dt> {{ object.safe_storage|yesnoi:'invert' }}
<dd class="col-sm-6"> </dd>
{{ object.area_outside_of_control|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'area_outside_of_control' }}</dt>
</dd> <dd class="col-2">
<dt class="col-sm-6">{{ object|help_text:'barrier_required' }}</dt> {{ object.area_outside_of_control|yesnoi:'invert' }}
<dd class="col-sm-6"> </dd>
{{ object.barrier_required|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'barrier_required' }}</dt>
</dd> <dd class="col-2">
<dt class="col-sm-6">{{ object|help_text:'nonstandard_emergency_procedure' }}</dt> {{ object.barrier_required|yesnoi:'invert' }}
<dd class="col-sm-6"> </dd>
{{ object.nonstandard_emergency_procedure|yesnoi:'invert' }} <dt class="col-10">{{ object|help_text:'nonstandard_emergency_procedure' }}</dt>
</dd> <dd class="col-2">
</dl> {{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
</dd>
</dl>
</div>
</div>
</div> </div>
</div> <div class="col-lg-6 col-12">
<div class="card card-default mb-3"> <div class="card card-default mb-3">
<div class="card-header">Structures</div> <div class="card-header">Structures</div>
<div class="card-body"> <div class="card-body">
<dl class="row"> <dl class="row">
<dt class="col-sm-6">{{ object|help_text:'special_structures' }}</dt> <dt class="col-10">{{ object|help_text:'special_structures' }}</dt>
<dd class="col-sm-6"> <dd class="col-2">
{{ object.special_structures|yesnoi:'invert' }} {{ object.special_structures|yesnoi:'invert' }}
</dd> </dd>
<dt class="col-sm-6">{{ object|help_text:'suspended_structures' }}</dt> <dt class="col-10">{{ object|help_text:'suspended_structures' }}</dt>
<dd class="col-sm-6"> <dd class="col-2">
{{ object.suspended_structures|yesnoi:'invert' }} {{ object.suspended_structures|yesnoi:'invert' }}
</dd> </dd>
<dt class="col-sm-6">{{ object|help_text:'persons_responsible_structures' }}</dt> <dt class="col-12">{{ object|help_text:'persons_responsible_structures' }}</dt>
<dd class="col-sm-6"> <dd class="col-12">
{{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }} {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
</dd> </dd>
<dt class="col-6">{{ object|help_text:'rigging_plan'|safe }}</dt> <dt class="col-12">{{ object|help_text:'rigging_plan'|safe }}</dt>
<dd class="col-6"> <dd class="col-12">
{{ object.rigging_plan|linkornone }} {{ object.rigging_plan|linkornone|default:'N/A' }}
</dd> </dd>
</dl> </dl>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -11,13 +11,12 @@
{% block preload_js %} {% block preload_js %}
{{ block.super }} {{ block.super }}
<script src="{% static 'js/selects.js' %}" async></script> <script src="{% static 'js/selects.js' %}"></script>
{% endblock %} {% endblock %}
{% block js %} {% block js %}
{{ block.super }} {{ block.super }}
<script src="{% static 'js/autocompleter.js' %}"></script> <script src="{% static 'js/autocompleter.js' %}"></script>
<script src="{% static 'js/tooltip.js' %}"></script>
<script> <script>
function parseBool(str) { function parseBool(str) {