From 935273362955bcaa8d9c9eb2dc5649c60a04e8c3 Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Thu, 6 Nov 2014 03:32:36 +0000 Subject: [PATCH] Working rigboard. Thank fuck... --- RIGS/models.py | 8 +++ RIGS/rigboard.py | 16 +++++ RIGS/templates/RIGS/rigboard.html | 113 ++++++++++++++++++++++++++++++ RIGS/urls.py | 5 +- db.sqlite3 | Bin 25077760 -> 25079808 bytes templates/base.html | 2 +- 6 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 RIGS/rigboard.py create mode 100644 RIGS/templates/RIGS/rigboard.html 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 4fdb98f5cfd7a062baac41b2d05e199314653507..70e0e7856b7bec1606031bf37a0af8d831df2e8e 100644 GIT binary patch delta 3827 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 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