From ddf87afeaaf0aeee0200d0774519c4cb73bc36c5 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Fri, 8 Jun 2018 19:44:32 +0200 Subject: [PATCH 1/9] Create UserSchool model and data migrations. --- .../migrations/0017_auto_20180607_1156.py | 32 +++++++++++++++++ .../migrations/0018_auto_20180607_1158.py | 36 +++++++++++++++++++ trojsten/people/models.py | 14 ++++++++ 3 files changed, 82 insertions(+) create mode 100644 trojsten/people/migrations/0017_auto_20180607_1156.py create mode 100644 trojsten/people/migrations/0018_auto_20180607_1158.py diff --git a/trojsten/people/migrations/0017_auto_20180607_1156.py b/trojsten/people/migrations/0017_auto_20180607_1156.py new file mode 100644 index 000000000..f6fd32608 --- /dev/null +++ b/trojsten/people/migrations/0017_auto_20180607_1156.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-06-07 09:56 +from __future__ import unicode_literals + +from django.conf import settings +import django.contrib.auth.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('schools', '0001_initial'), + ('people', '0016_merge_20180121_1616'), + ] + + operations = [ + migrations.CreateModel( + name='UserSchool', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start_time', models.DateField(verbose_name='Start of study')), + ('school', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='schools.School', verbose_name='School')), + ], + ), + migrations.AddField( + model_name='userschool', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + ] diff --git a/trojsten/people/migrations/0018_auto_20180607_1158.py b/trojsten/people/migrations/0018_auto_20180607_1158.py new file mode 100644 index 000000000..87ec8e07f --- /dev/null +++ b/trojsten/people/migrations/0018_auto_20180607_1158.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-06-07 09:58 +from __future__ import unicode_literals +from datetime import date + +from django.db import migrations + + +def migrate_schools(apps, schema_editor): + User = apps.get_model('people', 'User') + UserSchool = apps.get_model('people', 'UserSchool') + for user in User.objects.all(): + if user.school: + UserSchool.objects.create( + user=user, + school=user.school, + start_time=date(max(user.graduation - 8, 1) if user.graduation else 1, 9, 1) + ) + + +def reverse_migrate_schools(apps, schema_editor): + UserSchool = apps.get_model('people', 'UserSchool') + for row in UserSchool.objects.order_by('user', '-start_time').distinct('user'): + row.user.school = row.school + row.user.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('people', '0017_auto_20180607_1156'), + ] + + operations = [ + migrations.RunPython(migrate_schools, reverse_migrate_schools) + ] diff --git a/trojsten/people/models.py b/trojsten/people/models.py index 26595646f..d558586e2 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -13,6 +13,7 @@ from django.utils.translation import ugettext_lazy as _ from unidecode import unidecode +from trojsten.schools.models import School from . import constants @@ -109,6 +110,13 @@ class Meta: verbose_name = 'používateľ' verbose_name_plural = 'používatelia' + @property + def school_now(self): + return UserSchool.objects.filter(user=self).order_by('-start_time').first().school + + def school_at(self, date): + return UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time').first().school + @property def school_year(self): return self.school_year_at( @@ -160,6 +168,12 @@ def format_name(num): User._meta.get_field('username').blank = True +class UserSchool(models.Model): + user = models.ForeignKey(User, verbose_name=_('User')) + school = models.ForeignKey(School, verbose_name=_('School')) + start_time = models.DateField(verbose_name=_('Start of study')) + + class UserPropertyManager(models.Manager): def get_queryset(self): return super(UserPropertyManager, self).get_queryset().select_related('key') From 042f20860c758a8643ee3a64e98d3e66cdc6d481 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Fri, 8 Jun 2018 21:26:49 +0200 Subject: [PATCH 2/9] Edit Trojsten User forms, admin interface and exports. --- trojsten/events/admin.py | 5 +++ trojsten/people/admin.py | 39 ++++++++++++++++--- trojsten/people/forms.py | 26 ++++++++----- .../migrations/0019_auto_20180608_2124.py | 26 +++++++++++++ trojsten/people/models.py | 16 +++----- 5 files changed, 86 insertions(+), 26 deletions(-) create mode 100644 trojsten/people/migrations/0019_auto_20180608_2124.py diff --git a/trojsten/events/admin.py b/trojsten/events/admin.py index f9d4a6883..00aa612c7 100644 --- a/trojsten/events/admin.py +++ b/trojsten/events/admin.py @@ -4,6 +4,7 @@ from django.contrib import admin from django.utils.encoding import force_text +from django.utils.translation import ugettext_lazy as _ from easy_select2 import select2_modelform from import_export import fields, resources from import_export.admin import ExportMixin @@ -67,6 +68,7 @@ def get_queryset(self, request): class EventParticipantExport(resources.ModelResource): + user__school__verbose_name = fields.Field() type = fields.Field() street = fields.Field() @@ -83,6 +85,9 @@ class Meta: ] widgets = {'user__birth_date': {'format': '%d.%m.%Y'}} + def dehydrate_user__school__verbose_name(selfs, obj): + return obj.user.school.verbose_name if obj.user.school else _('Other_school') + def dehydrate_type(self, obj): return obj.get_type_display() diff --git a/trojsten/people/admin.py b/trojsten/people/admin.py index 5410cc97c..78384332e 100644 --- a/trojsten/people/admin.py +++ b/trojsten/people/admin.py @@ -25,7 +25,7 @@ from .forms import MergeForm from .helpers import get_similar_users, merge_users from .models import (Address, DuplicateUser, User, UserProperty, - UserPropertyKey) + UserPropertyKey, UserSchool) class AddressAdmin(admin.ModelAdmin): @@ -38,6 +38,13 @@ class UserPropertyInLine(admin.TabularInline): extra = 0 +class UserSchoolInLine(admin.TabularInline): + model = UserSchool + form = select2_modelform(UserSchool) + ordering = ['start_time'] + extra = 1 + + class StaffFilter(admin.SimpleListFilter): title = 'postavenia' parameter_name = 'is_staff' @@ -95,6 +102,11 @@ def queryset(self, request, queryset): class UsersExport(resources.ModelResource): + school__verbose_name = fields.Field() + school__addr_name = fields.Field() + school__street = fields.Field() + school__city = fields.Field() + school__zip_code = fields.Field() street = fields.Field() town = fields.Field() postal_code = fields.Field() @@ -110,6 +122,21 @@ class Meta: ) widgets = {'birth_date': {'format': '%d.%m.%Y'}} + def dehydrate_school__verbose_name(self, obj): + return obj.school.verbose_name if obj.school else _('Other school') + + def dehydrate_school__addr_name(self, obj): + return obj.school.addr_name if obj.school else _('Other school') + + def dehydrate_school__street(self, obj): + return obj.school.street if obj.school else '' + + def dehydrate_school__city(self, obj): + return obj.school.city if obj.school else '' + + def dehydrate_school__zip_code(self, obj): + return obj.school.zip_code if obj.school else '' + def dehydrate_street(self, obj): address = obj.get_mailing_address() return '' if address is None else address.street @@ -131,7 +158,7 @@ class AdminUserAddForm(ModelForm): class Meta: model = User - fields = ['first_name', 'last_name', 'school', 'graduation'] + fields = ['first_name', 'last_name', 'graduation'] class UserAdmin(ExportMixin, DefaultUserAdmin): @@ -149,7 +176,7 @@ class UserAdmin(ExportMixin, DefaultUserAdmin): } add_fieldsets = ( - (None, {'fields': ('first_name', 'last_name', 'school', 'graduation')}), + (None, {'fields': ('first_name', 'last_name', 'graduation')}), ) fieldsets = ( @@ -158,7 +185,7 @@ class UserAdmin(ExportMixin, DefaultUserAdmin): 'first_name', 'last_name', 'email', 'gender', 'birth_date' )}), (_('Address'), {'fields': ('home_address', 'mail_to_school', 'mailing_address')}), - (_('School'), {'fields': ('school', 'graduation')}), + (_('School'), {'fields': ('graduation',)}), ) superuser_fieldsets = fieldsets + ( (_('Password'), {'fields': ('password',)}), @@ -168,13 +195,13 @@ class UserAdmin(ExportMixin, DefaultUserAdmin): (_('Important dates'), {'fields': ('last_login', 'date_joined')}), ) - inlines = (UserPropertyInLine,) + inlines = (UserSchoolInLine, UserPropertyInLine) resource_class = UsersExport def get_queryset(self, request): qs = super(UserAdmin, self).get_queryset(request) - return qs.select_related('school').prefetch_related( + return qs.prefetch_related( 'groups', 'properties__key' ) diff --git a/trojsten/people/forms.py b/trojsten/people/forms.py index a491b40a6..41380e7fe 100644 --- a/trojsten/people/forms.py +++ b/trojsten/people/forms.py @@ -14,6 +14,7 @@ from trojsten.contests.models import Competition, Round, Task from trojsten.people.models import Address, DuplicateUser, User, UserProperty +from trojsten.schools.models import School from trojsten.submit.constants import (SUBMIT_PAPER_FILEPATH, SUBMIT_STATUS_IN_QUEUE, SUBMIT_STATUS_REVIEWED, @@ -28,6 +29,17 @@ # TODO: reuse code from ksp_login class TrojstenUserBaseForm(forms.ModelForm): required_css_class = 'required' + school = forms.ModelChoiceField( + label='Škola', + help_text='Do políčka napíšte skratku, ' + 'časť názvu alebo adresy školy a následne ' + 'vyberte správnu možnosť zo zoznamu. ' + 'Pokiaľ vaša škola nie je ' + 'v zozname, vyberte "Iná škola" ' + 'a pošlite nám e-mail.', + queryset=School.objects.all(), + widget=forms.Select(attrs={'class': 'autocomplete'}), + ) street = forms.CharField(max_length=70, label=_('Street')) town = forms.CharField(max_length=64, label=_('Town')) postal_code = forms.CharField( @@ -57,10 +69,7 @@ class TrojstenUserBaseForm(forms.ModelForm): class Meta: model = User fields = ('first_name', 'last_name', 'email', - 'birth_date', 'gender', 'school', 'graduation',) - widgets = { - 'school': forms.Select(attrs={'class': 'autocomplete'}), - } + 'birth_date', 'gender', 'graduation',) def __init__(self, *args, **kwargs): super(TrojstenUserBaseForm, self).__init__(*args, **kwargs) @@ -72,7 +81,6 @@ def __init__(self, *args, **kwargs): label=_('Gender'), choices=User.GENDER_CHOICES, ) - self.fields['school'].initial = 1 def get_initial_from_pipeline(self, pipeline_state): return None if not pipeline_state else { @@ -186,6 +194,7 @@ def __init__(self, *args, **kwargs): kwargs['instance'] = self.user if self.user.home_address: kwargs['initial'] = { + 'school': user.school, 'street': user.home_address.street, 'town': user.home_address.town, 'postal_code': user.home_address.postal_code, @@ -258,6 +267,7 @@ def save(self, commit=True): corr_address.save() user.mailing_address = corr_address user.save() + user.add_school(self.cleaned_data.get('school')) if not DuplicateUser.objects.filter(user=user).exists(): similar_users = get_similar_users(user) if len(similar_users): @@ -277,10 +287,7 @@ class TrojstenUserCreationForm(TrojstenUserBaseForm): class Meta: model = User fields = ('username', 'first_name', 'last_name', 'email', - 'birth_date', 'gender', 'school', 'graduation',) - widgets = { - 'school': forms.Select(attrs={'class': 'autocomplete'}), - } + 'birth_date', 'gender', 'graduation',) def __init__(self, *args, **kwargs): try: @@ -365,6 +372,7 @@ def save(self, commit=True): corr_address.save() user.mailing_address = corr_address user.save() + user.add_school(self.cleaned_data.get('school')) similar_users = get_similar_users(user) if len(similar_users): DuplicateUser.objects.create(user=user) diff --git a/trojsten/people/migrations/0019_auto_20180608_2124.py b/trojsten/people/migrations/0019_auto_20180608_2124.py new file mode 100644 index 000000000..44b25a455 --- /dev/null +++ b/trojsten/people/migrations/0019_auto_20180608_2124.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-06-08 19:24 +from __future__ import unicode_literals + +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('people', '0018_auto_20180607_1158'), + ] + + operations = [ + migrations.RemoveField( + model_name='user', + name='school', + ), + migrations.AlterField( + model_name='userschool', + name='start_time', + field=models.DateField(default=django.utils.timezone.now, verbose_name='Start of study'), + ), + ] diff --git a/trojsten/people/models.py b/trojsten/people/models.py index d558586e2..072ab99c4 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -74,15 +74,6 @@ class User(AbstractUser): verbose_name='adresa korešpondencie') mail_to_school = models.BooleanField(default=False, verbose_name='posielať poštu do školy') - school = models.ForeignKey('schools.School', - null=True, - verbose_name='škola', - help_text='Do políčka napíšte skratku, ' - 'časť názvu alebo adresy školy a následne ' - 'vyberte správnu možnosť zo zoznamu. ' - 'Pokiaľ vaša škola nie je ' - 'v zozname, vyberte "Iná škola" ' - 'a pošlite nám e-mail.') graduation = models.IntegerField(null=True, verbose_name='rok maturity', help_text='Povinné pre žiakov.') @@ -111,12 +102,15 @@ class Meta: verbose_name_plural = 'používatelia' @property - def school_now(self): + def school(self): return UserSchool.objects.filter(user=self).order_by('-start_time').first().school def school_at(self, date): return UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time').first().school + def add_school(self, school, date=timezone.now()): + UserSchool.objects.create(user=self, school=school, start_time=date) + @property def school_year(self): return self.school_year_at( @@ -171,7 +165,7 @@ def format_name(num): class UserSchool(models.Model): user = models.ForeignKey(User, verbose_name=_('User')) school = models.ForeignKey(School, verbose_name=_('School')) - start_time = models.DateField(verbose_name=_('Start of study')) + start_time = models.DateField(verbose_name=_('Start of study'), default=timezone.now) class UserPropertyManager(models.Manager): From aca216bfbe484342d3d8c23e4ebe9376878c4a18 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Tue, 12 Jun 2018 15:26:00 +0200 Subject: [PATCH 3/9] Changes across the code such as remove school from select_related. --- trojsten/events/views.py | 4 ++-- trojsten/people/forms.py | 3 ++- .../commands/migrate_people_from_kaspar.py | 2 +- trojsten/people/models.py | 3 ++- trojsten/people/tests.py | 5 ++++- trojsten/results/generator.py | 2 +- trojsten/results/helpers.py | 1 - trojsten/results/tests.py | 16 ++++++++-------- trojsten/rules/ksp.py | 2 +- trojsten/rules/old_ksp.py | 2 +- trojsten/submit/models.py | 2 +- 11 files changed, 23 insertions(+), 19 deletions(-) diff --git a/trojsten/events/views.py b/trojsten/events/views.py index 6df3da760..5e8f90078 100644 --- a/trojsten/events/views.py +++ b/trojsten/events/views.py @@ -19,12 +19,12 @@ class ParticipantsAndOrganizersListView(DetailView): def get_context_data(self, **kwargs): context = super(ParticipantsAndOrganizersListView, self).get_context_data(**kwargs) event = context['event'] - participants = event.participants.select_related('user__school') + participants = event.participants for participant in participants: participant.year_at_event = participant.user.school_year_at(event.start_time) context.update({ 'participants': participants, - 'organizers': event.organizers.select_related('user__school'), + 'organizers': event.organizers, }) return context diff --git a/trojsten/people/forms.py b/trojsten/people/forms.py index 41380e7fe..42e39e216 100644 --- a/trojsten/people/forms.py +++ b/trojsten/people/forms.py @@ -194,7 +194,6 @@ def __init__(self, *args, **kwargs): kwargs['instance'] = self.user if self.user.home_address: kwargs['initial'] = { - 'school': user.school, 'street': user.home_address.street, 'town': user.home_address.town, 'postal_code': user.home_address.postal_code, @@ -209,6 +208,8 @@ def __init__(self, *args, **kwargs): kwargs['initial'][ 'corr_country'] = user.mailing_address.country kwargs['initial']['has_correspondence_address'] = True + if self.user.school: + kwargs['initial']['school'] = user.school.pk super(TrojstenUserChangeForm, self).__init__(*args, **kwargs) diff --git a/trojsten/people/management/commands/migrate_people_from_kaspar.py b/trojsten/people/management/commands/migrate_people_from_kaspar.py index 4abeb5109..ef8c0c700 100644 --- a/trojsten/people/management/commands/migrate_people_from_kaspar.py +++ b/trojsten/people/management/commands/migrate_people_from_kaspar.py @@ -113,7 +113,6 @@ def process_person(self, man_id, first_name, last_name, school_id, # The username needs to be unique, thus the ID. 'username': '%s%s%d' % (first_name, last_name, man_id), 'is_active': False, - 'school': self.school_id_map[school_id] } if grad_year: @@ -140,6 +139,7 @@ def process_person(self, man_id, first_name, last_name, school_id, self.stdout.write("Creating user %s %s" % (first_name, last_name)) new_user = User.objects.create(**new_user_args) + new_user.add_school(self.school_id_map[school_id]) self.man_id_map[man_id] = new_user new_user.properties.create(key=self.kaspar_id_key, value=man_id) diff --git a/trojsten/people/models.py b/trojsten/people/models.py index 072ab99c4..3b8b915c5 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -103,7 +103,8 @@ class Meta: @property def school(self): - return UserSchool.objects.filter(user=self).order_by('-start_time').first().school + schools_queryset = UserSchool.objects.filter(user=self).order_by('-start_time') + return schools_queryset.first().school if len(schools_queryset) > 0 else None def school_at(self, date): return UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time').first().school diff --git a/trojsten/people/tests.py b/trojsten/people/tests.py index 82ef5200e..edc984b1b 100644 --- a/trojsten/people/tests.py +++ b/trojsten/people/tests.py @@ -206,9 +206,10 @@ def setUp(self): self.user = User.objects.create( username='janko4247', first_name='Janko', last_name='Hrasko', password='pass', gender='M', birth_date=datetime.date(1999, 9, 19), email='hrasko@example.com', - mail_to_school=True, school=self.school, graduation=2018, + mail_to_school=True, graduation=2018, home_address=address ) + self.user.add_school(self.school) self.form_data = { 'username': 'mrkva', 'password1': 'heslo', @@ -303,6 +304,8 @@ def test_user_creation_invalid_password(self): def test_valid_initial_data(self): form = TrojstenUserChangeForm({}, user=self.user) form.data = form.initial + form.is_valid() + print(form.errors) self.assertTrue(form.is_valid()) def test_valid_user_change(self): diff --git a/trojsten/results/generator.py b/trojsten/results/generator.py index 82526938e..e5ed05e9f 100644 --- a/trojsten/results/generator.py +++ b/trojsten/results/generator.py @@ -111,7 +111,7 @@ def get_submit_queryset(self, res_request): ).distinct( 'user', 'task', 'submit_type' ).select_related( - 'user', 'user__school', 'task' + 'user', 'task' ).prefetch_related('user__properties', 'user__ignored_competitions') def create_row(self, res_request, user, cols): diff --git a/trojsten/results/helpers.py b/trojsten/results/helpers.py index 1c53856fd..ff44fe7d7 100644 --- a/trojsten/results/helpers.py +++ b/trojsten/results/helpers.py @@ -187,7 +187,6 @@ def create_frozen_user(frozen_result): 'task_points__task', ).select_related( 'original_user', - 'school', ).order_by('rank') results = defaultdict(FrozenUserResult) diff --git a/trojsten/results/tests.py b/trojsten/results/tests.py index cdf0e8564..de1e3ef4c 100644 --- a/trojsten/results/tests.py +++ b/trojsten/results/tests.py @@ -280,8 +280,8 @@ def test_serialize_row_without_previous(self): school = School.objects.create(abbreviation='GJH', verbose_name='Gymnazium Jura Hronca') user = User.objects.create(username="TestUser", password="password", first_name="Jozko", last_name="Mrkvicka", - graduation=timezone.now().year + 2, - school=school) + graduation=timezone.now().year + 2) + user.add_school(school) school_dict = { 'id': school.id, @@ -315,8 +315,8 @@ def test_serialize_row_with_previous(self): school = School.objects.create(abbreviation='GJH', verbose_name='Gymnazium Jura Hronca') user = User.objects.create(username="TestUser", password="password", first_name="Jozko", last_name="Mrkvicka", - graduation=timezone.now().year + 2, - school=school) + graduation=timezone.now().year + 2) + user.add_school(school) school_dict = { 'id': school.id, @@ -369,8 +369,8 @@ def test_serialize_results(self): school = School.objects.create(abbreviation='GJH', verbose_name='Gymnazium Jura Hronca') user = User.objects.create(username="TestUser", password="password", first_name="Jozko", last_name="Mrkvicka", - graduation=timezone.now().year + 2, - school=school) + graduation=timezone.now().year + 2) + user.add_school(school) school_dict = { 'id': school.id, @@ -400,8 +400,8 @@ def test_serialize_results(self): user = User.objects.create(username="TestUser2", password="password", first_name="Ferko", last_name="Mrkvicka", - graduation=timezone.now().year + 3, - school=school) + graduation=timezone.now().year + 3) + user.add_school(school) user_dict = { 'id': user.id, diff --git a/trojsten/rules/ksp.py b/trojsten/rules/ksp.py index 1fa0d1c35..e75a40f95 100644 --- a/trojsten/rules/ksp.py +++ b/trojsten/rules/ksp.py @@ -60,7 +60,7 @@ def get_submit_queryset(self, res_request): 'user', 'task', '-time', '-id', ).distinct( 'user', 'task', - ).select_related('user', 'user__school', 'task', 'task__round') + ).select_related('user', 'task', 'task__round') return chain(submits, penalized_submits) def source_submit_points(self, previous_points, submit): diff --git a/trojsten/rules/old_ksp.py b/trojsten/rules/old_ksp.py index 9cb61819b..b8ca8c2c5 100644 --- a/trojsten/rules/old_ksp.py +++ b/trojsten/rules/old_ksp.py @@ -44,7 +44,7 @@ def get_submit_queryset(self, res_request): 'user', 'task', '-time', '-id', ).distinct( 'user', 'task', - ).select_related('user', 'user__school', 'task', 'task__round') + ).select_related('user', 'task', 'task__round') return chain(submits, penalized_submits) def source_submit_points(self, previous_points, submit): diff --git a/trojsten/submit/models.py b/trojsten/submit/models.py index 874ef94c0..55054cb9a 100644 --- a/trojsten/submit/models.py +++ b/trojsten/submit/models.py @@ -56,7 +56,7 @@ def for_tasks(self, tasks, include_staff=False): 'user', 'task', 'submit_type', '-time', '-id', ).distinct( 'user', 'task', 'submit_type' - ).select_related('user__school', 'task') + ).select_related('task') # @FIXME: This is used for rendering points for each task at task_list view. # Displaying scores for tasks should be implemented in results/rules. From e16e4675738b0dd9a8abccf9f9b1c5a45c0389b7 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 13 Jun 2018 12:29:14 +0200 Subject: [PATCH 4/9] Allow users to edit their shool history in settings. --- trojsten/people/admin.py | 2 +- trojsten/people/forms.py | 11 ++- trojsten/people/models.py | 8 +- .../templates/trojsten/people/settings.html | 92 +++++++++++++++++-- trojsten/people/views.py | 25 ++++- 5 files changed, 121 insertions(+), 17 deletions(-) diff --git a/trojsten/people/admin.py b/trojsten/people/admin.py index 78384332e..3cefabfc5 100644 --- a/trojsten/people/admin.py +++ b/trojsten/people/admin.py @@ -42,7 +42,7 @@ class UserSchoolInLine(admin.TabularInline): model = UserSchool form = select2_modelform(UserSchool) ordering = ['start_time'] - extra = 1 + extra = 0 class StaffFilter(admin.SimpleListFilter): diff --git a/trojsten/people/forms.py b/trojsten/people/forms.py index 42e39e216..55685bdc0 100644 --- a/trojsten/people/forms.py +++ b/trojsten/people/forms.py @@ -13,7 +13,7 @@ from ksp_login.utils import get_partial_pipeline from trojsten.contests.models import Competition, Round, Task -from trojsten.people.models import Address, DuplicateUser, User, UserProperty +from trojsten.people.models import Address, DuplicateUser, User, UserProperty, UserSchool from trojsten.schools.models import School from trojsten.submit.constants import (SUBMIT_PAPER_FILEPATH, SUBMIT_STATUS_IN_QUEUE, @@ -519,6 +519,15 @@ def __init__(self, *args, **kwargs): ) +class UserSchoolFrom(forms.ModelForm): + class Meta: + model = UserSchool + exclude = () + widgets = { + 'school': forms.Select(attrs={'class': 'autocomplete form-control'}), + } + + class IgnoreCompetitionForm(forms.Form): def __init__(self, user, *args, **kwargs): diff --git a/trojsten/people/models.py b/trojsten/people/models.py index 3b8b915c5..c11b4d12a 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -110,7 +110,8 @@ def school_at(self, date): return UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time').first().school def add_school(self, school, date=timezone.now()): - UserSchool.objects.create(user=self, school=school, start_time=date) + if school != self.school: + UserSchool.objects.create(user=self, school=school, start_time=date) @property def school_year(self): @@ -168,6 +169,11 @@ class UserSchool(models.Model): school = models.ForeignKey(School, verbose_name=_('School')) start_time = models.DateField(verbose_name=_('Start of study'), default=timezone.now) + class Meta: + verbose_name = _('School of user') + verbose_name_plural = _('Schools of user') + ordering = ['start_time'] + class UserPropertyManager(models.Manager): def get_queryset(self): diff --git a/trojsten/people/templates/trojsten/people/settings.html b/trojsten/people/templates/trojsten/people/settings.html index d5d3d2ace..143859df2 100644 --- a/trojsten/people/templates/trojsten/people/settings.html +++ b/trojsten/people/templates/trojsten/people/settings.html @@ -19,6 +19,7 @@

{% trans "Account settings" %}

    +
  • {% trans "School History" %}
  • {% trans "Properties" %}
  • {% trans "Contests" %}
    • {% if SITE.is_login_provider %} @@ -33,11 +34,84 @@

    {% trans "Account settings" %}

    {% include "ksp_login/parts/multiple_forms.html" %} +
    + {% blocktrans %} +

    Here you can see and edit informations, which schoos you have visited during attending our seminars + along dates, since when the information is valid. According to these informations, + your school is showed in results and camp paticipants list.

    + +

    If your school is missing in the list, write us an email and we add it to the list.

    + {% endblocktrans %} +
    + {% csrf_token %} + {{ school_history_form_set.management_form }} +
    + {% for form in school_history_form_set %} +
    + {% for field in form %} + {% if field.name == "school" %} + {% if field.value %} + + + {% else %} + {{ field | bootstrap_inline}} + {% endif %} + {% elif field.name == "start_time" %} + + {{ field | bootstrap_inline}} + + {% elif field.is_hidden %} + {{ field }} + {% else %} + + {{ field | bootstrap_inline}} + + {% endif %} + {% for error in field.errors %} + {{ error }} + {% endfor %} + {% endfor %} +
    + {% endfor %} +
    + + +
    +
    + + {% trans "Add school" %} +
    +
    +
    +
    +
    {% csrf_token %} {{ user_props_form_set.management_form }} -
    +
    {% for form in user_props_form_set %}
    {% for field in form %} @@ -66,8 +140,8 @@

    {% trans "Account settings" %}

    {% endfor %}
    - {% endaddtoblock %} diff --git a/trojsten/people/views.py b/trojsten/people/views.py index 7073b423d..ab7f4958e 100644 --- a/trojsten/people/views.py +++ b/trojsten/people/views.py @@ -6,14 +6,14 @@ from social_django.models import UserSocialAuth from trojsten.contests.models import Competition, Round -from trojsten.people.models import User +from trojsten.people.models import User, UserSchool from trojsten.submit.constants import (SUBMIT_STATUS_REVIEWED, SUBMIT_TYPE_DESCRIPTION) from trojsten.submit.models import Submit from .constants import DEENVELOPING_NOT_REVIEWED_SYMBOL from .forms import (AdditionalRegistrationForm, IgnoreCompetitionForm, - RoundSelectForm, SubmittedTasksForm) + RoundSelectForm, SubmittedTasksForm, UserSchoolFrom) from .helpers import get_required_properties from .models import UserProperty @@ -51,16 +51,28 @@ def settings(request, settings_form=UserProfileForm): """ UserPropsFormSet = _get_user_props_formset(request.user.is_staff) + SchoolHistoryFormSet = forms.inlineformset_factory( + User, UserSchool, + form=UserSchoolFrom, + fields=('school', 'start_time'), + extra=0, + ) form_classes = [settings_form] + get_profile_forms() _forms = None + school_history_form_set = None user_props_form_set = None competition_select_form = None if request.method == "POST": - if request.POST.get('user_props_submit', None): - user_props_form_set = UserPropsFormSet(request.POST, instance=request.user) + if request.POST.get('school_history_submit', None): + school_history_form_set = SchoolHistoryFormSet(request.POST, instance=request.user, prefix='schools') + if school_history_form_set.is_valid(): + school_history_form_set.save() + return redirect(reverse('account_settings') + '#schools') + elif request.POST.get('user_props_submit', None): + user_props_form_set = UserPropsFormSet(request.POST, instance=request.user, prefix='props') if user_props_form_set.is_valid(): user_props_form_set.save() return redirect(reverse('account_settings') + '#props') @@ -79,9 +91,11 @@ def settings(request, settings_form=UserProfileForm): if not _forms: _forms = [form(user=request.user) for form in form_classes] + if not school_history_form_set: + school_history_form_set = SchoolHistoryFormSet(instance=request.user, prefix='schools') if not user_props_form_set: user_props_form_set = UserPropsFormSet( - instance=request.user, queryset=UserProperty.objects.visible(request.user) + instance=request.user, queryset=UserProperty.objects.visible(request.user), prefix='props' ) if not competition_select_form: competition_select_form = IgnoreCompetitionForm(user=request.user) @@ -89,6 +103,7 @@ def settings(request, settings_form=UserProfileForm): return render(request, 'trojsten/people/settings.html', { 'account_associations': UserSocialAuth.get_social_auth_for_user(request.user), 'forms': _forms, + 'school_history_form_set': school_history_form_set, 'user_props_form_set': user_props_form_set, 'competition_select_form': competition_select_form, }) From 6bf59b345bba8271ed9b16dff9fb675b94d43ebf Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 27 Jun 2018 02:21:11 +0200 Subject: [PATCH 5/9] Show correct school in result and event participants list. --- .../events/participants_and_organizers_list.html | 16 ++++++++-------- trojsten/events/views.py | 7 ++++++- trojsten/people/forms.py | 2 +- trojsten/people/models.py | 7 +++++-- .../templates/trojsten/people/settings.html | 2 +- trojsten/results/generator.py | 1 + 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/trojsten/events/templates/trojsten/events/participants_and_organizers_list.html b/trojsten/events/templates/trojsten/events/participants_and_organizers_list.html index 79293307c..f711abe53 100644 --- a/trojsten/events/templates/trojsten/events/participants_and_organizers_list.html +++ b/trojsten/events/templates/trojsten/events/participants_and_organizers_list.html @@ -23,13 +23,13 @@

    Zoznam účastníkov

    {{ participant.user.get_full_name }} {{ participant.year_at_event | school_year }} - {% if participant.user.school.has_abbreviation %} - - {{ participant.user.school.abbreviation }} + {{ participant.school_at_event.abbreviation }} {% else %} - {{ participant.user.school.verbose_name }} + {{ participant.school_at_event.verbose_name }} {% endif %} @@ -39,13 +39,13 @@

    Zoznam účastníkov

    {{ organizer.user.get_full_name }} - {% if organizer.user.school.has_abbreviation %} - - {{ organizer.user.school.abbreviation }} + {{ organizer.school_at_event.abbreviation }} {% else %} - {{ organizer.user.school.verbose_name }} + {{ organizer.school_at_event.verbose_name }} {% endif %} diff --git a/trojsten/events/views.py b/trojsten/events/views.py index 5e8f90078..0e1a150cf 100644 --- a/trojsten/events/views.py +++ b/trojsten/events/views.py @@ -22,9 +22,14 @@ def get_context_data(self, **kwargs): participants = event.participants for participant in participants: participant.year_at_event = participant.user.school_year_at(event.start_time) + participant.school_at_event = participant.user.school_at(event.start_time) + + organizers = event.organizers + for organizer in organizers: + organizer.school_at_event = organizer.user.school_at(event.start_time) context.update({ 'participants': participants, - 'organizers': event.organizers, + 'organizers': organizers, }) return context diff --git a/trojsten/people/forms.py b/trojsten/people/forms.py index 55685bdc0..6fbf77e36 100644 --- a/trojsten/people/forms.py +++ b/trojsten/people/forms.py @@ -524,7 +524,7 @@ class Meta: model = UserSchool exclude = () widgets = { - 'school': forms.Select(attrs={'class': 'autocomplete form-control'}), + 'school': forms.Select(attrs={'class': 'input autocomplete'}), } diff --git a/trojsten/people/models.py b/trojsten/people/models.py index c11b4d12a..88e23a4e4 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -104,10 +104,13 @@ class Meta: @property def school(self): schools_queryset = UserSchool.objects.filter(user=self).order_by('-start_time') - return schools_queryset.first().school if len(schools_queryset) > 0 else None + return schools_queryset.first().school if schools_queryset.count() > 0 \ + else School.objects.get(pk=constants.OTHER_SCHOOL_ID) def school_at(self, date): - return UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time').first().school + schools_queryset = UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time') + return schools_queryset.first().school if schools_queryset.count() > 0 \ + else School.objects.get(pk=constants.OTHER_SCHOOL_ID) def add_school(self, school, date=timezone.now()): if school != self.school: diff --git a/trojsten/people/templates/trojsten/people/settings.html b/trojsten/people/templates/trojsten/people/settings.html index 143859df2..dd3863de8 100644 --- a/trojsten/people/templates/trojsten/people/settings.html +++ b/trojsten/people/templates/trojsten/people/settings.html @@ -80,7 +80,7 @@

    {% trans "Account settings" %}

    {{ field.errors }} {% if field.name == "school" %} - {{ field }} + {{ field | bootstrap_inline}} {% elif field.name == "start_time" %} diff --git a/trojsten/results/generator.py b/trojsten/results/generator.py index e5ed05e9f..8e76f36b4 100644 --- a/trojsten/results/generator.py +++ b/trojsten/results/generator.py @@ -125,6 +125,7 @@ def create_row(self, res_request, user, cols): year=user.school_year_at(res_request.round.end_time), previous=res_request.get_previous_row_for_user(user), active=self.is_user_active(res_request, user), + school=user.school_at(res_request.round.end_time), ) for col in cols: if col.task is not None: From 249c803e4ceebf1898f3c13274f92e5e94ce4e78 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 27 Jun 2018 12:26:41 +0200 Subject: [PATCH 6/9] Add tests. --- trojsten/events/tests.py | 63 +++++++++++++++++++++++++++++++-------- trojsten/people/models.py | 6 ++-- trojsten/people/tests.py | 20 +++++++++++-- 3 files changed, 73 insertions(+), 16 deletions(-) diff --git a/trojsten/events/tests.py b/trojsten/events/tests.py index 6b418b41a..aef1e9f47 100644 --- a/trojsten/events/tests.py +++ b/trojsten/events/tests.py @@ -11,7 +11,8 @@ from django.utils import timezone from wiki.models import Article, ArticleRevision, URLPath -from trojsten.people.models import User +from trojsten.people.models import User, UserSchool +from trojsten.schools.models import School from trojsten.utils.test_utils import get_noexisting_id from .models import Event, EventParticipant, EventPlace, EventType @@ -193,25 +194,63 @@ def test_participant_substitute_display(self): class ParticipantsAndOrganizersListViewTest(TestCase): - def test_school_year(self): + def setUp(self): current_year = timezone.now().year site = Site.objects.get(pk=settings.SITE_ID) - user = User.objects.create( + self.user = User.objects.create( username='ferko', first_name='Ferko', last_name='Mrkvicka', graduation=current_year - 1) + group = Group.objects.create(name="skupina") - place = EventPlace.objects.create(name="Miesto") - type_camp = EventType.objects.create(name="sustredenie", - organizers_group=group, is_camp=True) - type_camp.sites.add(site) - event = Event.objects.create( + self.place = EventPlace.objects.create(name="Miesto") + self.type_camp = EventType.objects.create(name="sustredenie", + organizers_group=group, is_camp=True) + self.type_camp.sites.add(site) + self.event = Event.objects.create( start_time=datetime.datetime(day=12, month=3, year=current_year - 2, tzinfo=pytz.utc), end_time=datetime.datetime(day=17, month=3, year=current_year - 2, tzinfo=pytz.utc), - place=place, type=type_camp, + place=self.place, type=self.type_camp, ) - EventParticipant.objects.create(event=event, user=user, going=True, type=0) + EventParticipant.objects.create(event=self.event, user=self.user, going=True, type=0) - part_list_url = reverse('participants_list', kwargs={'event_id': event.id}) - response = self.client.get(part_list_url) + self.old_school = School.objects.create( + abbreviation='GYMN1', verbose_name='Gymnázium Janka Hraška', + street='Hronca 42', city='Bratislava', zip_code='123 45' + ) + self.current_school = School.objects.create( + abbreviation='GYMN2', verbose_name='Gymnázium Janka Hraška', + street='Hronca 42', city='Bratislava', zip_code='123 45' + ) + UserSchool.objects.create( + user=self.user, school=self.old_school, start_time=self.event.start_time + timezone.timedelta(-10) + ) + UserSchool.objects.create( + user=self.user, school=self.current_school, start_time=self.event.end_time + timezone.timedelta(10) + ) + + self.part_list_url = reverse('participants_list', kwargs={'event_id': self.event.id}) + + def test_school_year(self): + response = self.client.get(self.part_list_url) self.assertContains(response, '3') + + def test_old_school_at_event_time(self): + response = self.client.get(self.part_list_url) + + self.assertContains(response, self.old_school.abbreviation) + self.assertNotContains(response, self.current_school.abbreviation) + + def test_current_school_at_event_time(self): + event = Event.objects.create( + start_time=self.event.end_time + timezone.timedelta(20), + end_time=self.event.end_time + timezone.timedelta(30), + place=self.place, type=self.type_camp, + ) + EventParticipant.objects.create(event=event, user=self.user, going=True, type=0) + + url = reverse('participants_list', kwargs={'event_id': event.id}) + response = self.client.get(url) + + self.assertContains(response, self.current_school.abbreviation) + self.assertNotContains(response, self.old_school.abbreviation) diff --git a/trojsten/people/models.py b/trojsten/people/models.py index 88e23a4e4..63758fd52 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -103,12 +103,14 @@ class Meta: @property def school(self): - schools_queryset = UserSchool.objects.filter(user=self).order_by('-start_time') + schools_queryset = UserSchool.objects.filter(user=self).order_by('-start_time', '-id') + # TODO: Replace Other school with None return schools_queryset.first().school if schools_queryset.count() > 0 \ else School.objects.get(pk=constants.OTHER_SCHOOL_ID) def school_at(self, date): - schools_queryset = UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time') + schools_queryset = UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time', '-id') + # TODO: Replace Other school with None return schools_queryset.first().school if schools_queryset.count() > 0 \ else School.objects.get(pk=constants.OTHER_SCHOOL_ID) diff --git a/trojsten/people/tests.py b/trojsten/people/tests.py index edc984b1b..1e20e798a 100644 --- a/trojsten/people/tests.py +++ b/trojsten/people/tests.py @@ -301,11 +301,15 @@ def test_user_creation_invalid_password(self): self.assertFalse(form.is_valid()) self.assertEqual(form.errors, {'password2': ['Heslo a jeho potvrdenie sa nezhodujú.']}) + def test_valid_user_creation_school(self): + form = TrojstenUserCreationForm(data=self.form_data, request=self.request) + self.assertTrue(form.is_valid()) + user = form.save() + self.assertEqual(user.school, self.school) + def test_valid_initial_data(self): form = TrojstenUserChangeForm({}, user=self.user) form.data = form.initial - form.is_valid() - print(form.errors) self.assertTrue(form.is_valid()) def test_valid_user_change(self): @@ -328,6 +332,18 @@ def test_invalid_user_change(self): 'corr_country': ['Toto pole je povinné.'] }) + def test_valid_school_change(self): + new_school = School.objects.create( + abbreviation='GG', verbose_name='Gymnázium 2', pk=3, + street='Hronca 47', city='Bratislava', zip_code='123 45' + ) + form = TrojstenUserChangeForm({}, user=self.user) + form.data = form.initial + form.data['school'] = new_school.pk + self.assertTrue(form.is_valid()) + form.save() + self.assertEqual(self.user.school, new_school) + def test_mailing_address_change(self): form = TrojstenUserChangeForm({}, user=self.user) form.data = form.initial From 34af87a19a17b75c902860da7dd1d2575d9d8e8f Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 27 Jun 2018 12:39:15 +0200 Subject: [PATCH 7/9] Squash migrations. --- .../migrations/0017_auto_20180607_1156.py | 32 ----------------- .../migrations/0018_auto_20180607_1158.py | 36 ------------------- .../migrations/0019_auto_20180608_2124.py | 26 -------------- 3 files changed, 94 deletions(-) delete mode 100644 trojsten/people/migrations/0017_auto_20180607_1156.py delete mode 100644 trojsten/people/migrations/0018_auto_20180607_1158.py delete mode 100644 trojsten/people/migrations/0019_auto_20180608_2124.py diff --git a/trojsten/people/migrations/0017_auto_20180607_1156.py b/trojsten/people/migrations/0017_auto_20180607_1156.py deleted file mode 100644 index f6fd32608..000000000 --- a/trojsten/people/migrations/0017_auto_20180607_1156.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-06-07 09:56 -from __future__ import unicode_literals - -from django.conf import settings -import django.contrib.auth.validators -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('schools', '0001_initial'), - ('people', '0016_merge_20180121_1616'), - ] - - operations = [ - migrations.CreateModel( - name='UserSchool', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_time', models.DateField(verbose_name='Start of study')), - ('school', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='schools.School', verbose_name='School')), - ], - ), - migrations.AddField( - model_name='userschool', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - ] diff --git a/trojsten/people/migrations/0018_auto_20180607_1158.py b/trojsten/people/migrations/0018_auto_20180607_1158.py deleted file mode 100644 index 87ec8e07f..000000000 --- a/trojsten/people/migrations/0018_auto_20180607_1158.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-06-07 09:58 -from __future__ import unicode_literals -from datetime import date - -from django.db import migrations - - -def migrate_schools(apps, schema_editor): - User = apps.get_model('people', 'User') - UserSchool = apps.get_model('people', 'UserSchool') - for user in User.objects.all(): - if user.school: - UserSchool.objects.create( - user=user, - school=user.school, - start_time=date(max(user.graduation - 8, 1) if user.graduation else 1, 9, 1) - ) - - -def reverse_migrate_schools(apps, schema_editor): - UserSchool = apps.get_model('people', 'UserSchool') - for row in UserSchool.objects.order_by('user', '-start_time').distinct('user'): - row.user.school = row.school - row.user.save() - - -class Migration(migrations.Migration): - - dependencies = [ - ('people', '0017_auto_20180607_1156'), - ] - - operations = [ - migrations.RunPython(migrate_schools, reverse_migrate_schools) - ] diff --git a/trojsten/people/migrations/0019_auto_20180608_2124.py b/trojsten/people/migrations/0019_auto_20180608_2124.py deleted file mode 100644 index 44b25a455..000000000 --- a/trojsten/people/migrations/0019_auto_20180608_2124.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-06-08 19:24 -from __future__ import unicode_literals - -import django.contrib.auth.validators -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('people', '0018_auto_20180607_1158'), - ] - - operations = [ - migrations.RemoveField( - model_name='user', - name='school', - ), - migrations.AlterField( - model_name='userschool', - name='start_time', - field=models.DateField(default=django.utils.timezone.now, verbose_name='Start of study'), - ), - ] From 5ad3e978d2de2c603c9b1deceaf97dc2b39f751d Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 27 Jun 2018 12:51:33 +0200 Subject: [PATCH 8/9] Edit translations. --- trojsten/locale/sk/LC_MESSAGES/django.po | 526 ++++++++++++----------- 1 file changed, 286 insertions(+), 240 deletions(-) diff --git a/trojsten/locale/sk/LC_MESSAGES/django.po b/trojsten/locale/sk/LC_MESSAGES/django.po index 11420c195..fdaef2a74 100644 --- a/trojsten/locale/sk/LC_MESSAGES/django.po +++ b/trojsten/locale/sk/LC_MESSAGES/django.po @@ -1,30 +1,27 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-18 12:09+0000\n" +"POT-Creation-Date: 2018-06-27 12:46+0200\n" "Content-Type: text/plain; charset=UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: trojsten/contact_form/forms.py:15 +#: contact_form/forms.py:15 msgid "Subject" msgstr "Predmet" -#: trojsten/contact_form/forms.py:22 trojsten/contact_form/tests.py:63 -#: trojsten/contact_form/tests.py:72 +#: contact_form/forms.py:22 contact_form/tests.py:63 contact_form/tests.py:72 msgid "Name" msgstr "Meno" -#: trojsten/contact_form/forms.py:23 trojsten/contact_form/tests.py:64 -#: trojsten/contact_form/tests.py:73 +#: contact_form/forms.py:23 contact_form/tests.py:64 contact_form/tests.py:73 msgid "Email" msgstr "E-mail" -#: trojsten/contact_form/forms.py:24 trojsten/contact_form/tests.py:65 -#: trojsten/contact_form/tests.py:74 +#: contact_form/forms.py:24 contact_form/tests.py:65 contact_form/tests.py:74 msgid "Message" msgstr "Správa" -#: trojsten/contact_form/templates/contact_form/contact_form.html:19 +#: contact_form/templates/contact_form/contact_form.html:19 #, python-format msgid "" "\n" @@ -42,7 +39,7 @@ msgstr "" "alebo priamo vedúcemu uvedenému pri úlohe.\n" " " -#: trojsten/contact_form/templates/contact_form/contact_form.html:29 +#: contact_form/templates/contact_form/contact_form.html:29 msgid "" "If you have found any problem with our web site, please let us know using " "the following form." @@ -50,80 +47,80 @@ msgstr "" "Ak ste objavili chybu na našej stránke, prosím, dajte nám vedieť použitím " "nasledujúceho formulára." -#: trojsten/contests/forms.py:11 +#: contests/forms.py:11 msgid "Category doesn't correspond with competition." msgstr "" # pdf file names -#: trojsten/contests/models.py:258 +#: contests/models.py:258 msgid "year" msgstr "ročník" -#: trojsten/contests/models.py:260 +#: contests/models.py:260 msgid "round" msgstr "kolo" -#: trojsten/contests/models.py:262 +#: contests/models.py:262 msgid "solutions" msgstr "vzoráky" -#: trojsten/contests/models.py:262 +#: contests/models.py:262 msgid "tasks" msgstr "zadania" -#: trojsten/contests/models.py:328 +#: contests/models.py:328 msgid "Send notification to reviewers about new description submit" msgstr "Zaslať opravovateľom notifikáciu o submite popisu" -#: trojsten/contests/models.py:331 +#: contests/models.py:331 msgid "Send notification to reviewers about new code submit" msgstr "Zaslať opravovateľom notifikáciu o submite kódu" -#: trojsten/contests/models.py:406 +#: contests/models.py:406 #, fuzzy #| msgid "tasks" msgid "task" msgstr "úloha" -#: trojsten/contests/models.py:409 +#: contests/models.py:409 msgid "organizer" msgstr "vedúci" -#: trojsten/contests/models.py:412 +#: contests/models.py:412 msgid "reviewer" msgstr "opravovateľ" -#: trojsten/contests/models.py:413 +#: contests/models.py:413 #, fuzzy #| msgid "solution-writer" msgid "solution writer" msgstr "vzorákovač" -#: trojsten/contests/models.py:414 +#: contests/models.py:414 msgid "proofreader" msgstr "recenzovač" -#: trojsten/contests/models.py:417 +#: contests/models.py:417 msgid "role" msgstr "funkcia" -#: trojsten/contests/models.py:421 +#: contests/models.py:421 msgid "Assigned user" msgstr "Pridelený človek" -#: trojsten/contests/models.py:422 +#: contests/models.py:422 msgid "Assigned people" msgstr "Pridelení ľudia" -#: trojsten/contests/templates/trojsten/contests/parts/progress.html:10 +#: contests/templates/trojsten/contests/parts/progress.html:10 msgid "Submit programs until" msgstr "Doprogramovanie do" -#: trojsten/contests/templates/trojsten/contests/parts/progress.html:12 +#: contests/templates/trojsten/contests/parts/progress.html:12 msgid "End of the round" msgstr "Koniec kola" -#: trojsten/contests/templates/trojsten/contests/parts/progress.html:26 +#: contests/templates/trojsten/contests/parts/progress.html:26 msgid "" "\n" " Don't submit descriptions.\n" @@ -137,131 +134,138 @@ msgstr "" "ktoré dostanete časť bodov.\n" " " -#: trojsten/contests/templates/trojsten/contests/parts/progress.html:36 +#: contests/templates/trojsten/contests/parts/progress.html:36 msgid "The round has finished." msgstr "Kolo už skončilo." -#: trojsten/contests/templates/trojsten/contests/parts/progress.html:39 +#: contests/templates/trojsten/contests/parts/progress.html:39 msgid "View the solution." msgstr "Pozrieť vzorové riešenie." # Task Statements -#: trojsten/contests/templatetags/statements_parts.py:99 +#: contests/templatetags/statements_parts.py:99 #, fuzzy, python-format #| msgid "%(count)d day" #| msgid_plural "%(count)s days" msgid "%(count)d day" msgstr "%(count)s deň" -#: trojsten/contests/templatetags/statements_parts.py:102 +#: contests/templatetags/statements_parts.py:102 #, fuzzy, python-format #| msgid "%(count)d hour" #| msgid_plural "%(count)s hours" msgid "%(count)d hour" msgstr "%(count)s hodina" -#: trojsten/contests/templatetags/statements_parts.py:105 +#: contests/templatetags/statements_parts.py:105 #, fuzzy, python-format #| msgid "%(count)d minute" #| msgid_plural "%(count)s minutes" msgid "%(count)d minute" msgstr "%(count)s minúta" -#: trojsten/contests/templatetags/statements_parts.py:108 +#: contests/templatetags/statements_parts.py:108 #, fuzzy, python-format #| msgid "%(count)d second" #| msgid_plural "%(count)s seconds" msgid "%(count)d second" msgstr "%(count)s sekunda" -#: trojsten/login/views.py:29 +#: events/admin.py:89 +msgid "Other_school" +msgstr "Iná škola" + +#: login/views.py:29 msgid "Logout successful" msgstr "Odhlásenie úspešné" -#: trojsten/people/admin.py:157 +#: people/admin.py:126 people/admin.py:129 +msgid "Other school" +msgstr "Iná škola" + +#: people/admin.py:184 msgid "Personal info" msgstr "Osobné údaje" -#: trojsten/people/admin.py:160 +#: people/admin.py:187 msgid "Address" msgstr "Adresa" -#: trojsten/people/admin.py:161 +#: people/admin.py:188 people/models.py:174 msgid "School" msgstr "Škola" -#: trojsten/people/admin.py:164 trojsten/people/forms.py:271 +#: people/admin.py:191 people/forms.py:282 msgid "Password" msgstr "Heslo" -#: trojsten/people/admin.py:165 +#: people/admin.py:192 msgid "Permissions" msgstr "Práva" -#: trojsten/people/admin.py:168 +#: people/admin.py:195 msgid "Important dates" msgstr "Dôležité dátumy" -#: trojsten/people/admin.py:257 +#: people/admin.py:284 msgid "Users merged succesfully." msgstr "Používatelia spojení úspešne." -#: trojsten/people/forms.py:31 trojsten/people/forms.py:49 +#: people/forms.py:43 people/forms.py:61 msgid "Street" msgstr "Ulica" -#: trojsten/people/forms.py:32 trojsten/people/forms.py:50 +#: people/forms.py:44 people/forms.py:62 msgid "Town" msgstr "Mesto" -#: trojsten/people/forms.py:34 trojsten/people/forms.py:52 +#: people/forms.py:46 people/forms.py:64 msgid "Postal code" msgstr "PSČ" -#: trojsten/people/forms.py:35 trojsten/people/forms.py:54 +#: people/forms.py:47 people/forms.py:66 msgid "Country" msgstr "Krajina" -#: trojsten/people/forms.py:38 +#: people/forms.py:50 msgid "home" msgstr "domov" -#: trojsten/people/forms.py:39 +#: people/forms.py:51 msgid "school" msgstr "do školy" -#: trojsten/people/forms.py:40 +#: people/forms.py:52 msgid "other address (e. g. to a dormitory)" msgstr "na inú adresu (napr. na internát)" -#: trojsten/people/forms.py:44 +#: people/forms.py:56 msgid "Correspondence address" msgstr "Korešpondenčná adresa" -#: trojsten/people/forms.py:45 +#: people/forms.py:57 msgid "Choose, where you want to accept mails." msgstr "Vyber, kam ti máme posielať poštu." -#: trojsten/people/forms.py:72 +#: people/forms.py:81 msgid "Gender" msgstr "Pohlavie" -#: trojsten/people/forms.py:88 trojsten/people/forms.py:96 -#: trojsten/people/forms.py:104 trojsten/people/forms.py:113 -#: trojsten/people/forms.py:123 trojsten/people/forms.py:133 -#: trojsten/people/forms.py:143 +#: people/forms.py:96 people/forms.py:104 people/forms.py:112 +#: people/forms.py:121 people/forms.py:131 people/forms.py:141 +#: people/forms.py:151 msgid "This field is required." msgstr "Toto pole je povinné." -#: trojsten/people/forms.py:154 +#: people/forms.py:162 msgid "Your graduation year is too far in the past." msgstr "Tvoj rok maturity je príliš ďaleko v minulosti." -#: trojsten/people/forms.py:160 +#: people/forms.py:168 msgid "Your graduation year is too far in the future." msgstr "Tvoj rok maturity je príliš ďaleko v budúcnosti." -#: trojsten/people/forms.py:172 +#: people/forms.py:180 msgid "" "We cannot send you correspondence to school when you don't choose any " "school. If your school is not in the list write us in an e-mail that you " @@ -271,15 +275,15 @@ msgstr "" "tvoja škola nenachádza v zozname, napíš v e-maili, že ti máme posielať poštu " "na školu" -#: trojsten/people/forms.py:273 +#: people/forms.py:284 msgid "Password confirmation" msgstr "Potvrdenie hesla" -#: trojsten/people/forms.py:274 +#: people/forms.py:285 msgid "Enter the same password as above, for verification." msgstr "Zadaj rovnaké heslo ako vyššie pre jeho overenie" -#: trojsten/people/forms.py:300 +#: people/forms.py:308 msgid "" "We recommend choosing a strong passphrase but we don't enforce any " "ridiculous constraints on your passwords." @@ -287,90 +291,109 @@ msgstr "" "Odporúčame ti vybrať silné heslo, ale nebudeme od teba vyžadovať žiadne " "smiešne požiadavky" -#: trojsten/people/forms.py:308 +#: people/forms.py:316 msgid "" "Since you're logging in using an external provider, this field is optional; " "however, by supplying it, you will be able to log in using a password. " msgstr "" -#: trojsten/people/forms.py:318 +#: people/forms.py:326 msgid "The two password fields didn't match." msgstr "" -#: trojsten/people/forms.py:457 +#: people/forms.py:466 msgid "Points have to be non-negative and at most {}." msgstr "Body musia byť nezáporné a najviac {}." -#: trojsten/people/forms.py:462 +#: people/forms.py:471 #, fuzzy #| msgid "The value has to be integer or {}." msgid "The value has to be number or {}." msgstr "Hodnota musí byť číslo alebo {}." -#: trojsten/people/forms.py:506 +#: people/forms.py:515 msgid "Round" msgstr "Kolo" -#: trojsten/people/forms.py:520 trojsten/people/forms.py:558 -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:31 -#: trojsten/people/templates/trojsten/people/settings.html:95 -#: trojsten/templates/ksp_login/parts/multiple_forms.html:11 -#: trojsten/templates/ksp_login/parts/single_form.html:10 +#: people/forms.py:538 people/forms.py:576 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:31 +#: people/templates/trojsten/people/settings.html:103 +#: people/templates/trojsten/people/settings.html:169 +#: templates/ksp_login/parts/multiple_forms.html:11 +#: templates/ksp_login/parts/single_form.html:10 msgid "Submit" msgstr "Odoslať" -#: trojsten/people/models.py:220 +#: people/models.py:173 reviews/templates/admin/zip_upload.html:32 +msgid "User" +msgstr "Používateľ" + +#: people/models.py:175 +msgid "Start of study" +msgstr "Začiatok štúdia" + +#: people/models.py:178 +#, fuzzy +#| msgid "School" +msgid "School of user" +msgstr "Škola používateľa" + +#: people/models.py:179 +msgid "Schools of user" +msgstr "Školy používateľa" + +#: people/models.py:240 msgid "Value \"{}\" does not match regex \"{}\"." msgstr "" -#: trojsten/people/templates/admin/people/duplicateuser/change_form.html:5 +#: people/templates/admin/people/duplicateuser/change_form.html:5 msgid "Merge candidates" msgstr "" -#: trojsten/people/templates/admin/people/duplicateuser/change_form.html:11 -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:10 +#: people/templates/admin/people/duplicateuser/change_form.html:11 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:10 msgid "Merge" msgstr "" -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:6 -#: trojsten/people/templates/admin/people/submitted_tasks.html:6 -#: trojsten/reviews/templates/admin/review_edit.html:6 -#: trojsten/reviews/templates/admin/review_form.html:6 -#: trojsten/reviews/templates/admin/zip_upload.html:6 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:6 +#: people/templates/admin/people/submitted_tasks.html:6 +#: reviews/templates/admin/review_edit.html:6 +#: reviews/templates/admin/review_form.html:6 +#: reviews/templates/admin/zip_upload.html:6 msgid "Home" msgstr "" -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:16 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:16 #, python-format msgid "Merge users %(user)s and %(candidate)s" msgstr "" -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:32 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:32 msgid "Reset" msgstr "Obnoviť" -#: trojsten/people/templates/admin/people/duplicateuser/merge_duplicate_users.html:33 +#: people/templates/admin/people/duplicateuser/merge_duplicate_users.html:33 msgid "Cancel" msgstr "Zrušiť" -#: trojsten/people/templates/admin/people/submitted_tasks.html:7 +#: people/templates/admin/people/submitted_tasks.html:7 msgid "People" msgstr "Ľudia" -#: trojsten/people/templates/admin/people/submitted_tasks.html:8 +#: people/templates/admin/people/submitted_tasks.html:8 msgid "Users" msgstr "Používatelia" -#: trojsten/people/templates/admin/people/submitted_tasks.html:10 -#: trojsten/people/templates/admin/people/submitted_tasks_button.html:6 +#: people/templates/admin/people/submitted_tasks.html:10 +#: people/templates/admin/people/submitted_tasks_button.html:6 msgid "Submitted tasks" msgstr "Odovzdané úlohy" -#: trojsten/people/templates/admin/people/submitted_tasks.html:15 +#: people/templates/admin/people/submitted_tasks.html:15 msgid "Tasks submitted by competitor" msgstr "Úlohy odovzdané riešiteľom" -#: trojsten/people/templates/admin/people/submitted_tasks.html:16 +#: people/templates/admin/people/submitted_tasks.html:16 msgid "" "\n" "You are viewing submits for round:\n" @@ -378,11 +401,11 @@ msgstr "" "\n" "Prezeráš si odovzdané úlohy pre kolo:\n" -#: trojsten/people/templates/admin/people/submitted_tasks.html:23 +#: people/templates/admin/people/submitted_tasks.html:23 msgid "Change round" msgstr "Zmeň kolo" -#: trojsten/people/templates/admin/people/submitted_tasks.html:27 +#: people/templates/admin/people/submitted_tasks.html:27 #, python-format msgid "" "\n" @@ -403,23 +426,23 @@ msgstr "" "Políčkami môžeš prechádzať pomocou tabulátora.\n" # Login -#: trojsten/people/templates/trojsten/people/additional_registration.html:11 -#: trojsten/people/templates/trojsten/people/additional_registration.html:14 +#: people/templates/trojsten/people/additional_registration.html:11 +#: people/templates/trojsten/people/additional_registration.html:14 #, fuzzy #| msgid "Registration" msgid "Complete Registration" msgstr "Dodatočná Registrácia" -#: trojsten/people/templates/trojsten/people/additional_registration.html:23 -#: trojsten/people/tests.py:759 +#: people/templates/trojsten/people/additional_registration.html:23 +#: people/tests.py:778 msgid "You have already filled all required properties." msgstr "Momentálne máš vyplnené všetky potrebné údaje." -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:9 +#: people/templates/trojsten/people/parts/additional_registration.html:9 msgid "We need a little more information" msgstr "Potrebujeme ešte zopár údajov" -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:13 +#: people/templates/trojsten/people/parts/additional_registration.html:13 msgid "" "To participate in some competitions, we need you to fill some more data in " "addition to those you have filled during registration.\n" @@ -429,7 +452,7 @@ msgstr "" "údaje navyše okrem tých, ktoré si zadal pri registrácii. Pokiaľ ich " "nevyplníš, nebudeme ťa zobrazovať vo výsledkovej listine." -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:17 +#: people/templates/trojsten/people/parts/additional_registration.html:17 msgid "" "If you want to prevent this message from showing, you may check \"I do not " "want to participate in competition\".\n" @@ -439,7 +462,7 @@ msgstr "" "\"Nechcem sa zapojiť do súťaže\". Toto rozhodnutie môžeš neskôr zmeniť v " "nastaveniach v sekcii \"Súťaže\"." -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:22 +#: people/templates/trojsten/people/parts/additional_registration.html:22 #, python-format msgid "" "To participate in competition %(competition)s you need to fill:" @@ -447,71 +470,102 @@ msgstr "" "V súťaži %(competition)s potrebujeme ešte aby si vyplnil tieto " "údaje:" -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:33 +#: people/templates/trojsten/people/parts/additional_registration.html:33 #, python-format msgid "I do not want to participate in competition %(competition)s." msgstr "Nechcem sa zapojiť do súťaže %(competition)s." -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:37 +#: people/templates/trojsten/people/parts/additional_registration.html:37 msgid "Close" msgstr "Zavrieť" -#: trojsten/people/templates/trojsten/people/parts/additional_registration.html:38 +#: people/templates/trojsten/people/parts/additional_registration.html:38 msgid "Fill data" msgstr "Vyplniť údaje" -#: trojsten/people/templates/trojsten/people/settings.html:11 -#: trojsten/people/templates/trojsten/people/settings.html:14 +#: people/templates/trojsten/people/settings.html:11 +#: people/templates/trojsten/people/settings.html:14 #, fuzzy #| msgid "Account information" msgid "Account settings" msgstr "Nastavenia účtu" -#: trojsten/people/templates/trojsten/people/settings.html:21 +#: people/templates/trojsten/people/settings.html:21 msgid "Profile" msgstr "Profil" -#: trojsten/people/templates/trojsten/people/settings.html:22 +#: people/templates/trojsten/people/settings.html:22 +msgid "School History" +msgstr "História škôl" + +#: people/templates/trojsten/people/settings.html:23 msgid "Properties" msgstr "Vlastnosti" -#: trojsten/people/templates/trojsten/people/settings.html:23 -#: trojsten/reviews/templates/admin/review_form.html:7 -#: trojsten/reviews/templates/admin/zip_upload.html:7 +#: people/templates/trojsten/people/settings.html:24 +#: reviews/templates/admin/review_form.html:7 +#: reviews/templates/admin/zip_upload.html:7 msgid "Contests" msgstr "Súťaže" -#: trojsten/people/templates/trojsten/people/settings.html:25 -#: trojsten/people/templates/trojsten/people/settings.html:27 +#: people/templates/trojsten/people/settings.html:26 +#: people/templates/trojsten/people/settings.html:28 msgid "Login settings" msgstr "Nastavenia prihlasovania" -#: trojsten/people/templates/trojsten/people/settings.html:96 +#: people/templates/trojsten/people/settings.html:38 +msgid "" +"\n" +"

    Here you can see and edit informations, which schoos you " +"have visited during attending our seminars\n" +" along dates, since when the information is valid. " +"According to these informations,\n" +" your school is showed in results and camp paticipants " +"list.

    \n" +"\n" +"

    If your school is missing in the list, write us an email " +"and we add it to the list.

    \n" +" " +msgstr "" +"\n" +"

    Tu môžeš vidieť a upravovať údaje o tom, ktoré školy si navštevoval(a) počas riešenia našich seminárov" +"spolu s dátumami, od kedy je údaj o navštevovaní školy aktuálny." +"Na základe týchto údajov sa zobrazuje tvoja škola vo výsledkovkách a zoznamov účastníkov.

    \n" +"" +"

    V prípade, že sa tvoja škola nenachádza v zozneme, napíš nám mail a my ju doplníme.

    \n" +" " + +#: people/templates/trojsten/people/settings.html:104 +#, fuzzy +#| msgid "school" +msgid "Add school" +msgstr "Pridaj školu" + +#: people/templates/trojsten/people/settings.html:170 msgid "Add property" msgstr "Pridať vlastnosť" -#: trojsten/people/templates/trojsten/people/settings.html:104 +#: people/templates/trojsten/people/settings.html:178 msgid "Choose which competitions would you like to participate in:" msgstr "Vyber si súťaže, ktoré chceš riešiť:" -#: trojsten/people/templates/trojsten/people/settings.html:112 +#: people/templates/trojsten/people/settings.html:186 msgid "You can use any of the following services to log in to your account." msgstr "Možete použiť ľubovoľnú z nasledujúcich služieb na prihlásenie." -#: trojsten/people/templates/trojsten/people/settings.html:133 -#: trojsten/templates/ksp_login/login.html:4 -#: trojsten/templates/ksp_login/login.html:7 -#: trojsten/templates/ksp_login/parts/include_javascript.html:15 -#: trojsten/templates/ksp_login/parts/login_box.html:44 -#: trojsten/templates/ksp_login/parts/login_box.html:61 -#: trojsten/templates/ksp_login/parts/login_box.html:75 -#: trojsten/templates/ksp_login/parts/login_full_contents.html:47 -#: trojsten/templates/ksp_login/parts/login_full_contents.html:53 -#: trojsten/templates/ksp_login/parts/login_full_contents.html:82 +#: people/templates/trojsten/people/settings.html:207 +#: templates/ksp_login/login.html:4 templates/ksp_login/login.html:7 +#: templates/ksp_login/parts/include_javascript.html:15 +#: templates/ksp_login/parts/login_box.html:44 +#: templates/ksp_login/parts/login_box.html:61 +#: templates/ksp_login/parts/login_box.html:75 +#: templates/ksp_login/parts/login_full_contents.html:47 +#: templates/ksp_login/parts/login_full_contents.html:53 +#: templates/ksp_login/parts/login_full_contents.html:82 msgid "Log in" msgstr "Prihlásiť sa" -#: trojsten/people/templates/trojsten/people/settings.html:141 +#: people/templates/trojsten/people/settings.html:215 #, python-format msgid "" "\n" @@ -526,13 +580,12 @@ msgstr "" "stránke.\n" " " -#: trojsten/people/templates/trojsten/people/settings.html:146 -#: trojsten/templates/ksp_login/password.html:5 -#: trojsten/templates/ksp_login/password.html:8 +#: people/templates/trojsten/people/settings.html:220 +#: templates/ksp_login/password.html:5 templates/ksp_login/password.html:8 msgid "Password change" msgstr "Zmena hesla" -#: trojsten/people/templates/trojsten/people/settings.html:149 +#: people/templates/trojsten/people/settings.html:223 #, python-format msgid "" "\n" @@ -545,253 +598,249 @@ msgstr "" "a>.\n" " " -#: trojsten/reviews/forms.py:49 +#: reviews/forms.py:49 #, python-format msgid "File must be a ZIP archive: %s" msgstr "Súbor musí byť ZIP archív: %s" -#: trojsten/reviews/forms.py:86 +#: reviews/forms.py:86 msgid "Points are required" msgstr "Body sú povinné" -#: trojsten/reviews/forms.py:89 +#: reviews/forms.py:89 msgid "User is required" msgstr "Používateľ je povinný" -#: trojsten/reviews/forms.py:94 +#: reviews/forms.py:94 #, python-format msgid "User %s does not exist" msgstr "Používateľ %s neexistuje" -#: trojsten/reviews/forms.py:185 +#: reviews/forms.py:185 #, python-format msgid "Invalid filename %s" msgstr "Neplatný názov súboru %s" -#: trojsten/reviews/forms.py:188 +#: reviews/forms.py:188 msgid "Must have set points" msgstr "Musíš uviesť body" -#: trojsten/reviews/forms.py:206 +#: reviews/forms.py:206 msgid "Assigned 2 or more files to the same user." msgstr "Rovnaký používateľ má priradené 2 alebo viac súborov." -#: trojsten/reviews/helpers.py:17 +#: reviews/helpers.py:17 msgid "You should upload a file or specify parent submit." msgstr "Mal by si nahrať súbor alebo špecifikovať predchádzajúci submit." -#: trojsten/reviews/templates/admin/review_edit.html:10 -#: trojsten/reviews/templates/admin/review_form.html:10 -#: trojsten/reviews/templates/admin/task_review.html:6 -#: trojsten/reviews/templates/admin/zip_upload.html:10 +#: reviews/templates/admin/review_edit.html:10 +#: reviews/templates/admin/review_form.html:10 +#: reviews/templates/admin/task_review.html:6 +#: reviews/templates/admin/zip_upload.html:10 msgid "Review" msgstr "Opravovanie" -#: trojsten/reviews/templates/admin/review_edit.html:11 -#: trojsten/reviews/templates/admin/review_form.html:64 +#: reviews/templates/admin/review_edit.html:11 +#: reviews/templates/admin/review_form.html:64 msgid "Edit" msgstr "Upraviť" -#: trojsten/reviews/templates/admin/review_form.html:8 -#: trojsten/reviews/templates/admin/zip_upload.html:8 +#: reviews/templates/admin/review_form.html:8 +#: reviews/templates/admin/zip_upload.html:8 msgid "Task" msgstr "Úloha" -#: trojsten/reviews/templates/admin/review_form.html:18 +#: reviews/templates/admin/review_form.html:18 msgid "Download all original solutions" msgstr "Stiahnuť všetky pôvodné riešenia" -#: trojsten/reviews/templates/admin/review_form.html:19 +#: reviews/templates/admin/review_form.html:19 msgid " (it downloads last submitted solution for each competitor)" msgstr " (stiahne pre každého užívateľa posledné odovzdané riešenie)" -#: trojsten/reviews/templates/admin/review_form.html:21 +#: reviews/templates/admin/review_form.html:21 msgid "Download all reviewed solutions" msgstr "Stiahnuť všetky opravené riešenia" -#: trojsten/reviews/templates/admin/review_form.html:22 +#: reviews/templates/admin/review_form.html:22 msgid " (it downloads reviewed solutions for each competitor if there is any)" msgstr " (stiahne pre každého užívateľa opravené riešenie, ak je opravené)" -#: trojsten/reviews/templates/admin/review_form.html:57 -#: trojsten/reviews/templates/admin/submit_form.html:12 -#: trojsten/submit/templates/trojsten/submit/parts/submit_list.html:30 -#: trojsten/submit/templates/trojsten/submit/parts/submit_list.html:36 -#: trojsten/submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:30 -#: trojsten/submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:37 +#: reviews/templates/admin/review_form.html:57 +#: reviews/templates/admin/submit_form.html:12 +#: submit/templates/trojsten/submit/parts/submit_list.html:30 +#: submit/templates/trojsten/submit/parts/submit_list.html:36 +#: submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:30 +#: submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:37 msgid "Download" msgstr "Stiahnuť" -#: trojsten/reviews/templates/admin/review_form.html:63 -#: trojsten/reviews/templates/admin/submit_form.html:9 +#: reviews/templates/admin/review_form.html:63 +#: reviews/templates/admin/submit_form.html:9 msgid "View" msgstr "Pozrieť" -#: trojsten/reviews/templates/admin/review_form.html:67 +#: reviews/templates/admin/review_form.html:67 msgid "Add new review" msgstr "Pridaj opravenie" -#: trojsten/reviews/templates/admin/review_form.html:82 +#: reviews/templates/admin/review_form.html:82 msgid "Update points and comments" msgstr "Aktualizuj body a komentáre" -#: trojsten/reviews/templates/admin/submit_form.html:6 +#: reviews/templates/admin/submit_form.html:6 msgid "View task" msgstr "Pozrieť úlohu" -#: trojsten/reviews/templates/admin/zip_upload.html:11 +#: reviews/templates/admin/zip_upload.html:11 msgid "Upload Zip" msgstr "Nahraj Zip" -#: trojsten/reviews/templates/admin/zip_upload.html:31 +#: reviews/templates/admin/zip_upload.html:31 msgid "Filename" msgstr "Názov súboru" -#: trojsten/reviews/templates/admin/zip_upload.html:32 -msgid "User" -msgstr "Používateľ" - -#: trojsten/reviews/templates/admin/zip_upload.html:33 +#: reviews/templates/admin/zip_upload.html:33 msgid "Points" msgstr "Body" -#: trojsten/reviews/templates/admin/zip_upload.html:34 +#: reviews/templates/admin/zip_upload.html:34 msgid "Comment" msgstr "Komentár" -#: trojsten/reviews/views.py:56 +#: reviews/views.py:56 msgid "Successfully uploaded a zip file." msgstr "Zip súbor bol úspešne nahraný" -#: trojsten/reviews/views.py:66 +#: reviews/views.py:66 msgid "Points and comments were successfully updated." msgstr "Body a komentáre boli úspešne aktualizované" -#: trojsten/reviews/views.py:127 +#: reviews/views.py:127 msgid "Successfully saved the review" msgstr "Opravenie bolo úspešne uložené" -#: trojsten/reviews/views.py:190 +#: reviews/views.py:190 #, python-format msgid "Missing file of user %s" msgstr "Chýba súbor používateľa %s" -#: trojsten/reviews/views.py:203 +#: reviews/views.py:203 #, python-format msgid "Missing source file of user %s" msgstr "Chýba zdrojový súbor používateľa %s" -#: trojsten/reviews/views.py:208 +#: reviews/views.py:208 #, python-format msgid "Missing protocol file of user %s" msgstr "Chýba protokol používateľa %s" -#: trojsten/reviews/views.py:244 +#: reviews/views.py:244 msgid "Problems with uploaded zip" msgstr "Problémy s nahratým zip-om" -#: trojsten/reviews/views.py:250 +#: reviews/views.py:250 msgid "Ignore" msgstr "Ignorovať" -#: trojsten/reviews/views.py:295 +#: reviews/views.py:295 msgid "Successfully finished reviewing this task!" msgstr "Úspešne dokončené opravovanie tejto úlohy!" -#: trojsten/settings/common.py:424 +#: settings/common.py:424 msgid "Table of Contents" msgstr "" -#: trojsten/submit/constants.py:11 +#: submit/constants.py:11 msgid "reviewed" msgstr "opravený" -#: trojsten/submit/constants.py:12 +#: submit/constants.py:12 msgid "in queue" msgstr "v poradí" -#: trojsten/submit/constants.py:13 +#: submit/constants.py:13 msgid "finished" msgstr "ukončený" -#: trojsten/submit/constants.py:14 trojsten/submit/constants.py:38 +#: submit/constants.py:14 submit/constants.py:38 msgid "OK" msgstr "OK" # Submit -#: trojsten/submit/constants.py:34 trojsten/submit/tests.py:393 +#: submit/constants.py:34 submit/tests.py:393 msgid "Wrong answer" msgstr "Zlá odpoveď" -#: trojsten/submit/constants.py:35 +#: submit/constants.py:35 msgid "Compilation error" msgstr "Chyba počas kompilácie" -#: trojsten/submit/constants.py:36 +#: submit/constants.py:36 msgid "Time limit exceeded" msgstr "Prekročený časový limit" -#: trojsten/submit/constants.py:37 +#: submit/constants.py:37 msgid "Memory limit exceeded" msgstr "Prekročený pamäťový limit" -#: trojsten/submit/constants.py:39 +#: submit/constants.py:39 msgid "Runtime exception" msgstr "Chyba počas behu programu" -#: trojsten/submit/constants.py:40 +#: submit/constants.py:40 msgid "Security exception" msgstr "Pokus o narušenie bezpečnosti" -#: trojsten/submit/constants.py:41 +#: submit/constants.py:41 msgid "Ignored" msgstr "" -#: trojsten/submit/constants.py:42 +#: submit/constants.py:42 msgid "Protocol corrupted" msgstr "Nečitateľný protokol" -#: trojsten/submit/forms.py:76 +#: submit/forms.py:76 #, fuzzy #| msgid "Submit" msgid "Submit file" msgstr "Nahrať súbor" -#: trojsten/submit/forms.py:77 +#: submit/forms.py:77 msgid "Here you can upload a file with submit description" msgstr "Tu môžeš nahrať súbor s popisom riešenia" -#: trojsten/submit/forms.py:85 +#: submit/forms.py:85 msgid "You can attach a submit file only to descriptions." msgstr "Nahrať súbor môžeš len k popisom." -#: trojsten/submit/templates/trojsten/submit/all_submits_page.html:7 -#: trojsten/submit/templates/trojsten/submit/all_submits_page.html:10 +#: submit/templates/trojsten/submit/all_submits_page.html:7 +#: submit/templates/trojsten/submit/all_submits_page.html:10 msgid "My submitted tasks" msgstr "Moje odovzdané úlohy" -#: trojsten/submit/templates/trojsten/submit/parts/submit_list.html:37 +#: submit/templates/trojsten/submit/parts/submit_list.html:37 msgid "Show comment" msgstr "Pozri komentár" -#: trojsten/submit/templates/trojsten/submit/parts/submit_list.html:75 -#: trojsten/submit/templates/trojsten/submit/parts/submit_list.html:92 +#: submit/templates/trojsten/submit/parts/submit_list.html:75 +#: submit/templates/trojsten/submit/parts/submit_list.html:92 msgid "Detaily" msgstr "" -#: trojsten/submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:39 +#: submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:39 msgid "View comment" msgstr "Pozri komentár" -#: trojsten/submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:53 +#: submit/templates/trojsten/submit/parts/submits_for_user_and_round.html:53 msgid "Details" msgstr "Detaily" -#: trojsten/submit/views.py:308 +#: submit/views.py:308 msgid "[Trojstenweb] User submission detected" msgstr "[Trojstenweb] Nový submit uživateľa" -#: trojsten/submit/views.py:309 +#: submit/views.py:309 #, python-brace-format msgid "" "{name} submitted solution to task {task}\n" @@ -800,7 +849,7 @@ msgstr "" "Uživateľ {name} submitol riešenie úlohy {task}\n" "\n" -#: trojsten/submit/views.py:310 +#: submit/views.py:310 #, python-brace-format msgid "" "Link for reviewing: {review_link}\n" @@ -809,7 +858,7 @@ msgstr "" "Link na opravovanie: {review_link}\n" "\n" -#: trojsten/submit/views.py:311 +#: submit/views.py:311 #, fuzzy, python-brace-format #| msgid "" #| "{name} submitted solution to task {task}\n" @@ -828,7 +877,7 @@ msgstr "" "\n" "Toto je automatizovaná správa, neodpovedajte na ňu" -#: trojsten/submit/views.py:425 +#: submit/views.py:425 msgid "" "You have successfully submitted your description, it will be reviewed after " "the round finishes." @@ -836,7 +885,7 @@ msgstr "" "Úspešne sa ti podarilo submitnúť popis, po skončení kola ti ho vedúci " "opravia." -#: trojsten/submit/views.py:429 +#: submit/views.py:429 msgid "" "You have submitted your description after the deadline. It is not counted in " "results." @@ -844,97 +893,96 @@ msgstr "" "Nahral si svoj popis riešenia po termíne kola. Nebude zarátaný vo " "výsledkovke." -#: trojsten/templates/comments/comment.html:23 +#: templates/comments/comment.html:23 msgid "Preview of your comment" msgstr "Náhľad komentára" -#: trojsten/templates/comments/comment.html:32 +#: templates/comments/comment.html:32 msgid "Anonymous" msgstr "Anonym" -#: trojsten/templates/comments/comment.html:39 +#: templates/comments/comment.html:39 #, python-format msgid "on %(submit_date)s" msgstr "%(submit_date)s" -#: trojsten/templates/comments/comment.html:46 +#: templates/comments/comment.html:46 msgid "reply" msgstr "reagovať" -#: trojsten/templates/comments/form.html:4 +#: templates/comments/form.html:4 msgid "Comments are closed." msgstr "Diskusia je uzavretá." -#: trojsten/templates/comments/form.html:24 +#: templates/comments/form.html:24 msgid "Post" msgstr "Odoslať" -#: trojsten/templates/ksp_login/parts/associated_accounts_list.html:9 +#: templates/ksp_login/parts/associated_accounts_list.html:9 msgid "Provider" msgstr "" -#: trojsten/templates/ksp_login/parts/associated_accounts_list.html:10 +#: templates/ksp_login/parts/associated_accounts_list.html:10 msgid "Account" msgstr "" -#: trojsten/templates/ksp_login/parts/associated_accounts_list.html:32 +#: templates/ksp_login/parts/associated_accounts_list.html:32 msgid "Disconnect" msgstr "" -#: trojsten/templates/ksp_login/parts/associated_accounts_list.html:42 +#: templates/ksp_login/parts/associated_accounts_list.html:42 msgid "You don't have any services associated with your account." msgstr "" -#: trojsten/templates/ksp_login/parts/login_box.html:11 +#: templates/ksp_login/parts/login_box.html:11 msgid "Logged in as" msgstr "" # Login -#: trojsten/templates/ksp_login/parts/login_box.html:22 +#: templates/ksp_login/parts/login_box.html:22 #, fuzzy #| msgid "Registration" msgid "Site administration" msgstr "Registrácia" -#: trojsten/templates/ksp_login/parts/login_box.html:29 +#: templates/ksp_login/parts/login_box.html:29 msgid "Settings" msgstr "" -#: trojsten/templates/ksp_login/parts/login_box.html:38 +#: templates/ksp_login/parts/login_box.html:38 msgid "Log out" msgstr "" -#: trojsten/templates/ksp_login/parts/login_box.html:67 +#: templates/ksp_login/parts/login_box.html:67 msgid "More login options" msgstr "" -#: trojsten/templates/ksp_login/parts/login_full_contents.html:85 +#: templates/ksp_login/parts/login_full_contents.html:85 msgid "Forgotten password" msgstr "" # Login -#: trojsten/templates/ksp_login/parts/login_full_contents.html:96 -#: trojsten/templates/ksp_login/registration.html:5 -#: trojsten/templates/ksp_login/registration.html:8 +#: templates/ksp_login/parts/login_full_contents.html:96 +#: templates/ksp_login/registration.html:5 +#: templates/ksp_login/registration.html:8 msgid "Registration" msgstr "Registrácia" -#: trojsten/templates/ksp_login/parts/login_full_contents.html:112 +#: templates/ksp_login/parts/login_full_contents.html:112 msgid "Log in with your Trojsten account" msgstr "" -#: trojsten/templates/ksp_login/registration.html:14 +#: templates/ksp_login/registration.html:14 msgid "" "Welcome, new user. You only need to give us a few details in order to finish " "the registration process." msgstr "" -#: trojsten/templates/search/search.html:5 -#: trojsten/templates/search/search.html:9 +#: templates/search/search.html:5 templates/search/search.html:9 msgid "Search results for:" msgstr "Výsledky hľadania pre" -#: trojsten/templates/search/search.html:23 +#: templates/search/search.html:23 #, python-format msgid "" "\n" @@ -943,33 +991,31 @@ msgstr "" "\n" " Nájdených %(cnt)s výskytov." -#: trojsten/templates/search/search.html:32 +#: templates/search/search.html:32 msgid "Title" msgstr "Názov" -#: trojsten/templates/search/search.html:33 +#: templates/search/search.html:33 msgid "Last modified" msgstr "Naposledy upravené" -#: trojsten/templates/search/search.html:58 +#: templates/search/search.html:58 msgid "There are no articles in this level" msgstr "Na tejto úrovni nie sú žiadne články." -#: trojsten/templates/search/search.html:68 -#: trojsten/templates/search/search.html:70 +#: templates/search/search.html:68 templates/search/search.html:70 msgid "Previous" msgstr "Predchádzajúca" -#: trojsten/templates/search/search.html:79 -#: trojsten/templates/search/search.html:81 +#: templates/search/search.html:79 templates/search/search.html:81 msgid "Next" msgstr "Nasledujúca" -#: trojsten/templates/wiki/article.html:19 +#: templates/wiki/article.html:19 msgid "locked" msgstr "" -#: trojsten/templates/wiki/article.html:40 +#: templates/wiki/article.html:40 msgid "This article was last modified:" msgstr "Čas poslednej úpravy:" From 6787b350b25e835285e6ebd407e7dd13caeb9777 Mon Sep 17 00:00:00 2001 From: dodo42 Date: Wed, 27 Jun 2018 13:15:25 +0200 Subject: [PATCH 9/9] Fix tests and add squashed migration. --- ...7_1156_squashed_0019_auto_20180608_2124.py | 65 +++++++++++++++++++ trojsten/people/models.py | 9 +-- 2 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 trojsten/people/migrations/0017_auto_20180607_1156_squashed_0019_auto_20180608_2124.py diff --git a/trojsten/people/migrations/0017_auto_20180607_1156_squashed_0019_auto_20180608_2124.py b/trojsten/people/migrations/0017_auto_20180607_1156_squashed_0019_auto_20180608_2124.py new file mode 100644 index 000000000..0f4b05fa9 --- /dev/null +++ b/trojsten/people/migrations/0017_auto_20180607_1156_squashed_0019_auto_20180608_2124.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-06-27 10:28 +from __future__ import unicode_literals + +from datetime import date + +from django.conf import settings +from django.db import migrations, models +import django.utils.timezone + +from trojsten.people.constants import OTHER_SCHOOL_ID + + +def migrate_schools(apps, schema_editor): + User = apps.get_model('people', 'User') + UserSchool = apps.get_model('people', 'UserSchool') + for user in User.objects.all(): + if user.school and user.school.id != OTHER_SCHOOL_ID: + UserSchool.objects.create( + user=user, + school=user.school, + start_time=date(max(user.graduation - 8, 1) if user.graduation else 1, 9, 1) + ) + + +def reverse_migrate_schools(apps, schema_editor): + UserSchool = apps.get_model('people', 'UserSchool') + for row in UserSchool.objects.order_by('user', '-start_time').distinct('user'): + row.user.school = row.school + row.user.save() + + +class Migration(migrations.Migration): + + replaces = [('people', '0017_auto_20180607_1156'), ('people', '0018_auto_20180607_1158'), ('people', '0019_auto_20180608_2124')] + + dependencies = [ + ('schools', '0001_initial'), + ('people', '0016_merge_20180121_1616'), + ] + + operations = [ + migrations.CreateModel( + name='UserSchool', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('start_time', models.DateField(verbose_name='Start of study')), + ('school', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='schools.School', verbose_name='School')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User')), + ], + ), + migrations.RunPython( + code=migrate_schools, + reverse_code=reverse_migrate_schools, + ), + migrations.RemoveField( + model_name='user', + name='school', + ), + migrations.AlterField( + model_name='userschool', + name='start_time', + field=models.DateField(default=django.utils.timezone.now, verbose_name='Start of study'), + ), + ] diff --git a/trojsten/people/models.py b/trojsten/people/models.py index 63758fd52..c07a63ab6 100644 --- a/trojsten/people/models.py +++ b/trojsten/people/models.py @@ -103,16 +103,13 @@ class Meta: @property def school(self): - schools_queryset = UserSchool.objects.filter(user=self).order_by('-start_time', '-id') - # TODO: Replace Other school with None - return schools_queryset.first().school if schools_queryset.count() > 0 \ - else School.objects.get(pk=constants.OTHER_SCHOOL_ID) + return self.school_at(timezone.now()) def school_at(self, date): - schools_queryset = UserSchool.objects.filter(user=self, start_time__lt=date).order_by('-start_time', '-id') + schools_queryset = UserSchool.objects.filter(user=self, start_time__lte=date).order_by('-start_time', '-id') # TODO: Replace Other school with None return schools_queryset.first().school if schools_queryset.count() > 0 \ - else School.objects.get(pk=constants.OTHER_SCHOOL_ID) + else School.objects.filter(pk=constants.OTHER_SCHOOL_ID).first() def add_school(self, school, date=timezone.now()): if school != self.school: