Merge remote-tracking branch 'origin/develop' into test

vysledkovky/templates/vysledkovky/vysledkovka_cisla.html

@@ -4,16 +4,16 @@
         <th class='border-r'>#
         <th class='border-r'>Jméno
             {% for p in problemy %}
-                <th class='border-r' id="problem{{ forloop.counter }}">{# <a href="{{ p.verejne_url }}"> #}{{ p.kod_v_rocniku }}{# </a> #}
+                <th class='border-r' id="problem{{ forloop.counter0 }}">{# <a href="{{ p.verejne_url }}"> #}{{ p.kod_v_rocniku }}{# </a> #}
 
                     {# TODELETE #}
                     {% for podproblemy in podproblemy_iter.next %}
-                        <th class='border-r podproblem{{ forloop.parentloop.counter }} podproblem'>{# <a href="{{ podproblemy.verejne_url }}"> #}{{ podproblemy.kod_v_rocniku }}{# </a> #}
+                        <th class='border-r podproblem{{ forloop.parentloop.counter0 }} podproblem'>{# <a href="{{ podproblemy.verejne_url }}"> #}{{ podproblemy.kod_v_rocniku }}{# </a> #}
                     {% endfor %}
                 {# TODELETE #}
 
             {% endfor %}
-        {% if ostatni %}<th class='border-r'>Ostatní {% endif %}
+        {% if ostatni %}<th class='border-r' id='problem{{ problemy | length }}'>Ostatní {% endif %}
 
         {# TODELETE #}
         {% for podproblemy in podproblemy_iter.next %}
@@ -38,7 +38,7 @@
 
                                 {# TODELETE #}
                                 {% for body_podproblemu in rv.body_podproblemy_iter.next %}
-                                    <td class='border-r podproblem{{ forloop.parentloop.counter }} podproblem'>{{ body_podproblemu }}
+                                    <td class='border-r podproblem{{ forloop.parentloop.counter0 }} podproblem'>{{ body_podproblemu }}
                                 {% endfor %}
                             {# TODELETE #}
 
@@ -56,17 +56,30 @@
 {# TODELETE #}
 <script>
     {% for p in problemy %}
-        diplayed{{ forloop.counter }} = false;
-        $(".podproblem{{ forloop.counter }}").css("display", "none")
-        $("#problem{{ forloop.counter }}")[0].addEventListener('click', podproblem{{ forloop.counter }});
-        function podproblem{{ forloop.counter }}(event) {
-            diplayed{{ forloop.counter }} = !diplayed{{ forloop.counter }};
-            if (diplayed{{ forloop.counter }}) {
-                $(".podproblem{{ forloop.counter }}").css("display", "");
+        diplayed{{ forloop.counter0 }} = false;
+        $(".podproblem{{ forloop.counter0 }}").css("display", "none")
+        $("#problem{{ forloop.counter0 }}")[0].addEventListener('click', podproblem{{ forloop.counter0 }});
+        function podproblem{{ forloop.counter0 }}(event) {
+            diplayed{{ forloop.counter0 }} = !diplayed{{ forloop.counter0 }};
+            if (diplayed{{ forloop.counter0 }}) {
+                $(".podproblem{{ forloop.counter0 }}").css("display", "");
             } else {
-                $(".podproblem{{ forloop.counter }}").css("display", "none");
+                $(".podproblem{{ forloop.counter0 }}").css("display", "none");
             }
         }
     {% endfor %}
+    {% if ostatni %}
+        diplayed{{ problemy | length }} = false;
+        $(".podproblem{{ problemy | length }}").css("display", "none")
+        $("#problem{{ problemy | length }}")[0].addEventListener('click', podproblem{{ problemy | length }});
+        function podproblem{{ problemy | length }}(event) {
+            diplayed{{ problemy | length }} = !diplayed{{ problemy | length }};
+            if (diplayed{{ problemy | length }}) {
+                $(".podproblem{{ problemy | length }}").css("display", "");
+            } else {
+                $(".podproblem{{ problemy | length }}").css("display", "none");
+            }
+        }
+    {% endif %}
 </script>
 {# TODELETE #}