Compare commits

...

4 Commits

Author SHA1 Message Date
Danhia 1ee02fc964 Merge pull request 'fix-campus-in-scoreboard' (#65) from fix-campus-in-scoreboard into main
Reviewed-on: 42CTF/website#65
Reviewed-by: Danhia <danhia@protonmail.com>
2022-08-01 22:21:44 +02:00
Starthur ff23250275
Remove old field 2022-08-01 22:18:23 +02:00
Starthur c449f26ad7
Check FK to print value in scoreboard 2022-08-01 22:18:23 +02:00
Danhia 42858e4342 Hotfix for indentation error 2022-07-02 00:26:12 +02:00
6 changed files with 39 additions and 16 deletions

View File

@ -8,9 +8,9 @@ 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):

View File

@ -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',
),
]

View File

@ -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"),)

View File

@ -28,9 +28,9 @@
{% endif %}
</td>
<td>
{% if s.user.userprofileinfo.intra42_campus %}
<a href="{% url 'scoreboard:campus' campus=s.user.userprofileinfo.intra42_campus %}">
{{ s.user.userprofileinfo.intra42_campus }}
{% if s.user.userprofileinfo.campus %}
<a href="{% url 'scoreboard:campus' campus=s.user.userprofileinfo.campus %}">
{{ s.user.userprofileinfo.campus }}
</a>
{% endif %}
</td>

View File

@ -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)