diff --git a/RIGS/hs.py b/RIGS/hs.py index 72719ec7..33fa5d80 100644 --- a/RIGS/hs.py +++ b/RIGS/hs.py @@ -82,7 +82,7 @@ class EventRiskAssessmentList(generic.ListView): template_name = 'hs_object_list.html' def get_queryset(self): - return self.model.objects.order_by('reviewed_at').select_related('event') + return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event') def get_context_data(self, **kwargs): context = super(EventRiskAssessmentList, self).get_context_data(**kwargs) @@ -187,6 +187,9 @@ class EventChecklistList(generic.ListView): model = models.EventChecklist template_name = 'hs_object_list.html' + def get_queryset(self): + return self.model.objects.exclude(event__status=models.Event.CANCELLED).order_by('reviewed_at').select_related('event') + def get_context_data(self, **kwargs): context = super(EventChecklistList, self).get_context_data(**kwargs) context['title'] = 'Event Checklist' @@ -215,7 +218,7 @@ class HSList(generic.ListView): template_name = 'hs_list.html' def get_queryset(self): - return models.Event.objects.all().order_by('-start_date').select_related('riskassessment').prefetch_related('checklists') + return models.Event.objects.all().exclude(status=models.Event.CANCELLED).order_by('-start_date').select_related('riskassessment').prefetch_related('checklists') def get_context_data(self, **kwargs): context = super(HSList, self).get_context_data(**kwargs) diff --git a/RIGS/templates/hs_list.html b/RIGS/templates/hs_list.html index 0a11b99b..221eecd2 100644 --- a/RIGS/templates/hs_list.html +++ b/RIGS/templates/hs_list.html @@ -4,10 +4,11 @@ {% block content %}
| Event | +MIC | Dates | RA | Checklists | @@ -16,7 +17,8 @@|||
|---|---|---|---|---|---|---|---|
| {{ event }} | +{{ event }} {{ event.get_status_display }} |
+ {% if event.mic is not None %}{% else %}{% endif %}{{ event.mic }}{% if event.mic is not None %}{% else %}{%endif%} |
{{ event.start_date|date:"D d/m/Y" }}
diff --git a/RIGS/templates/hs_object_list.html b/RIGS/templates/hs_object_list.html
index c9029a02..c3ebaf4d 100644
--- a/RIGS/templates/hs_object_list.html
+++ b/RIGS/templates/hs_object_list.html
@@ -15,7 +15,7 @@
-
|