From 8671822ca0cad3de1a4f1af3d4908ea343938e83 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Sat, 12 Nov 2016 14:00:49 +0100 Subject: [PATCH 1/2] Razeni lidi podle poctu korektur. --- korektury/templates/korektury/opraf.html | 4 ++-- korektury/views.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/korektury/templates/korektury/opraf.html b/korektury/templates/korektury/opraf.html index 6a92f28c..fddf1e0c 100644 --- a/korektury/templates/korektury/opraf.html +++ b/korektury/templates/korektury/opraf.html @@ -83,8 +83,8 @@

Děkujeme opravovatelům: - {% for autor,pocet in zasluhy.items %} - {{autor}} ({{pocet}}){% if not forloop.last %},{% endif %} + {% for z in zasluhy %} + {{z.autor}} ({{z.pocet}}){% if not forloop.last %},{% endif %} {% endfor %}


diff --git a/korektury/views.py b/korektury/views.py index 70cfaf6e..6562f8fd 100644 --- a/korektury/views.py +++ b/korektury/views.py @@ -184,6 +184,8 @@ class KorekturyView(generic.TemplateView): zasluhy[k.autor]+=1 else: zasluhy[k.autor]=1 + zasluhy = [{'autor':jmeno, 'pocet':pocet} for (jmeno,pocet) in zasluhy.items()] + zasluhy.sort(key=lambda z:z['pocet'],reverse=True) strany = set(o.strana for o in opravy) opravy_na_stranu = [{'strana': s, 'op_id': opravy.filter(strana=s)} for s in strany] From 67d61cabb7b86e3c3ae423ce0f36b2b40957eda6 Mon Sep 17 00:00:00 2001 From: "Tomas \"Jethro\" Pokorny" Date: Sat, 12 Nov 2016 15:41:30 +0100 Subject: [PATCH 2/2] U sbalenych korektur nezobrazovat ikony. --- korektury/static/korektury/opraf.js | 3 +++ korektury/templates/korektury/opraf.html | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/korektury/static/korektury/opraf.js b/korektury/static/korektury/opraf.js index a6d6244c..75591fe7 100644 --- a/korektury/static/korektury/opraf.js +++ b/korektury/static/korektury/opraf.js @@ -126,11 +126,14 @@ function img_click(element, ev) { function toggle_visibility(button){ var divbox = button.parentNode.parentNode.parentNode; var id = divbox.id; + var buttondiv = document.getElementById(id+'-buttons') var text = document.getElementById(id+'-body'); if (text.style.display == 'none'){ text.style.display = 'block'; + buttondiv.style.display = 'inline-block'; }else { text.style.display = 'none'; + buttondiv.style.display = 'none'; } for (var i=0;i
-
{{o.autor}}
-
+ {{o.autor}} + +
{% csrf_token %} @@ -147,11 +148,12 @@ + -
+
{{o.text}}
@@ -159,17 +161,17 @@ {% for k in o.komentare %}
-
+
{{k.autor}}
-
- + + {% csrf_token %} @@ -178,7 +180,7 @@
-
+
{{k.text}}
{% endfor %}