Merge branch 'master' into python_deps_2020

# Conflicts:
#	PyRIGS/settings.py
#	RIGS/templates/RIGS/event_embed.html
#	RIGS/views.py

PyRIGS/settings.py

@@ -12,6 +12,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 import os
 import raven
 import secrets
+import datetime
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -44,13 +45,11 @@ if not DEBUG:
 
 INTERNAL_IPS = ['127.0.0.1']
 
-# TODO This will conflict with merging the auth refactor
+ADMINS = [('Tom Price', 'tomtom5152@gmail.com'), ('IT Manager', 'it@nottinghamtec.co.uk'), ('Arona Jones', 'arona.jones@nottinghamtec.co.uk')]
-ADMINS = [
+if DEBUG:
-    ('Tom Price', 'tomtom5152@gmail.com')
+    ADMINS.append(('Testing Superuser', 'superuser@example.com'))
-]
 
 # Application definition
-
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -185,6 +184,8 @@ if not DEBUG or EMAILER_TEST:
 else:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
+EMAIL_COOLDOWN = datetime.timedelta(minutes=15)
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 

RIGS/admin.py

@@ -22,13 +22,22 @@ admin.site.register(models.Invoice)
 admin.site.register(models.Payment)
 
 
+def approve_user(modeladmin, request, queryset):
+    queryset.update(is_approved=True)
+
+
+approve_user.short_description = "Approve selected users"
+
+
 @admin.register(models.Profile)
 class ProfileAdmin(UserAdmin):
+    # Don't know how to add 'is_approved' whilst preserving the default list...
+    list_filter = ('is_approved', 'is_active', 'is_staff', 'is_superuser', 'groups')
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
         (_('Personal info'), {
             'fields': ('first_name', 'last_name', 'email', 'initials', 'phone')}),
-        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+        (_('Permissions'), {'fields': ('is_approved', 'is_active', 'is_staff', 'is_superuser',
                                        'groups', 'user_permissions')}),
         (_('Important dates'), {
             'fields': ('last_login', 'date_joined')}),
@@ -41,6 +50,7 @@ class ProfileAdmin(UserAdmin):
     )
     form = forms.ProfileChangeForm
     add_form = forms.ProfileCreationForm
+    actions = [approve_user]
 
 
 class AssociateAdmin(VersionAdmin):

RIGS/finance.py

@@ -11,6 +11,7 @@ from django.template.loader import get_template
 from django.views import generic
 from django.db.models import Q
 from z3c.rml import rml2pdf
+from django.db.models import Q
 
 from RIGS import models
 
@@ -122,6 +123,34 @@ class InvoiceArchive(generic.ListView):
     template_name = 'RIGS/invoice_list_archive.html'
     paginate_by = 25
 
+    def get_queryset(self):
+        q = self.request.GET.get('q', "")
+
+        filter = Q(event__name__icontains=q)
+
+        # try and parse an int
+        try:
+            val = int(q)
+            filter = filter | Q(pk=val)
+            filter = filter | Q(event__pk=val)
+        except:  # noqa
+            # not an integer
+            pass
+
+        try:
+            if q[0] == "N":
+                val = int(q[1:])
+                filter = Q(event__pk=val)  # If string is Nxxxxx then filter by event number
+            elif q[0] == "#":
+                val = int(q[1:])
+                filter = Q(pk=val)  # If string is #xxxxx then filter by invoice number
+        except:  # noqa
+            pass
+
+        object_list = self.model.objects.filter(filter).order_by('-invoice_date')
+
+        return object_list
+
 
 class InvoiceWaiting(generic.ListView):
     model = models.Event

RIGS/forms.py

@@ -2,8 +2,10 @@ from django import forms
 from django.utils import formats
 from django.conf import settings
 from django.core import serializers
+from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.contrib.auth.forms import UserCreationForm, UserChangeForm, AuthenticationForm, PasswordResetForm
 from registration.forms import RegistrationFormUniqueEmail
+from django.contrib.auth.forms import AuthenticationForm
 from captcha.fields import ReCaptchaField
 import simplejson
 
@@ -33,8 +35,16 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
         return self.cleaned_data['initials']
 
 
+class CheckApprovedForm(AuthenticationForm):
+    def confirm_login_allowed(self, user):
+        if user.is_approved or user.is_superuser:
+            return AuthenticationForm.confirm_login_allowed(self, user)
+        else:
+            raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
+
+
 # Embedded Login form - remove the autofocus
-class EmbeddedAuthenticationForm(AuthenticationForm):
+class EmbeddedAuthenticationForm(CheckApprovedForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['username'].widget.attrs.pop('autofocus', None)

RIGS/migrations/0036_profile_is_approved.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.0.13 on 2020-01-10 14:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0035_auto_20191124_1319'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='is_approved',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='profile',
+            name='last_emailed',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]

RIGS/migrations/0037_approve_legacy.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.0.13 on 2020-01-11 18:29
+# This migration ensures that legacy Profiles from before approvals were implemented are automatically approved 
+from django.db import migrations
+
+def approve_legacy(apps, schema_editor):
+    Profile = apps.get_model('RIGS', 'Profile')
+    for person in Profile.objects.all():
+        person.is_approved = True
+        person.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0036_profile_is_approved'),
+    ]
+
+    operations = [
+        migrations.RunPython(approve_legacy)
+    ]

RIGS/migrations/0038_auto_20200306_2000.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.3 on 2020-02-08 13:42
+# Generated by Django 2.0.13 on 2020-03-06 20:00
 
 from django.db import migrations
 
@@ -6,7 +6,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('RIGS', '0035_auto_20191124_1319'),
+        ('RIGS', '0037_approve_legacy'),
     ]
 
     operations = [

RIGS/models.py

@@ -25,6 +25,8 @@ class Profile(AbstractUser):
     initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
     phone = models.CharField(max_length=13, null=True, blank=True)
     api_key = models.CharField(max_length=40, blank=True, editable=False, null=True)
+    is_approved = models.BooleanField(default=False)
+    last_emailed = models.DateTimeField(blank=True, null=True)  # Currently only populated by the admin approval email. TODO: Populate it each time we send any email, might need that...
 
     @classmethod
     def make_api_key(cls):
@@ -51,6 +53,14 @@ class Profile(AbstractUser):
     def latest_events(self):
         return self.event_mic.order_by('-start_date').select_related('person', 'organisation', 'venue', 'mic')
 
+    @classmethod
+    def admins(cls):
+        return Profile.objects.filter(email__in=[y for x in settings.ADMINS for y in x])
+
+    @classmethod
+    def users_awaiting_approval_count(cls):
+        return Profile.objects.filter(models.Q(is_approved=False)).count()
+
     def __str__(self):
         return self.name
 

RIGS/rigboard.py

@@ -225,10 +225,18 @@ class EventPrint(generic.View):
         return response
 
 
-class EventArchive(generic.ArchiveIndexView):
+class EventArchive(generic.ListView):
     model = models.Event
-    date_field = "start_date"
     paginate_by = 25
+    template_name = "RIGS/event_archive.html"
+
+    def get_context_data(self, **kwargs):
+        # get super context
+        context = super(EventArchive, self).get_context_data(**kwargs)
+
+        context['start'] = self.request.GET.get('start', None)
+        context['end'] = self.request.GET.get('end', datetime.date.today().strftime('%Y-%m-%d'))
+        return context
 
     def get_queryset(self):
         start = self.request.GET.get('start', None)
@@ -240,19 +248,34 @@ class EventArchive(generic.ArchiveIndexView):
                                  "Muppet! Check the dates, it has been fixed for you.")
             start, end = end, start  # Stop the impending fail
 
-        filter = False
+        filter = Q()
         if end != "":
-            filter = Q(start_date__lte=end)
+            filter &= Q(start_date__lte=end)
         if start:
-            if filter:
+            filter &= Q(start_date__gte=start)
-                filter = filter & Q(start_date__gte=start)
+
-            else:
+        q = self.request.GET.get('q', "")
-                filter = Q(start_date__gte=start)
+
+        if q is not "":
+            qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q)
+
+            # try and parse an int
+            try:
+                val = int(q)
+                qfilter = qfilter | Q(pk=val)
+            except:  # noqa not an integer
+                pass
+
+            try:
+                if q[0] == "N":
+                    val = int(q[1:])
+                    qfilter = Q(pk=val)  # If string is N###### then do a simple PK filter
+            except:  # noqa
+                pass
+
+            filter &= qfilter
 
-        if filter:
         qs = self.model.objects.filter(filter).order_by('-start_date')
-        else:
-            qs = self.model.objects.all().order_by('-start_date')
 
         # Preselect related for efficiency
         qs.select_related('person', 'organisation', 'venue', 'mic')

RIGS/signals.py

@@ -1,3 +1,4 @@
+import datetime
 import re
 import urllib.request
 import urllib.error
@@ -10,6 +11,9 @@ from django.conf import settings
 from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core.mail import EmailMessage, EmailMultiAlternatives
 from django.template.loader import get_template
+from django.urls import reverse
+from django.utils import timezone
+from registration.signals import user_activated
 from premailer import Premailer
 from z3c.rml import rml2pdf
 
@@ -102,3 +106,35 @@ def on_revision_commit(sender, instance, created, **kwargs):
 
 
 post_save.connect(on_revision_commit, sender=models.EventAuthorisation)
+
+
+def send_admin_awaiting_approval_email(user, request, **kwargs):
+    # Bit more controlled than just emailing all superusers
+    for admin in models.Profile.admins():
+        # Check we've ever emailed them before and if so, if cooldown has passed.
+        if admin.last_emailed is None or admin.last_emailed + settings.EMAIL_COOLDOWN <= timezone.now():
+            context = {
+                'request': request,
+                'link_suffix': reverse("admin:RIGS_profile_changelist") + '?is_approved__exact=0',
+                'number_of_users': models.Profile.users_awaiting_approval_count(),
+                'to_name': admin.first_name
+            }
+
+            email = EmailMultiAlternatives(
+                "%s new users awaiting approval on RIGS" % (context['number_of_users']),
+                get_template("RIGS/admin_awaiting_approval.txt").render(context),
+                to=[admin.email],
+                reply_to=[user.email],
+            )
+            css = staticfiles_storage.path('css/email.css')
+            html = Premailer(get_template("RIGS/admin_awaiting_approval.html").render(context),
+                             external_styles=css).transform()
+            email.attach_alternative(html, 'text/html')
+            email.send()
+
+            # Update last sent
+            admin.last_emailed = timezone.now()
+            admin.save()
+
+
+user_activated.connect(send_admin_awaiting_approval_email)

RIGS/templates/RIGS/admin_awaiting_approval.html

@@ -0,0 +1,9 @@
+{% extends 'base_client_email.html' %}
+
+{% block content %}
+    <p>Hi {{ to_name|default_if_none:"Administrator" }},</p>
+
+    <p>{{ number_of_users|default_if_none:"Some" }} new users are awaiting administrator approval on RIGS. Click <a href="{{ request.scheme }}://{{ request.get_host }}{{ link_suffix }}">here</a> to  approve them.</p>
+
+    <p>TEC PA &amp; Lighting</p>
+{% endblock %}

RIGS/templates/RIGS/admin_awaiting_approval.txt

@@ -0,0 +1,5 @@
+Hi {{ to_name|default_if_none:"Administrator" }},
+
+{{ number_of_users|default_if_none:"Some" }} new users are awaiting administrator approval on RIGS. Use this link to approve them: {{ request.scheme }}://{{ request.get_host }}/{{ link_suffix }}
+
+TEC PA & Lighting

RIGS/templates/RIGS/event_archive.html

@@ -5,35 +5,50 @@
 
 {% block content %}
     <div class="row">
+        <div class="col-sm-12">
             <h2>Event Archive</h2>
-
+        </div>
-        <div class="col-sm-12 col-md-6 pagination">
+        <div class="col-sm-12">
             <form class="form-inline">
-                <div class="form-group">
+                    
-                    <label for="start">Start</label>
+                <div class="input-group">
-                    <input type="date" name="start" id="start" value="{{ request.GET.start }}" placeholder="Start" class="form-control" />
+                      <div class="input-group-addon">Start</div>
+                    <input type="date" name="start" id="start" value="{{ start|default_if_none:"" }}" placeholder="Start" class="form-control" />
                 </div>
-                <div class="form-group">
+            
-                    <label for="end">End</label>
+                <div class="input-group">
-                    <input type="date" name="end" id="end" value="{% if request.GET.end %}{{ request.GET.end }}{% else %}{% now "Y-m-d" %}{% endif %}" placeholder="End" class="form-control" />
+                      <div class="input-group-addon">End</div>
+                    <input type="date" name="end" id="end" value="{{ end|default_if_none:"" }}" placeholder="End" class="form-control" />
                 </div>
-                <div class="form-group">
+            
-                    <input type="submit" class="btn btn-primary" />
+                <div class="input-group">
+                    <div class="input-group-addon">Keyword</div>
+                    <input type="search" name="q" placeholder="Keyword" value="{{ request.GET.q }}"
+                           class="form-control"/>
                 </div>
+                        
+                <div class="input-group">
+                        <input type="submit" class="btn btn-primary" value="Search"/>
+                </div>
+                    
             </form>
         </div>
 
+    <div class="col-sm-12">
     {% if is_paginated %}
-            <div class="col-md-6 text-right">
+        <div class="pull-right">
             {% paginator %}
         </div>
     {% endif %}  
+        
     </div>
     <div class="row">
-        {% with latest as events %}
+        <div class="col-sm-12">
+            {% with object_list as events %}
                 {% include 'RIGS/event_table.html' %}
             {% endwith %}
         </div>
+    </div>
 
     {% if is_paginated %}
         <div class="row">

RIGS/templates/RIGS/event_detail.html

@@ -10,12 +10,14 @@
                 | {{ object.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
             </h1>
     </div>
+        {% if perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'RIGS/event_detail_buttons.html' %}
         </div>
+        {% endif %}
 
     {% endif %}
-    {% if object.is_rig %}
+    {% if object.is_rig and perms.RIGS.view_event %}
         {# only need contact details for a rig #}
         <div class="col-sm-12 col-md-6 col-lg-5">
             <div class="panel panel-default">
@@ -72,7 +74,7 @@
             {% endif %}
         </div>
     {% endif %}
-    <div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
+    <div class="col-sm-12 {% if event.is_rig and perms.RIGS.view_event %}col-md-6 col-lg-7{% endif %}">
         <div class="panel panel-info">
             <div class="panel-heading">Event Info</div>
             <div class="panel-body">
@@ -147,7 +149,7 @@
                         <dd>{{ object.collector }}</dd>
                     {% endif %}
 
-                    {% if event.is_rig and not event.internal %}
+                    {% if event.is_rig and not event.internal and perms.RIGS.view_event %}
                         <dd>&nbsp;</dd>
                         <dt>PO</dt>
                         <dd>{{ object.purchase_order }}</dd>
@@ -156,7 +158,7 @@
             </div>
         </div>
     </div>
-    {% if event.is_rig and event.internal %}
+    {% if event.is_rig and event.internal and perms.RIGS.view_event %}
     <div class="col-sm-12">
         <div class="panel panel-default
             {% if object.authorised %}
@@ -212,7 +214,7 @@
         </div>
     <div>
     {% endif %}
-    {% if not request.is_ajax %}
+    {% if not request.is_ajax and perms.RIGS.view_event %}
     <div class="col-sm-12 text-right">
         {% include 'RIGS/event_detail_buttons.html' %}
     </div>
@@ -222,21 +224,23 @@
             <div class="panel panel-default">
                 <div class="panel-heading">Event Details</div>
                 <div class="panel-body">
+                    {% if perms.RIGS.view_event %}
                     <div class="well well-sm">
                         <h4>Notes</h4>
                         <div class="dont-break-out">{{ event.notes|linebreaksbr }}</div>
                     </div>
+                    {% endif %}
                     {% include 'RIGS/item_table.html' %}
                 </div>
             </div>
         </div>
-        {% if not request.is_ajax %}
+        {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             {% include 'RIGS/event_detail_buttons.html' %}
         </div>
         {% endif %}
     {% endif %}
-    {% if not request.is_ajax %}
+    {% if not request.is_ajax and perms.RIGS.view_event %}
         <div class="col-sm-12 text-right">
             <div>
                 <a href="{% url 'event_history' object.pk %}" title="View Revision History">
@@ -251,12 +255,16 @@
 {% if request.is_ajax %}
     {% block footer %}
         <div class="row">
+            {% if perms.RIGS.view_event %}
             <div class="col-sm-10 align-left">
                 <a href="{% url 'event_history' object.pk %}" title="View Revision History">
                     Last edited at {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'nobody' }}
                 </a>
             </div>
             <div class="col-sm-2">
+            {% else %}
+            <div class="col-sm-12">
+            {% endif %}
                 <div class="pull-right">
                     <a href="{% url 'event_detail' object.pk %}" class="btn btn-primary">Open Event Page <span
                             class="glyphicon glyphicon-eye"></span></a>

RIGS/templates/RIGS/event_embed.html

@@ -21,7 +21,7 @@
         </span>
 
         <h3>
-            <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' object.pk %}"{% endif %}>
+            <a href="{% url 'event_detail' object.pk %}">
                 {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
                 | {{ object.name }} </a>
                 {% if object.venue %}

RIGS/templates/RIGS/event_table.html

@@ -33,7 +33,7 @@
                 </td>
                 <td>
                     <h4>
-                        <a {% if perms.RIGS.view_event %}href="{% url 'event_detail' event.pk %}" {% endif %}>
+                        <a href="{% url 'event_detail' event.pk %}">
                             {{ event.name }}
                         </a>
                         {% if event.venue %}

RIGS/templates/RIGS/index.html

@@ -1,6 +1,14 @@
 {% extends 'base_rigs.html' %}
 {% block title %}RIGS{% endblock %}
 
+{% block js %}
+<script>
+    $(function () {
+          $('[data-toggle="tooltip"]').tooltip();
+        })
+</script>
+{% endblock %}
+
 {% block content %}
     <div class="col-sm-12">
         <h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
@@ -26,44 +34,51 @@
 
                     <a class="list-group-item" href="https://forum.nottinghamtec.co.uk" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Forum</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Wiki</a>
+                    {% if perms.RIGS.view_event %}
                     <a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="glyphicon glyphicon-link"></span> Pre-Event Risk Assessment</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="glyphicon glyphicon-link"></span> Price List</a>
                     <a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
-                
+                    {% endif %}
             </div>
         </div>
 
         <div class="panel panel-default">
             <div class="panel-heading">
-              <h4 class="panel-title">Search Rigboard</h4>
+              <h4 class="panel-title">Search Rigboard
+                <a href="{% url 'search_help' %}" class="pull-right modal-href"><span class="glyphicon glyphicon-question-sign"</span></a></h4>
             </div>
+            <script>
+                $(document).ready(function(){
+                    $('#search-options li a').click(function(){
+                        $('#searchForm').attr('action', $(this).data('action')).submit();
+                    });
+                    $('#id_search_input').keypress(function (e) {
+                      if (e.which == 13) {
+                        $('#searchForm').attr('action', $('#search-options li a').first().data('action')).submit();
+                        return false;
+                      }
+                    });
+
+                });
+            </script>
             <div class="list-group">
                 <div class="list-group-item">
-                    <form class="form" role="form" action="{% url 'person_list' %}" method="GET">
+                    <form id="searchForm" class="form" role="form" method="GET">
-                        <div class="input-group">
+                        <div class="input-group" data-toggle="tooltip" title="Use the dropdown button to select what to search. The default is Event Archive.">
-                            <input type="search" name="q" class="form-control" placeholder="Search People" />
+                            <input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
                             <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+                                <div class="btn-group" role="group">
-                            </span>
+                                    <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="glyphicon glyphicon-search"></span> Search <span class="caret"></span></button>
+                                     <ul id="search-options" class="dropdown-menu">
+                                      <li><a data-action="{% url 'event_archive' %}" href="#">Events</a></li>
+                                      <li><a data-action="{% url 'person_list' %}" href="#">People</a></li>
+                                      <li><a data-action="{% url 'organisation_list' %}" href="#">Organisations</a></li>
+                                      <li><a data-action="{% url 'venue_list' %}" href="#">Venues</a></li>
+                                      {% if perms.RIGS.view_invoice %}
+                                      <li><a data-action="{% url 'invoice_archive' %}" href="#">Invoices</a></li>
+                                      {% endif %}
+                                    </ul>
                                 </div>
-                    </form>
-                </div>
-                <div class="list-group-item">
-                    <form class="form" role="form" action="{% url 'organisation_list' %}" method="GET">
-                        <div class="input-group">
-                            <input type="search" name="q" class="form-control" placeholder="Search Organisations" />
-                            <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
-                            </span>
-                        </div>
-                    </form>
-                </div>
-                <div class="list-group-item">
-                    <form class="form" role="form" action="{% url 'venue_list' %}" method="GET">
-                        <div class="input-group">
-                            <input type="search" name="q" class="form-control" placeholder="Search Venues" />
-                            <span class="input-group-btn">
-                                <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
                             </span>
                         </div>
                     </form>

RIGS/templates/RIGS/invoice_detail.html

@@ -111,7 +111,7 @@
                                 {% endif %}
                             </dd>
 
-                            <dt>Authorsation request sent by</dt>
+                            <dt>Authorisation request sent by</dt>
                             <dd>{{ object.authorisation.sent_by }}</dd>
                         </dl>
                     </div>

RIGS/templates/RIGS/invoice_list.html

@@ -12,6 +12,7 @@
                 {% paginator %}
             </div>
         {% endif %}
+        {% block search %}{% endblock %}
         <div class="table-responsive col-sm-12">
             <table class="table table-hover">
                 <thead>

RIGS/templates/RIGS/invoice_list_archive.html

@@ -11,3 +11,14 @@ All Invoices
 {% block description %}
 <p>This page displays all invoices: outstanding, paid, and void</p>
 {% endblock %}
+
+{% block search %}
+	<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>
+{% endblock %}

RIGS/templates/RIGS/item_row.html

@@ -6,9 +6,13 @@
             <em class="description">{{item.description|linebreaksbr}}</em>
         </div>
 	</td>
+    {% if perms.RIGS.view_event %}
 	<td>£&nbsp;<span class="cost">{{item.cost|floatformat:2}}</span></td>
+    {% endif %}
 	<td class="quantity">{{item.quantity}}</td>
+    {% if perms.RIGS.view_event %}
 	<td>£&nbsp;<span class="sub-total" data-subtotal="{{item.total_cost}}">{{item.total_cost|floatformat:2}}</span></td>
+    {% endif %}
 	{% if edit %}
 	<td class="vert-align text-right">
 		<button type="button" class="item-edit btn btn-xs btn-default"

RIGS/templates/RIGS/item_table.html

@@ -3,9 +3,13 @@
 		<thead>
 			<tr>
 				<td>Item</td>
+                {% if perms.RIGS.view_event %}
 				<td>Price</td>
+                {% endif %}
 				<td>Quantity</td>
+                {% if perms.RIGS.view_event %}
 				<td>Sub-total</td>
+                {% endif %}
 				{% if edit %}
 				<td class="text-right">
 					<button type="button" class="btn btn-default btn-xs item-add"
@@ -22,6 +26,7 @@
 				{% include 'RIGS/item_row.html' %}
 			{% endfor %}
 		</tbody>
+        {% if perms.RIGS.view_event %}
 		<tfoot>
 			<tr>
 				<td rowspan="3" colspan="2"></td>
@@ -43,6 +48,7 @@
 				<td colspan="2">£ <span id="total">{{object.total|default:0|floatformat:2}}</span></td>
 			</tr>
 		</tfoot>
+        {% endif %}
 	</table>
 </div>
 <table class="hidden invisible">

RIGS/templates/RIGS/search_help.html

@@ -0,0 +1,70 @@
+{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
+
+{% block title %}Search Help{% endblock %}
+
+{% block content %}
+    <div class="row">
+        {% if not request.is_ajax %}
+            <div class="col-sm-12">
+                <h1>Search Help</h1>
+            </div>
+        {% endif %}
+        <div class="col-sm-12">
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <h3 class="panel-title">Searching Events</h3>
+              </div>
+              <div class="panel-body">
+                <p>
+                Searches for entire query in:
+                    <button type="button" class="btn btn-default btn-xs">name</button>
+                    <button type="button" class="btn btn-default btn-xs">description</button> and 
+                    <button type="button" class="btn btn-default btn-xs">notes</button>
+                </p>
+                <p>You can search for an event by <button type="button" class="btn btn-default btn-xs">event_id</button> by entering an integer, or using the format <code>N01234</code></p>
+                <p>On the search results page you can also specify the date range for the <button type="button" class="btn btn-default btn-xs">start_date</button> of the event</p>
+                <p>Events are sorted in reverse <button type="button" class="btn btn-default btn-xs">start_date</button> order (most recent events at the top)</p>
+              </div>
+            </div>
+
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <h3 class="panel-title">Searching People/Organisations/Venues</h3>
+              </div>
+              <div class="panel-body">
+                <p>
+                Searches for entire search phrase in:
+                    <button type="button" class="btn btn-default btn-xs">name</button>
+                    <button type="button" class="btn btn-default btn-xs">email</button>
+                    <button type="button" class="btn btn-default btn-xs">address</button>
+                    <button type="button" class="btn btn-default btn-xs">notes</button> and 
+                    <button type="button" class="btn btn-default btn-xs">phone</button>
+                </p>
+                <p>You can search for an entry by <button type="button" class="btn btn-default btn-xs">id</button> by entering an integer</p>
+                <p>Entries are sorted in alphabetical order by <button type="button" class="btn btn-default btn-xs">name</button></p>
+              </div>
+            </div>
+
+            {% if perms.RIGS.view_invoice %}
+                <div class="panel panel-default">
+                  <div class="panel-heading">
+                    <h3 class="panel-title">Searching Invoices</h3>
+                  </div>
+                  <div class="panel-body">
+                    <p>
+                    Searches for entire search phrase in:
+                        <button type="button" class="btn btn-default btn-xs">event__name</button>
+                    </p>
+                    <p>You can search for an event's invoice by entering the <button type="button" class="btn btn-default btn-xs">event_id</button> using the format <code>N01234</code></p>
+                    <p>You can search for an invoice by <button type="button" class="btn btn-default btn-xs">invoice_id</button> using the format <code>#01234</code></p>
+                    <p>Entering a raw integer will search by both <button type="button" class="btn btn-default btn-xs">invoice_id</button> and <button type="button" class="btn btn-default btn-xs">event_id</button></p>
+                    <p>Entries are sorted in reverse <button type="button" class="btn btn-default btn-xs">invoice_date</button> order</p>
+                  </div>
+                </div>
+            {% endif %}
+
+            
+
+        </div>
+    </div>
+{% endblock %}

RIGS/test_functional.py

@@ -142,18 +142,41 @@ class UserRegistrationTest(LiveServerTestCase):
         self.assertEqual(password.get_attribute('placeholder'), 'Password')
         self.assertEqual(password.get_attribute('type'), 'password')
 
+        # Expected to fail as not approved
         username.send_keys('TestUsername')
         password.send_keys('correcthorsebatterystaple')
         self.browser.execute_script(
             "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
         password.send_keys(Keys.ENTER)
 
+        # Test approval
+        profileObject = models.Profile.objects.all()[0]
+        self.assertFalse(profileObject.is_approved)
+
+        # Read what the error is
+        alert = self.browser.find_element_by_css_selector(
+            'div.alert-danger').text
+        self.assertIn("approved", alert)
+
+        # Approve the user so we can proceed
+        profileObject.is_approved = True
+        profileObject.save()
+
+        # Retry login
+        self.browser.get(self.live_server_url + '/user/login')
+        username = self.browser.find_element_by_id('id_username')
+        username.send_keys('TestUsername')
+        password = self.browser.find_element_by_id('id_password')
+        password.send_keys('correcthorsebatterystaple')
+        self.browser.execute_script(
+            "return function() {jQuery('#g-recaptcha-response').val('PASSED'); return 0}()")
+        password.send_keys(Keys.ENTER)
+
         # Check we are logged in
         udd = self.browser.find_element_by_class_name('navbar').text
         self.assertIn('Hi John', udd)
 
         # Check all the data actually got saved
-        profileObject = models.Profile.objects.all()[0]
         self.assertEqual(profileObject.username, 'TestUsername')
         self.assertEqual(profileObject.first_name, 'John')
         self.assertEqual(profileObject.last_name, 'Smith')
@@ -232,7 +255,7 @@ class EventTest(LiveServerTestCase):
 
         # Slider expands and save button visible
         self.assertTrue(save.is_displayed())
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
 
         # For now, just check that HTML5 Client validation is in place TODO Test needs rewriting to properly test all levels of validation.
         self.assertTrue(self.browser.find_element_by_id('id_name').get_attribute('required') is not None)
@@ -470,7 +493,7 @@ class EventTest(LiveServerTestCase):
 
         save = self.browser.find_element_by_xpath(
             '(//button[@type="submit"])[3]')
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
 
         # Check the items are visible
         table = self.browser.find_element_by_id('item-table')  # ID number is known, see above
@@ -554,7 +577,7 @@ class EventTest(LiveServerTestCase):
         # Click Rig button
         self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('//*[@id="content"]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
 
         # Set title
@@ -584,7 +607,7 @@ class EventTest(LiveServerTestCase):
         self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
 
         # Same date, end time before start time
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
 
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
@@ -603,7 +626,7 @@ class EventTest(LiveServerTestCase):
         self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
 
         # Same date, end time before start time
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
 
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
@@ -616,7 +639,7 @@ class EventTest(LiveServerTestCase):
         form.find_element_by_id('id_end_time').send_keys('06:00')
 
         # No end date, end time before start time
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
 
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
@@ -635,7 +658,7 @@ class EventTest(LiveServerTestCase):
         self.assertIn("can't finish before it has started", error.find_element_by_xpath('//dd[1]/ul/li').text)
 
         # 2 dates, end after start
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
         self.browser.execute_script("document.getElementById('id_start_date').value='3015-04-24'")
         self.browser.execute_script("document.getElementById('id_end_date').value='3015-04-26'")
@@ -668,7 +691,7 @@ class EventTest(LiveServerTestCase):
         # Click Rig button
         self.browser.find_element_by_xpath('//button[.="Rig"]').click()
 
-        form = self.browser.find_element_by_tag_name('form')
+        form = self.browser.find_element_by_xpath('/html/body/div[2]/div[1]/form')
         save = self.browser.find_element_by_xpath('(//button[@type="submit"])[3]')
 
         # Set title
@@ -1202,3 +1225,47 @@ class TECEventAuthorisationTest(TestCase):
         self.assertEqual(self.event.auth_request_by, self.profile)
         self.assertEqual(self.event.auth_request_to, 'client@functional.test')
         self.assertIsNotNone(self.event.auth_request_at)
+
+
+class SearchTest(LiveServerTestCase):
+    def setUp(self):
+        self.profile = models.Profile(
+            username="SearchTest", first_name="Search", last_name="Test", initials="STU", is_superuser=True)
+        self.profile.set_password("SearchTestPassword")
+        self.profile.save()
+
+        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+
+        self.browser = create_browser()
+        self.browser.implicitly_wait(10)  # Set implicit wait session wide
+
+        os.environ['RECAPTCHA_TESTING'] = 'True'
+
+        models.Event.objects.create(name="Right Event", status=models.Event.PROVISIONAL,
+                                    start_date=date.today(), description="This event is searched for endlessly over and over")
+        models.Event.objects.create(name="Wrong Event", status=models.Event.PROVISIONAL, start_date=date.today(),
+                                    description="This one should never be found.")
+
+    def tearDown(self):
+        self.browser.quit()
+        os.environ['RECAPTCHA_TESTING'] = 'False'
+
+    def test_search(self):
+        self.browser.get(self.live_server_url)
+        username = self.browser.find_element_by_id('id_username')
+        password = self.browser.find_element_by_id('id_password')
+        submit = self.browser.find_element_by_css_selector(
+            'input[type=submit]')
+
+        username.send_keys("SearchTest")
+        password.send_keys("SearchTestPassword")
+        submit.click()
+
+        form = self.browser.find_element_by_id('searchForm')
+        search_box = form.find_element_by_id('id_search_input')
+        search_box.send_keys('Right')
+        search_box.send_keys(Keys.ENTER)
+
+        event_name = self.browser.find_element_by_xpath('//*[@id="content"]/div[1]/div[4]/div/div/table/tbody/tr[1]/td[3]/h4').text
+        self.assertIn('Right', event_name)
+        self.assertNotIn('Wrong', event_name)

RIGS/test_unit.py

@@ -423,3 +423,107 @@ class TestSampleDataGenerator(TestCase):
         from django.core.management.base import CommandError
 
         self.assertRaisesRegex(CommandError, ".*production", call_command, 'generateSampleRIGSData')
+
+
+class TestSearchLogic(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
+                                                    is_active=True, is_staff=True)
+
+        cls.persons = {
+            1: models.Person.objects.create(name="Right Person", phone="1234"),
+            2: models.Person.objects.create(name="Wrong Person", phone="5678"),
+        }
+
+        cls.organisations = {
+            1: models.Organisation.objects.create(name="Right Organisation", email="test@example.com"),
+            2: models.Organisation.objects.create(name="Wrong Organisation", email="check@fake.co.uk"),
+        }
+
+        cls.venues = {
+            1: models.Venue.objects.create(name="Right Venue", address="1 Test Street, EX1"),
+            2: models.Venue.objects.create(name="Wrong Venue", address="2 Check Way, TS2"),
+        }
+
+        cls.events = {
+            1: models.Event.objects.create(name="Right Event", start_date=date.today(), person=cls.persons[1],
+                                           organisation=cls.organisations[1], venue=cls.venues[1]),
+            2: models.Event.objects.create(name="Wrong Event", start_date=date.today(), person=cls.persons[2],
+                                           organisation=cls.organisations[2], venue=cls.venues[2]),
+        }
+
+    def setUp(self):
+        self.profile.set_password('testuser')
+        self.profile.save()
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+    def test_event_search(self):
+        # Test search by name
+        request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].name)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.events[1].name)
+        self.assertNotContains(response, self.events[2].name)
+
+        # Test search by ID
+        request_url = "%s?q=%s" % (reverse('event_archive'), self.events[1].pk)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.events[1].name)
+        self.assertNotContains(response, self.events[2].name)
+
+    def test_people_search(self):
+        # Test search by name
+        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].name)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.persons[1].name)
+        self.assertNotContains(response, self.persons[2].name)
+
+        # Test search by ID
+        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].pk)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.persons[1].name)
+        self.assertNotContains(response, self.persons[2].name)
+
+        # Test search by phone
+        request_url = "%s?q=%s" % (reverse('person_list'), self.persons[1].phone)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.persons[1].name)
+        self.assertNotContains(response, self.persons[2].name)
+
+    def test_organisation_search(self):
+        # Test search by name
+        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].name)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.organisations[1].name)
+        self.assertNotContains(response, self.organisations[2].name)
+
+        # Test search by ID
+        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].pk)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.organisations[1].name)
+        self.assertNotContains(response, self.organisations[2].name)
+
+        # Test search by email
+        request_url = "%s?q=%s" % (reverse('organisation_list'), self.organisations[1].email)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.organisations[1].email)
+        self.assertNotContains(response, self.organisations[2].email)
+
+    def test_venue_search(self):
+        # Test search by name
+        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].name)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.venues[1].name)
+        self.assertNotContains(response, self.venues[2].name)
+
+        # Test search by ID
+        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].pk)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.venues[1].name)
+        self.assertNotContains(response, self.venues[2].name)
+
+        # Test search by address
+        request_url = "%s?q=%s" % (reverse('venue_list'), self.venues[1].address)
+        response = self.client.get(request_url, follow=True)
+        self.assertContains(response, self.venues[1].address)
+        self.assertNotContains(response, self.venues[2].address)

RIGS/urls.py

@@ -7,7 +7,7 @@ from RIGS import models, views, rigboard, finance, ical, versioning, forms
 from django.views.generic import RedirectView
 from django.views.decorators.clickjacking import xframe_options_exempt
 
-from PyRIGS.decorators import permission_required_with_403
+from PyRIGS.decorators import permission_required_with_403, has_oembed
 from PyRIGS.decorators import api_key_required
 
 urlpatterns = [
@@ -19,6 +19,8 @@ urlpatterns = [
 
     path('user/login/embed/', xframe_options_exempt(views.LoginEmbed.as_view()), name='login_embed'),
 
+    url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'),
+
     # People
     url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
         name='person_list'),
@@ -85,8 +87,7 @@ urlpatterns = [
         permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
         name='activity_feed'),
 
-    url(r'^event/(?P<pk>\d+)/$',
+    url(r'^event/(?P<pk>\d+)/$', has_oembed(oembed_view="event_oembed")(
-        permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(
             rigboard.EventDetail.as_view()),
         name='event_detail'),
     url(r'^event/(?P<pk>\d+)/embed/$',

RIGS/views.py

@@ -35,6 +35,20 @@ class Index(generic.TemplateView):
         return context
 
 
+def login(request, **kwargs):
+    if request.user.is_authenticated:
+        next = request.GET.get('next', '/')
+        return HttpResponseRedirect(next)
+    else:
+        from django.contrib.auth.views import login
+
+        return login(request, authentication_form=forms.CheckApprovedForm)
+
+
+class SearchHelp(generic.TemplateView):
+    template_name = 'RIGS/search_help.html'
+
+
 # This view should be exempt from requiring CSRF token.
 # Then we can check for it and show a nice error
 # Don't worry, django.contrib.auth.views.login will
@@ -74,11 +88,20 @@ class PersonList(generic.ListView):
 
     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(email__icontains=q))
+        filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
-        else:
+
-            object_list = self.model.objects.all()
+        # try and parse an int
-        orderBy = self.request.GET.get('orderBy', None)
+        try:
+            val = int(q)
+            filter = filter | Q(pk=val)
+        except:  # noqa
+            # not an integer
+            pass
+
+        object_list = self.model.objects.filter(filter)
+
+        orderBy = self.request.GET.get('orderBy', 'name')
         if orderBy is not None:
             object_list = object_list.order_by(orderBy)
         return object_list
@@ -128,11 +151,20 @@ class OrganisationList(generic.ListView):
 
     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))
+        filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
-        else:
+
-            object_list = self.model.objects.all()
+        # try and parse an int
-        orderBy = self.request.GET.get('orderBy', "")
+        try:
+            val = int(q)
+            filter = filter | Q(pk=val)
+        except:  # noqa
+            # not an integer
+            pass
+
+        object_list = self.model.objects.filter(filter)
+
+        orderBy = self.request.GET.get('orderBy', "name")
         if orderBy is not "":
             object_list = object_list.order_by(orderBy)
         return object_list
@@ -182,11 +214,20 @@ class VenueList(generic.ListView):
 
     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))
+        filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
-        else:
+
-            object_list = self.model.objects.all()
+        # try and parse an int
-        orderBy = self.request.GET.get('orderBy', "")
+        try:
+            val = int(q)
+            filter = filter | Q(pk=val)
+        except:  # noqa
+            # not an integer
+            pass
+
+        object_list = self.model.objects.filter(filter)
+
+        orderBy = self.request.GET.get('orderBy', "name")
         if orderBy is not "":
             object_list = object_list.order_by(orderBy)
         return object_list

templates/registration/activation_complete.html

@@ -5,6 +5,6 @@
 {% block content %}
 <div class="alert alert-success">
 	<h2>Activation Complete</h2>
-	<p>You user account is now fully registered. Enjoy RIGS</p>
+	<p>Your user account is now awaiting administrator approval. Won't be long!</p>
 </div>
 {% endblock %}