Initial work on new checklist handling. No more JSON!

RIGS/forms.py

@@ -4,9 +4,11 @@ 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 django.db import transaction
 from registration.forms import RegistrationFormUniqueEmail
 from django.contrib.auth.forms import AuthenticationForm
 from captcha.fields import ReCaptchaField
+from reversion import revisions as reversion
 import simplejson
 
 from RIGS import models
@@ -18,8 +20,6 @@ forms.DateTimeField.widget = forms.DateTimeInput(attrs={'type': 'datetime-local'
 
 
 # Events Shit
-
-
 class EventForm(forms.ModelForm):
     datetime_input_formats = list(settings.DATETIME_INPUT_FORMATS)
     meet_at = forms.DateTimeField(input_formats=datetime_input_formats, required=False)
@@ -172,6 +172,50 @@ class EventRiskAssessmentForm(forms.ModelForm):
 
 
 class EventChecklistForm(forms.ModelForm):
+    items = {}
+
+    def clean(self):
+        vehicles = {key:val for key, val in self.data.items()
+                   if key.startswith('vehicle')}
+        drivers = {key:val for key, val in self.data.items()
+                   if key.startswith('driver')}
+        for key in vehicles:
+            pk = int(key.split('_')[1])
+            driver_key = 'driver_' + str(pk)
+            if(drivers[driver_key] == ''):
+                raise forms.ValidationError('Add a driver to vehicle ' + str(pk), code='vehicle_mismatch')
+            else:
+                try:
+                    item = models.EventChecklistVehicle.objects.get(pk=pk)
+                except models.EventChecklistVehicle.DoesNotExist:
+                    item = models.EventChecklistVehicle()
+
+                item.vehicle = vehicles['vehicle_' + str(pk)]
+                item.driver = models.Profile.objects.get(pk=drivers['driver_' + str(pk)])
+
+                # item does not have a database pk yet as it isn't saved
+                self.items[pk] = item
+
+        return super(EventChecklistForm, self).clean()
+
+    def save(self, commit=True):
+        checklist = super(EventChecklistForm, self).save(commit=False)
+        if (commit):
+            # Remove all existing, to be recreated from the form
+            checklist.vehicles.all().delete()
+            checklist.save()
+
+            for key in self.items:
+                item = self.items[key]
+                reversion.add_to_revision(item)
+                # finish and save new database items
+                item.checklist = checklist
+                item.save()
+
+        self.items.clear()
+
+        return checklist
+
     class Meta:
         model = models.EventChecklist
         fields = '__all__'

RIGS/hs.py

@@ -100,7 +100,6 @@ class EventChecklistEdit(generic.UpdateView):
         ec = models.EventChecklist.objects.get(pk=pk)
         context['event'] = ec.event
         context['edit'] = True
-        context['vehicles_length'] = range(len(self.object.vehicles))
         return context
 
 class EventChecklistCreate(generic.CreateView):
@@ -132,7 +131,6 @@ class EventChecklistCreate(generic.CreateView):
         epk = self.kwargs.get('pk')
         event = models.Event.objects.get(pk=epk)
         context['event'] = event
-        context['vehicles_length'] = range(2)
         return context
 
     def get_success_url(self):

RIGS/migrations/0046_auto_20200828_1246.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.1 on 2020-08-28 11:46
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('RIGS', '0045_auto_20200824_1431'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='eventchecklist',
+            name='vehicles',
+        ),
+        migrations.AlterField(
+            model_name='eventchecklist',
+            name='power_mic',
+            field=models.ForeignKey(help_text='Who is the Power MIC?', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='checklists', to=settings.AUTH_USER_MODEL, verbose_name='Power MIC'),
+        ),
+        migrations.AlterField(
+            model_name='profile',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+        migrations.CreateModel(
+            name='EventChecklistVehicle',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('vehicle', models.CharField(max_length=255)),
+                ('checklist', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='vehicles', to='RIGS.eventchecklist')),
+                ('driver', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='drivers', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

RIGS/models.py

@@ -505,7 +505,6 @@ class EventAuthorisation(models.Model, RevisionMixin):
         return str("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')')
 
 
-@reversion.register(follow=['payment_set'])
 class Invoice(models.Model):
     event = models.OneToOneField('Event', on_delete=models.CASCADE)
     invoice_date = models.DateField(auto_now_add=True)
@@ -627,15 +626,14 @@ class RiskAssessment(models.Model, RevisionMixin):
     def __str__(self):
         return "%i - %s" % (self.pk, self.event)
 
-@reversion.register
+@reversion.register(follow=['vehicles',])
 class EventChecklist(models.Model, RevisionMixin):
-
     event = models.OneToOneField('Event', on_delete=models.CASCADE)
 
     # General
-    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checklist',
+    power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='checklists', null=True,
                                   verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?")
-    vehicles = models.JSONField(help_text="List vehicles and their drivers", default=dict, null=False)
+    #vehicles = models.JSONField(help_text="List vehicles and their drivers", default=dict, null=False)
 
     # Safety Checks
     safe_parking = models.BooleanField(help_text="Vehicles parked safely?<br><small>(does not obstruct venue access)</small>")
@@ -667,3 +665,13 @@ class EventChecklist(models.Model, RevisionMixin):
 
     def __str__(self):
         return "%i - %s" % (self.pk, self.event)
+
+
+@reversion.register
+class EventChecklistVehicle(models.Model):
+    checklist = models.ForeignKey('EventChecklist', related_name='vehicles', blank=True, on_delete=models.CASCADE)
+    vehicle = models.CharField(max_length=255)
+    driver = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='drivers', on_delete=models.CASCADE)
+
+    def __str__(self):
+        return "{} driven by {}".format(self.vehicle, str(self.driver))

RIGS/static/js/autocompleter.js

@@ -1 +1 @@
-function changeSelectedValue(e,t,a,l){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",l)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?targetObject.attr("disabled",!0):(targetObject.attr("href",update_url),targetObject.attr("disabled",!1))}function initPicker(e){console.log("called!");var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,l=[];if(l.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)l.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return l}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));
+function changeSelectedValue(e,t,a,r){e.find("option").remove(),e.append($("<option></option>").attr("value",t).text(a).data("update_url",r)),e.selectpicker("render"),e.selectpicker("refresh"),e.selectpicker("val",t),e.change()}function refreshUpdateHref(e){targetObject=$("#"+e.attr("id")+"-update"),update_url=$("option:selected",e).data("update_url"),""==update_url?targetObject.attr("disabled",!0):(targetObject.attr("href",update_url),targetObject.attr("disabled",!1))}function initPicker(e){var t={ajax:{url:e.data("sourceurl"),type:"GET",dataType:"json",data:{term:"{{{q}}}"}},locale:{emptyTitle:""},clearOnEmpty:!1,preprocessData:function(e){var t,a=e.length,r=[];if(r.push({text:clearSelectionLabel,value:"",data:{update_url:"",subtext:""}}),a)for(t=0;t<a;t++)r.push($.extend(!0,e[t],{text:e[t].label,value:e[t].pk,data:{update_url:e[t].update,subtext:""}}));return r}};e.prepend($("<option></option>").attr("value","").text(clearSelectionLabel).data("update_url","")),e.selectpicker().ajaxSelectPicker(t),e.change((function(){refreshUpdateHref(e)})),refreshUpdateHref(e)}$(document).ready((function(){clearSelectionLabel="(no selection)",$(".selectpicker").each((function(){initPicker($(this))})),$("#modal").on("hide.bs.modal",(function(e){null!=modaltarget&&""!=modalobject&&changeSelectedValue($(modaltarget),modalobject[0].pk,modalobject[0].fields.name,modalobject[0].update_url)}))}));

RIGS/static/js/src/autocompleter.js

@@ -28,7 +28,6 @@ function refreshUpdateHref(obj) {
 }
 
 function initPicker(obj) {
-    console.log('called!');
 	var options = {
         ajax: {
             url: obj.data('sourceurl'),

RIGS/templates/event_checklist_detail.html

@@ -1,8 +1,6 @@
 {% extends request.is_ajax|yesno:"base_ajax.html,base_rigs.html" %}
-{% block title %}Risk Assessment for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
+{% block title %}Event Checklist for Event N{{ object.event.pk|stringformat:"05d" }} {{ object.event.name }}{% endblock %}
 {% load help_text from filters %}
-{% load get_json_element from filters %}
-{% load get_item from filters %}
 {% load profile_by_index from filters %}
 
 {% block content %}
@@ -24,11 +22,10 @@
                             {{ object.power_mic.name }}
                         </dd>
                     </dl>
-                    <p>{{ object|help_text:'vehicles' }}</p>
+                    <p>List vehicles and their drivers</p>
                     <ul>
-                        {% for i in object.vehicles %}
-
-                            <li>Vehicle <strong>{{ object.vehicles|get_item:i|get_item:'vehicle'|default:'none' }}</strong> driven by <strong>{{ object.vehicles|get_item:i|get_item:'driver'|profile_by_index|default:'nobody'}}</strong></li>
+                        {% for i in object.vehicles.all %}
+                            <li>{{i}}</li>
                         {% endfor %}
                     </ul>
                 </div>

RIGS/templates/event_checklist_form.html

@@ -2,8 +2,6 @@
 {% load widget_tweaks %}
 {% load static %}
 {% load help_text from filters %}
-{% load get_json_element from filters %}
-{% load get_item from filters %}
 {% load profile_by_index from filters %}
 
 {% block title %}{% if edit %}Edit{% else %}Create{% endif %} Event Checklist for Event N{{ event.pk|stringformat:"05d" }}{% endblock %}
@@ -55,39 +53,31 @@
                 $('#medium-event').slideUp();
             }
         });
-        $("form").submit(function( event ) {
-            // Mmmm Javascript data mangling...
-            var raw = $('*[data-serialize]').serializeArray();
-            var post = raw.reduce(function (result, current) {
-                var index = current.name.split('_')[1];
-                var name = current.name.split('_')[0];
-                result[index] = result[index] || {};
-                var nested = result[index] || {};
-                if(current.value):
-                    nested[name] = current.value;
-                result[index] = nested;
-                return result;
-            }, {});
-            $({{form.vehicles.id_for_label}}).val(JSON.stringify(post));
-        });
         $('#vehicle-add').on('click', function (event) {
             event.preventDefault();
             var newID = Number($('#vehiclest').attr('data-pk'));
             $('#vehicles_new').clone().attr('style', "").attr('id', 'vehicles_' + newID).appendTo('#vehiclest');
             $('#vehicles_' + newID).find('select,input').attr('name', function(){
                 return this.name.split('_')[0] + '_' + newID;
-            }).attr('data-serialize', 'true');
+            //Disabled prevents the hidden row being sent to the form
+            }).removeAttr('disabled');
+            $('#vehicles_' + newID).find('button[data-action=delete]').attr('data-id', newID);
             $('#vehicles_' + newID).find('select').addClass('selectpicker');
             $('#vehicles_' + newID).find('.selectpicker').selectpicker('refresh');
             $(".selectpicker").each(function(){initPicker($(this))});
-            $('#vehiclest').attr('data-pk', newID + 1);
+            $('#vehiclest').attr('data-pk', newID - 1);
+        });
+        $('button[data-action=delete]').on('click', function(event) {
+           event.preventDefault();
+            console.log($(this).attr('data-id'));
+           $('#vehicles_' + $(this).attr('data-id')).remove();
         });
     });
     </script>
 {% endblock %}
 
 {% block content %}
-    <div class="col-sm-offset-1 col-sm-10">
+    <div class="col-12">
         <h3>{% if edit %}Edit{% else %}Create{% endif %} Event Checklist for Event N{{ event.pk|stringformat:"05d" }}</h3>
         {% include 'form_errors.html' %}
         {% if edit %}
@@ -122,36 +112,36 @@
                                     {% endif %}
                                 </select>
                             </div>
-                            <label class="col-12 pt-3" for="{{ form.vehicles.id_for_label }}">{{ form.vehicles.help_text }}</label>
-                            <input name="{{ form.vehicles.name }}" id="{{ form.vehicles.id_for_label }}"
-               value="{{ form.vehicles.value }}"/>
+                            <p class="pt-3">List vehicles and their drivers</p>
                             <table class="table">
                                 <thead>
                                     <tr>
                                         <th scope="col">Vehicle</th>
                                         <th scope="col">Driver</th>
+                                        <th scope="col"></th>
                                     </tr>
                                 </thead>
-                                <tbody id="vehiclest" data-pk="2">
+                                <tbody id="vehiclest" data-pk="-1">
                                     <tr id="vehicles_new" style="display: none;">
-                                        <td><input name="vehicle_new" type="text" class="form-control"/></td>
+                                        <td><input type="text" class="form-control" name="vehicle_new" disabled="true"/></td>
                                         <td>
-                                            <select name="driver_new" class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                            <select class="form-control" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" name="driver_new" disabled="true">
                                             </select>
                                         </td>
+                                        <td><button class="btn btn-danger" data-action='delete'><span class="fas fa-times"></span></button</td>
                                     </tr>
                                     {# TODO Add required to all fields on row when one is edited #}
-                                    {% for i in vehicles_length %}
-                                    <tr id="vehicles_{{i}}">
-                                        <td><input name="vehicle_{{i}}" type="text" class="form-control" data-serialize="true" value="{{ form.vehicles.value|get_json_element:i|get_item:'vehicle'|default:'' }}"/></td>
+                                    {% for i in object.vehicles.all %}
+                                    <tr id="vehicles_{{i.pk}}">
+                                        <td><input name="vehicle_{{i.pk}}" type="text" class="form-control" value="{{ i.vehicle }}"/></td>
                                         <td>
-                                            <select name="driver_{{i}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" data-serialize="true">
-                                            {% if form.vehicles.value|get_json_element:i|get_item:'driver' is not 0 %}
-                                                <option value="{{ form.vehicles.value|get_json_element:i|get_item:'driver'|default:'0' }}" selected="selected">{{form.vehicles.value|get_json_element:i|get_item:'driver'|profile_by_index}}</option>
-                                            {% endif %}
+                                            <select name="driver_{{i.pk}}" class="form-control selectpicker" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials">
+                                                {% if i.driver != '' %}
+                                                    <option value="{{i.driver.pk}}" selected="selected">{{ i.driver.name }}</option>
+                                                {% endif %}
                                             </select>
                                         </td>
-                                        {# TODO Delete functionality <td><button class="btn btn-danger" data-id='{{i}}' data-action='delete'><span class="fas fa-times"></span></button</td>#}
+                                        <td><button class="btn btn-danger" data-id='{{i.pk}}' data-action='delete'><span class="fas fa-times"></span></button</td>
                                     </tr>
                                     {% endfor %}
                                 </tbody>

RIGS/templates/hs_list.html

@@ -39,8 +39,12 @@
                 {% endif %}
             </td>
             <td>
-                <a href="{% url 'event_ec' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
-                class="hidden-xs">Create Event Checklist</span></a>
+                {% if event.eventchecklist %}
+                    <a class="btn btn-primary" href="{% url 'ec_detail' event.eventchecklist.pk %}">View</a>
+                {% else %}
+                    <a href="{% url 'event_ec' event.pk %}" class="btn btn-success"><span class="fas fa-paperclip"></span> <span
+                    class="hidden-xs">Create Event Checklist</span></a>
+                {% endif %}
             </td>
         </tr>
         {% empty %}

RIGS/templates/invoice_detail.html

@@ -53,13 +53,13 @@
             {% endif %}
         </div>
 
-        <div class="row">
+        <div class="row py-4">
             <div class="col-sm-6">
                 <div class="card card-default">
                     <div class="card-body">
-                        <div class="pull-right">
+                        <div class="text-right py-3">
                             <a href="{% url 'payment_create' %}?invoice={{ object.pk }}"
-                               class="btn btn-default modal-href"
+                               class="btn btn-success modal-href"
                                data-target="#{{ form.person.id_for_label }}">
                                 <span class="fas fa-plus"></span> Add
                             </a>
@@ -104,7 +104,9 @@
                     </div>
                 </div>
             </div>
-            {% include 'partials/last_edited.html' with target="invoice_history" %}
+            <div class="col-12 text-right">
+                {% include 'partials/last_edited.html' with target="invoice_history" %}
+            </div>
         </div>
     </div>
 {% endblock %}

RIGS/templatetags/filters.py

@@ -137,19 +137,6 @@ def profile_by_index(value):
     else:
         return ""
 
-#TODO More sensible returns
-@register.filter
-def get_json_element(value, element):
-    try:
-        return json.loads(value)[str(element)]
-    except Exception as e:
-        return None
-
-@register.filter
-def get_item(dictionary, key):
-    if(type(dictionary) is dict):
-        return dictionary.get(key)
-
 @register.filter
 def next(alist, current_index):
     """

RIGS/urls.py

@@ -115,6 +115,9 @@ urlpatterns = [
          name='ec_history', kwargs={'model': models.EventChecklist}),
     path('event/checklist/list', permission_required_with_403('RIGS.change_event')(hs.EventChecklistList.as_view()),
          name='ec_list'),
+    # TEMPORARY
+    path('event/vehicle/<int:pk>/history/', permission_required_with_403('RIGS.change_event')(versioning.VersionHistory.as_view()),
+         name='vc_history', kwargs={'model': models.EventChecklistVehicle}),
 
     # Finance
     path('invoice/', permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),