From 3636a44fd713e06484434f39057b1d8bf9c85bb9 Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Thu, 26 Apr 2018 14:58:39 +0200 Subject: [PATCH] Add personalized home page and quiz --- teleforma/admin.py | 6 + teleforma/exam/views.py | 0 teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 14965 -> 15061 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 8 + teleforma/migrations/0092_auto__add_home.py | 577 +++++++++++++++++ ...d_field_home_video__chg_field_home_text.py | 582 +++++++++++++++++ .../0094_auto__add_field_course_quiz.py | 599 +++++++++++++++++ .../0095_auto__del_field_course_quiz.py | 611 ++++++++++++++++++ teleforma/models/core.py | 2 + teleforma/models/crfpa.py | 21 + teleforma/static/teleforma/js/application.js | 15 + teleforma/templates/quiz/category_list.html | 18 + teleforma/templates/quiz/correct_answer.html | 32 + teleforma/templates/quiz/progress.html | 86 +++ teleforma/templates/quiz/question.html | 82 +++ teleforma/templates/quiz/quiz_detail.html | 20 + teleforma/templates/quiz/quiz_list.html | 43 ++ teleforma/templates/quiz/result.html | 92 +++ teleforma/templates/quiz/single_complete.html | 18 + teleforma/templates/quiz/sitting_detail.html | 59 ++ teleforma/templates/quiz/sitting_list.html | 54 ++ .../templates/quiz/view_quiz_category.html | 23 + .../templates/teleforma/course_detail.html | 48 +- teleforma/templates/teleforma/courses.html | 33 +- teleforma/templatetags/teleforma_tags.py | 2 + teleforma/views/core.py | 7 +- 26 files changed, 3020 insertions(+), 18 deletions(-) mode change 100644 => 100755 teleforma/exam/views.py create mode 100644 teleforma/migrations/0092_auto__add_home.py create mode 100644 teleforma/migrations/0093_auto__add_field_home_video__chg_field_home_text.py create mode 100644 teleforma/migrations/0094_auto__add_field_course_quiz.py create mode 100644 teleforma/migrations/0095_auto__del_field_course_quiz.py create mode 100644 teleforma/templates/quiz/category_list.html create mode 100644 teleforma/templates/quiz/correct_answer.html create mode 100644 teleforma/templates/quiz/progress.html create mode 100644 teleforma/templates/quiz/question.html create mode 100644 teleforma/templates/quiz/quiz_detail.html create mode 100644 teleforma/templates/quiz/quiz_list.html create mode 100644 teleforma/templates/quiz/result.html create mode 100644 teleforma/templates/quiz/single_complete.html create mode 100644 teleforma/templates/quiz/sitting_detail.html create mode 100644 teleforma/templates/quiz/sitting_list.html create mode 100644 teleforma/templates/quiz/view_quiz_category.html diff --git a/teleforma/admin.py b/teleforma/admin.py index 806e3d95..226dd59e 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -159,6 +159,11 @@ class ConferenceAdmin(admin.ModelAdmin): list_filter = ('course', 'period', 'date_begin', 'session') search_fields = ['public_id', 'id', 'course__code', 'course__title', 'session'] +class HomeAdmin(admin.ModelAdmin): + def get_form(self, request, obj=None, **kwargs): + form = super(HomeAdmin, self).get_form(request, obj, **kwargs) + form.base_fields['video'].queryset = Media.objects.filter(type='webm') + return form admin.site.unregister(User) admin.site.register(Organization) @@ -181,3 +186,4 @@ admin.site.register(Student, StudentAdmin) admin.site.register(Professor, ProfessorAdmin) admin.site.register(StudentGroup, StudentGroupAdmin) admin.site.register(GroupedMessage) +admin.site.register(Home, HomeAdmin) diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py old mode 100644 new mode 100755 diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index a9b175a7b6a523984d2d7b2a31c181564d522857..68127c16d5b7131cfb049d359d86f86eb1958eba 100644 GIT binary patch delta 6371 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 ATmS$7 delta 6278 zcmZA5d3;V+9>?*UJw#-ekdTO2V&93atOTUN z$ONlTLx0wHW>HWAb5Ij4L{0R8w}ayppcX1bO;}{^vi5_>PMl-tho`Ll3=XA!8N)C= z-nB1ky-dma&Lj%TaHe(0MoqZX>MN|i5p@!qQ9Id&O7shBKY&W$FlvEsQHhtK62D~L zM9u#*dNkn^3gPI(3!oE-MDNj}2BxC=wXk|yR05q*{kmKImv(=EnTbkdBC6jE)H{)l zN<24#^Vf}4G-#m$)PODMi^bM)m$e^4^*@PY@Ej`P7puD`*bjAousITy_$1W)(@+V_ zMxDT->YTq`^!I6q#sce5jCv%8%;Ttu%dCD0^-Qm$5_p7KD7XfvfuX1!W}r?s6E$BJ zDv`I$`5wEGi#pPksD;*I1a3l2P>dS*4eC=;YWFXp#@$DadyMMupXeqOgIc&6YRAc_ z{`IWg)5IFuppL#1D)a8vp}#o{U_y8>08~-zsL&ZvcZqb3|=^-QZzMos(%s{dS6LQ7ENR-%r4gSid0;9k_Y z!>D(ov=*O#HC&-V18-Z0$7W!PJ5dDc=n_#A)y6n%f?Bv6>RIn=#){58RH8kE2q)B=U56Zsr{aVKh`-KZ1UkLq^>`RF^R?EZc9r~U}l?-^>I zpxW;Il~MCmL$z1;P*BGd)H7~qc0e6%PYl2TRv(J$KLIsC7V4;Hp%#7*18^}a!DZ$e z)VNJn-)ee_Dd+_Dqb4XZPoNe!je2>`qx#*k`wuaI`cqUt|2pmhA*gy3YQAdLo@niL zQHeE1zNkD-TkFsrwLl-#vm0pbV^IU9pq|+*R6_I3mDXN}8n+$28$vzO5>%pPsH4At z>URmF^z;8G3ObsAy6(VG)Phw|N1KG&Nn=z3El`iDlePCk_3w*XXb1*kChBL)ICD1Y zk>;AK(O;kcLJHYF{M18b-YnI%9d@9ej?HimYDe2pZ~JZx!jq`){IgcSg_`F9R=}sI zgo5k4I}bx8QUg6Y$_CcZ5w(LJsD)lJ2b*J1N0)_~U>@q5E*C4}0n|wyLnTm(O5nV; zUqy|(h0*w^KIgB6!Wy_4#$!e5$*A^5sGX&u9z_q-gug<4j)!9ij=~W*6}6$$<~7s_ zJvRLsx`~CL`b9V7{B<;SXwWllgc{HhwUe%>`#n$z^s)OxQ3;H;_VK8GGp&7&`Hr>c zm`hM!_4%mzHhU=On`|d)XD3k$pGUnsmr*D3v)%V;t_?L7)E%6k=((hRV>VspIequ@jG)xD6`fbkxAX<_HX@J^{7E z+15S}mEb~a&o%SSRj3WG!!UjRw^C5Xdr=u5L@jgz^$5m+g|aAUr*D}#s4tjhsGS$$bliv9X#pL_gA#!{I&BnG$_+T>rjl9sUJlpcpjD59n_8= zpvFBz9eqeEw;qQ&xfIm6cBqZ?M4em)Dxo15iK9Fel-W$w#0#vx4Arp!wZNz7Jt@?} zC8!C?FdA>7UMio~ZvQaU1`<&H8d!TL)cBWCiFq=tFdUW0L{uVgqmD8M6EPPxa4Ygx zm-D6FFGD4E5w*j6=0nt@dxo0NuZ_E4C~BQJq}}7Bx&@~NYCuQS!Y`QJ?S3EB!h=wc zVg{=JY}8J(QO`6NmFNo8&-?Y}N2qx}MxDrKUU~leDd>n#qjqowmEm>N5j{pdiomw+ zQHP-tNHJ4U{TiETs6@J;cK$MI;r{4-_Neir(3ka{@f0**62{?lRL8}rgjS#ithV|( z)PkE(J1s&ju*W=zn(rtofm5h=!FUSDeCi`j!G;8 z^~{H%`cFkA@+KEJYL2qvr$ImT}4D6Z^`|qGVOlEPO4uK9}xl6Uvh6dqw(KX{wEG3(uwXw zJ^D>UeWaczf~YUT21IS5t3Io`Dstmn494@StI@8`*xbrK+@C^uGqJ+jZsI87dtx6^ zO6a;o=zCn3-h<)9S>hX_{Q6GopQQFNp||!ogfDT1(4{w3*XJ((`!|+EbVZ>)=SPVQ zqL|PXN30^+6Uzx*dTAOHb!@Eu#yg-_`Aeb;v5DB0Hzg*q`ejPDh+0H0F_-8?>>zUT zHpj$pMY0&ZrKzD6aOJHiCRonml#i3*H#zrzYp_5W8*!)wU#KHNc@ecOMF0d zBTf^4C3KB+@&1qXKPZPV^H6+)c#+shEFj9S!xS14N33CuxezB4d-P^kVv<-YRZ-Vp zi0R%EUt9QyxI(NY?i244^{uZzR zLOtRhv5ZKvfp1cNLX=-A)_#|Ub;K?rlD6YGn|MZyB}Nb}iKaveF_rj9 z^nLh(7S>gh2&3V3yr2fI_guVR;2-9d#3i=6NK1sZK1H&3IuXN&DvU0_@+oX5IuQGd fYF5n;Ecz;Ok8jb^=2) { + $tbody.find('tr:not(:first)').remove(); + $tbody.append('Voir la suite') + } + }); + }) + } +}); \ No newline at end of file diff --git a/teleforma/templates/quiz/category_list.html b/teleforma/templates/quiz/category_list.html new file mode 100644 index 00000000..e595e8bb --- /dev/null +++ b/teleforma/templates/quiz/category_list.html @@ -0,0 +1,18 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% block title %}{% trans "All Quizzes" %}{% endblock %} + +{% block content %} +

{% trans "Category list" %}

+ + + +{% endblock %} diff --git a/teleforma/templates/quiz/correct_answer.html b/teleforma/templates/quiz/correct_answer.html new file mode 100644 index 00000000..d98a10d9 --- /dev/null +++ b/teleforma/templates/quiz/correct_answer.html @@ -0,0 +1,32 @@ +{% load i18n %} +{% if previous.answers %} + + {% if user_was_incorrect %} +
+ {% trans "You answered the above question incorrectly" %} +
+ {% endif %} + + + + {% for answer in previous.answers %} + {% if answer.correct %} + + + + {% else %} + + + + {% endif %} + + {% endfor %} + +
{{ answer.content }}{% trans "This is the correct answer" %}
{{ answer.content }} + {% if previous.question_type.MCQuestion %} + {% if answer.id|add:"0" == previous.previous_answer|add:"0" %} + {% trans "This was your answer." %} + {% endif %} + {% endif %} +
+{% endif %} diff --git a/teleforma/templates/quiz/progress.html b/teleforma/templates/quiz/progress.html new file mode 100644 index 00000000..12b7b927 --- /dev/null +++ b/teleforma/templates/quiz/progress.html @@ -0,0 +1,86 @@ +{% extends "teleforma/base.html" %} +{% load i18n %} + +{% load quiz_tags %} + +{% block title %} {% trans "Progress Page" %} {% endblock %} +{% block description %} {% trans "User Progress Page" %} {% endblock %} + +{% block content %} + + {% if cat_scores %} + +

{% trans "Question Category Scores" %}

+ + + + + + + + + + + + + + + + {% for cat, value in cat_scores.items %} + + + + + + + + {% endfor %} + + + +
{% trans "Category" %}{% trans "Correctly answererd" %}{% trans "Incorrect" %}%
{{ cat }}{{ value.0 }}{{ value.1 }}{{ value.2 }}
+ + + {% endif %} + + {% if exams %} + +
+ +

{% trans "Previous exam papers" %}

+

+ {% trans "Below are the results of exams that you have sat." %} +

+ + + + + + + + + + + + + + + {% for exam in exams %} + + + + + + + + + {% endfor %} + + + +
{% trans "Quiz Title" %}{% trans "Score" %}{% trans "Possible Score" %}%
{{ exam.quiz.title }}{{ exam.current_score }}{{ exam.get_max_score }}{{ exam.get_percent_correct }}
+ + {% endif %} + + +{% endblock %} diff --git a/teleforma/templates/quiz/question.html b/teleforma/templates/quiz/question.html new file mode 100644 index 00000000..29733ebd --- /dev/null +++ b/teleforma/templates/quiz/question.html @@ -0,0 +1,82 @@ +{% extends "teleforma/base.html" %} +{% load i18n%} + +{% load quiz_tags %} + +{% block title %} {{ quiz.title }} {% endblock %} +{% block description %} {{ quiz.title }} - {{ quiz.description }} {% endblock %} + +{% block content %} + +{% if previous.answers %} + +

{% trans "The previous question" %}:

+

{{ previous.previous_question }}

+ + {% if previous.previous_outcome %} +
+ {% else %} +
+ {% endif %} +

+ Votre réponse est + + {{ previous.previous_outcome|yesno:"correct,incorrect" }} + +

+ +
+ + {% include 'correct_answer.html' %} + +

{% trans "Explanation" %}:

+
+

{{ previous.previous_question.explanation }}

+
+ +
+ +{% endif %} + +
+ +{% if question %} + +{% if progress %} +
+{% trans "Question" %} {{ progress.0|add:1 }} {% trans "of" %} {{ progress.1 }} +
+{% endif %} + +{% if question.category %}

+ {% trans "Question category" %}: + {{ question.category }} +

{% endif %} + +

{{ question.content }}

+ +{% if question.figure %} + {{ question.content }} +{% endif %} + +
{% csrf_token %} + + +
    + + {% for answer in form.answers %} +
  • + {{ answer }} +
    • + {% endfor %} + +
+ +
+ +{% endif %} + +
+ + +{% endblock %} diff --git a/teleforma/templates/quiz/quiz_detail.html b/teleforma/templates/quiz/quiz_detail.html new file mode 100644 index 00000000..800afbc2 --- /dev/null +++ b/teleforma/templates/quiz/quiz_detail.html @@ -0,0 +1,20 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% block title %} +{{ quiz.title }} +{% endblock %} + +{% block content %} + + +{% if quiz.single_attempt %} +

{% trans "You will only get one attempt at this quiz" %}.

+{% endif %} +

{{ quiz.description }}

+

+ + {% trans "Start quiz" %} + +

+{% endblock %} + diff --git a/teleforma/templates/quiz/quiz_list.html b/teleforma/templates/quiz/quiz_list.html new file mode 100644 index 00000000..0b163759 --- /dev/null +++ b/teleforma/templates/quiz/quiz_list.html @@ -0,0 +1,43 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% block title %}{% trans "All Quizzes" %}{% endblock %} + +{% block content %} +

{% trans "List of quizzes" %}

+ {% if quiz_list %} + + + + + + + + + + + + + + + {% for quiz in quiz_list %} + + + + + + + + + {% endfor %} + + +
{% trans "Title" %}{% trans "Category" %}{% trans "Exam" %}{% trans "Single attempt" %}
{{ quiz.title }}{{ quiz.category }}{{ quiz.exam_paper }}{{ quiz.single_attempt }} + + {% trans "View details" %} + +
+ + {% else %} +

{% trans "There are no available quizzes" %}.

+ {% endif %} +{% endblock %} diff --git a/teleforma/templates/quiz/result.html b/teleforma/templates/quiz/result.html new file mode 100644 index 00000000..d5bb4d27 --- /dev/null +++ b/teleforma/templates/quiz/result.html @@ -0,0 +1,92 @@ +{% extends "teleforma/base.html" %} +{% load i18n %} + +{% load quiz_tags %} + +{% block title %} {{ quiz.title}} {% endblock %} +{% block description %} {% trans "Exam Results for" %} {{ quiz.title }} {% endblock %} + +{% block content %} + + {% if previous.answers %} + +

{% trans "The previous question" %}:

+

{{ previous.previous_question }}

+

Votre réponse est + + {{ previous.previous_outcome|yesno:"correct,incorrect" }} + +

+ {% include 'correct_answer.html' %} +

{% trans "Explanation" %}:

+
+

{{ previous.previous_question.explanation }}

+
+
+ + {% endif %} + + {% if max_score %} + +
+

{% trans "Exam results" %}

+

+ {% trans "Exam title" %}: + {{ quiz.title }}

+ +

+ {% trans "You answered" %} {{ score }} {% trans "questions correctly out of" %} {{ max_score }}, {% trans "giving you" %} {{ percent }} {% trans "percent correct" %} +

+ + {% if quiz.pass_mark %} +
+

{{ sitting.result_message }}

+
+ + {% endif %} + +
+ + + {% endif %} + + +
+ + {% if possible %} + +

+ {% trans "Your session score is" %} {{ session }} {% trans "out of a possible" %} {{ possible }} +

+ +
+ + {% endif %} + + {% if questions %} + + {% for question in questions %} + +

+ {{ question.content }} +

+ + {% correct_answer_for_all question %} + + {% if question.user_answer %} +

{% trans "Your answer" %}: {{ question|answer_choice_to_string:question.user_answer }}

+ {% endif %} + +

{% trans "Explanation" %}:

+
+

{{ question.explanation }}

+
+ +
+ + {% endfor %} + + {% endif %} + + +{% endblock %} diff --git a/teleforma/templates/quiz/single_complete.html b/teleforma/templates/quiz/single_complete.html new file mode 100644 index 00000000..2dc0e25f --- /dev/null +++ b/teleforma/templates/quiz/single_complete.html @@ -0,0 +1,18 @@ +{% extends "teleforma/base.html" %} +{% load i18n %} + +{% load quiz_tags %} + +{% block title %} {{ quiz.title }} {% endblock %} +{% block description %} {{ quiz.title }} - {{ quiz.description }} {% endblock %} + +{% block content %} + + +{% if user.is_authenticated %} +

{% trans "You have already sat this exam and only one sitting is permitted" %}.

+{% else %} +

{% trans "This exam is only accessible to signed in users" %}.

+{% endif %} + +{% endblock %} diff --git a/teleforma/templates/quiz/sitting_detail.html b/teleforma/templates/quiz/sitting_detail.html new file mode 100644 index 00000000..c76bf94d --- /dev/null +++ b/teleforma/templates/quiz/sitting_detail.html @@ -0,0 +1,59 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% load quiz_tags %} +{% block title %} +{% trans "Result of" %} {{ sitting.quiz.title }} {% trans "for" %} {{ sitting.user }} +{% endblock %} + +{% block content %} +

{% trans "Quiz title" %}: {{ sitting.quiz.title }}

+

{% trans "Category" %}: {{ sitting.quiz.category }}

+

{{ sitting.quiz.description }}

+
+

{% trans "User" %}: {{ sitting.user }}

+

{% trans "Completed" %}: {{ sitting.end|date }}

+

{% trans "Score" %}: {{ sitting.get_percent_correct }}%

+ + + + + + + + + + + + + +{% for question in questions %} + + + + + + + + +{% endfor %} + + + +
{% trans "Question" %}{% trans "User answer" %}
+ {{ question.content }} + {% if question.figure %} +
{{ question.figure }}
+ {% endif %} + 		{{ question|answer_choice_to_string:question.user_answer }} + {% if question.id in sitting.get_incorrect_questions %} +

{% trans "incorrect" %}

+ {% else %} +

{% trans "Correct" %}

+ {% endif %} + 		+
{% csrf_token %} + + +
+
+{% endblock %} diff --git a/teleforma/templates/quiz/sitting_list.html b/teleforma/templates/quiz/sitting_list.html new file mode 100644 index 00000000..f29180ad --- /dev/null +++ b/teleforma/templates/quiz/sitting_list.html @@ -0,0 +1,54 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% block title %}{% trans "All Quizzes" %}{% endblock %} + +{% block content %} +

{% trans "List of complete exams" %}

+ {% if sitting_list %} + + + + + + + + + + + + + + + + + + + + + + + + + + {% for sitting in sitting_list %} + + + + + + + + + {% endfor %} + + + +
{% trans "User" %}{% trans "Quiz" %}{% trans "Completed" %}{% trans "Score" %}(%)
{{ sitting.user }}{{ sitting.quiz }}{{ sitting.end|date }}{{ sitting.get_percent_correct }} + + {% trans "View details" %} + +
+ {% else %} +

{% trans "There are no matching quizzes" %}.

+ {% endif %} +{% endblock %} diff --git a/teleforma/templates/quiz/view_quiz_category.html b/teleforma/templates/quiz/view_quiz_category.html new file mode 100644 index 00000000..374a4663 --- /dev/null +++ b/teleforma/templates/quiz/view_quiz_category.html @@ -0,0 +1,23 @@ +{% extends 'teleforma/base.html' %} +{% load i18n %} +{% block title %}{% trans "Quizzes related to" %} {{ category.category }}{% endblock %} + +{% block content %} +

{% trans "Quizzes in the" %} {{ category.category }} {% trans "category" %}

+ + {% with object_list as quizzes %} + {% if quizzes %} + + {% else %} +

{% trans "There are no quizzes" %}

+ {% endif %} + {% endwith %} +{% endblock %} diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html index fe86cb0c..3f9c696a 100644 --- a/teleforma/templates/teleforma/course_detail.html +++ b/teleforma/templates/teleforma/course_detail.html @@ -18,31 +18,53 @@ $(document).ready(function(){ {% endblock courses %} {% block course %} +
+ + + + +

{% for c in courses %} {% with c.course as course %} {% for type in c.types %} + {% if course.quiz.all or type.name != 'Quiz' %}
{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}
- {% if not user.correctors.all or user.is_staff %} - {% block conference %} - {% include "teleforma/inc/conference_list.html" %} - {% endblock %} + {% if type.name == 'Quiz' %} +
+ + + {% for quiz in course.quiz.all %} + + + {% endfor %} + +
{{quiz.title}}{{quiz.description}}
+
- {% block media %} - {% include "teleforma/inc/media_list.html" %} - {% endblock %} - {% endif %} + {% else %} + {% if not user.correctors.all or user.is_staff %} + {% block conference %} + {% include "teleforma/inc/conference_list.html" %} + {% endblock %} + + {% block media %} + {% include "teleforma/inc/media_list.html" %} + {% endblock %} + {% endif %} - {% block document %} - {% with forloop.counter as type_counter %} - {% include "teleforma/inc/document_list.html" %} - {% endwith %} - {% endblock %} + {% block document %} + {% with forloop.counter as type_counter %} + {% include "teleforma/inc/document_list.html" %} + {% endwith %} + {% endblock %} + {% endif %}
+ {% endif %} {% endfor %} {% endwith %} {% endfor %} diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html index 50c05fca..fdc2f599 100644 --- a/teleforma/templates/teleforma/courses.html +++ b/teleforma/templates/teleforma/courses.html @@ -1,5 +1,6 @@ {% extends "telemeta/base.html" %} {% load teleforma_tags %} +{% load thumbnail %} {% load telemeta_utils %} {% load i18n %} @@ -73,7 +74,32 @@ $(document).ready(function(){ {% block course %} -
+
+ + {% autoescape off %} + {{ home_text }} + {% endautoescape %} + + {% if home_video.type == 'webm' %} +

{% if home_video.title %}{{ home_video.title }}{% else %}{{ home_video.course.title }}{% endif %}

+
+ + {% if home_video.item.related.all %} + {% for related in home_video.item.related.all %} + {% if related.title == "preview" %} + {% thumbnail related.file "168x96" as im %} +
+ {% trans 'Click here' %} +
+ {% endthumbnail %} + {% endif %} + {% endfor %} + {% else %} + {% trans 'Click here' %} + {% endif %} + +
+ {% endif %} {% for c in courses %} {% with c.course as course %} @@ -89,14 +115,14 @@ $(document).ready(function(){ {% block media %} {% with "Passed conferences" as title %} - {% include "teleforma/inc/media_list.html" %} + {% include "teleforma/inc/media_list.html" with show_only=1 %} {% endwith %} {% endblock %} {% comment %} {% block webclass %} {% with "Web class" as title %} - {% include "teleforma/inc/media_list.html" %} + {% include "teleforma/inc/media_list.html" with show_only=1 %} {% endwith %} {% endblock %} {% endcomment %} @@ -106,7 +132,6 @@ $(document).ready(function(){ {% include "teleforma/inc/document_list.html" %} {% endwith %} {% endblock %} -
{% endfor %} {% endwith %} diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index 8b20662d..33d02a39 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -226,6 +226,8 @@ def untreated_scripts_count(user, period): @register.simple_tag def treated_scripts_count(user, period): + if not period: + return '' Q1 = Q(status=4, author=user, period=period) Q2 = Q(status=4, corrector=user, period=period) scripts = Script.objects.filter(Q1 | Q2) diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 7f91d9d3..7d8e36f2 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -245,7 +245,7 @@ class HomeRedirectView(View): period = get_default_period(periods) return HttpResponseRedirect(reverse('teleforma-desk-period-list', kwargs={'period_id': period.id})) else: - HttpResponseRedirect(reverse('telemeta-admin')) + return HttpResponseRedirect(reverse('telemeta-admin')) else: return HttpResponseRedirect(reverse('teleforma-login')) @@ -296,6 +296,11 @@ class CourseListView(CourseAccessMixin, ListView): context['doc_types'] = DocumentType.objects.all() context['list_view'] = True context['courses'] = sorted(context['all_courses'], key=lambda k: k['date'], reverse=True)[:1] + home = Home.objects.all() + if home: + home = home[0] + context['home_text'] = home.text + context['home_video'] = home.video return context @method_decorator(login_required) -- 2.39.5