- {{ script.title }} + {{ script.title }}

{% if topic.file %} - {% trans "Topic" %} + {% trans "Topic" %} {% endif %} {% if script.score %} {% trans "Score" %} : {{ script.score|floatformat }}/20 diff --git a/teleforma/exam/templates/exam/scripts.html b/teleforma/exam/templates/exam/scripts.html index a059cdce..5d630ee3 100644 --- a/teleforma/exam/templates/exam/scripts.html +++ b/teleforma/exam/templates/exam/scripts.html @@ -18,27 +18,26 @@ {% block modules %}

{% trans "Scripts" %}

- -{% if upload %} {% block module-action %} +{% if upload %}

-{% trans "New script" %} +{% trans "New script" %}

-{% endblock module-action %} {% endif %} +{% endblock module-action %} {% endblock modules %} diff --git a/teleforma/exam/urls.py b/teleforma/exam/urls.py index 33512037..9f6dc360 100644 --- a/teleforma/exam/urls.py +++ b/teleforma/exam/urls.py @@ -54,7 +54,8 @@ urlpatterns = patterns('', url(r'^exam/periods/(?P.*)/scripts_pending/$', ScriptsPendingView.as_view(), name="teleforma-exam-scripts-pending"), url(r'^exam/periods/(?P.*)/scripts_treated/$', ScriptsTreatedView.as_view(), name="teleforma-exam-scripts-treated"), url(r'^exam/periods/(?P.*)/scripts_rejected/$', ScriptsRejectedView.as_view(), name="teleforma-exam-scripts-rejected"), - url(r'^exam/periods/(?P.*)/scripts_scores/$', ScriptsScoreView.as_view(), name="teleforma-exam-scripts-scores"), + url(r'^exam/periods/(?P.*)/scripts_scores_all/$', ScriptsScoreAllView.as_view(), name="teleforma-exam-scripts-scores-all"), + url(r'^exam/periods/(?P.*)/scripts_scores/(?P.*)/$', ScriptsScoreCourseView.as_view(), name="teleforma-exam-scripts-scores-course"), url(r'^exam/periods/(?P.*)/quotas/$', QuotasView.as_view(), name="teleforma-exam-quotas"), diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index c5eb2e87..a7a3a9ae 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -8,6 +8,7 @@ from django.views.generic.edit import CreateView, UpdateView, DeleteView from django.core.urlresolvers import reverse_lazy, reverse from django.utils.translation import ugettext_lazy as _ +import numpy as np class ScriptView(CourseAccessMixin, UpdateView): @@ -175,17 +176,18 @@ class QuotasView(ListView): return super(QuotasView, self).dispatch(*args, **kwargs) -class ScriptsScoreView(ScriptsTreatedView): +class ScriptsScoreAllView(ScriptsTreatedView): template_name='exam/scores.html' - def get_nvd3_data(self): - scripts = self.get_queryset() - xdata = [script.session for script in scripts] - ydata = [float(script.score) for script in scripts] - chartdata = {'x': xdata, 'name1': 'scores', 'y1': ydata} - charttype = "lineChart" - chartcontainer = 'linechart_container' + def get_score_data(self, xdata, y1data, y1title, y2data, y2title): + chartdata = {'x': xdata, + 'name1': y1title, 'y1': y1data, + 'name2': y2title, 'y2': y2data, + } + charttype = "multiBarChart" + chartcontainer = 'multibarchart_container' + extra_serie = {"tooltip": {"y_start": "There are ", "y_end": " calls"}} data = { 'charttype': charttype, 'chartdata': chartdata, @@ -199,7 +201,57 @@ class ScriptsScoreView(ScriptsTreatedView): return data def get_context_data(self, **kwargs): - context = super(ScriptsScoreView, self).get_context_data(**kwargs) - context['title'] = ugettext('Scores') - context['data'] = self.get_nvd3_data() + context = super(ScriptsScoreAllView, self).get_context_data(**kwargs) + scripts = self.get_queryset() + + sessions = [] + for script in scripts: + if not script.session in sessions: + sessions.append(script.session) + sessions = sorted(sessions) + + # user mean scores + user_scores = [] + for session in sessions: + user_scores.append(np.mean([float(script.score) for script in scripts.filter(session=session)])) + + # all user mean scores + all_user_score = [] + for session in sessions: + scripts = Script.objects.filter(session=session).exclude(score=None) + all_user_score.append(np.mean([s.score for s in scripts])) + + context['course'] = ugettext('all courses') + context['data'] = self.get_score_data(sessions, user_scores, 'moyenne personnelle', all_user_score, 'moyenne generale') + return context + + +class ScriptsScoreCourseView(ScriptsScoreAllView): + + def get_context_data(self, **kwargs): + context = super(ScriptsScoreCourseView, self).get_context_data(**kwargs) + course = Course.objects.get(id=self.kwargs['course_id']) + scripts = self.get_queryset() + scripts = scripts.filter(course=course) + + sessions = [] + for script in scripts: + if not script.session in sessions: + sessions.append(script.session) + sessions = sorted(sessions) + + # user mean scores + user_scores = [] + for session in sessions: + user_scores.append(np.mean([float(script.score) for script in scripts.filter(session=session)])) + + # all user mean scores + all_user_score = [] + for session in sessions: + scripts = Script.objects.filter(session=session, course=course).exclude(score=None) + all_user_score.append(np.mean([s.score for s in scripts])) + + context['course'] = course.title + context['data'] = self.get_score_data(sessions, user_scores, 'note personnelle', all_user_score, 'moyenne generale') return context + diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html index 254de435..cc500fb3 100644 --- a/teleforma/templates/postman/base.html +++ b/teleforma/templates/postman/base.html @@ -12,15 +12,15 @@

{% postman_unread as unread_count %}

-{% trans "New message" %} +{% trans "New message" %}

- + {{ message.obfuscated_sender|or_me:user }} » - + {{ message.obfuscated_recipient|or_me:user }} | {{ message.sent_at|date:"DATETIME_FORMAT"}} | @@ -36,19 +36,19 @@ {% trans "Back" %} {% block pm_delete_button %} -{% trans "Delete" %} +{% trans "Delete" %} {% endblock %} {% block pm_archive_button %} {% if not archived %} -{% trans "Archive" %} +{% trans "Archive" %} {% endif %} {% endblock %} -{% if reply_to_pk %}{% trans "Reply" %}{% endif %} +{% if reply_to_pk %}{% trans "Reply" %}{% endif %} {% if reply_to_pk %}

{% trans 'Reply' %}

{% csrf_token %} +{% csrf_token %}

{% trans "Reply" %} diff --git a/teleforma/templates/registration/activate.html b/teleforma/templates/registration/activate.html index 4f3bdbe2..6cf22cbc 100644 --- a/teleforma/templates/registration/activate.html +++ b/teleforma/templates/registration/activate.html @@ -2,7 +2,7 @@ {% load i18n %} {% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %} {% block content %} -{% url 'auth_login' as auth_login_url %} +{% url auth_login as auth_login_url %} {% if account %} {% blocktrans %} Thanks {{ account }}, activation complete! diff --git a/teleforma/templates/registration/activation_complete.html b/teleforma/templates/registration/activation_complete.html index c2ab8dd6..2082f775 100644 --- a/teleforma/templates/registration/activation_complete.html +++ b/teleforma/templates/registration/activation_complete.html @@ -2,7 +2,7 @@ {% load i18n %} {% block title %}{% trans "Activation complete" %}{% endblock %} {% block content %} -{% url 'auth_login' as auth_login_url %} +{% url auth_login as auth_login_url %} {% blocktrans %} Thanks, activation complete! You may now login using the username and password you set at registration. {% endblocktrans %} diff --git a/teleforma/templates/registration/activation_email.html b/teleforma/templates/registration/activation_email.html index c6ebc265..8483b4a9 100644 --- a/teleforma/templates/registration/activation_email.html +++ b/teleforma/templates/registration/activation_email.html @@ -4,7 +4,7 @@ This template is used for the html alternative of the activation email if you use a django-registration backend that looks for it. e.g. https://github.com/huseyinyilmaz/django-registration-extended-backend {% endcomment %} -{% url 'registration_activate' activation_key as activation_key_url %} +{% url registration_activate activation_key as activation_key_url %} {% blocktrans with sitename=site.name sitedomain=site.domain%}

Account registration for {{ sitename }}

diff --git a/teleforma/templates/registration/activation_email.txt b/teleforma/templates/registration/activation_email.txt index 9ca54b3c..c29561fa 100644 --- a/teleforma/templates/registration/activation_email.txt +++ b/teleforma/templates/registration/activation_email.txt @@ -1,5 +1,5 @@ {% load i18n %} -{% url 'registration_activate' activation_key as activation_key_url%} +{% url registration_activate activation_key as activation_key_url%} {% blocktrans with sitename=site.name siteurl=site.domain %} You (or someone pretending to be you) have asked to register an account at {{ sitename }}. If this wasn't you, please ignore this email diff --git a/teleforma/templates/registration/login.html b/teleforma/templates/registration/login.html index 2fd6edb6..f8ceae74 100644 --- a/teleforma/templates/registration/login.html +++ b/teleforma/templates/registration/login.html @@ -2,14 +2,14 @@ {% load i18n %} {% block title %}{% trans "Login" %}{% endblock %} {% block content %} -{% url 'auth_password_reset' as auth_pwd_reset_url %} -{% url 'registration_register' as register_url%} +{% url auth_password_reset as auth_pwd_reset_url %} +{% url registration_register as register_url%} {% if form.errors %}

{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

{% endif %} -{% csrf_token %} +{% csrf_token %} diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html index 287737fb..c59f65a1 100644 --- a/teleforma/templates/registration/password_reset_email.html +++ b/teleforma/templates/registration/password_reset_email.html @@ -7,7 +7,7 @@ wish to reset your password, please ignore this message. To reset your password, please click the following link, or copy and paste it into your web browser:{% endblocktrans %} -{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uid token %} +{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uid token %} {% blocktrans with username=user.username %} Your username, in case you've forgotten: {{ username }} diff --git a/teleforma/templates/teleforma/annals.html b/teleforma/templates/teleforma/annals.html index 2d481f42..2e0c8f5b 100644 --- a/teleforma/templates/teleforma/annals.html +++ b/teleforma/templates/teleforma/annals.html @@ -12,13 +12,13 @@

{% trans "My courses" %}

{{ course.title }}
{{ course.title }}

{{ iej.name|lower|capfirst }}
{{ iej.name|lower|capfirst }}

{% for doc in docs %} - + - + {% endfor %} diff --git a/teleforma/templates/teleforma/course.html b/teleforma/templates/teleforma/course.html index cfda3e84..65d2f05d 100644 --- a/teleforma/templates/teleforma/course.html +++ b/teleforma/templates/teleforma/course.html @@ -36,7 +36,7 @@ {% for media in course.media.all %} - + diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html index 7e931c48..bbdd17ed 100644 --- a/teleforma/templates/teleforma/course_conference.html +++ b/teleforma/templates/teleforma/course_conference.html @@ -10,7 +10,7 @@ var conferenceUtils = { stop : function(id){ json([id],'teleforma.stop_conference',function(){ - location.href = '{% url 'teleforma-conference-record' %}'; + location.href = '{% url teleforma-conference-record %}'; } ); }} @@ -34,10 +34,10 @@

- {% trans "Audio" %} + {% trans "Audio" %}

-{{ course.title }} - {{ type }} - {% trans "Session" %} {{ conference.session }} +{{ course.title }} - {{ type }} - {% trans "Session" %} {{ conference.session }}

@@ -67,10 +67,10 @@

{% trans "Course" %}: {{ conference.course.title }} - {{ conference.course_type }}
{% trans "Course" %}: {{ conference.course.title }} - {{ conference.course_type }}
{% trans "Session" %}: {{ conference.session }}
{% trans "Professor" %}: {{ conference.professor }}; {{ conference.professor }}
{% trans "Comment" %}: {{ conference.comment }}
{% trans "Begin date" %}: {{ conference.date_begin }}

{% if stream.streaming %} @@ -25,7 +25,7 @@

{% trans "Title" %}

{% trans "Session" %}

{% if stream.conference.professor.user.username %} -

{% trans "Professor" %}

{% endif %}

{% trans "Begin" %}

diff --git a/teleforma/templates/teleforma/inc/document_list.html b/teleforma/templates/teleforma/inc/document_list.html index e2964586..4c649158 100644 --- a/teleforma/templates/teleforma/inc/document_list.html +++ b/teleforma/templates/teleforma/inc/document_list.html @@ -17,9 +17,9 @@ {% if doc.course_type.all|length > 1 and type_counter > 1 %} {% else %} - + - + {% endif %} {% endfor %} diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index b4140630..400cc1ba 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -14,7 +14,7 @@ {% if media.type == 'webm' %}

{% trans form.username.label_tag %}
{% if doc.file %}{% endif %} {{ doc.title }}{% if doc.file %}{% endif %}	{% if doc.file %}{% endif %} {{ doc.title }}{% if doc.file %}{% endif %}	{{ year }}	{% if doc.file %}{% endif %}	{% if doc.file %}{% endif %}
{{ media.item.title }}	{{ media.item.title }}	{{ media.item.description }}	{{ media.date_added }}
- +
{% if doc.file %}{% endif %} {{ doc.title }}{% if doc.file %}{% endif %}	{% if doc.file %}{% endif %} {{ doc.title }}{% if doc.file %}{% endif %}	{{ doc.date_added }}	{% if doc.file %}{% endif %}	{% if doc.file %}{% endif %}
- + {% if media.item.related.all %} {% for related in media.item.related.all %} {% if related.title == "preview" %} @@ -36,7 +36,7 @@ {% trans "Title" %} {{ media.conference.course.title }} {% trans "Session" %} {{ media.conference.session }} {% if media.conference.professor %} - {% trans "Professor" %} {{ media.conference.professor }} + {% trans "Professor" %} {{ media.conference.professor }} {% endif %} {% trans "Begin" %} {{ media.conference.date_begin }} {% if media.conference.comment %} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index 692eb975..97d4c434 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -25,7 +25,6 @@ {% block stylesheets %} - + diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html index 26ca809e..bfee8ac2 100644 --- a/teleforma/templates/telemeta/search_criteria.html +++ b/teleforma/templates/telemeta/search_criteria.html @@ -32,7 +32,7 @@ function update_period(source, from_field, to_field) { } $(document).ready(function () { - $('#location').autocomplete('{% url 'telemeta-complete-location' %}', { + $('#location').autocomplete('{% url telemeta-complete-location %}', { max: 20, formatResult: function(data) { return data[0].replace(/ $[0-9]+.$ *$/, ''); @@ -75,7 +75,7 @@ $(document).ready(function () { {% trans "Advanced Search" %} -{% csrf_token %} +{% csrf_token %} diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html index 52e000aa..3409b83a 100644 --- a/teleforma/templates/telemeta/users.html +++ b/teleforma/templates/telemeta/users.html @@ -17,7 +17,7 @@ {% block trainings %} {% for t in trainings %} - {{ t.code\|lower\|capfirst }} - {{ t.period\|lower\|capfirst }} + {{ t.code\|lower\|capfirst }} - {{ t.period\|lower\|capfirst }} {% endfor %} {% endblock trainings %} @@ -30,7 +30,7 @@ {% block iej %} {% for i in iejs %} - {{ i.name\|lower\|capfirst }} + {{ i.name\|lower\|capfirst }} {% endfor %} {% endblock iej %} @@ -43,7 +43,7 @@ {% block courses %} {% for c in courses %} - {{ c }} + {{ c }} {% endfor %} {% endblock courses %} @@ -52,7 +52,7 @@ {% if users %} -{% trans "Grouped message" %} +{% trans "Grouped message" %} {% endif %} @@ -62,7 +62,7 @@ {% if user.is_staff %} -XLS Export +XLS Export {% endif %} -- 2.39.5

{% trans "My courses" %}

{% trans "Scripts" %}

{% trans "Scripts" %}

{% trans 'Reply' %}

Account registration for {{ sitename }}

{% trans "My courses" %}

{% trans "My courses" %}

{% trans "Advanced Search" %}