feat: add always_allow_students to Group model and update UI in sport comples view

Author: GrigsyChudin

adminpage/sport/admin/groupAdmin.py

@@ -93,6 +93,7 @@ class GroupAdmin(DefaultFilterMixIn):
         'trainers',
         'allowed_students',
         'banned_students',
+        'always_allow_students',
     )
 
     list_filter = (
@@ -131,6 +132,7 @@ class GroupAdmin(DefaultFilterMixIn):
         "allowed_education_level",
         "allowed_medical_groups",
         "allowed_gender",
+        "always_allow_students",
         "allowed_students",
         "banned_students",
     )

adminpage/sport/models/group.py

@@ -14,7 +14,6 @@ class Group(models.Model):
     trainer = models.ForeignKey('Trainer', on_delete=models.SET_NULL, null=True, blank=True, verbose_name='teacher')
     trainers = models.ManyToManyField('Trainer', related_name='m2m', blank=True, verbose_name='teachers')
     accredited = models.BooleanField(default=True, null=False)
-
     # minimum_medical_group = models.ForeignKey('MedicalGroup', on_delete=models.DO_NOTHING, null=True, blank=True)
     allowed_education_level = models.IntegerField(
         choices=EducationLevelChoice.choices,
@@ -48,6 +47,12 @@ class Group(models.Model):
         blank=True,
         help_text='List of students that can not attend classes. The students will not see the training, and the teacher will not be able to set hours for these students.'
     )
+    always_allow_students = models.ManyToManyField(
+        'Student',
+        related_name='always_allow_groups',
+        blank=True,
+        help_text='List of students that are always allowed to attend classes.'
+    )
 
     class Meta:
         db_table = "group"

adminpage/sport/templates/sport_complex.html

@@ -34,11 +34,29 @@ <h2>{{ training.formatted_timerange }}:</h2>
                 <span>({{ training.location }})</span>
             </div>
             <div class="checkins">
-                {% for formatted_trainer in training.trainers %}
-                    <p>Тренер: {{ formatted_trainer }}</p>
-                {% endfor %}
+                {% if training.trainers|length == 1 %}
+                    <p><strong>Тренер:</strong> <span style="color: #2e7d32;">✔ {{ training.trainers.0 }}</span></p>
+                {% elif training.trainers|length > 1 %}
+                    <p><strong>Тренеры:</strong></p>
+                    {% for formatted_trainer in training.trainers %}
+                        <p style="color: #2e7d32; margin-left: 10px;">✔ {{ formatted_trainer }}</p>
+                    {% endfor %}
+                {% endif %}
+
+                <hr>
+
+                {% if training.always_allow %}
+                    <p><strong>Всегда пропускать (основная команда):</strong></p>
+                    {% for person in training.always_allow %}
+                        <p style="color: #2e7d32;">✔ {{ person }}</p>
+                    {% endfor %}
+                {% endif %}
+
+                <p><strong>Отметились на занятие:</strong></p>
                 {% for formatted_student in training.checkins %}
-                    <p>{{ formatted_student }}</p>
+                    <p style="color: #2e7d32;">✔ {{ formatted_student }}</p>
+                {% empty %}
+                    <p style="color: #999; font-style: italic;">Пока никто не отметился</p>
                 {% endfor %}
             </div>
         </div>

adminpage/sport/views/sport_complex.py

@@ -20,8 +20,16 @@ def sport_complex_view(request, **kwargs):
             end__gte=now,  # And not finished yet
         )
         .order_by("start")
-        .select_related("group", "group__sport", "training_class")
-        .prefetch_related("group__trainers__user", "checkins__student__user")
+        .select_related(
+            "group",
+            "group__sport",
+            "training_class",
+        )
+        .prefetch_related(
+            "group__trainers__user",
+            "checkins__student__user",
+            "group__always_allow_students__user",
+        )
     )
 
     today_schedule_with_checkins = [
@@ -33,6 +41,10 @@ def sport_complex_view(request, **kwargs):
             "trainers": sorted([
                 f"{trainer.user.get_full_name()} ({trainer.user.email})" for trainer in training.group.trainers.all()
             ]),
+            "always_allow": sorted([
+                f"{student.user.get_full_name()} ({student.user.email})" for student in
+                training.group.always_allow_students.all()
+            ]),
             "checkins": sorted([
                 f"{checkin.student.user.get_full_name()} ({checkin.student.user.email})" for checkin in training.checkins.all()
             ]),