answer counts and other minor improvements

diff --git a/stage2/static/js/checkfile.js b/stage2/static/js/checkfile.js
index f15c134..6d3782c 100644 (file)
--- a/stage2/static/js/checkfile.js
+++ b/stage2/static/js/checkfile.js
@@ -8,7 +8,10 @@ $(function() {
                 var ext = this.getAttribute('data-ext');
                 var re = new RegExp('\\.(' + ext + ')$', 'i');
                 if (!re.exec(name)) {
                 var ext = this.getAttribute('data-ext');
                 var re = new RegExp('\\.(' + ext + ')$', 'i');
                 if (!re.exec(name)) {

-                    alert('Błędne rozszerzenie! Powinno być jedno z: ' + ext.replace(/\|/g, ', '));
+                    if (/\|/.exec(ext))
+                        alert('Błędne rozszerzenie! Powinno być jedno z: ' + ext.replace(/\|/g, ', '));
+                    else
+                        alert('Błędne rozszerzenie! Powinno być: ' + ext);

                     ok = false;
                 }
             }
                     ok = false;
                 }
             }

diff --git a/stage2/templates/stage2/answer_list.html b/stage2/templates/stage2/answer_list.html
index 42f90db..aa00891 100644 (file)
--- a/stage2/templates/stage2/answer_list.html
+++ b/stage2/templates/stage2/answer_list.html
@@ -5,11 +5,14 @@
   <h1>{% if marked %}Ocenione odpowiedzi{% else %}Odpowiedzi do oceny{% endif %}</h1>
   <p>Zadanie <cite>{{ assignment.title }}</cite> (max {{ assignment.max_points }} pkt)</p>
   <p><strong>{% if assignment.is_active %}Możliwość oceniania zostanie włączona po terminie wysyłania rozwiązań</strong>{% endif %}</p>
   <h1>{% if marked %}Ocenione odpowiedzi{% else %}Odpowiedzi do oceny{% endif %}</h1>
   <p>Zadanie <cite>{{ assignment.title }}</cite> (max {{ assignment.max_points }} pkt)</p>
   <p><strong>{% if assignment.is_active %}Możliwość oceniania zostanie włączona po terminie wysyłania rozwiązań</strong>{% endif %}</p>

-  {% if marked %}
-    <p><a href="{% url 'stage2_answer_list' assignment.id %}">Przejdź do odpowiedzi do oceny</a></p>
-  {% else %}
-    <p><a href="{% url 'stage2_marked_answers' assignment.id %}">Przejdź do ocenionych odpowiedzi</a></p>
+  {% if not assignment.is_active %}
+    {% if marked %}
+      <p><a href="{% url 'stage2_answer_list' assignment.id %}">Przejdź do odpowiedzi do oceny</a></p>
+    {% else %}
+      <p><a href="{% url 'stage2_marked_answers' assignment.id %}">Przejdź do ocenionych odpowiedzi</a></p>
+    {% endif %}

   {% endif %}
   {% endif %}

+  <p>{% if not marked and not assignment.is_active %}Pozostało {% endif %}{{ answers|length }} odpowiedzi</p>

   {% for answer in answers %}
     <h3>{{ answer.participant }}</h3>
     {% for label, attachment in answer.attachments %}
   {% for answer in answers %}
     <h3>{{ answer.participant }}</h3>
     {% for label, attachment in answer.attachments %}

diff --git a/stage2/templates/stage2/participant.html b/stage2/templates/stage2/participant.html
index f369bb4..ec481f8 100644 (file)
--- a/stage2/templates/stage2/participant.html
+++ b/stage2/templates/stage2/participant.html
@@ -11,7 +11,9 @@
 
   {% for assignment in assignments %}
     <h2>{{ assignment.title }} (do {{ assignment.deadline }})</h2>
 
   {% for assignment in assignments %}
     <h2>{{ assignment.title }} (do {{ assignment.deadline }})</h2>

-    <p>{{ assignment.content|textile_pl }}</p>
+    {% if assignment.is_active %}
+      <p>{{ assignment.content|textile_pl }}</p>
+    {% endif %}

     <form method="POST" action="{% url 'stage2_upload' assignment.id participant.id participant.key %}"
           enctype="multipart/form-data">
       {% csrf_token %}
     <form method="POST" action="{% url 'stage2_upload' assignment.id participant.id participant.key %}"
           enctype="multipart/form-data">
       {% csrf_token %}