diff --git a/RIGS/forms.py b/RIGS/forms.py index d008deb5..a192b252 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -84,4 +84,4 @@ class EventForm(forms.ModelForm): model = models.Event fields = ['is_rig', 'name', 'venue', 'start_date', 'start_time', 'end_date', 'end_time', 'meet_at', 'access_at', 'description', 'notes', 'mic', - 'person', 'organisation', 'dry_hire', 'based_on', 'checked_in_by'] \ No newline at end of file + 'person', 'organisation', 'dry_hire', 'based_on', 'checked_in_by', 'status'] \ No newline at end of file diff --git a/RIGS/templates/RIGS/event_detail.html b/RIGS/templates/RIGS/event_detail.html index 82bd0baa..eadeaab5 100644 --- a/RIGS/templates/RIGS/event_detail.html +++ b/RIGS/templates/RIGS/event_detail.html @@ -67,6 +67,9 @@
Event MIC
{{ event.mic.name }}
+
Status
+
{{ event.get_status_display }}
+
 
{% if event.is_rig %} @@ -101,6 +104,11 @@ {% endif %} + + {% if event.dry_hire %} +
Checked In By
+
{{ object.checked_in_by.name }}
+ {% endif %} diff --git a/RIGS/views.py b/RIGS/views.py index f3e7c9d3..6d82cb5c 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -1,3 +1,4 @@ +from django.core.exceptions import PermissionDenied from django.http.response import HttpResponseRedirect from django.http import HttpResponse from django.core.urlresolvers import reverse_lazy