Added Venue views, urls and templates

RIGS/models.py

@@ -86,6 +86,8 @@ class Venue(models.Model, RevisionMixin):
     three_phase_available = models.BooleanField(default=False)
     notes = models.TextField(blank=True, null=True)
 
+    address = models.TextField(blank=True, null=True)
+
     def __str__(self):
         string = self.name
         if self.notes and len(self.notes) > 0:

RIGS/templates/RIGS/venue_detail.html

@@ -0,0 +1,52 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% load widget_tweaks %}
+
+{% block title %}{{ object.name }}{% endblock %}
+
+{% block content %}
+    <div class="row">
+        {% if not request.is_ajax %}
+            <h3>{{ object.name }}</h3>
+            <div class="pull-right">
+                <a href="{% url 'venue_update' object.pk %}" class="btn btn-primary">Edit <span
+                        class="glyphicon glyphicon-pencil"></span></a>
+            </div>
+        {% endif %}
+        <div class="col-sm-10 col-sm-offset-1">
+            <div class="">
+                <dl class="dl-horizontal">
+                    <dt>Name</dt>
+                    <dd>{{ object.name }}</dd>
+
+                    <dt>Phone</dt>
+                    <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
+
+                    <dt>Email</dt>
+                    <dd><a href="mailto:{{ object.email }}">{{ object.email }}</a></dd>
+
+                    <dt>Address</dt>
+                    <dd>{{ object.address|linebreaksbr }}</dd>
+
+                    <dt>Notes</dt>
+                    <dd>{{ object.notes|linebreaksbr }}</dd>
+                </dl>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+{% if request.is_ajax %}
+    {% block footer %}
+        <div class="row">
+            <div class="col-sm-10 align-left">
+                Lasted edited at {{ object.last_edited_at|date:"SHORT_DATE_FORMAT" }} by {{ object.last_edited_by }}
+            </div>
+            <div class="col-sm-2">
+                <div class="pull-right">
+                    <a href="{% url 'venue_update' object.pk %}" class="btn btn-primary">Edit <span
+                            class="glyphicon glyphicon-pencil"></span></a>
+                </div>
+            </div>
+        </div>
+    {% endblock %}
+{% endif %}

RIGS/templates/RIGS/venue_form.html

@@ -0,0 +1,68 @@
+{% extends request.is_ajax|yesno:'base_ajax.html,base.html' %}
+{% load widget_tweaks %}
+
+{% block title %}{{ object.pk|yesno:"Edit,Add" }} Venue{% endblock %}
+
+{% block content %}
+    <div class="col-sm-offset-1 col-sm-10">
+        <h3>{{ object.pk|yesno:"Edit,Add" }} Venue</h3>
+
+        <form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
+            <div class="row">
+                <div class="col-md-6">
+                    {% include 'form_errors.html' %}
+                    <div class="form-group">
+                        <label for="{{ form.name.id_for_label }}"
+                               class="col-sm-2 control-label">{{ form.name.label }}</label>
+
+                        <div class="col-sm-10">
+                            {% render_field form.name class+="form-control" placeholder=form.name.label %}
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="{{ form.phone.id_for_label }}"
+                               class="col-sm-2 control-label">{{ form.phone.label }}</label>
+
+                        <div class="col-sm-10">
+                            {% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %}
+                        </div>
+                    </div>
+
+
+                    <div class="form-group">
+                        <label for="{{ form.email.id_for_label }}"
+                               class="col-sm-2 control-label">{{ form.email.label }}</label>
+
+                        <div class="col-sm-10">
+                            {% render_field form.email class+="form-control" type="email" placeholder=form.email.label %}
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <label for="{{ form.address.id_for_label }}"
+                               class="col-sm-2 control-label">{{ form.address.label }}</label>
+
+                        <div class="col-sm-10">
+                            {% render_field form.address class+="form-control" placeholder=form.address.label %}
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label for="{{ form.notes.id_for_label }}"
+                               class="col-sm-2 control-label">{{ form.notes.label }}</label>
+
+                        <div class="col-sm-10">
+                            {% render_field form.notes class+="form-control" placeholder=form.notes.label %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <input class="btn btn-primary pull-right" type="submit"/>
+            </div>
+        </form>
+    </div>
+{% endblock %}

RIGS/templates/RIGS/venue_list.html

@@ -0,0 +1,68 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+{% load widget_tweaks %}
+{% load paginator from filters %}
+{% load url_replace from filters %}
+{% load orderby from filters %}
+
+{% block title %}Venues{% endblock %}
+
+{% block content %}
+    <div class="col-sm-10 col-sm-offset-1">
+        <div class="row">
+            <div class="col-sm-10">
+                <h3>Venues</h3>
+            </div>
+            <div class="col-sm-2">
+                <a href="{% url 'venue_create' %}" class="btn btn-default pull-right">New <span
+                        class="glyphicon glyphicon-plus"></span></a>
+            </div>
+            <div class="col-sm-3 col-sm-offset-9">
+                <form class="form form-horizontal col-sm-12">
+                    <div class="form-group">
+                        <input type="search" name="q" placeholder="Search" value="{{ request.GET.q }}"
+                               class="form-control"/>
+                    </div>
+                </form>
+            </div>
+        </div>
+        <div class="pull-right">{% paginator %}</div>
+        <div>
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <td></td>
+                    <td>Name<a href="?{% orderby request 'orderBy' 'name' %}"><span class="caret"></span></a></td>
+                    <td>Email</td>
+                    <td>Phone</td>
+                    <td>Notes</td>
+                    <td></td>
+                </tr>
+                </thead>
+                <tbody>
+                {% for object in object_list %}
+                    <tr>
+                        <td>{{ object.pk }}</td>
+                        <td>{{ object.name }}</td>
+                        <td>{{ object.email }}</td>
+                        <td>{{ object.phone }}</td>
+                        <td>{{ object.notes|yesno|capfirst }}</td>
+                        <td>
+                            <a href="{% url 'venue_detail' object.pk %}" class="btn btn-default modal-href">
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </a>
+                            <a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
+                                    class="glyphicon glyphicon-pencil"></span></a>
+                        </td>
+                    </tr>
+                {% empty %}
+                    <tr>
+                        <td></td>
+                        <td colspan="5">No venues found</td>
+                    </tr>
+                {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <div class="align-right">{% paginator %}</div>
+    </div>
+{% endblock %}

RIGS/urls.py

@@ -38,5 +38,19 @@ urlpatterns = patterns('',
                        url(r'^organisations/(?P<pk>\d+)/edit/$',
                            permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
                            name='organisation_update'),
+
+                       # Venues
+                       url(r'^venues/$',
+                           permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
+                           name='venue_list'),
+                       url(r'^venues/add/$',
+                           permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
+                           name='venue_create'),
+                       url(r'^venues/(?P<pk>\d+)/$',
+                           permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
+                           name='venue_detail'),
+                       url(r'^venues/(?P<pk>\d+)/edit/$',
+                           permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
+                           name='venue_update'),
 )
 

RIGS/views.py

@@ -12,18 +12,23 @@ def login(request, **kwargs):
         return HttpResponseRedirect(request.REQUEST.get('next', '/'))
     else:
         from django.contrib.auth.views import login
+
         return login(request)
 
+
 """
 Called from a modal window (e.g. when an item is submitted to an event/invoice).
 May optionally also include some javascript in a success message to cause a load of
 the new information onto the page.
 """
+
+
 class CloseModal(generic.TemplateView):
     template_name = 'closemodal.html'
 
     def get_context_data(self, **kwargs):
         from django.contrib import messages
+
         return {'messages', messages.get_messages(self.request)}
 
 
@@ -42,9 +47,11 @@ class PersonList(generic.ListView):
             object_list = object_list.order_by(orderBy)
         return object_list
 
+
 class PersonDetail(generic.DetailView):
     model = models.Person
 
+
 class PersonCreate(generic.CreateView):
     model = models.Person
 
@@ -53,6 +60,7 @@ class PersonCreate(generic.CreateView):
             'pk': self.object.pk,
         })
 
+
 class PersonUpdate(generic.UpdateView):
     model = models.Person
 
@@ -77,9 +85,11 @@ class OrganisationList(generic.ListView):
             object_list = object_list.order_by(orderBy)
         return object_list
 
+
 class OrganisationDetail(generic.DetailView):
     model = models.Organisation
 
+
 class OrganisationCreate(generic.CreateView):
     model = models.Organisation
 
@@ -88,10 +98,49 @@ class OrganisationCreate(generic.CreateView):
             'pk': self.object.pk,
         })
 
+
 class OrganisationUpdate(generic.UpdateView):
     model = models.Organisation
 
     def get_success_url(self):
         return reverse_lazy('organisation_detail', kwargs={
             'pk': self.object.pk,
+        })
+
+
+class VenueList(generic.ListView):
+    model = models.Venue
+    paginate_by = 20
+
+    def get_queryset(self):
+        q = self.request.GET.get('q', "")
+        if len(q) >= 3:
+            object_list = self.model.objects.filter(Q(name__icontains=q) | Q(address__icontains=q))
+        else:
+            object_list = self.model.objects.all()
+        orderBy = self.request.GET.get('orderBy', "")
+        if orderBy is not "":
+            object_list = object_list.order_by(orderBy)
+        return object_list
+
+
+class VenueDetail(generic.DetailView):
+    model = models.Venue
+
+
+class VenueCreate(generic.CreateView):
+    model = models.Venue
+
+    def get_success_url(self):
+        return reverse_lazy('venue_detail', kwargs={
+            'pk': self.object.pk,
+        })
+
+
+class VenueUpdate(generic.UpdateView):
+    model = models.Venue
+
+    def get_success_url(self):
+        return reverse_lazy('venue_detail', kwargs={
+            'pk': self.object.pk,
         })