diff --git a/RIGS/models.py b/RIGS/models.py index 9143d78f..7af7687d 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -209,6 +209,14 @@ class Event(models.Model, RevisionMixin): def total(self): return self.sum_total + self.vat + @property + def cancelled(self): + return (self.status == self.CANCELLED) + + @property + def confirmed(self): + return (self.status == self.BOOKED or self.status == self.CONFIRMED) + objects = EventManager() def __str__(self): diff --git a/RIGS/rigboard.py b/RIGS/rigboard.py new file mode 100644 index 00000000..42170dbf --- /dev/null +++ b/RIGS/rigboard.py @@ -0,0 +1,16 @@ +from django.views import generic +from RIGS import models + +__author__ = 'ghost' + + +class RigboardIndex(generic.TemplateView): + template_name = 'RIGS/rigboard.html' + + def get_context_data(self, **kwargs): + # get super context + context = super(RigboardIndex, self).get_context_data(**kwargs) + + # call out method to get current events + context['events'] = models.Event.objects.current_events() + return context \ No newline at end of file diff --git a/RIGS/templates/RIGS/rigboard.html b/RIGS/templates/RIGS/rigboard.html new file mode 100644 index 00000000..2e3746e0 --- /dev/null +++ b/RIGS/templates/RIGS/rigboard.html @@ -0,0 +1,113 @@ +{% extends 'base.html' %} + +{% block title %}Rigboard{% endblock %} + +{% block content %} +
+
+
+
+

Rigboard

+
+
+ New +
+ {% comment %} + {# Bring search back at a later date #} +
+
+
+ +
+
+
+ {% endcomment %} +
+ {# .row #} + +
+ + + + + + + + + + {% for event in events %} + + + + + + + + {% endfor %} + +
Event DateEvent DetailsEvent TimingsMIC
+
{{ event.start_date|date:"SHORT_DATE_FORMAT" }}
+ {% if event.end_date and event.end_date != event.start_date %} +
{{ event.end_date|date:"SHORT_DATE_FORMAT" }}
+ {% endif %} + 		+

+ {{ event.name }} + {% if event.venue %} + at {{ event.venue }} + {% endif %} +

+ {% if event.is_rig %} +
+ {{ event.person.name }} + {% if event.organisation %} + for {{ event.organisation.name }} + {% endif %} +
+ {% endif %} + {% if not event.cancelled and event.description %} +
+ {{ event.description|linebreaksbr }} +
+ {% endif %} + 		+
+ {% if event.meet_at %} +
Crew meet
+
{{ event.meet_at|date:"H:i" }}
{{ event.meet_at|date:"(Y-m-d)" }}
+ {% endif %} + {% if event.start_time %} +
Event starts
+
+ {{ event.start_time|date:"H:i" }}
+ {{ event.start_date|date:"(Y-m-d)" }} +
+ {% endif %} + {% if event.end_time and event.start_time != event.end_time %} +
Event ends
+
+ {{ event.end_time|date:"H:i" }}
+ {{ event.end_date|date:"(Y-m-d)" }} +
+ {% endif %} +
+ 		+ {{ event.mic.initials }} +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/RIGS/urls.py b/RIGS/urls.py index eb7d1398..52df34a8 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import patterns, include, url from django.contrib.auth.decorators import login_required -from RIGS import views +from RIGS import views, rigboard from PyRIGS.decorators import permission_required_with_403 @@ -52,5 +52,8 @@ urlpatterns = patterns('', url(r'^venues/(?P\d+)/edit/$', permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()), name='venue_update'), + + # Rigboard + url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'), ) diff --git a/db.sqlite3 b/db.sqlite3 index 4fdb98f5..70e0e785 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/templates/base.html b/templates/base.html index cecbfb2e..87a4bf18 100644 --- a/templates/base.html +++ b/templates/base.html @@ -39,7 +39,7 @@
  • Rigboard