diff --git a/RIGS/models.py b/RIGS/models.py index 3fb482df..a1f539db 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -609,6 +609,11 @@ class RiskAssessment(models.Model): # Blimey that was a lot of options + # created = models.DateTimeField(auto_now_add=True) + # reviewed_at = models.DateTimeField() + # reviewed_by = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, + # verbose_name="Reviewer", on_delete=models.CASCADE) + @property def activity_feed_string(self): return str(self.event) diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py index 2493a6e7..1603f924 100644 --- a/RIGS/rigboard.py +++ b/RIGS/rigboard.py @@ -439,3 +439,9 @@ class EventAuthoriseRequestEmailPreview(generic.DetailView): }) context['to_name'] = self.request.GET.get('to_name', None) return context + + +class EventRiskAssessmentList(generic.ListView): + paginate_by = 20 + model = models.RiskAssessment + template_name = 'risk_assessment_table.html' diff --git a/RIGS/templates/.risk_assessment_table.html.kate-swp b/RIGS/templates/.risk_assessment_table.html.kate-swp new file mode 100644 index 00000000..6a7e0023 Binary files /dev/null and b/RIGS/templates/.risk_assessment_table.html.kate-swp differ diff --git a/RIGS/templates/risk_assessment_detail.html b/RIGS/templates/risk_assessment_detail.html index 166d9865..6f67c973 100644 --- a/RIGS/templates/risk_assessment_detail.html +++ b/RIGS/templates/risk_assessment_detail.html @@ -12,31 +12,31 @@
| Event | +{{ object_list.0|verbose_name:'nonstandard_equipment'|title }} | +{{ object_list.0|verbose_name:'nonstandard_use'|title }} | +{{ object_list.0|verbose_name:'contractors'|title }} | +{{ object_list.0|verbose_name:'other_companies'|title }} | +{{ object_list.0|verbose_name:'crew_fatigue'|title }} | +{{ object_list.0|verbose_name:'general_notes'|title }} | +{{ object_list.0|verbose_name:'big_power'|title }} | +{{ object_list.0|verbose_name:'power_mic'|title }} | +{{ object_list.0|verbose_name:'generators'|title }} | +{{ object_list.0|verbose_name:'other_companies_power'|title }} | +{{ object_list.0|verbose_name:'nonstandard_equipment_power'|title }} | +{{ object_list.0|verbose_name:'multiple_electrical_environments'|title }} | +{{ object_list.0|verbose_name:'power_notes'|title }} | +{{ object_list.0|verbose_name:'noise_monitoring'|title }} | +{{ object_list.0|verbose_name:'sound_notes'|title }} | +{{ object_list.0|verbose_name:'known_venue'|title }} | +{{ object_list.0|verbose_name:'safe_loading'|title }} | +{{ object_list.0|verbose_name:'safe_storage'|title }} | +{{ object_list.0|verbose_name:'area_outside_of_control'|title }} | +{{ object_list.0|verbose_name:'nonstandard_emergency_procedure'|title }} | +{{ object_list.0|verbose_name:'barrier_required'|title }} | +{{ object_list.0|verbose_name:'special_structures'|title }} | +{{ object_list.0|verbose_name:'persons_responsible_structures'|title }} | +{{ object_list.0|verbose_name:'suspended_structures'|title }} | +
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ object.event }} | +{{object.nonstandard_equipment|yesno|title}} | +{{object.nonstandard_use|yesno|title}} | +{{object.contractors|yesno|title}} | +{{object.other_companies|yesno|title}} | +{{object.crew_fatigue|yesno|title}} | +{{ object.general_notes|default:'N/A'|linebreaks }} | + +{{object.big_power|yesno|title}} | +{{ object.power_mic.name|default:'N/A' }} | +{{object.generators|yesno|title}} | +{{object.other_companies_power|yesno|title}} | +{{object.nonstandard_equipment_power|yesno|title}} | +{{object.multiple_electrical_environments|yesno|title}} | +{{ object.power_notes|default:'N/A'|linebreaks }} | + +{{object.noise_monitoring|yesno|title}} | +{{ object.sound_notes|default:'N/A'|linebreaks }} | + +{{object.known_venue|yesno|title}} | +{{object.safe_loading|yesno|title}} | +{{object.safe_storage|yesno|title}} | +{{object.area_outside_of_control|yesno|title}} | +{{object.nonstandard_emergency_procedure|yesno|title}} | +{{object.barrier_required|yesno|title}} | + +{{object.special_structures|yesno|title}} | +{{ object.persons_responsible_structures|default:'N/A'|linebreaks }} | +{{object.suspended_structures|yesno|title}} | +
| Not Found | +||||||||||||||||||||||||