From b25c04bf42f81c2acf7a2878890d485f2787bc75 Mon Sep 17 00:00:00 2001
From: ticvac <vaclav.tichy180@gmail.com>
Date: Wed, 26 Feb 2025 20:13:25 +0100
Subject: [PATCH] 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 %}
   </ul>
 
+  <ul>
+    {% for resitel in resitele %} 
+      <li>{{ resitel.jmeno }} {{ resitel.tbody - resitel.fbody }}</li>
+    {% endfor %}
+  </ul>
+
 {% 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