From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 17 Jul 2014 11:40:17 +0000 (+0200)
Subject: add messages
X-Git-Tag: 1.1~419
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f52daa6dcdf1b759b08967329fa29a34555bbb39;p=teleforma.git

add messages
---

diff --git a/teleforma/exam/templates/exam/inc/script_list.html b/teleforma/exam/templates/exam/inc/script_list.html
index 6d544bf8..7b72c1c5 100644
--- a/teleforma/exam/templates/exam/inc/script_list.html
+++ b/teleforma/exam/templates/exam/inc/script_list.html
@@ -6,6 +6,16 @@
 {% autopaginate object_list 8 %}
 {% paginate %}
 
+<script>
+$(document).ready(function(){
+    $('table tr').click(function(){
+        window.location = $(this).data('href');
+        return false;
+    });
+});
+</script>
+
+
 <div id="users">
   <table class="listing" width="100%">
    <thead>
@@ -21,19 +31,18 @@
     <th>{% trans "Score"%}</th>
     </tr>
     </thead>
-    <tbody id="spacing">
+    <tbody id="spacing" class="script-list">
     {% for script in object_list %}
-    <tr style="font-weight: bold;">
-    <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{{ script.course.title }}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{{ script.session }}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{{ script.type }}</a></td>
-
-     <td><a href="{% url teleforma-profile-detail script.author.username %}">{{ script.author.last_name }}</a></td>
-     <td><a href="{% url teleforma-profile-detail script.author.username %}">{{ script.author.first_name }}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{{ script.date_submitted }}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{% if script.date_marked %}{{ script.date_marked }}{% endif %}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{% if script.corrector %}{{ script.corrector }}{% endif %}</a></td>
-     <td><a href="{% url teleforma-exam-script-detail period.id script.id %}">{% if script.score %}{{ script.score|floatformat }}{% endif %}</a></td>
+    <tr data-href="{% url teleforma-exam-script-detail period.id script.id %}">
+    <td>{{ script.course.title }}</td>
+     <td>{{ script.session }}</td>
+     <td>{{ script.type }}</td>
+     <td>{{ script.author.last_name }}</td>
+     <td>{{ script.author.first_name }}</td>
+     <td>{{ script.date_submitted }}</td>
+     <td>{% if script.date_marked %}{{ script.date_marked }}{% endif %}</td>
+     <td>{% if script.corrector %}{{ script.corrector }}{% endif %}</td>
+     <td>{% if script.score %}{{ script.score|floatformat }}{% endif %}</td>
     </tr>
     {% endfor %}
     </tbody>
diff --git a/teleforma/management/commands/teleforma-exam-submit-scripts.py b/teleforma/management/commands/teleforma-exam-submit-scripts.py
index f6b7cbd8..6be69a8b 100644
--- a/teleforma/management/commands/teleforma-exam-submit-scripts.py
+++ b/teleforma/management/commands/teleforma-exam-submit-scripts.py
@@ -1,3 +1,4 @@
+
 from optparse import make_option
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
@@ -8,12 +9,28 @@ from telemeta.util.unaccent import unaccent
 from teleforma.exam.models import *
 import logging
 import codecs
+import time
+
+
+class Logger:
+    """A logging object"""
+
+    def __init__(self, file):
+        self.logger = logging.getLogger('teleforma')
+        self.hdlr = logging.FileHandler(file)
+        self.formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
+        self.hdlr.setFormatter(self.formatter)
+        self.logger.addHandler(self.hdlr)
+        self.logger.setLevel(logging.INFO)
 
 
 class Command(BaseCommand):
     help = "submit all script to Box View"
 
     def handle(self, *args, **options):
+    	logger = Logger(args[0])
     	for script in Script.objects.filter(status=2):
-    		print unicode(script)
+    		logger.logger.info(script.title)
     		script.submit()
+    		logger.logger.info('OK')
+    		time.sleep(10)
diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 8ad5695c..e3483c3a 100644
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1713,3 +1713,9 @@ input,textarea{
 .errorlist li {
     font-size: 1.2em;
 }
+
+.script-list tr {
+    cursor: pointer;
+    font-weight: bold;
+}
+
diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index e51ce2de..a46c0661 100644
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -24,6 +24,14 @@
 {% autopaginate pm_messages %}{% paginate %}
 </div>
 
+{% if messages %}
+    <div class="messages">
+        {% for message in messages %}
+          <div{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</div>
+        {% endfor %}
+    </div>
+{% endif %}
+
 <form id="_messageForm" action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
 <table id="pm_messages" class="listing" >
  <thead>
diff --git a/teleforma/templates/postman/email_user_init.txt b/teleforma/templates/postman/email_user_init.txt
index 108fdfe6..4a718e77 100644
--- a/teleforma/templates/postman/email_user_init.txt
+++ b/teleforma/templates/postman/email_user_init.txt
@@ -1,6 +1,6 @@
 {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ object.recipient.first_name }} {{ object.recipient.last_name }},
 
-Suite à votre inscription à la formation semestrielle 2014 du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail :
+Suite à votre inscription à la formation estivale 2014 du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail :
 
 http://{{ site.domain }}/accounts/password_reset/