mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

odmeny jsou pekny #90

Merged
zelvuska merged 10 commits from odmeny into master 2025-02-26 21:22:33 +01:00
Conversation 0 Commits 10 Files changed 2 +13 -3
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b25c04bf42 - Show all commits

6
tvorba/templates/tvorba/archiv/odmeny.html
View file

@ -16,4 +16,10 @@
{% endfor %} {% endfor %}
</ul> </ul>
<ul>
zelvuska commented 2025-02-26 21:07:04 +01:00
Outdated
Review
Copy link

Tam patří pomlčka (a vůbec, myslím si, že to nemusí být v nadpisu…)

Tam patří pomlčka (a vůbec, myslím si, že to nemusí být v nadpisu…)
ticvac commented 2025-02-26 21:12:11 +01:00
Outdated
Review
Copy link
-
{% for resitel in resitele %}
<li>{{ resitel.jmeno }} {{ resitel.tbody - resitel.fbody }}</li>
{% endfor %}
zelvuska commented 2025-02-26 21:07:59 +01:00
Review
Copy link

CSS?

CSS?
ticvac commented 2025-02-26 21:11:45 +01:00
Review
Copy link

Ano, to je css

Ano, to je css
</ul>
{% endblock content %} {% endblock content %}

10
tvorba/views/__init__.py
View file

@ -375,7 +375,7 @@ class OdmenyView(generic.TemplateView):
tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo')) tocislo = get_object_or_404(Cislo, rocnik=self.kwargs.get('trocnik'), poradi=self.kwargs.get('tcislo'))
resitele = utils.aktivniResitele(tocislo) resitele = utils.aktivniResitele(tocislo)
def get_diff(from_deadline: Deadline, to_deadline: Deadline): def get_diff(from_deadline: Deadline, to_deadline: Deadline, probody=False):
zelvuska commented 2025-02-26 21:09:56 +01:00
Outdated
Review
Copy link

Okomentovat probody!

Okomentovat `probody`!
frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline) frombody = body_resitelu(resitele=resitele, jen_verejne=False, do=from_deadline)
tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline) tobody = body_resitelu(resitele=resitele, jen_verejne=False, do=to_deadline)
outlist = [] outlist = []
@ -384,8 +384,11 @@ class OdmenyView(generic.TemplateView):
tbody = tobody.get(resitel.id, 0) tbody = tobody.get(resitel.id, 0)
ftitul = resitel.get_titul(fbody) ftitul = resitel.get_titul(fbody)
ttitul = resitel.get_titul(tbody) ttitul = resitel.get_titul(tbody)
if ftitul != ttitul: if probody:
outlist.append({'jmeno': resitel.osoba.plne_jmeno(), 'ftitul': ftitul, 'ttitul': ttitul}) 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 return outlist
def posledni_deadline_oprava(cislo: Cislo) -> Deadline: def posledni_deadline_oprava(cislo: Cislo) -> Deadline:
@ -401,6 +404,7 @@ class OdmenyView(generic.TemplateView):
context["from_deadline"] = from_deadline context["from_deadline"] = from_deadline
context["to_deadline"] = to_deadline context["to_deadline"] = to_deadline
context["zmeny"] = get_diff(from_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 return context