fix answer submit, fix progress titles

diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py
index fbb6741aeb8dcddd14dba046af8c5f199737b8a8..b00c7fa9906485f4e4d66a1fc0b0b6375a237f98 100644 (file)
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
@@ -181,7 +181,7 @@ class Answer(models.Model):
     class Meta(MetaCore):
         db_table = app_label + '_' + 'answer'
         verbose_name = _('Answer')
-
+        ordering = ['-date_submitted']
 
 class TestimonialTemplate(models.Model):
 
@@ -219,7 +219,8 @@ class Evaluation(models.Model):
 
     seminar     = models.ForeignKey(Seminar, related_name="evaluation", verbose_name=_('seminar'))
     user        = models.ForeignKey(User, related_name="evaluation", verbose_name=_('user'))
-    #TODO
+    
+
 
     class Meta(MetaCore):
         db_table = app_label + '_' + 'evaluation'

diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html
index 1d6003744acfc16b8c0637947713bf30969d3199..f6b8f7142fa8f7f62d58ca1ccf2c8415ae0fc580 100644 (file)
--- a/teleforma/templates/teleforma/answer_form.html
+++ b/teleforma/templates/teleforma/answer_form.html
@@ -29,7 +29,7 @@ $(document).ready(function(){
           new Messi(gettext('You must reach the required number of characters.'), {buttons: [{id: 0, label: gettext('OK'), val: 'X'}], modal: true});
         }
         if (c.hasClass('exceed')){
-            $('#id_status').value=3; 
+            $('#id_status').val("3"); 
             $('#_AnswerForm').submit(); 
         }
       });
@@ -69,13 +69,13 @@ $(document).ready(function(){
   <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
  <div class="progress">
   <ul>
-    <li>{% trans "General progress" %} : {{ total_progress }}%
+    <li>{% trans "General" %} : {{ total_progress }}%
      <div id="progressbar-general"></div>
     </li>
-    <li>{% trans "Seminar progress" %} : {{ seminar_progress }}%
+    <li>{% trans "Seminar" %} : {{ seminar_progress }}%
      <div id="progressbar-seminar"></div>
     </li>
-    <li>{% trans "Answer progress" %} : <span id="answer-progress">0</span>%
+    <li>{% trans "Answer" %} : <span id="answer-progress">0</span>%
      <div id="progressbar-answer"></div>
     </li>
 

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index bc7621d2a69d10c3563a6951870692b2a1724259..7a561d00419da16488c1c88d9db945dae7458141 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -4,6 +4,26 @@
 {% load i18n %}
 
 
+{% block infra_javascript %}
+<script type="text/javascript">
+$(function() {
+        $( "#progressbar-general" ).progressbar({
+            value: {{ total_progress }}
+        });
+    });
+</script>
+<script type="text/javascript">
+$(function() {
+        $( "#progressbar-seminar" ).progressbar({
+            value: {{ seminar_progress }}
+        });
+    });
+</script>
+
+{% endblock infra_javascript %}
+
+
+
 {% block course %}
 <div class="desk_center">
 
@@ -112,12 +132,12 @@
 {% block progress %}
 <div class="module">
   <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
- <div style="background: white;">
+ <div class="progress">
   <ul>
-    <li>{% trans "General progress" %} : {{ total_progress }}%
+    <li>{% trans "General" %} : {{ total_progress }}%
      <div id="progressbar-general"></div>
     </li>
-    <li>{% trans "Seminar progress" %} : {{ seminar_progress }}%
+    <li>{% trans "Seminar" %} : {{ seminar_progress }}%
      <div id="progressbar-seminar"></div>
     </li>
   </ul>

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index 663506b95ae46926080f3a9e8a0aaee9794496c4..511a7769ab45056298725333489a55302db3e13f 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -22,11 +22,6 @@ $(function() {
             value: {{ total_progress }}
         });
     });
-$(function() {
-        $( "#progressbar-seminar" ).progressbar({
-            value: {{ seminar_progress }}
-        });
-    });
 </script>
 {% endblock infra_javascript %}
 
@@ -110,10 +105,10 @@ $(function() {
 
 {% block progress %}
 <div class="module">
-  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Informations" %}</h3>
- <div style="background: white;">
+  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Progress" %}</h3>
+ <div class="progress">
   <ul>
-    <li>{% trans "General progress" %} : {{ total_progess }}
+    <li>{% trans "General" %} : {{ total_progress }}
      <div id="progressbar-general"></div>
     </li>
   </ul>