Merge pull request #98 from HackAssistant/meals

Modified meals permissions and added checkin admin to change QR codes

Author: Casassarnau

event/apps.py

@@ -12,14 +12,21 @@ def create_new_permissions(self):
         from application.models import ApplicationTypeConfig
 
         permissions = ['can_checkin', ]
+        not_type_permissions = ['can_checkin_meal', ]
 
         content_type = ContentType.objects.get_or_create(app_label='event', model='event')[0]
 
+        for permission in not_type_permissions:
+            name = permission.replace('_', ' ').capitalize()
+            Permission.objects.get_or_create(codename=permission, defaults={'name': name,
+                                                                            'content_type': content_type})
+
+        application_types = ApplicationTypeConfig.objects.all()
+
         for permission in permissions:
             name = permission.replace('_', ' ').capitalize()
-            Permission.objects.get_or_create(codename=permission, defaults={'name': 'Can checkin',
+            Permission.objects.get_or_create(codename=permission, defaults={'name': name,
                                                                             'content_type': content_type})
-            application_types = ApplicationTypeConfig.objects.all()
             for application_type in application_types:
                 Permission.objects.get_or_create(
                     codename='%s_%s' % (permission, application_type.name.lower()),

event/meals/migrations/0003_alter_meal_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.8 on 2022-12-29 11:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meals', '0002_alter_meal_options'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='meal',
+            options={},
+        ),
+    ]

event/meals/models.py

@@ -1,7 +1,6 @@
 from django.db import models
 from user.models import User
 
-from django.utils.translation import gettext_lazy as _
 
 MEAL_TYPE = (
     ('B', 'Breakfast'),
@@ -32,11 +31,6 @@ def __str__(self):
     def eaten(self):
         return self.eaten_set.count()
 
-    class Meta:
-        permissions = (
-            ('can_checkin_meals', _('Can checkin meals')),
-        )
-
 
 class Eaten(models.Model):
     """Represents when a hacker has eatean a meal"""

event/meals/views.py

@@ -15,15 +15,8 @@
 from user.models import User
 
 
-# TODO: create --> meal list
-#   First meal, closest to time
-#   API amb python
-# TODO: QR view (que el meal seleccionat no és actual)
-# TODO: optional: meal edit i meal create (UI)
-
-
 class MealsList(PermissionRequiredMixin, SingleTableMixin, TemplateView):
-    permission_required = 'meals.can_checkin_meals'
+    permission_required = 'event.can_checkin_meal'
     template_name = 'meals_list.html'
     table_class = MealsTable
 
@@ -33,12 +26,16 @@ def get_queryset(self):
 
 class CheckinMeal(PermissionRequiredMixin, SingleTableMixin, FilterView):
     template_name = 'checkin_meal.html'
-    permission_required = 'meals.can_checkin_meals'
+    permission_required = 'event.can_checkin_meal'
     table_class = CheckinMealTable
     filterset_class = MealsTableFilter
 
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
+    def handle_no_permission(self):
+        if self.request.method == 'POST':
+            if not self.request.user.is_authenticated:
+                return JsonResponse({'errors': ['Unauthorized, you are not logged in.']}, status=401)
+            return JsonResponse({'errors': ['You have no permissions.']}, status=403)
+        return super().handle_no_permission()
 
     def get_queryset(self):
         return get_user_model().objects.filter(application__status=Application.STATUS_ATTENDED,

event/templates/checkin_list.html

@@ -10,7 +10,21 @@
 
 {% block content %}
 
-    <h1 class="mt-3">{% translate 'Checkin users' %}</h1>
+    <div class="row m-0 mt-3">
+        <div class="col-lg-9">
+            <h1 class="">{% translate 'Checkin users' %}{% if admin %} {% translate 'admin' %}{% endif %}</h1>
+        </div>
+        {% if request.user.is_staff and not admin %}
+            <div class="col-lg-3">
+                <a class="btn btn-secondary col-12" href="{% url 'checkin_list_admin' %}">{% translate 'Admin checkin' %}</a>
+            </div>
+        {% else %}
+            <div class="col-lg-3">
+                <a class="btn btn-secondary col-12" href="{% url 'checkin_list' %}"><i class="bi bi-caret-left-fill"></i> {% translate 'Back' %}</a>
+            </div>
+        {% endif %}
+    </div>
+
 
     <div class="mt-2" style="display: flex">
         <form method="get" id="filter-form" style="width: 100%" class="mr-2">

event/templates/checkin_user.html

@@ -42,7 +42,7 @@
                                     <div class="mb-3 ms-3 me-3">
                                         <video id="qr-video" style="width: 100%; height: auto; display: none"></video>
                                         <div style="position: relative">
-                                            <input type="text" name="qr_code" class="form-control bg-{{ theme }} text-white" placeholder="{% translate 'QR code' %}" id="id_qr_code">
+                                            <input type="text" name="qr_code" class="form-control bg-{{ theme }} text-{% if theme == 'dark' %}white{% else %}black{% endif %}" placeholder="{% translate 'QR code' %}" id="id_qr_code">
                                             <i id="button-rescan" class="bi bi-arrow-repeat fs-4" style="display: none; position: absolute; z-index: 1; right: 3%; top: 7%; cursor: pointer"></i>
                                         </div>
                                     </div>

event/templates/tables/checkin_action.html

@@ -1 +1 @@
-<a class="btn btn-primary btn-sm" href='{% url 'checkin_user' record.get_encoded_pk %}'>Check-in</a>
+<a class="btn btn-primary btn-sm" href='{% url 'checkin_user' record.get_encoded_pk %}?next={{ request.get_full_path|urlencode }}'>Check-in</a>

event/urls.py

@@ -5,6 +5,7 @@
 
 urlpatterns = [
     path('checkin/', views.CheckinList.as_view(), name='checkin_list'),
+    path('checkin/admin/', views.CheckinAdminList.as_view(), name='checkin_list_admin'),
     path('checkin/<str:uid>/', views.CheckinUser.as_view(), name='checkin_user'),
 ]
 

event/views.py

@@ -5,6 +5,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.db import transaction
+from django.db.models import Q
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.views.generic import TemplateView
@@ -25,8 +26,9 @@ class CheckinList(AnyApplicationPermissionRequiredMixin, SingleTableMixin, Filte
     filterset_class = CheckinTableFilter
 
     def get_queryset(self):
-        return get_user_model().objects.filter(application__status=Application.STATUS_CONFIRMED,
-                                               application__edition=Edition.get_default_edition()).distinct()
+        return get_user_model().objects.filter(Q(application__status=Application.STATUS_CONFIRMED,
+                                                 application__edition=Edition.get_default_edition()) |
+                                               Q(groups__name='Organizer', qr_code='')).distinct()
 
 
 class CheckinUser(TemplateView):
@@ -41,14 +43,23 @@ def has_permission(self, types):
                 return False
         return True
 
+    def get_accepted_status_to_checkin(self):
+        accepted_status = [Application.STATUS_CONFIRMED]
+        if self.request.user.is_staff:
+            accepted_status.append(Application.STATUS_ATTENDED)
+        return accepted_status
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         User = get_user_model()
         try:
             uid = User.decode_encoded_pk(kwargs.get('uid'))
             user = User.objects.get(pk=uid)
-            application_types = user.application_set.actual().filter(status=Application.STATUS_CONFIRMED)\
-                .values_list('type__name', flat=True)
+            accepted_status = self.get_accepted_status_to_checkin()
+            application_types = list(user.application_set.actual().filter(status__in=accepted_status)
+                                     .values_list('type__name', flat=True))
+            if user.is_organizer():
+                application_types.append('Organizer')
             context.update({'app_user': user, 'types': application_types,
                             'has_permission': self.has_permission(types=application_types)})
         except (User.DoesNotExist, ValueError):
@@ -61,26 +72,60 @@ def get_code(self):
             return ''.join([choice(string.ascii_letters + string.digits + string.punctuation) for i in range(12)])
         return qr_code
 
+    def manage_application_confirm(self, application):
+        application.set_status(Application.STATUS_ATTENDED)
+        application.save()
+        application_log = ApplicationLog(application=application, user=self.request.user, comment='',
+                                         name='Checked-in')
+        application_log.changes = {'status': {'new': Application.STATUS_ATTENDED,
+                                              'old': Application.STATUS_CONFIRMED}}
+        application_log.save()
+
+    def manage_application_attended(self, application):
+        application_log = ApplicationLog(application=application, user=self.request.user, comment='',
+                                         name='Changed QR code')
+        application_log.save()
+
+    def redirect_successful(self):
+        next_ = self.request.GET.get('next', reverse('checkin_list'))
+        if next_[0] != '/':
+            next_ = reverse('checkin_list')
+        return redirect(next_)
+
     def post(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
         qr_code = self.get_code()
         if context['has_permission'] and len(context['types']) > 0 and qr_code is not None:
             user = context['app_user']
             user.qr_code = qr_code
-            applications = user.application_set.actual().filter(status=Application.STATUS_CONFIRMED)\
+            accepted_status = self.get_accepted_status_to_checkin()
+            applications = user.application_set.actual().filter(status__in=accepted_status)\
                 .select_related('type')
             groups = Group.objects.filter(name__in=context['types'])
             with transaction.atomic():
                 user.save()
                 user.groups.add(*groups)
                 for application in applications:
-                    application.set_status(Application.STATUS_ATTENDED)
-                    application.save()
-                    application_log = ApplicationLog(application=application, user=request.user, comment='',
-                                                     name='Checked-in')
-                    application_log.changes = {'status': {'new': Application.STATUS_ATTENDED,
-                                                          'old': Application.STATUS_CONFIRMED}}
-                    application_log.save()
-            return redirect(reverse('checkin_list'))
+                    if application.status == Application.STATUS_CONFIRMED:
+                        self.manage_application_confirm(application)
+                    else:
+                        self.manage_application_attended(application)
+            messages.success(request, _('User checked in!'))
+            return self.redirect_successful()
         messages.error(request, _('Permission denied'))
         return self.render_to_response(context)
+
+
+class CheckinAdminList(CheckinList):
+    def get_queryset(self):
+        if self.request.user.is_staff:
+            return get_user_model().objects.filter(Q(application__status__in=[Application.STATUS_CONFIRMED,
+                                                                              Application.STATUS_ATTENDED],
+                                                     application__edition=Edition.get_default_edition()) |
+                                                   Q(groups__name='Organizer')).distinct()
+        return get_user_model().objects.none()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update({'admin': True})
+        return context