From 971cb5d12dfc21dfa01853d70165288c23db457f Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 21 Jan 2018 11:43:41 +1100 Subject: [PATCH] Expand admin ui for checkins to be useful for admins ... also (and this really should be another commit, I am a horrible person) change name of exception text fields --- vendor/regidesk/regidesk/admin.py | 6 ++--- .../migrations/0004_auto_20180121_1140.py | 25 +++++++++++++++++++ vendor/regidesk/regidesk/models.py | 8 +++--- .../templates/regidesk/ci_overview.html | 2 +- 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 vendor/regidesk/regidesk/migrations/0004_auto_20180121_1140.py diff --git a/vendor/regidesk/regidesk/admin.py b/vendor/regidesk/regidesk/admin.py index 48567f33..ae49cbc9 100644 --- a/vendor/regidesk/regidesk/admin.py +++ b/vendor/regidesk/regidesk/admin.py @@ -19,8 +19,8 @@ admin.site.register( BoardingPass, admin.site.register( CheckIn, - list_display=['user','seen','checked_in','checkin_code'], - search_fields=['user','checkin_code'], - filter_fields=['seen','checked_in'], + list_display=['user','seen','checked_in','checkin_code','checked_in_bool','badge_printed','schwag_given','needs_review'], + search_fields=['user__username','checkin_code'], + list_filter=['seen','checked_in',"checked_in_bool","badge_printed","schwag_given"], readonly_fields=['user','seen','checked_in','checkin_code'] ) diff --git a/vendor/regidesk/regidesk/migrations/0004_auto_20180121_1140.py b/vendor/regidesk/regidesk/migrations/0004_auto_20180121_1140.py new file mode 100644 index 00000000..4358dca8 --- /dev/null +++ b/vendor/regidesk/regidesk/migrations/0004_auto_20180121_1140.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.9 on 2018-01-21 00:40 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('regidesk', '0003_auto_20180121_1023'), + ] + + operations = [ + migrations.RenameField( + model_name='checkin', + old_name='exception_set', + new_name='needs_review', + ), + migrations.RenameField( + model_name='checkin', + old_name='exception_text', + new_name='review_text', + ), + ] diff --git a/vendor/regidesk/regidesk/models.py b/vendor/regidesk/regidesk/models.py index 6589ee9d..d36bb301 100644 --- a/vendor/regidesk/regidesk/models.py +++ b/vendor/regidesk/regidesk/models.py @@ -74,8 +74,8 @@ class CheckIn(models.Model): badge_printed = models.BooleanField(default=False) schwag_given = models.BooleanField(default=False) checked_in_bool = models.BooleanField(default=False) - exception_set = models.BooleanField(default=False) - exception_text = models.TextField(blank=True) + needs_review = models.BooleanField(default=False) + review_text = models.TextField(blank=True) class Meta: permissions = ( @@ -108,8 +108,8 @@ class CheckIn(models.Model): self.save() def set_exception(self, text): - self.exception_set = True - self.exception_text = text + self.needs_review = True + self.review_text = text self.save() @property diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html index 35324ebc..ed792a4f 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html @@ -92,7 +92,7 @@
Log Exception
- +

Reminder: Please tell attendee to email boarding@lca2018.org with the details as well