From 009cd49f3723047146211c962cf38ae671433b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 24 Oct 2022 20:16:41 +0200 Subject: [PATCH 01/32] =?UTF-8?q?Revert=20"Fix=20(tab.=20do=C5=A1.=20?= =?UTF-8?q?=C5=99e=C5=A1en=C3=AD):=20strftime=20nefunguje,=20jak=20jsem=20?= =?UTF-8?q?si=20myslel"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4b03a2d23ce085f72ff486a90f1c283324c647a5. --- odevzdavatko/forms.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py index 0e3582c4..271c448a 100644 --- a/odevzdavatko/forms.py +++ b/odevzdavatko/forms.py @@ -155,10 +155,8 @@ class OdevzdavatkoTabulkaFiltrForm(forms.Form): result = [] - date_str = strftime(DATE_FORMAT, datetime.date.min.timetuple()) - if date_str[0] == '1': # Někde očividně vrací strftime rok bez nul. - date_str = "000" + date_str - result.append((date_str, f"Odjakživa")) + result.append(( + strftime(DATE_FORMAT, datetime.date.min.timetuple()), f"Odjakživa")) for deadline in m.Deadline.objects.filter( deadline__lte=timezone.now(), From a03c9a3369947a68ea99dc7ad4d88f76f31d0530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 24 Oct 2022 20:33:55 +0200 Subject: [PATCH 02/32] =?UTF-8?q?Fix=20(tab.=20do=C5=A1.=20=C5=99e=C5=A1en?= =?UTF-8?q?=C3=AD):=20strftime=20vyhazuje=20datum=20bez=20paddingu=20nul,?= =?UTF-8?q?=20tak=20tam=20nak=C3=B3d=C3=ADme=20string=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odevzdavatko/forms.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py index 271c448a..6eb2a973 100644 --- a/odevzdavatko/forms.py +++ b/odevzdavatko/forms.py @@ -155,8 +155,7 @@ class OdevzdavatkoTabulkaFiltrForm(forms.Form): result = [] - result.append(( - strftime(DATE_FORMAT, datetime.date.min.timetuple()), f"Odjakživa")) + result.append(("0001-01-01", f"Odjakživa")) for deadline in m.Deadline.objects.filter( deadline__lte=timezone.now(), From 046a6be790d716df80dfe2ec6b52dad99d9b632c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 31 Oct 2022 21:31:09 +0100 Subject: [PATCH 03/32] =?UTF-8?q?Add:=20Aktu=C3=A1ln=C3=AD=20v=C3=BDsledko?= =?UTF-8?q?vka=20mus=C3=AD=20obsahovat=20datum,=20jinak=20se=20=C5=99e?= =?UTF-8?q?=C5=A1itel=C3=A9=20ptaj=C3=AD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/zadani/AktualniVysledkovka.html | 1 + 1 file changed, 1 insertion(+) diff --git a/seminar/templates/seminar/zadani/AktualniVysledkovka.html b/seminar/templates/seminar/zadani/AktualniVysledkovka.html index 20e81ac7..ba97522b 100644 --- a/seminar/templates/seminar/zadani/AktualniVysledkovka.html +++ b/seminar/templates/seminar/zadani/AktualniVysledkovka.html @@ -5,6 +5,7 @@

{% block nadpis1a %} Průběžné výsledky {{ rocnik.rocnik }}. ročníku + {% if vysledkovka.do_deadlinu %}k datu {{ vysledkovka.do_deadlinu.deadline.date }}{% endif %} {% endblock %}

From 51710892dfd3639c49fae47b041380971320bb90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 31 Oct 2022 21:46:24 +0100 Subject: [PATCH 04/32] =?UTF-8?q?Fix:=20ve=C5=99ejn=C3=A1=20v=C3=BDsledkov?= =?UTF-8?q?ka=20ro=C4=8Dn=C3=ADku=20se=20m=C3=A1=20s=C4=8D=C3=ADtat=20jen?= =?UTF-8?q?=20do=20ve=C5=99ejn=C3=A9ho=20deadlinu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vysledkovky/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vysledkovky/utils.py b/vysledkovky/utils.py index 8281e723..f363abfd 100644 --- a/vysledkovky/utils.py +++ b/vysledkovky/utils.py @@ -146,7 +146,10 @@ class VysledkovkaRocniku(Vysledkovka): def __init__(self, rocnik: m.Rocnik, jen_verejne: bool = True): self.rocnik = rocnik self.jen_verejne = jen_verejne - self.do_deadlinu = m.Deadline.objects.filter(cislo__rocnik=rocnik).last() + deadliny = m.Deadline.objects.filter(cislo__rocnik=rocnik) + if jen_verejne: + deadliny = deadliny.filter(verejna_vysledkovka=True) + self.do_deadlinu = deadliny.order_by("deadline").last() @cached_property def aktivni_resitele(self) -> list[m.Resitel]: From 313ee120aee0f0c09b2b15a84dc0e3a43a5ced29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 31 Oct 2022 21:51:22 +0100 Subject: [PATCH 05/32] =?UTF-8?q?Fix:=20aktu=C3=A1ln=C3=AD=20v=C3=BDsledko?= =?UTF-8?q?vka=20u=C5=BE=20nen=C3=AD=20pr=C5=AFb=C4=9B=C5=BEn=C3=A1,=20ale?= =?UTF-8?q?=20k=20datu=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/zadani/AktualniVysledkovka.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/zadani/AktualniVysledkovka.html b/seminar/templates/seminar/zadani/AktualniVysledkovka.html index ba97522b..640600f3 100644 --- a/seminar/templates/seminar/zadani/AktualniVysledkovka.html +++ b/seminar/templates/seminar/zadani/AktualniVysledkovka.html @@ -4,7 +4,7 @@

{% block nadpis1a %} - Průběžné výsledky {{ rocnik.rocnik }}. ročníku + Výsledky {{ rocnik.rocnik }}. ročníku {% if vysledkovka.do_deadlinu %}k datu {{ vysledkovka.do_deadlinu.deadline.date }}{% endif %} {% endblock %}

From 81ef3a8f53798d06c89f1c876fd543fe74fe9892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 31 Oct 2022 22:42:42 +0100 Subject: [PATCH 06/32] =?UTF-8?q?Fix:=20resetov=C3=A1n=C3=AD=20hesla=20pos?= =?UTF-8?q?=C3=ADl=C3=A1=20i=20u=C5=BEivatelsk=C3=A9=20jm=C3=A9no,=20ale?= =?UTF-8?q?=20odkaz=20na=20resetov=C3=A1n=C3=AD=20o=20tom=20nemluv=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- various/autentizace/templates/autentizace/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/various/autentizace/templates/autentizace/login.html b/various/autentizace/templates/autentizace/login.html index 595c120d..2dbabcc4 100644 --- a/various/autentizace/templates/autentizace/login.html +++ b/various/autentizace/templates/autentizace/login.html @@ -24,7 +24,7 @@

- Zapomněl jsem heslo + Zapomněl jsem heslo nebo uživatelské jméno

From 6eaa174d877993356cc92df5fb2669db485e5d93 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Mon, 10 Oct 2022 23:48:45 +0200 Subject: [PATCH 07/32] localhost do ALLOWED_HOSTS --- mamweb/settings_local.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py index 9368524b..4cf76dc2 100644 --- a/mamweb/settings_local.py +++ b/mamweb/settings_local.py @@ -31,6 +31,7 @@ TEMPLATES[0]['OPTIONS']['debug'] = True from ipaddress import ip_network ALLOWED_HOSTS = [str(ip) for ip in ip_network('192.168.0.0/16')] ALLOWED_HOSTS.append('127.0.0.1') +ALLOWED_HOSTS.append('localhost') # Database # https://docs.djangoproject.com/en/1.7/ref/settings/#databases From 3d1b2794e9de1af26e9105347c8a61b9c3ac56e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Nov 2022 19:44:49 +0100 Subject: [PATCH 08/32] =?UTF-8?q?Fix:=20rozbit=C3=A1=20testdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/testutils.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/seminar/testutils.py b/seminar/testutils.py index fe73875f..14932916 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -13,7 +13,7 @@ import unidecode import logging from korektury.testutils import create_test_pdf -from seminar.models import Skola, Resitel, Rocnik, Cislo, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode +from seminar.models import Skola, Resitel, Rocnik, Cislo, Deadline, Problem, Reseni, PrilohaReseni, Nastaveni, Soustredeni, Soustredeni_Ucastnici, Soustredeni_Organizatori, Osoba, Organizator, Prijemce, Tema, Uloha, Konfera, TextNode, UlohaVzorakNode, RocnikNode, CisloNode, TemaVCisleNode, Text, Hodnoceni, UlohaZadaniNode, Novinky, TreeNode import seminar.models as m from django.contrib.flatpages.models import FlatPage @@ -299,7 +299,7 @@ def gen_reseni_ulohy(rnd, cisla, uloha, pocet_resitelu, poradi_cisla, resitele_c # Vytvoření řešení. if uloha.cislo_zadani.zlomovy_deadline_pro_papirove_cislo() is not None: # combine, abychom dostali plný čas a ne jen datum - cas_doruceni = datetime.datetime.combine(uloha.cislo_zadani.datum_deadline, datetime.datetime.min.time()) - datetime.timedelta(days=random.randint(0, 40)) - datetime.timedelta(minutes=random.randint(0, 60*24)) + cas_doruceni = uloha.cislo_zadani.deadline_v_cisle.first().deadline - datetime.timedelta(days=random.randint(0, 40)) - datetime.timedelta(minutes=random.randint(0, 60*24)) # astimezone, protože jinak vyhazuje warning o nenastavené TZ res = Reseni.objects.create(forma=rnd.choice(Reseni.FORMA_CHOICES)[0], cas_doruceni=cas_doruceni.astimezone(datetime.timezone.utc)) else: @@ -444,7 +444,6 @@ def gen_cisla(rnd, rocniky): rocnik = rocnik, poradi = str(ci), datum_vydani=vydano, - datum_deadline=deadline, verejne_db=True, verejna_vysledkovka=True ) @@ -452,6 +451,12 @@ def gen_cisla(rnd, rocniky): node2.succ = node node2.root = rocnik.rocniknode cislo.save() + deadline = Deadline.objects.create( + cislo=cislo, + deadline=deadline, + typ=Deadline.TYP_CISLA + ) + deadline.save() node = node2 if otec: otec = False From 100e16030a70b4e4cec0acdb0de9eadc5554b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Nov 2022 20:42:12 +0100 Subject: [PATCH 09/32] =?UTF-8?q?Fix:=20rozbit=C3=A1=20testdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/testutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seminar/testutils.py b/seminar/testutils.py index 14932916..2d4f3abf 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -445,7 +445,6 @@ def gen_cisla(rnd, rocniky): poradi = str(ci), datum_vydani=vydano, verejne_db=True, - verejna_vysledkovka=True ) node2 = CisloNode.objects.get(cislo = cislo) node2.succ = node @@ -454,7 +453,8 @@ def gen_cisla(rnd, rocniky): deadline = Deadline.objects.create( cislo=cislo, deadline=deadline, - typ=Deadline.TYP_CISLA + typ=Deadline.TYP_CISLA, + verejna_vysledkovka=True, ) deadline.save() node = node2 From f12c4ccb7a1d4e229344d9b86ccaf5e325893091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Nov 2022 20:45:39 +0100 Subject: [PATCH 10/32] =?UTF-8?q?Fix:=20rozbit=C3=A1=20testdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/testutils.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/seminar/testutils.py b/seminar/testutils.py index 2d4f3abf..a13e82c8 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -436,10 +436,6 @@ def gen_cisla(rnd, rocniky): (mesic_vydani + 1) % 12 + 1, rnd.randint(1, 28)) - # posledni 2 cisla v rocniku nemaji deadline - if (ci + 2 > cisel): - deadline = None - cislo = Cislo.objects.create( rocnik = rocnik, poradi = str(ci), From 32768aab10799f11645124f34404de37efe99903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Nov 2022 22:05:44 +0100 Subject: [PATCH 11/32] =?UTF-8?q?Fix:=20na=20mobilu=20nen=C3=AD=20menu=20k?= =?UTF-8?q?orektur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/templates/menu_mobile.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mamweb/templates/menu_mobile.html b/mamweb/templates/menu_mobile.html index aed04cd5..28b3aad3 100644 --- a/mamweb/templates/menu_mobile.html +++ b/mamweb/templates/menu_mobile.html @@ -3,11 +3,9 @@ {% autoescape off %}
    {% for item in sitetree_items %} -
  • +
  • - {{ item.title_resolved }} + {% if item.title == "HIDDEN" %}Korektury{% else %}{{ item.title_resolved }}{% endif %}
    {% if item.has_children %} From 7e60791c33b7632aa7d0bbcca422ee3644898acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 7 Nov 2022 22:53:08 +0100 Subject: [PATCH 12/32] Fix: #1331 --- prednasky/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prednasky/urls.py b/prednasky/urls.py index 0a96aa59..d0e7a703 100644 --- a/prednasky/urls.py +++ b/prednasky/urls.py @@ -8,13 +8,13 @@ Soubor sloužící jako „router“, tj. zde se definují url adresy a na co uk - ``prednasky/seznam_prednasek//`` (seznam-list) :class:`~prednasky.views.SeznamListView` """ from django.urls import path -from seminar.utils import org_required, resitel_required +from seminar.utils import org_required, resitel_or_org_required from . import views urlpatterns = [ path( 'prednasky/', - resitel_required(views.newPrednaska) + resitel_or_org_required(views.newPrednaska) ), path('prednasky/hotovo', views.Prednaska_hotovo), path( From f8667b82474d348c3a38c502b941bbec05278141 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Mon, 10 Oct 2022 23:49:24 +0200 Subject: [PATCH 13/32] =?UTF-8?q?odevzdavatko:=20pol=C3=AD=C4=8Dko=20pro?= =?UTF-8?q?=20zp=C4=9Btnou=20vazbu=20=C5=99e=C5=A1iteli?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mamweb/static/css/mamweb.css | 4 ++++ odevzdavatko/forms.py | 5 +++-- .../templates/odevzdavatko/detail.html | 6 ++++-- .../odevzdavatko/detail_resitele.html | 3 ++- odevzdavatko/views.py | 8 ++++++-- seminar/migrations/0108_hodnoceni_feedback.py | 18 ++++++++++++++++++ seminar/models/odevzdavatko.py | 2 ++ 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 seminar/migrations/0108_hodnoceni_feedback.py diff --git a/mamweb/static/css/mamweb.css b/mamweb/static/css/mamweb.css index fa5de880..53e06967 100644 --- a/mamweb/static/css/mamweb.css +++ b/mamweb/static/css/mamweb.css @@ -421,6 +421,10 @@ input { margin: 5px; } +textarea.feedback { + margin: 5px; +} + /* titulni stranka */ diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py index 6eb2a973..a8538668 100644 --- a/odevzdavatko/forms.py +++ b/odevzdavatko/forms.py @@ -88,11 +88,12 @@ ReseniSPrilohamiFormSet = inlineformset_factory(m.Reseni,m.PrilohaReseni, class JednoHodnoceniForm(forms.ModelForm): class Meta: model = m.Hodnoceni - fields = ('problem', 'body', 'deadline_body') + fields = ('problem', 'body', 'deadline_body', 'feedback',) widgets = { 'problem': autocomplete.ModelSelect2( url='autocomplete_problem_odevzdatelny', # FIXME: Dovolit i starší? - ) + ), + 'feedback': forms.Textarea(attrs={'rows': 1, 'cols': 30, 'class': 'feedback'}), } OhodnoceniReseniFormSet = formset_factory(JednoHodnoceniForm, diff --git a/odevzdavatko/templates/odevzdavatko/detail.html b/odevzdavatko/templates/odevzdavatko/detail.html index 10f86a14..9f6d31ac 100644 --- a/odevzdavatko/templates/odevzdavatko/detail.html +++ b/odevzdavatko/templates/odevzdavatko/detail.html @@ -91,7 +91,7 @@ $(document).ready(function(){
    {# Poznámka #} -

    Poznámka:

    +

    Neveřejná poznámka:

    {{ poznamka_form.poznamka }}

    {# Hodnocení: #} @@ -101,13 +101,14 @@ $(document).ready(function(){ {{ form.management_form }} - + {% for subform in form %} + @@ -123,6 +124,7 @@ $(document).ready(function(){ +
    ProblémBodyDeadline pro body
    ProblémBodyDeadline pro bodyZpětná vazba pro řešitele
    {{ subform.problem }} {{ subform.body }} {{ subform.deadline_body }}{{ subform.feedback }} Smazat
    {{ form.empty_form.problem }} {{ form.empty_form.body }} {{ form.empty_form.deadline_body }}{{ form.empty_form.feedback }} Smazat
    diff --git a/odevzdavatko/templates/odevzdavatko/detail_resitele.html b/odevzdavatko/templates/odevzdavatko/detail_resitele.html index 1c7622a7..fb0cb5fb 100644 --- a/odevzdavatko/templates/odevzdavatko/detail_resitele.html +++ b/odevzdavatko/templates/odevzdavatko/detail_resitele.html @@ -37,11 +37,12 @@ {# Hodnocení: #}

    Hodnocení:

    -{# #} +{# #} {% for h in hodnoceni %} + {# #} {% endfor %} diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py index 6e0f7c47..ae466b0d 100644 --- a/odevzdavatko/views.py +++ b/odevzdavatko/views.py @@ -218,10 +218,11 @@ class DetailReseniView(DetailView): self.reseni = get_object_or_404(m.Reseni, id=self.kwargs['pk']) result = [] # Slovníky s klíči problem, body, deadline_body -- initial data pro f.OhodnoceniReseniFormSet for hodn in m.Hodnoceni.objects.filter(reseni=self.reseni): - result.append( - {"problem": hodn.problem, + result.append({ + "problem": hodn.problem, "body": hodn.body, "deadline_body": hodn.deadline_body, + "feedback": hodn.feedback, }) return result @@ -261,10 +262,12 @@ def hodnoceniReseniView(request, pk, *args, **kwargs): problem = form.cleaned_data['problem'] body = form.cleaned_data['body'] deadline_body = form.cleaned_data['deadline_body'] + feedback = form.cleaned_data['feedback'] hodnoceni = m.Hodnoceni( problem=problem, body=body, deadline_body=deadline_body, + feedback=feedback, reseni=reseni, ) logger.info(f"Creating Hodnoceni: {hodnoceni}") @@ -285,6 +288,7 @@ class ResitelReseniView(DetailView): { "problem": hodn.problem, "body": hodn.body, + "feedback": hodn.feedback, # "deadline_body": hodn.deadline_body, } ) diff --git a/seminar/migrations/0108_hodnoceni_feedback.py b/seminar/migrations/0108_hodnoceni_feedback.py new file mode 100644 index 00000000..282849d8 --- /dev/null +++ b/seminar/migrations/0108_hodnoceni_feedback.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.16 on 2022-11-14 19:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('seminar', '0107_zmrazenavysledkovka'), + ] + + operations = [ + migrations.AddField( + model_name='hodnoceni', + name='feedback', + field=models.TextField(blank=True, default='', help_text='Zpětná vazba řešiteli (plain text)', verbose_name='zpětná vazba'), + ), + ] diff --git a/seminar/models/odevzdavatko.py b/seminar/models/odevzdavatko.py index 77ed5018..9ae161c5 100644 --- a/seminar/models/odevzdavatko.py +++ b/seminar/models/odevzdavatko.py @@ -113,6 +113,8 @@ class Hodnoceni(bm.SeminarModelBase): problem = models.ForeignKey(am.Problem, verbose_name='problém', related_name='hodnoceni', on_delete=models.PROTECT) + feedback = models.TextField('zpětná vazba', blank=True, default='', help_text='Zpětná vazba řešiteli (plain text)') + def __str__(self): return "{}, {}, {}".format(self.problem, self.reseni, self.body) From e856859ffb1926c22eeb9bdc5af9b73c53479037 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Thu, 3 Nov 2022 19:56:11 +0100 Subject: [PATCH 14/32] =?UTF-8?q?odevzdavatko:=20zobrazen=C3=AD=20chyby=20?= =?UTF-8?q?p=C5=99i=20nevalidn=C3=ADm=20formsetu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- odevzdavatko/views.py | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/odevzdavatko/views.py b/odevzdavatko/views.py index ae466b0d..6c232172 100644 --- a/odevzdavatko/views.py +++ b/odevzdavatko/views.py @@ -246,32 +246,26 @@ def hodnoceniReseniView(request, pk, *args, **kwargs): formset = f.OhodnoceniReseniFormSet(request.POST) poznamka_form = f.PoznamkaReseniForm(request.POST, instance=reseni) # TODO: Napsat validaci formuláře a formsetu - # TODO: Implementovat větev, kdy formulář validní není. - if formset.is_valid() and poznamka_form.is_valid(): - with transaction.atomic(): - # Poznámka je jednoduchá na zpracování: - poznamka_form.save() + if not (formset.is_valid() and poznamka_form.is_valid()): + raise ValueError(formset.errors, poznamka_form.errors) - # Smažeme všechna dosavadní hodnocení tohoto řešení - qs = m.Hodnoceni.objects.filter(reseni=reseni) - logger.info(f"Will delete {qs.count()} objects: {qs}") - qs.delete() - - # Vyrobíme nová podle formsetu - for form in formset: - problem = form.cleaned_data['problem'] - body = form.cleaned_data['body'] - deadline_body = form.cleaned_data['deadline_body'] - feedback = form.cleaned_data['feedback'] - hodnoceni = m.Hodnoceni( - problem=problem, - body=body, - deadline_body=deadline_body, - feedback=feedback, + with transaction.atomic(): + # Poznámka je jednoduchá na zpracování: + poznamka_form.save() + + # Smažeme všechna dosavadní hodnocení tohoto řešení + qs = m.Hodnoceni.objects.filter(reseni=reseni) + logger.info(f"Will delete {qs.count()} objects: {qs}") + qs.delete() + + # Vyrobíme nová podle formsetu + for form in formset: + hodnoceni = m.Hodnoceni( reseni=reseni, + **form.cleaned_data, ) - logger.info(f"Creating Hodnoceni: {hodnoceni}") - hodnoceni.save() + logger.info(f"Creating Hodnoceni: {hodnoceni}") + hodnoceni.save() return redirect(success_url) From 9ee7ac78c4e1911e3aee80397a8fa25203223ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 21:36:10 +0100 Subject: [PATCH 15/32] Fix: #1125 --- mamweb/templates/admin/base_site.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mamweb/templates/admin/base_site.html b/mamweb/templates/admin/base_site.html index b5738832..ce58b32e 100644 --- a/mamweb/templates/admin/base_site.html +++ b/mamweb/templates/admin/base_site.html @@ -10,5 +10,5 @@ {% block bodyclass %}{{ LOCAL_TEST_PROD }}web{% endblock %} {% block branding %} -

    M&M GWP web

    +

    M&M web

    {% endblock %} From 39c37c0c73241365b2aff27bbb67207368f0e3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 21:53:07 +0100 Subject: [PATCH 16/32] Fix: #992 --- .../vysledkovky/vysledkovka_cisla.html | 32 +++++++++---------- .../vysledkovky/vysledkovka_rocnik.html | 24 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/vysledkovky/templates/vysledkovky/vysledkovka_cisla.html b/vysledkovky/templates/vysledkovky/vysledkovka_cisla.html index e24b3d12..ac53c811 100644 --- a/vysledkovky/templates/vysledkovky/vysledkovka_cisla.html +++ b/vysledkovky/templates/vysledkovky/vysledkovka_cisla.html @@ -1,49 +1,49 @@
    ProblémBodyDeadline pro body
    ProblémBodyZpětná vazba od opravovateleDeadline pro body
    {{ h.problem }} {{ h.body }}{{ h.feedback }}{{ h.deadline_body }}
    - + {% for p in vysledkovka.temata_a_spol%} - {# TODELETE #} {% for podproblemy in vysledkovka.podproblemy_iter.next %} - {% endfor %} {# TODELETE #} {% endfor %} - {% if vysledkovka.je_nejake_ostatni %}{% endif %} {# TODELETE #} {% for podproblemy in vysledkovka.podproblemy_iter.next %} - {% endfor %} {# TODELETE #} - + + {% for rv in vysledkovka.radky_vysledkovky %} - {% for b in rv.body_za_temata_seznam %} - {% for body_podproblemu in rv.body_podproblemy_iter.next %} - {% endfor %} {% endfor %} - + + {% endfor %}
    # - Jméno + #Jméno{# #}{{ p.kod_v_rocniku }}{# #} + {# #}{{ p.kod_v_rocniku }}{# #}{# #}{{ podproblemy.kod_v_rocniku }}{# #} + {# #}{{ podproblemy.kod_v_rocniku }}{# #}Ostatní {% endif %} + {% if vysledkovka.je_nejake_ostatni %}Ostatní{# #}{{ podproblemy.kod_v_rocniku }}{# #} + {# #}{{ podproblemy.kod_v_rocniku }}{# #}Za číslo - Za ročník - Odjakživa + Za čísloZa ročníkOdjakživa
    {% autoescape off %}{{ rv.poradi }}{% endautoescape %} + {% autoescape off %}{{ rv.poradi }}{% endautoescape %} {% if rv.titul %} {{ rv.titul }}MM {% endif %} - {{ rv.resitel.osoba.plne_jmeno }} + {{ rv.resitel.osoba.plne_jmeno }}{{ b }} + {{ b }}{{ body_podproblemu }} + {{ body_podproblemu }}{{ rv.body_cislo }} - {{ rv.body_rocnik }} - {{ rv.body_celkem_odjakziva }} + {{ rv.body_cislo }}{{ rv.body_rocnik }}{{ rv.body_celkem_odjakziva }}
    diff --git a/vysledkovky/templates/vysledkovky/vysledkovka_rocnik.html b/vysledkovky/templates/vysledkovky/vysledkovka_rocnik.html index 14d5369e..22b81555 100644 --- a/vysledkovky/templates/vysledkovky/vysledkovka_rocnik.html +++ b/vysledkovky/templates/vysledkovky/vysledkovka_rocnik.html @@ -1,29 +1,29 @@ - + + + {% for c in vysledkovka.cisla_rocniku %} {% endfor %} - {% for rv in vysledkovka.radky_vysledkovky %} - + {% for b in rv.body_cisla_seznam %} - {% endfor %} - {% endfor %}
    # - Jméno - R. - Odjakživa + #JménoR.Odjakživa - {{c.rocnik.rocnik}}.{{ c.poradi }} + {{c.rocnik.rocnik}}.{{ c.poradi }}Celkem + Celkem
    {% autoescape off %}{{ rv.poradi }}{% endautoescape %} + {% autoescape off %}{{ rv.poradi }}{% endautoescape %} {% if rv.titul %} {{ rv.titul }}MM {% endif %} - {{ rv.resitel.osoba.plne_jmeno }} - {{ rv.rocnik_resitele }} - {{ rv.body_celkem_odjakziva }} + {{ rv.resitel.osoba.plne_jmeno }} + {{ rv.rocnik_resitele }}{{ rv.body_celkem_odjakziva }}{{ b }} + {{ b }}{{ rv.body_rocnik }} + {{ rv.body_rocnik }}
    From c3728750f7db6cfe06d1e581b01867d2b9cccd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 22:07:29 +0100 Subject: [PATCH 17/32] Fix: #910 --- mamweb/settings_common.py | 3 +++ requirements.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py index baebe3b4..5a610795 100644 --- a/mamweb/settings_common.py +++ b/mamweb/settings_common.py @@ -160,6 +160,9 @@ INSTALLED_APPS = ( # 'admin_tools.menu', # 'admin_tools.dashboard', 'django.contrib.admin', + + # Nechat na konci (INSTALLED_APPS je uspořádané): + 'django_cleanup.apps.CleanupConfig', # Uklízí media/ ) DEBUG_TOOLBAR_CONFIG = { diff --git a/requirements.txt b/requirements.txt index 9ad24a7f..39eabfb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,6 +21,7 @@ django-sekizai django-countries django-solo django-ckeditor +django-cleanup # Uklízí media/ od smazaných „databázových“ souborů django-flat-theme django-taggit django-autocomplete-light>=3.9.0rc1 From 376cc0d7e5d65bf51478d2cbdd05d83e6d3a7966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 22:35:00 +0100 Subject: [PATCH 18/32] Fix: #1251 --- seminar/templates/seminar/archiv/cislo.html | 3 +- .../seminar/archiv/cislo_obalkovani.html | 33 ---------------- seminar/templates/seminar/org/obalkovani.html | 30 -------------- seminar/urls.py | 6 --- seminar/views/views_all.py | 39 ------------------- 5 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 seminar/templates/seminar/archiv/cislo_obalkovani.html delete mode 100644 seminar/templates/seminar/org/obalkovani.html diff --git a/seminar/templates/seminar/archiv/cislo.html b/seminar/templates/seminar/archiv/cislo.html index d472826f..b8edce90 100644 --- a/seminar/templates/seminar/archiv/cislo.html +++ b/seminar/templates/seminar/archiv/cislo.html @@ -40,8 +40,7 @@
  • Obálky (PDF)
  • Tituly (TeX)
  • Výsledkovka (TeX)
    • -
  • Obálkování
    • -
  • Odměny
    • +
  • Odměny
{% endif %} diff --git a/seminar/templates/seminar/archiv/cislo_obalkovani.html b/seminar/templates/seminar/archiv/cislo_obalkovani.html deleted file mode 100644 index 48b4a324..00000000 --- a/seminar/templates/seminar/archiv/cislo_obalkovani.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -

- {% block nadpis1a %} - Obálkování {{ cislo }} - {% endblock %} -

- - Obálkovat se budou tyto problémy: -
    - {% for p in problemy %} - -
  • {{ p.kod_v_rocniku }} {{ p }} - {% endfor %} -
- - {% for r in reseni %} - {% ifchanged r.resitel %} - {% if not forloop.first %} - - {% endif %} -

{{ r.resitel }}

-
    - {% endifchanged %} - -
  • - {{ r.problem.kod_v_rocniku }} {{ r.problem.nazev }} ({{ r.body }}) - - {% endfor %} -
- -{% endblock content %} diff --git a/seminar/templates/seminar/org/obalkovani.html b/seminar/templates/seminar/org/obalkovani.html deleted file mode 100644 index a4420dba..00000000 --- a/seminar/templates/seminar/org/obalkovani.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -

- {% block nadpis1a %} - Obálkování {{ cislo }} - {% endblock %} -

-
    - {% for reseni in object_list %} - {% ifchanged reseni.resitele %} - {% if not forloop.first %} -
- {% endif %} -

{% for resitel in reseni.resitele.all %}{{resitel.osoba}},{% endfor %}

-
    - {% endifchanged %} - -
  • Celkem {{reseni.hodnoceni__body__sum}} bodů z {{reseni.hodnoceni__count}} hodnocení -
      - {% for h in reseni.hodnoceni_set.all %} -
    • {{ h.problem }}: {{ h.body }}b
      • - {% endfor %} -
    -
    • - {% endfor %} -
- - -{% endblock content %} diff --git a/seminar/urls.py b/seminar/urls.py index c6ab5695..f6f2e2fb 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -23,7 +23,6 @@ Soubor sloužící jako „router“, tj. zde se definují url adresy a na co uk - ``cislo/./obalky.pdf`` (seminar_cislo_obalky) :func:`~seminar.views.views_all.cisloObalkyView` - ``cislo/./tituly.tex`` (seminar_cislo_titul) :func:`~seminar.views.views_all.TitulyView` - ``stav`` (stav_databaze) :func:`~seminar.views.views_all.StavDatabazeView` - - ``cislo/./obalkovani`` (seminar_cislo_resitel_obalkovani) :class:`~seminar.views.views_all.ObalkovaniView` - ``cislo/./odmeny/./`` (seminar_archiv_odmeny) :class:`~seminar.views.views_all.OdmenyView` - Další - `` `` (titulni_strana) :class:`~seminar.views.views_all.TitulniStranaView` @@ -102,11 +101,6 @@ urlpatterns = [ org_required(views.StavDatabazeView), name='stav_databaze' ), - path( - 'cislo/./obalkovani', - org_required(views.ObalkovaniView.as_view()), - name='seminar_cislo_resitel_obalkovani' - ), path( 'cislo/./odmeny/./', org_required(views.OdmenyView.as_view()), diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 7cf79d9f..2c4bd4a6 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -53,23 +53,6 @@ logger = logging.getLogger(__name__) def get_problemy_k_tematu(tema): return Problem.objects.filter(nadproblem = tema) -class ObalkovaniView(generic.ListView): - template_name = 'seminar/org/obalkovani.html' - - def get_queryset(self): - rocnik = get_object_or_404(Rocnik,rocnik=self.kwargs['rocnik']) - cislo = get_object_or_404(Cislo,rocnik=rocnik,poradi=self.kwargs['cislo']) - self.cislo = cislo - self.hodnoceni = s.Hodnoceni.objects.filter(cislo_body=cislo) - self.reseni = Reseni.objects.filter(hodnoceni__in = self.hodnoceni).annotate(Sum('hodnoceni__body')).annotate(Count('hodnoceni')).order_by('resitele__osoba') - return self.reseni - - def get_context_data(self, **kwargs): - context = super(ObalkovaniView, self).get_context_data(**kwargs) - print(self.cislo) - context['cislo'] = self.cislo - return context - # FIXME: Pozor, níž je ještě jeden ProblemView! #class ProblemView(generic.DetailView): @@ -597,28 +580,6 @@ def obalkyView(request, resitele): return response -def oldObalkovaniView(request, rocnik, cislo): - rocnik = Rocnik.objects.get(rocnik=rocnik) - cislo = Cislo.objects.get(rocnik=rocnik, cislo=cislo) - - reseni = ( - Reseni.objects.filter(cislo_body=cislo) - .order_by( - 'resitel__prijmeni', - 'resitel__jmeno', - 'problem__typ', - 'problem__kod' - ) - ) - - problemy = sorted(set(r.problem for r in reseni), key=lambda p: (p.typ, p.kod)) - return render( - request, - 'seminar/archiv/cislo_obalkovani.html', - {'cislo': cislo, 'problemy': problemy, 'reseni': reseni} - ) - - ### Tituly def TitulyViewRocnik(request, rocnik): return TitulyView(request, rocnik, None) From 2c9c1dc8e17c8b93f5bb10fe9da0c5524054da12 Mon Sep 17 00:00:00 2001 From: Kristyna Petrlikova Date: Mon, 14 Nov 2022 23:08:02 +0100 Subject: [PATCH 19/32] =?UTF-8?q?P=C5=99id=C3=A1n=C3=AD=20=C3=BA=C4=8Dastn?= =?UTF-8?q?ick=C3=A9ho=20poplatku=20v=20nastaven=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/migrations/0108_nastaveni_cena_sous.py | 18 ++++++++++++++++++ seminar/models/tvorba.py | 4 ++++ 2 files changed, 22 insertions(+) create mode 100644 seminar/migrations/0108_nastaveni_cena_sous.py diff --git a/seminar/migrations/0108_nastaveni_cena_sous.py b/seminar/migrations/0108_nastaveni_cena_sous.py new file mode 100644 index 00000000..112b2a6c --- /dev/null +++ b/seminar/migrations/0108_nastaveni_cena_sous.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.16 on 2022-11-14 20:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('seminar', '0107_zmrazenavysledkovka'), + ] + + operations = [ + migrations.AddField( + model_name='nastaveni', + name='cena_sous', + field=models.IntegerField(default=1000, verbose_name='Účastnický poplatek za soustředění'), + ), + ] diff --git a/seminar/models/tvorba.py b/seminar/models/tvorba.py index 57813f39..7e04b213 100644 --- a/seminar/models/tvorba.py +++ b/seminar/models/tvorba.py @@ -718,6 +718,10 @@ class Nastaveni(SingletonModel): aktualni_cislo = models.ForeignKey(Cislo, verbose_name='Aktuální číslo', null=False, on_delete=models.PROTECT) + cena_sous = models.IntegerField(null=False, + verbose_name="Účastnický poplatek za soustředění", + default=1000) + @property def aktualni_rocnik(self): return self.aktualni_cislo.rocnik From c08e6c87f5c0b5a5f9b2467ee661cfabef2be6a5 Mon Sep 17 00:00:00 2001 From: Kristyna Petrlikova Date: Mon, 14 Nov 2022 23:16:24 +0100 Subject: [PATCH 20/32] =?UTF-8?q?P=C5=99eps=C3=A1n=C3=AD=20stvrzenek=20do?= =?UTF-8?q?=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/static/seminar/stvrzenky.tex | 25 ------------- .../templates/soustredeni/stvrzenky.tex | 37 +++++++++++++++++++ .../templates/soustredeni/ucastnici.tex | 5 --- soustredeni/views.py | 26 ++++++------- 4 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 seminar/static/seminar/stvrzenky.tex create mode 100644 soustredeni/templates/soustredeni/stvrzenky.tex delete mode 100644 soustredeni/templates/soustredeni/ucastnici.tex diff --git a/seminar/static/seminar/stvrzenky.tex b/seminar/static/seminar/stvrzenky.tex deleted file mode 100644 index 28eab580..00000000 --- a/seminar/static/seminar/stvrzenky.tex +++ /dev/null @@ -1,25 +0,0 @@ -\input opmac -\chyph -\nopagenumbers -\parindent=0pt - -\def\castka{1000} - -\newread\data -\openin\data=/dev/stdin -\read\data to\termin -\read\data to\misto - -\loop - \read\data to\ucastnik - \unless\ifeof\data - \vbox{\picw=2cm\inspic logomm.pdf \smallskip\hrule\medskip - Potvrzujeme, že \ucastnik se zúčastnil(a) soustředění Korespondenčního semináře M\&M konaného % \ucastnik má na konci mezeru - v~termínu \termin a že zaplatil(a) účastnický poplatek ve výši $\sim$\castka Kč$\sim$. % \termin též - \bigskip - \the\day.~\the\month.~\the\year, \misto\hfill Přijal(a): \hbox to 4cm{\hrulefill} - \bigskip - } -\repeat - -\bye diff --git a/soustredeni/templates/soustredeni/stvrzenky.tex b/soustredeni/templates/soustredeni/stvrzenky.tex new file mode 100644 index 00000000..78752866 --- /dev/null +++ b/soustredeni/templates/soustredeni/stvrzenky.tex @@ -0,0 +1,37 @@ +{% autoescape off %} +{% load static %} +{% load tex %} +\documentclass[11pt,a4paper]{article} +\usepackage[left=0.75in, right=0.75in,top=0.5in,bottom=0.5in]{geometry} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[czech]{babel} +\usepackage{graphicx} +\begin{document} +\pagenumbering{gobble} +\parindent=0pt + +\def\stvrzenka#1#2{ + \vbox{% + \includegraphics[width=2cm]{logomm.pdf} + \smallskip\hrule\medskip + {% with soustredeni as s %} + Potvrzujeme, že #1 #2 se zúčastnil(a) soustředění Korespondenčního semináře M\&M konaného + v~termínu {{s.datum_zacatku|date:"j.~n.~Y"|sloz}} -- + {{s.datum_konce|date:"j.~n.~Y"|sloz}} a~že zaplatil(a) účastnický poplatek ve + výši $\sim${{castka|sloz}}Kč$\sim$. + + \bigskip + {{s.datum_zacatku|date:"j.~n.~Y"|sloz}}, {{s.misto|sloz}} \hfill Přijal(a): \hbox to 4cm{\hrulefill} + \bigskip + } + {% endwith %} +} + +{% for u in ucastnici %} + {% with o=u.osoba %} + \stvrzenka{{o.jmeno|sloz}}{{o.prijmeni|sloz}} + {% endwith %} +{% endfor %} +\end{document} +{% endautoescape %} diff --git a/soustredeni/templates/soustredeni/ucastnici.tex b/soustredeni/templates/soustredeni/ucastnici.tex deleted file mode 100644 index a39885a6..00000000 --- a/soustredeni/templates/soustredeni/ucastnici.tex +++ /dev/null @@ -1,5 +0,0 @@ -{% load tex %} -\newcommand{\datum}{{datum|date:"j. n. Y"|sloz}} -{% for u in ucastnici %} -\stvrzenka{{u.cislo_stvrzenky|sloz}}{{u.jmeno|sloz}}{{u.prijmeni|sloz}}{{u.ulice|sloz}}{{u.psc|sloz}}{{u.mesto|sloz}} -{% endfor %} diff --git a/soustredeni/views.py b/soustredeni/views.py index 54c34fbe..e5ae2992 100644 --- a/soustredeni/views.py +++ b/soustredeni/views.py @@ -1,8 +1,9 @@ -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.http import HttpResponse from django.views import generic from django.conf import settings -from seminar.models import Soustredeni, Resitel, Soustredeni_Ucastnici # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci +from django.contrib.staticfiles.finders import find +from seminar.models import Soustredeni, Resitel, Soustredeni_Ucastnici, Nastaveni # Tohle je stare a chceme se toho zbavit. Pouzivejte s.ToCoChci import csv import tempfile import shutil @@ -62,20 +63,17 @@ def soustredeniUcastniciExportView(request, soustredeni): def soustredeniStvrzenkyView(request, soustredeni): soustredeni = get_object_or_404(Soustredeni, id=soustredeni) ucastnici = Resitel.objects.filter(soustredeni=soustredeni) + castka = Nastaveni.get_solo().cena_sous + tex = render(request, 'soustredeni/stvrzenky.tex', {'ucastnici': ucastnici, 'soustredeni': soustredeni, 'castka': castka}).content - static = Path(settings.STATIC_ROOT) tempdir = Path(tempfile.mkdtemp()) - shutil.copy(static / 'images/logomm.pdf', tempdir) - shutil.copy(static / 'seminar/stvrzenky.tex', tempdir) - subprocess.run( - ['pdfcsplain', 'stvrzenky.tex'], - cwd=tempdir, - encoding='utf-8', - input=f'{soustredeni.datum_zacatku.strftime("%-d.~%-m.~%Y")} -- {soustredeni.datum_konce.strftime("%-d.~%-m.~%Y")}\n{soustredeni.misto}\n' - + '\n'.join([f'{u.osoba.jmeno} {u.osoba.prijmeni}' for u in ucastnici]) - ) - - with open(tempdir / 'stvrzenky.pdf', 'rb') as pdffile: + with open(tempdir / "stvrzenky.tex", "w") as texfile: + texfile.write(tex.decode()) + + shutil.copy(find('images/logomm.pdf'), tempdir) + subprocess.call(["pdflatex", "stvrzenky.tex"], cwd = tempdir, stdout=subprocess.DEVNULL) + + with open(tempdir / "stvrzenky.pdf", "rb") as pdffile: response = HttpResponse(pdffile.read(), content_type='application/pdf') shutil.rmtree(tempdir) return response From 23dde1263a28db51e0e5a12be382e4cc46f3b93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 23:32:33 +0100 Subject: [PATCH 21/32] =?UTF-8?q?Fix:=20Petr=20chce=20ob=C3=A1lkovat=20od?= =?UTF-8?q?=20=C4=8D=C3=ADsla=20do=20=C4=8D=C3=ADsla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/templates/seminar/archiv/odmeny.html | 20 ++++---------------- seminar/views/views_all.py | 17 +++++------------ 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/seminar/templates/seminar/archiv/odmeny.html b/seminar/templates/seminar/archiv/odmeny.html index aa5ffb7f..6b2d1eb7 100644 --- a/seminar/templates/seminar/archiv/odmeny.html +++ b/seminar/templates/seminar/archiv/odmeny.html @@ -7,23 +7,11 @@ {% endblock %} -

Od prvního deadlinu {{ from_cislo }} do prvního deadlinu {{ to_cislo }}

+

Od čísla {{ from_cislo }} do čísla {{ to_cislo }}

+ (Od „{{ from_deadline }}“ (vyjma) do „{{ to_deadline }}“ (včetně))
+
Posílat použe po opravení všeho v čísle {{ to_cislo }}!
    - {% for z in zmeny_prvni_prvni %} -
  • {{z.jmeno}}: {{z.ftitul}} → {{z.ttitul}}
    • - {% endfor %} -
- -

Od {{ from_cislo }} do prvního deadlinu {{ to_cislo }} (pro první číslo)

-
    - {% for z in zmeny_posledni_prvni %} -
  • {{z.jmeno}}: {{z.ftitul}} → {{z.ttitul}}
    • - {% endfor %} -
- -

Od prvního deadlinu {{ from_cislo }} do {{ to_cislo }} (pro poslední číslo)

-
    - {% for z in zmeny_prvni_posledni %} + {% for z in zmeny %}
  • {{z.jmeno}}: {{z.ftitul}} → {{z.ttitul}}
    • {% endfor %}
diff --git a/seminar/views/views_all.py b/seminar/views/views_all.py index 7cf79d9f..424804b1 100644 --- a/seminar/views/views_all.py +++ b/seminar/views/views_all.py @@ -484,18 +484,11 @@ class OdmenyView(generic.TemplateView): context["from_cislo"] = fromcislo context["to_cislo"] = tocislo - context["zmeny_prvni_prvni"] = get_diff( - fromcislo.zlomovy_deadline_pro_papirove_cislo(), - tocislo.zlomovy_deadline_pro_papirove_cislo() - ) - context["zmeny_prvni_posledni"] = get_diff( - fromcislo.zlomovy_deadline_pro_papirove_cislo(), - posledni_deadline_oprava(tocislo) - ) - context["zmeny_posledni_prvni"] = get_diff( - posledni_deadline_oprava(fromcislo), - tocislo.zlomovy_deadline_pro_papirove_cislo() - ) + from_deadline = posledni_deadline_oprava(fromcislo) + to_deadline = posledni_deadline_oprava(tocislo) + context["from_deadline"] = from_deadline + context["to_deadline"] = to_deadline + context["zmeny"] = get_diff(from_deadline, to_deadline) return context From 8c1f042ea0732980772ce1df998e8f8dd82aa01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Mon, 14 Nov 2022 23:56:54 +0100 Subject: [PATCH 22/32] =?UTF-8?q?Fix:=20Haha,=20Jid=C3=A1=C5=A1=20neum?= =?UTF-8?q?=C3=AD=20mergeovat=20pull=20requesty=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{0108_hodnoceni_feedback.py => 0109_hodnoceni_feedback.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename seminar/migrations/{0108_hodnoceni_feedback.py => 0109_hodnoceni_feedback.py} (89%) diff --git a/seminar/migrations/0108_hodnoceni_feedback.py b/seminar/migrations/0109_hodnoceni_feedback.py similarity index 89% rename from seminar/migrations/0108_hodnoceni_feedback.py rename to seminar/migrations/0109_hodnoceni_feedback.py index 282849d8..cf920950 100644 --- a/seminar/migrations/0108_hodnoceni_feedback.py +++ b/seminar/migrations/0109_hodnoceni_feedback.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('seminar', '0107_zmrazenavysledkovka'), + ('seminar', '0108_nastaveni_cena_sous'), ] operations = [ From 2a81dbe09d26ba5be654352c03242ed56d304c4f Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Tue, 15 Nov 2022 00:47:19 +0100 Subject: [PATCH 23/32] =?UTF-8?q?P=C5=99id=C3=A1n=20editorconfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..e99349e1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +root = true + +[*] +charset = utf-8 +# Unix-y lines +end_of_line = lf +insert_final_newline = true + +[*.py] +indent_style = tab +# I do not think we prescribe, how big a tab is. +indent_size = tab + +# Migrations are auto-generated and thus follow PEP-8, let's not fight with that +[*/migrations/*.py] +indent_style = space +indent_size = 4 From e810d01b0ec8a689111a639e5769b757ce1c9037 Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Tue, 15 Nov 2022 12:49:11 +0100 Subject: [PATCH 24/32] =?UTF-8?q?Unset=20je=20lep=C5=A1=C3=AD=20varianta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index e99349e1..c86d7658 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,7 @@ insert_final_newline = true [*.py] indent_style = tab # I do not think we prescribe, how big a tab is. -indent_size = tab +indent_size = unset # Migrations are auto-generated and thus follow PEP-8, let's not fight with that [*/migrations/*.py] From e1be20c08b3f454250b638c137cb74dd45f0f029 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Wed, 16 Nov 2022 01:18:59 +0100 Subject: [PATCH 25/32] =?UTF-8?q?HTML=20odsazovat=20dv=C4=9Bma=20mezerami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index c86d7658..639d9791 100644 --- a/.editorconfig +++ b/.editorconfig @@ -15,3 +15,7 @@ indent_size = unset [*/migrations/*.py] indent_style = space indent_size = 4 + +[*.html] +indent_style = space +indent_size = 2 From 914ec732af19a72614a44cbf23ee2c70f7b0d716 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Wed, 16 Nov 2022 01:37:40 +0100 Subject: [PATCH 26/32] =?UTF-8?q?CSS=20jsou=20pro=20=C3=BA=C4=8Dely=20edit?= =?UTF-8?q?ace=20asi=20v=C3=ADcem=C3=A9n=C4=9B=20python?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 639d9791..e385fb3c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ charset = utf-8 end_of_line = lf insert_final_newline = true -[*.py] +[*.{py,css}] indent_style = tab # I do not think we prescribe, how big a tab is. indent_size = unset From 38192db1de2d617bbfeeebff0b7d984a4a214f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Turinsk=C3=BD?= Date: Wed, 16 Nov 2022 21:17:19 +0100 Subject: [PATCH 27/32] Popis, co je .editorconfig --- .editorconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.editorconfig b/.editorconfig index e385fb3c..94a82858 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,6 @@ +# Univerzální popis našich konvencí pro nastavení editorů. +# Vizte https://editorconfig.org pro detaily + root = true [*] From 30853ecd77cb02f450bef1dd26b4e3e9877b5296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Turinsk=C3=BD?= Date: Wed, 16 Nov 2022 21:20:09 +0100 Subject: [PATCH 28/32] =?UTF-8?q?Koment=C3=A1=C5=99e=20=C4=8Desky?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.editorconfig b/.editorconfig index 94a82858..758912bb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,16 +5,16 @@ root = true [*] charset = utf-8 -# Unix-y lines +# Unixové řádky end_of_line = lf insert_final_newline = true [*.{py,css}] indent_style = tab -# I do not think we prescribe, how big a tab is. +# Nenařizujeme konkrétní šířku tabulátoru indent_size = unset -# Migrations are auto-generated and thus follow PEP-8, let's not fight with that +# Automaticky generované migrace dodržují PEP-8, nemá smysl s tím moc bojovat. [*/migrations/*.py] indent_style = space indent_size = 4 From 6ee9c4e3808a2d4614eee179ed4cb9673ea34318 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Mon, 21 Nov 2022 20:05:06 +0100 Subject: [PATCH 29/32] Requirements: myst_parser pro dokumentaci --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 9ad24a7f..d4713d76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -62,3 +62,4 @@ lorem sphinx sphinx_rtd_theme +myst_parser From 7b5db01377070e7963a30c654331863b65123ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Thu, 24 Nov 2022 20:16:09 +0100 Subject: [PATCH 30/32] =?UTF-8?q?hotfix:=20org=20nem=C5=AF=C5=BEe=20p?= =?UTF-8?q?=C5=99i=C5=99adit=20hodnocen=C3=AD=20nezadan=C3=BD=20probl?= =?UTF-8?q?=C3=A9m=20(nap=C5=99.=20vy=C5=99e=C5=A1en=C3=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/urls.py | 1 + api/views/autocomplete.py | 9 +++++++++ odevzdavatko/forms.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/api/urls.py b/api/urls.py index 23aafe36..2570ded9 100644 --- a/api/urls.py +++ b/api/urls.py @@ -23,6 +23,7 @@ urlpatterns = [ path('api/autocomplete/skola/', views.SkolaAutocomplete.as_view(), name='autocomplete_skola'), path('api/autocomplete/resitel/', org_required(views.ResitelAutocomplete.as_view()), name='autocomplete_resitel'), path('api/autocomplete/problem/odevzdatelny', views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'), + path('api/autocomplete/problem/vsechny', views.ProblemAutocomplete.as_view(), name='autocomplete_problem'), # Ceka na autocomplete v3 # path('autocomplete/organizatori/', diff --git a/api/views/autocomplete.py b/api/views/autocomplete.py index 217df008..4cd2552a 100644 --- a/api/views/autocomplete.py +++ b/api/views/autocomplete.py @@ -66,6 +66,15 @@ class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView): Q(nazev__icontains=self.q)) return qs +class ProblemAutocomplete(autocomplete.Select2QuerySetView): + """ View k :mod:`dal.autocomplete` pro vyhledávání problémů především v odevzdávátku. """ + def get_queryset(self): + qs = m.Problem.objects.all().order_by("-stav", "nazev") + if self.q: + qs = qs.filter( + Q(nazev__icontains=self.q)) + return qs + # Ceka na autocomplete v3 # class OrganizatorAutocomplete(autocomplete.Select2QuerySetView): # def get_queryset(self): diff --git a/odevzdavatko/forms.py b/odevzdavatko/forms.py index a8538668..65a8b7ac 100644 --- a/odevzdavatko/forms.py +++ b/odevzdavatko/forms.py @@ -91,7 +91,7 @@ class JednoHodnoceniForm(forms.ModelForm): fields = ('problem', 'body', 'deadline_body', 'feedback',) widgets = { 'problem': autocomplete.ModelSelect2( - url='autocomplete_problem_odevzdatelny', # FIXME: Dovolit i starší? + url='autocomplete_problem', ), 'feedback': forms.Textarea(attrs={'rows': 1, 'cols': 30, 'class': 'feedback'}), } From 728de9be067f04454b6408e5bdd00e44d531c818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Thu, 24 Nov 2022 20:41:17 +0100 Subject: [PATCH 31/32] =?UTF-8?q?hotfix:=20p=C5=99i=20vyb=C3=ADr=C3=A1n?= =?UTF-8?q?=C3=AD=20probl=C3=A9mu=20jsou=20vid=C4=9Bt=20i=20star=C3=A9=20r?= =?UTF-8?q?o=C4=8Dn=C3=ADky,=20ale=20sortit=20podle=20ro=C4=8Dn=C3=ADku=20?= =?UTF-8?q?neum=C3=ADm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/views/autocomplete.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/api/views/autocomplete.py b/api/views/autocomplete.py index 4cd2552a..8c6f334c 100644 --- a/api/views/autocomplete.py +++ b/api/views/autocomplete.py @@ -69,7 +69,13 @@ class OdevzdatelnyProblemAutocomplete(autocomplete.Select2QuerySetView): class ProblemAutocomplete(autocomplete.Select2QuerySetView): """ View k :mod:`dal.autocomplete` pro vyhledávání problémů především v odevzdávátku. """ def get_queryset(self): - qs = m.Problem.objects.all().order_by("-stav", "nazev") + # FIXME i starší úlohy + nastaveni = get_object_or_404(m.Nastaveni) + rocnik = nastaveni.aktualni_rocnik + temaQ = Q(Tema___rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + ulohaQ = Q(Uloha___cislo_zadani__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + clanekQ = Q(Clanek___cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + qs = m.Problem.objects.filter(temaQ | ulohaQ | clanekQ).order_by("-stav", "nazev") if self.q: qs = qs.filter( Q(nazev__icontains=self.q)) From 79fea4074e18a9521a5af01c0696ebcd16e7f523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=C3=A1=C5=A1=20Havelka?= Date: Thu, 24 Nov 2022 20:44:15 +0100 Subject: [PATCH 32/32] =?UTF-8?q?hotfix:=20kruci,=20kop=C3=ADrov=C3=A1n?= =?UTF-8?q?=C3=AD=20je=20=C4=8Dast=C3=BDm=20zdrojem=20chyb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/views/autocomplete.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/views/autocomplete.py b/api/views/autocomplete.py index 8c6f334c..33e083eb 100644 --- a/api/views/autocomplete.py +++ b/api/views/autocomplete.py @@ -72,9 +72,9 @@ class ProblemAutocomplete(autocomplete.Select2QuerySetView): # FIXME i starší úlohy nastaveni = get_object_or_404(m.Nastaveni) rocnik = nastaveni.aktualni_rocnik - temaQ = Q(Tema___rocnik = rocnik, stav=m.Problem.STAV_ZADANY) - ulohaQ = Q(Uloha___cislo_zadani__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) - clanekQ = Q(Clanek___cislo__rocnik = rocnik, stav=m.Problem.STAV_ZADANY) + temaQ = Q(Tema___rocnik = rocnik) + ulohaQ = Q(Uloha___cislo_zadani__rocnik=rocnik) + clanekQ = Q(Clanek___cislo__rocnik=rocnik) qs = m.Problem.objects.filter(temaQ | ulohaQ | clanekQ).order_by("-stav", "nazev") if self.q: qs = qs.filter(