This commit is contained in:
2020-08-29 17:31:41 +01:00
parent d708207ab9
commit 1feb9449ed
9 changed files with 27 additions and 14 deletions

View File

@@ -175,9 +175,9 @@ 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()
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])

View File

@@ -89,6 +89,7 @@ class EventChecklistDetail(generic.DetailView):
model = models.EventChecklist
template_name = 'event_checklist_detail.html'
class EventChecklistEdit(generic.UpdateView):
model = models.EventChecklist
template_name = 'event_checklist_form.html'
@@ -102,6 +103,7 @@ class EventChecklistEdit(generic.UpdateView):
context['edit'] = True
return context
class EventChecklistCreate(generic.CreateView):
model = models.EventChecklist
template_name = 'event_checklist_form.html'

View File

@@ -473,6 +473,7 @@ class Event(models.Model, RevisionMixin):
self.full_clean()
super(Event, self).save(*args, **kwargs)
class EventItem(models.Model):
event = models.ForeignKey('Event', related_name='items', blank=True, on_delete=models.CASCADE)
name = models.CharField(max_length=255)
@@ -633,7 +634,8 @@ class RiskAssessment(models.Model, RevisionMixin):
def __str__(self):
return "%i - %s" % (self.pk, self.event)
@reversion.register(follow=['vehicles',])
@reversion.register(follow=['vehicles', ])
class EventChecklist(models.Model, RevisionMixin):
event = models.OneToOneField('Event', on_delete=models.CASCADE)

View File

@@ -142,6 +142,8 @@ def send_admin_awaiting_approval_email(user, request, **kwargs):
user_activated.connect(send_admin_awaiting_approval_email)
# TODO Move
def update_cache(sender, instance, created, **kwargs):
cache.clear()

View File

@@ -22,6 +22,7 @@ from functools import reduce
from PyRIGS.views import GenericListView
class PersonList(GenericListView):
template_name = 'person_list.html'
model = models.Person