From c449f26ad7867ec414d5325efad8ca6c7334323a Mon Sep 17 00:00:00 2001 From: Starthur Date: Mon, 1 Aug 2022 22:15:42 +0200 Subject: [PATCH 1/2] Check FK to print value in scoreboard --- .../templates/scoreboard/scoreboard.html | 14 +++++++------- src/scoreboard/views.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/scoreboard/templates/scoreboard/scoreboard.html b/src/scoreboard/templates/scoreboard/scoreboard.html index af7442b..798b24b 100644 --- a/src/scoreboard/templates/scoreboard/scoreboard.html +++ b/src/scoreboard/templates/scoreboard/scoreboard.html @@ -28,9 +28,9 @@ {% endif %} - {% if s.user.userprofileinfo.intra42_campus %} - - {{ s.user.userprofileinfo.intra42_campus }} + {% if s.user.userprofileinfo.campus %} + + {{ s.user.userprofileinfo.campus }} {% endif %} @@ -39,25 +39,25 @@ {% endfor %} - + - + diff --git a/src/scoreboard/views.py b/src/scoreboard/views.py index 1aeb356..c5fb031 100644 --- a/src/scoreboard/views.py +++ b/src/scoreboard/views.py @@ -10,7 +10,7 @@ def scoreboard(request): return render(request, 'scoreboard/scoreboard.html', {'scores':scores_p}) def campus(request, campus): - scores = UserProfileInfo.objects.filter(score__gt=0, intra42_campus__exact=campus).select_related().order_by('-score', 'last_submission_date', 'user__username') + scores = UserProfileInfo.objects.filter(score__gt=0, campus__name__exact=campus).select_related().order_by('-score', 'last_submission_date', 'user__username') paginator = Paginator(scores, 20) page = request.GET.get('page') scores_p = paginator.get_page(page) From ff23250275fd0ca72724fa5d97573cd34ab7403a Mon Sep 17 00:00:00 2001 From: Starthur Date: Mon, 1 Aug 2022 22:15:58 +0200 Subject: [PATCH 2/2] Remove old field --- src/accounts/admin.py | 6 ++--- .../migrations/0012_auto_20220801_2212.py | 25 +++++++++++++++++++ src/accounts/models.py | 4 +-- 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 src/accounts/migrations/0012_auto_20220801_2212.py diff --git a/src/accounts/admin.py b/src/accounts/admin.py index 03dfdfb..441b02c 100644 --- a/src/accounts/admin.py +++ b/src/accounts/admin.py @@ -8,10 +8,10 @@ from .models import Campus @admin.register(UserProfileInfo) class userprofile(admin.ModelAdmin): #list display - list_display = ['user', 'score', 'last_submission_date', 'intra42_campus'] + list_display = ['user', 'score', 'last_submission_date', 'campus'] # search list - search_fields = ['score', 'user__username', 'intra42_campus'] + search_fields = ['score', 'user__username', 'campus'] @admin.register(Campus) class campus(admin.ModelAdmin): - list_display = ['name'] \ No newline at end of file + list_display = ['name'] diff --git a/src/accounts/migrations/0012_auto_20220801_2212.py b/src/accounts/migrations/0012_auto_20220801_2212.py new file mode 100644 index 0000000..0fdf7e2 --- /dev/null +++ b/src/accounts/migrations/0012_auto_20220801_2212.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.11 on 2022-08-01 20:12 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('accounts', '0011_migration_campus'), + ] + + operations = [ + migrations.AlterModelOptions( + name='userprofileinfo', + options={'ordering': ['-score', 'last_submission_date', 'user__username', 'campus'], 'permissions': (('view_info', 'View user info'),), 'verbose_name': 'profile', 'verbose_name_plural': 'profiles'}, + ), + migrations.RemoveField( + model_name='userprofileinfo', + name='intra42_campus', + ), + migrations.RemoveField( + model_name='userprofileinfo', + name='intra42_campus_id', + ), + ] diff --git a/src/accounts/models.py b/src/accounts/models.py index 7bf0c2a..0514306 100644 --- a/src/accounts/models.py +++ b/src/accounts/models.py @@ -14,15 +14,13 @@ class UserProfileInfo(models.Model): discord_id = models.CharField(max_length=20, null=True, blank=True, unique=True) intra42_id = models.CharField(max_length=20, null=True, blank=True, unique=True) campus = models.ForeignKey('Campus', on_delete=models.DO_NOTHING, null=True, blank=True) - intra42_campus = models.CharField(max_length=50, null=True, blank=True) - intra42_campus_id = models.CharField(max_length=10, null=True, blank=True) member = models.BooleanField(default=False) member_since = models.DateTimeField('Member since', default=timezone.now) member_until = models.DateTimeField('Member until', default=timezone.now) def __str__(self): return self.user.username class Meta: - ordering = ['-score', 'last_submission_date', 'user__username', 'intra42_campus'] + ordering = ['-score', 'last_submission_date', 'user__username', 'campus'] verbose_name = 'profile' verbose_name_plural = 'profiles' permissions = (("view_info", "View user info"),)