fix links and periods

diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html
index a76e055b98fd0dca0f87832fa0ff169162838fd4..e973967025e5c564f603e7e62ac3e9c22c295281 100644 (file)
--- a/teleforma/exam/templates/exam/script_detail.html
+++ b/teleforma/exam/templates/exam/script_detail.html
@@ -133,7 +133,7 @@
     </form>
     <br />
     <center>
-    <a href="#" id="validate_button" class="component_icon button icon_ok">{% trans "Scoring" %}</a>
+    <a href="#" id="validate_button" class="component_icon button icon_ok">{% trans "Validate" %}</a>
     </center>
     <br /><br />
 </div>

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index de1ce161d6f6872b9a92a96c8e7d191c81536377..38ec1616d74066bb7242ca9f19038540132d9b95 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -13,6 +13,8 @@
             $(window).unbind('beforeunload');
             b2.unbind('click');
             $('#id_status').val("2");
+            $('#id_period').val("{{ period.id }}");
+
             $('#_ScriptForm').submit();
         });
     });

diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html
index e0a7130ed7bc02b8fe4dab8ac740388e70622942..46131582e48ce557481f61a4b9ba6110ebe2e8cf 100644 (file)
--- a/teleforma/exam/templates/exam/scripts.html
+++ b/teleforma/exam/templates/exam/scripts.html
@@ -22,8 +22,8 @@
  <div style="background: white;">
   <ul>
   {% block courses %}
-   <li><a href="{% url teleforma-exam-scripts-pending period.id %}">{% trans "Pending" %}{% if user.is_staff or user.correctors.all %}{% untreated_scripts_count user.username %}{% endif %}</a></li>
-   <li><a href="{% url teleforma-exam-scripts-treated period.id %}">{% trans "Treated" %}{% if not user.is_staff and not user.correctors.all %}{% treated_scripts_count user.username %}{% endif %}</a></li>
+   <li><a href="{% url teleforma-exam-scripts-pending period.id %}">{% trans "Pending" %}{% if user.is_staff or user.quotass.all %}{% untreated_scripts_count user.username %}{% endif %}</a></li>
+   <li><a href="{% url teleforma-exam-scripts-treated period.id %}">{% trans "Marked" %}{% if not user.is_staff and not user.quotas.all %}{% treated_scripts_count user.username %}{% endif %}</a></li>
    <li><a href="{% url teleforma-exam-scripts-rejected period.id %}">{% trans "Rejected" %}</a></li>
   {% endblock courses %}
   </ul>

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index 2a3f71741febc750c84bf239f316b8098fa6d0f9..18dcd76435fe8a3d1ad2588d25eeba70f11ffb1b 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -108,6 +108,7 @@ class ScriptCreateView(CreateView):
 
     def get_context_data(self, **kwargs):
         context = super(ScriptCreateView, self).get_context_data(**kwargs)
+        context['period'] = Period.objects.get(id=self.kwargs['period_id'])
         context['create_fields'] = ['course', 'period', 'session', 'type', 'file' ]
         return context