Compare commits
3 Commits
ff23250275
...
5ee37f61cf
Author | SHA1 | Date |
---|---|---|
Starthur | 5ee37f61cf | |
Starthur | 3f82dd50bd | |
Starthur | 121d06aff2 |
|
@ -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):
|
||||
|
|
|
@ -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',
|
||||
),
|
||||
]
|
|
@ -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"),)
|
||||
|
|
|
@ -27,7 +27,7 @@ def actualize_points(ctf):
|
|||
|
||||
def category(request, cat_slug):
|
||||
cat = get_object_or_404(Category, slug=cat_slug)
|
||||
ctfs = CTF.objects.filter(category=cat, event=None, disabled=False).order_by('points')
|
||||
ctfs = CTF.objects.filter(category=cat, event=None, disabled=False).order_by('points', 'solved_num')
|
||||
for ex in ctfs:
|
||||
ex.solved_num = CTF_flags.objects.filter(ctf=ex).count()
|
||||
ex.solved = ex.solved_by(request.user)
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue