diff --git a/README.md b/README.md index f930a7f..d6c3147 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,3 @@ DB_PASSWORD=... $ python manage.py migrate $ python manage.py runserver ``` - -### Problemy z instalacją - -Mogą pojawić się problemy związane z instalacją `django-crispy-forms==1.12.0`. -Najpierw trzeba zainstalować wszystkie pakiety, potem dokładnie wersję `1.12.0`. -Pomimo błędów ta wersja jest potrzebna do działania diff --git a/app/admin.py b/app/admin.py index 97f2122..11b1dcf 100644 --- a/app/admin.py +++ b/app/admin.py @@ -2,7 +2,6 @@ from django.apps import apps from django.contrib import admin from django.shortcuts import HttpResponse from django.contrib.admin.sites import AlreadyRegistered -from django_summernote.admin import SummernoteModelAdmin from .models import Announcement, Edition, School, Student from django.db import transaction @@ -10,10 +9,6 @@ from io import BytesIO import xlsxwriter -class AnnouncementModelAdmin(SummernoteModelAdmin): - summernote_fields = ['content'] - - class EditionModelAdmin(admin.ModelAdmin): list_display = ('__str__', 'active') ordering = ('-active', '-year') @@ -33,7 +28,8 @@ class EditionModelAdmin(admin.ModelAdmin): if index == 0: continue - Student.objects.filter(identifier=row[0]).update(score_first=row[1], score_second=row[2]) + Student.objects.filter(identifier=row[0]).update( + score_first=row[1], score_second=row[2]) if '_update-disable-submissions' in request.POST and obj.active and obj.submissions: if obj.active is True: @@ -49,7 +45,8 @@ class EditionModelAdmin(admin.ModelAdmin): if '_generate-student-list' in request.POST: year = obj.year students = Student.objects.filter(identifier__startswith=year) - schools_set = {int(student.identifier.split('-')[1]) for student in students} + schools_set = {int(student.identifier.split('-') + [1]) for student in students} output = BytesIO() workbook = xlsxwriter.Workbook(output) @@ -69,15 +66,21 @@ class EditionModelAdmin(admin.ModelAdmin): row = 1 for school_id in schools_set: for student in sorted(Student.objects.filter(identifier__startswith=f'{year}-{school_id}-'), key=lambda x: x.identifier.split('-')[2]): - worksheet.write(row, 0, student.identifier) # Identyfikator - worksheet.write(row, 1, student.score_first) # Wynik - eliminacje - worksheet.write(row, 2, student.score_second) # Wynik - finał + # Identyfikator + worksheet.write(row, 0, student.identifier) + # Wynik - eliminacje + worksheet.write(row, 1, student.score_first) + # Wynik - finał + worksheet.write(row, 2, student.score_second) worksheet.write(row, 3, student.name) # Imię worksheet.write(row, 4, student.surname) # Nazwisko worksheet.write(row, 5, student.grade) # Klasa - worksheet.write(row, 6, student.school_name) # Szkoła - nazwa - worksheet.write(row, 7, student.school_town) # Szkoła - miejscowość - worksheet.write(row, 8, student.school_address) # Szkoła - adres + # Szkoła - nazwa + worksheet.write(row, 6, student.school_name) + # Szkoła - miejscowość + worksheet.write(row, 7, student.school_town) + # Szkoła - adres + worksheet.write(row, 8, student.school_address) row += 1 @@ -93,14 +96,33 @@ class EditionModelAdmin(admin.ModelAdmin): return super().response_change(request, obj) +class StudentYearFilter(admin.SimpleListFilter): + title = 'aktualna edycja' + parameter_name = 'aktualna edycja' + + def lookups(self, request, model_admin): + return ( + ('Yes', 'Jedynie aktualna edycja'), + ) + + def queryset(self, request, queryset): + value = self.value() + year = Edition.current().year + + if value == 'Yes': + return queryset.filter(identifier__startswith=str(year)) + + return queryset + + class StudentModelAdmin(admin.ModelAdmin): list_display = ('identifier', '__str__', 'grade') search_fields = ('identifier', 'name', 'surname', 'grade') - ordering = ('identifier',) + ordering = ('-identifier',) + list_filter = (StudentYearFilter,) admin.site.register(Student, StudentModelAdmin) -admin.site.register(Announcement, AnnouncementModelAdmin) admin.site.register(Edition, EditionModelAdmin) diff --git a/app/migrations/0003_alter_announcement_content.py b/app/migrations/0003_alter_announcement_content.py new file mode 100644 index 0000000..df4f7b0 --- /dev/null +++ b/app/migrations/0003_alter_announcement_content.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.5 on 2022-12-05 02:41 + +from django.db import migrations +import tinymce.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0002_auto_20220420_1823'), + ] + + operations = [ + migrations.AlterField( + model_name='announcement', + name='content', + field=tinymce.models.HTMLField(verbose_name='Treść'), + ), + ] diff --git a/app/migrations/0004_auto_20221205_0348.py b/app/migrations/0004_auto_20221205_0348.py new file mode 100644 index 0000000..91bd3e4 --- /dev/null +++ b/app/migrations/0004_auto_20221205_0348.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2.5 on 2022-12-05 02:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0003_alter_announcement_content'), + ] + + operations = [ + migrations.AlterField( + model_name='edition', + name='active', + field=models.BooleanField(default=False, verbose_name='Aktualna edycja'), + ), + migrations.AlterField( + model_name='edition', + name='scores_available', + field=models.BooleanField(default=False, verbose_name='Wyniki finałowe opublikowane'), + ), + migrations.AlterField( + model_name='edition', + name='scores_eliminations', + field=models.BooleanField(default=False, verbose_name='Wyniki z eliminacji opublikowane dla nauczycieli'), + ), + migrations.AlterField( + model_name='edition', + name='submissions', + field=models.BooleanField(default=False, verbose_name='Rejestracja drużyn'), + ), + ] diff --git a/app/models.py b/app/models.py index 16c75a3..2ad4f2e 100644 --- a/app/models.py +++ b/app/models.py @@ -1,26 +1,35 @@ from django.contrib.auth.models import PermissionsMixin from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager from django.db import models, transaction +from tinymce.models import HTMLField class Edition(models.Model): year = models.PositiveIntegerField('Rok', unique=True) roman = models.CharField('Nr. edycji', max_length=25) - active = models.BooleanField('Aktualna', default=False) - submissions = models.BooleanField('Możliwość zgłoszenia drużyny', default=False) + active = models.BooleanField('Aktualna edycja', default=False) + submissions = models.BooleanField( + 'Rejestracja drużyn', default=False) - scores_available = models.BooleanField('Wyniki dostępne dla wszystkich', default=False) - scores_eliminations = models.BooleanField('Wyniki z eliminacji dostępne dla nauczycieli', default=False) + scores_eliminations = models.BooleanField( + 'Wyniki z eliminacji opublikowane dla nauczycieli', default=False) + scores_available = models.BooleanField( + 'Wyniki finałowe opublikowane', default=False) - entry_threshold = models.IntegerField('Próg punkowy - wejście do finału', default=0) - award_threshold = models.IntegerField('Próg punktowy - wyróżnienie', default=0) - laureate_threshold = models.IntegerField('Próg punktowy - tytuł laureata', default=0) + entry_threshold = models.IntegerField( + 'Próg punkowy - wejście do finału', default=0) + award_threshold = models.IntegerField( + 'Próg punktowy - wyróżnienie', default=0) + laureate_threshold = models.IntegerField( + 'Próg punktowy - tytuł laureata', default=0) scores = models.FileField('Wyniki do wczytania', blank=True, upload_to='wyniki', help_text='Uwaga! Wyniki muszą być zawarte w pliku .csv. Kolumny po kolei to odpowiednio: identyfikator ucznia, wynik z eliminacji, wynik z finału.') - first_test = models.FileField('Zadania eliminacyjne', blank=True, upload_to='eliminacje') - second_test = models.FileField('Zadania finałowe', blank=True, upload_to='finaly') + first_test = models.FileField( + 'Zadania eliminacyjne', blank=True, upload_to='eliminacje') + second_test = models.FileField( + 'Zadania finałowe', blank=True, upload_to='finaly') def __str__(self): return f'Edycja {self.roman}' @@ -43,7 +52,8 @@ class Edition(models.Model): class Student(models.Model): name = models.CharField('Imię', max_length=50) surname = models.CharField('Nazwisko', max_length=50) - grade = models.PositiveIntegerField('Klasa', choices=map(lambda x: (x, x), range(1, 9))) + grade = models.PositiveIntegerField( + 'Klasa', choices=map(lambda x: (x, x), range(1, 9))) score_first = models.IntegerField('Wynik z eliminacji', default=0) score_second = models.IntegerField('Wynik z finału', default=0) @@ -65,7 +75,7 @@ class Student(models.Model): class Announcement(models.Model): title = models.CharField('Tytuł', max_length=250) - content = models.TextField('Treść') + content = HTMLField('Treść') created_at = models.DateTimeField(auto_now_add=True) def __str__(self): @@ -115,8 +125,10 @@ class School(AbstractBaseUser, PermissionsMixin): is_staff = models.BooleanField('Staff status', default=False) is_active = models.BooleanField('Active status', default=True) - request_notifications = models.BooleanField('Powiadomienia przy wysłaniu zgłoszenia', default=False) - email_notifications = models.BooleanField('Powiadomienia przy wysłaniu wiadomości email', default=False) + request_notifications = models.BooleanField( + 'Powiadomienia przy wysłaniu zgłoszenia', default=False) + email_notifications = models.BooleanField( + 'Powiadomienia przy wysłaniu wiadomości email', default=False) objects = UserManager() diff --git a/app/templates/admin/edition_buttons.html b/app/templates/admin/edition_buttons.html index 9bcd670..923673e 100644 --- a/app/templates/admin/edition_buttons.html +++ b/app/templates/admin/edition_buttons.html @@ -3,7 +3,7 @@
Liczba punktów zdobytych podczas eliminacji - {% if ongoing.entry_threshold > 0 %} + {% if ongoing.entry_threshold >= 0 %} Wynik eliminacji {% endif %} {% endif %} @@ -44,7 +44,7 @@ {% if ongoing.entry_threshold > 0 %} - {% if student.score_first > ongoing.entry_threshold %} + {% if student.score_first >= ongoing.entry_threshold %} Uczeń zakwalifikowany do finału {% else %} Uczeń niezakwalifikowany do finału diff --git a/crispy_forms/LICENSE b/crispy_forms/LICENSE new file mode 100644 index 0000000..c3b9ee5 --- /dev/null +++ b/crispy_forms/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) 2009 Daniel Greenfeld and contributors. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/crispy_forms/LICENSE.txt b/crispy_forms/LICENSE.txt new file mode 100644 index 0000000..c1c3cf8 --- /dev/null +++ b/crispy_forms/LICENSE.txt @@ -0,0 +1,22 @@ +Copyright (c) 2009-2021 Miguel Araujo, Daniel Feldroy and contributors. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/crispy_forms/__init__.py b/crispy_forms/__init__.py new file mode 100644 index 0000000..b9f68ed --- /dev/null +++ b/crispy_forms/__init__.py @@ -0,0 +1 @@ +__version__ = "1.14.0" diff --git a/crispy_forms/base.py b/crispy_forms/base.py new file mode 100644 index 0000000..87c479a --- /dev/null +++ b/crispy_forms/base.py @@ -0,0 +1,22 @@ +class KeepContext: + """ + Context manager that receives a `django.template.Context` instance and a list of keys + + Once the context manager is exited, it removes `keys` from the context, to avoid + side effects in later layout objects that may use the same context variables. + + Layout objects should use `extra_context` to introduce context variables, never + touch context object themselves, that could introduce side effects. + """ + + def __init__(self, context, keys): + self.context = context + self.keys = keys + + def __enter__(self): + pass + + def __exit__(self, type, value, traceback): + for key in list(self.keys): + if key in self.context: + del self.context[key] diff --git a/crispy_forms/bootstrap.py b/crispy_forms/bootstrap.py new file mode 100644 index 0000000..aac501d --- /dev/null +++ b/crispy_forms/bootstrap.py @@ -0,0 +1,1132 @@ +from random import randint + +from django.template import Template +from django.template.loader import render_to_string +from django.utils.safestring import SafeString +from django.utils.text import slugify + +from .layout import Div, Field, LayoutObject, TemplateNameMixin +from .utils import TEMPLATE_PACK, flatatt, render_field + + +class PrependedAppendedText(Field): + """ + Layout object for rendering a field with prepended and appended text. + + Attributes + ---------- + template : str + The default template which this Layout Object will be rendered + with. + attrs : dict + Attributes to be applied to the field. These are converted into html + attributes. e.g. ``data_id: 'test'`` in the attrs dict will become + ``data-id='test'`` on the field's ````. + + Parameters + ---------- + field : str + The name of the field to be rendered. + prepended_text : str, optional + The prepended text, can be HTML like, by default None + appended_text : str, optional + The appended text, can be HTML like, by default None + input_size : str, optional + For Bootstrap4+ additional classes to customise the input-group size + e.g. ``input-group-sm``. By default None + active : bool + For Bootstrap3, a boolean to render the text active. By default + ``False``. + css_class : str, optional + CSS classes to be applied to the field. These are added to any classes + included in the ``attrs`` dict. By default ``None``. + wrapper_class: str, optional + CSS classes to be used when rendering the Field. This class is usually + applied to the ``
`` which wraps the Field's ``