From b25c04bf42f81c2acf7a2878890d485f2787bc75 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:13:25 +0100 Subject: [PATCH 01/10] odmena nastrel --- tvorba/templates/tvorba/archiv/odmeny.html | 6 ++++++ tvorba/views/__init__.py | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index 6b2d1eb7..e41ee2b8 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -16,4 +16,10 @@ {% endfor %} + + {% endblock content %} diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index 006a4e50..b9c4663e 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -375,7 +375,7 @@ class OdmenyView(generic.TemplateView): tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) resitele = utils.aktivniResitele(tocislo) - def get_diff(from_deadline: Deadline, to_deadline: Deadline): + def get_diff(from_deadline: Deadline, to_deadline: Deadline, probody=False): frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline) tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline) outlist = [] @@ -384,8 +384,11 @@ class OdmenyView(generic.TemplateView): tbody = tobody.get(resitel.id, 0) ftitul = resitel.get_titul(fbody) ttitul = resitel.get_titul(tbody) - if ftitul != ttitul: - outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) + if probody: + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul}) + else: + if ftitul != ttitul: + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) return outlist def posledni_deadline_oprava(cislo: Cislo) -> Deadline: @@ -401,6 +404,7 @@ class OdmenyView(generic.TemplateView): context["from_deadline"] = from_deadline context["to_deadline"] = to_deadline context["zmeny"] = get_diff(from_deadline, to_deadline) + context["resitele"] = get_diff(from_deadline, to_deadline, probody=resitele.order_by("osoba__prijmeni")) return context From 8e25a2eb4f0765a91c380b1438142d07c05e962c Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:34:59 +0100 Subject: [PATCH 02/10] bodydiff --- tvorba/templates/tvorba/archiv/odmeny.html | 2 +- tvorba/views/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index e41ee2b8..1f0b4a2b 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -18,7 +18,7 @@ diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index b9c4663e..0d33a557 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -385,7 +385,7 @@ class OdmenyView(generic.TemplateView): ftitul = resitel.get_titul(fbody) ttitul = resitel.get_titul(tbody) if probody: - outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul}) + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul, 'bodydiff': tbody - fbody}) else: if ftitul != ttitul: outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) From 380a14299d3492da6af47b676a46474553008e94 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:38:14 +0100 Subject: [PATCH 03/10] dalsi random test --- tvorba/templates/tvorba/archiv/odmeny.html | 4 ++-- tvorba/views/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index 1f0b4a2b..f7369947 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -17,8 +17,8 @@
    - {% for resitel in resitele %} -
  • {{ resitel.jmeno }}: {{ bodydiff }}
    • + {% for resitel in resitele %} +
  • {{ resitel.jmeno }}: {{ resitel.bodydiff }} {{resitel.posilat}}
    • {% endfor %}
diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index 0d33a557..3c9979bd 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -385,7 +385,7 @@ class OdmenyView(generic.TemplateView): ftitul = resitel.get_titul(fbody) ttitul = resitel.get_titul(tbody) if probody: - outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul, 'bodydiff': tbody - fbody}) + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul, 'bodydiff': tbody - fbody, "posilat": resitel.zasilat_cislo_papirove}) else: if ftitul != ttitul: outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) From c853e06d7104985e3204e155b1bdfdfded7bd147 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:43:47 +0100 Subject: [PATCH 04/10] random bulshit goes... --- tvorba/templates/tvorba/archiv/odmeny.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index f7369947..79229d15 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -18,7 +18,7 @@
    {% for resitel in resitele %} -
  • {{ resitel.jmeno }}: {{ resitel.bodydiff }} {{resitel.posilat}}
    • +
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.posilat %}POSÍLAT DOMŮ{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{z.ftitul}} → {{z.ttitul}} {% endif %}
    • {% endfor %}
From 8e8b446e09de72c93a2c322ff87be1b4c0803b77 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:45:57 +0100 Subject: [PATCH 05/10] fixint tyyyypos --- tvorba/templates/tvorba/archiv/odmeny.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index 79229d15..ec79937a 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -18,7 +18,7 @@
    {% for resitel in resitele %} -
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.posilat %}POSÍLAT DOMŮ{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{z.ftitul}} → {{z.ttitul}} {% endif %}
    • +
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.posilat %}POSÍLAT DOMŮ{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{resitel.ftitul}} → {{resitel.ttitul}} {% endif %}
    • {% endfor %}
From 80aa01d76b49eaf13ca4ab895debeedc030d904a Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:51:52 +0100 Subject: [PATCH 06/10] random inline css --- tvorba/templates/tvorba/archiv/odmeny.html | 2 +- tvorba/views/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index ec79937a..4dcd4806 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -18,7 +18,7 @@
    {% for resitel in resitele %} -
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.posilat %}POSÍLAT DOMŮ{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{resitel.ftitul}} → {{resitel.ttitul}} {% endif %}
    • +
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{resitel.ftitul}} → {{resitel.ttitul}} {% endif %}
    • {% endfor %}
diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index 3c9979bd..68f8772d 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -385,7 +385,7 @@ class OdmenyView(generic.TemplateView): ftitul = resitel.get_titul(fbody) ttitul = resitel.get_titul(tbody) if probody: - outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul, 'bodydiff': tbody - fbody, "posilat": resitel.zasilat_cislo_papirove}) + outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'fbody': fbody, 'tbody': tbody, 'ftitul': ftitul, 'ttitul': ttitul, 'bodydiff': tbody - fbody, "neposilame": not(resitel.zasilat_cislo_papirove)}) else: if ftitul != ttitul: outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) From 95e164650efd1b7f4e05e2d0921215c192831cc1 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 20:58:06 +0100 Subject: [PATCH 07/10] cervena text --- tvorba/templates/tvorba/archiv/odmeny.html | 1 + 1 file changed, 1 insertion(+) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index 4dcd4806..a2b35c8c 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -16,6 +16,7 @@ {% endfor %} +

Seznam účastníků - červená znamená že jim nechodí fyzické číslo

    {% for resitel in resitele %}
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{resitel.ftitul}} → {{resitel.ttitul}} {% endif %}
    • From c1ae550a781d36233da76a97f948d50d807c9486 Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 21:13:48 +0100 Subject: [PATCH 08/10] dokumentace probody --- tvorba/views/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index 68f8772d..2240abf3 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -375,6 +375,7 @@ class OdmenyView(generic.TemplateView): tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) resitele = utils.aktivniResitele(tocislo) + """Co je probody? pokud True, funkce vrací všechny rešitele a k nim potřebné informace, pokud False, vrací jen ty, kteří mají změnu v titulu.""" def get_diff(from_deadline: Deadline, to_deadline: Deadline, probody=False): frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline) tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline) From d34e551b715600ebf7471fd498fcb7a9809775bd Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 21:18:19 +0100 Subject: [PATCH 09/10] – --- tvorba/templates/tvorba/archiv/odmeny.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tvorba/templates/tvorba/archiv/odmeny.html b/tvorba/templates/tvorba/archiv/odmeny.html index a2b35c8c..f91a631a 100644 --- a/tvorba/templates/tvorba/archiv/odmeny.html +++ b/tvorba/templates/tvorba/archiv/odmeny.html @@ -16,7 +16,7 @@ {% endfor %}
-

Seznam účastníků - červená znamená že jim nechodí fyzické číslo

+

Seznam účastníků – červená znamená že jim nechodí fyzické číslo

    {% for resitel in resitele %}
  • {{ resitel.jmeno }}: {% if resitel.bodydiff > 3 %}🧦{% endif %} {% if resitel.ttitul != resitel.ftitul %} {{resitel.ftitul}} → {{resitel.ttitul}} {% endif %}
    • From 777a36b1f7b5354d2488e2ed8bc9786c321d0fbf Mon Sep 17 00:00:00 2001 From: ticvac Date: Wed, 26 Feb 2025 21:19:39 +0100 Subject: [PATCH 10/10] posunuti dokumneasasasa --- tvorba/views/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tvorba/views/__init__.py b/tvorba/views/__init__.py index 2240abf3..4cb769a6 100644 --- a/tvorba/views/__init__.py +++ b/tvorba/views/__init__.py @@ -375,8 +375,8 @@ class OdmenyView(generic.TemplateView): tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) resitele = utils.aktivniResitele(tocislo) - """Co je probody? pokud True, funkce vrací všechny rešitele a k nim potřebné informace, pokud False, vrací jen ty, kteří mají změnu v titulu.""" def get_diff(from_deadline: Deadline, to_deadline: Deadline, probody=False): + """Co je probody? pokud True, funkce vrací všechny rešitele a k nim potřebné informace, pokud False, vrací jen ty, kteří mají změnu v titulu.""" frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline) tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline) outlist = []