From 5f5161e6cea9eea185d0b6345af5324003aaea78 Mon Sep 17 00:00:00 2001 From: bebra_dev Date: Tue, 14 Jan 2025 21:55:02 +0300 Subject: [PATCH] Revert "chore: now its available to add allowed_students to the group" This reverts commit 4983b94e3d1bc36303a313aa723bd56338821087. --- adminpage/api/crud/crud_training.py | 3 +-- adminpage/sport/admin/groupAdmin.py | 2 -- .../migrations/0124_group_allowed_students.py | 18 ------------------ .../0125_alter_group_allowed_students.py | 18 ------------------ adminpage/sport/models/group.py | 1 - 5 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 adminpage/sport/migrations/0124_group_allowed_students.py delete mode 100644 adminpage/sport/migrations/0125_alter_group_allowed_students.py diff --git a/adminpage/api/crud/crud_training.py b/adminpage/api/crud/crud_training.py index cffa0af5..4f32a629 100644 --- a/adminpage/api/crud/crud_training.py +++ b/adminpage/api/crud/crud_training.py @@ -74,7 +74,6 @@ def can_check_in( ) free_places = training.group.capacity - training.checkins.count() allowed_medical_groups = training.group.allowed_medical_groups.all() - allowed_students = training.group.allowed_students.all() # All conditions must be True for the student to be able to check in. result = ( @@ -82,7 +81,7 @@ def can_check_in( training.start < (time_now + _week_delta) and time_now < training.end and (total_hours + training.academic_duration) <= 4 and (same_type_hours + training.academic_duration) <= 2 and - (student.medical_group in allowed_medical_groups or student in allowed_students) and + student.medical_group in allowed_medical_groups and training.group.allowed_gender in (student.gender, -1) ) diff --git a/adminpage/sport/admin/groupAdmin.py b/adminpage/sport/admin/groupAdmin.py index 287e3b7a..afd0b476 100644 --- a/adminpage/sport/admin/groupAdmin.py +++ b/adminpage/sport/admin/groupAdmin.py @@ -91,7 +91,6 @@ class GroupAdmin(DefaultFilterMixIn): "sport", # "trainer", 'trainers', - 'allowed_students', ) list_filter = ( @@ -129,7 +128,6 @@ class GroupAdmin(DefaultFilterMixIn): "trainers", "allowed_medical_groups", "allowed_gender", - "allowed_students", ) def get_changeform_initial_data(self, request): diff --git a/adminpage/sport/migrations/0124_group_allowed_students.py b/adminpage/sport/migrations/0124_group_allowed_students.py deleted file mode 100644 index 58fcb462..00000000 --- a/adminpage/sport/migrations/0124_group_allowed_students.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.1.3 on 2025-01-14 14:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('sport', '0123_auto_20230205_1938'), - ] - - operations = [ - migrations.AddField( - model_name='group', - name='allowed_students', - field=models.ManyToManyField(related_name='allowed_groups', to='sport.student'), - ), - ] diff --git a/adminpage/sport/migrations/0125_alter_group_allowed_students.py b/adminpage/sport/migrations/0125_alter_group_allowed_students.py deleted file mode 100644 index ab7150fd..00000000 --- a/adminpage/sport/migrations/0125_alter_group_allowed_students.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.1.3 on 2025-01-14 18:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('sport', '0124_group_allowed_students'), - ] - - operations = [ - migrations.AlterField( - model_name='group', - name='allowed_students', - field=models.ManyToManyField(blank=True, related_name='allowed_groups', to='sport.student'), - ), - ] diff --git a/adminpage/sport/models/group.py b/adminpage/sport/models/group.py index a410bc64..35b0b7d0 100644 --- a/adminpage/sport/models/group.py +++ b/adminpage/sport/models/group.py @@ -26,7 +26,6 @@ class Group(models.Model): default=-1, verbose_name="Is a QR required?" ) - allowed_students = models.ManyToManyField('Student', related_name='allowed_groups', blank=True) class Meta: db_table = "group"