Merge branch 'feature/education-open-files' into 'master'

Add help_text to summaries and exams to explain how to inspect files

Closes #295

See merge request !382

website/education/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-25 19:52+0100\n"
-"PO-Revision-Date: 2017-02-25 19:53+0100\n"
+"POT-Creation-Date: 2017-02-27 14:08+0100\n"
+"PO-Revision-Date: 2017-02-27 14:06+0100\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -18,149 +18,152 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.12\n"
 
-#: education/admin.py:30
+#: admin.py:33
 msgid "Mark exams as accepted"
 msgstr "Markeer tentamens als geaccepteerd"
 
-#: education/admin.py:35
+#: admin.py:38
 msgid "Mark exams as rejected"
 msgstr "Markeer tentamens als afgekeurd"
 
-#: education/admin.py:47
+#: admin.py:51
 msgid "Mark summaries as accepted"
 msgstr "Markeer samenvattingen als geaccepteerd"
 
-#: education/admin.py:52
+#: admin.py:56
 msgid "Mark summaries as rejected"
 msgstr "Markeer samenvattingen als afgekeurd"
 
-#: education/models.py:24
+#: models.py:24
 msgid "category"
 msgstr "categorie"
 
-#: education/models.py:25 education/models.py:36
+#: models.py:25 models.py:36
 msgid "categories"
 msgstr "categorieën"
 
-#: education/models.py:43
+#: models.py:43
 msgid "old courses"
 msgstr "oude vakken"
 
-#: education/models.py:57 education/templates/education/course.html:72
+#: models.py:57 templates/education/course.html:73
 msgid "EC"
 msgstr "EC"
 
-#: education/models.py:67
+#: models.py:67
 msgid "period"
 msgstr "periode"
 
-#: education/models.py:77 education/models.py:127 education/models.py:175
+#: models.py:77 models.py:129 models.py:177
 msgid "course"
 msgstr "vak"
 
-#: education/models.py:78
+#: models.py:78
 msgid "courses"
 msgstr "vakken"
 
-#: education/models.py:83
+#: models.py:83
 msgid "Document"
 msgstr "Document"
 
-#: education/models.py:84
+#: models.py:84
 msgid "Exam"
 msgstr "Tentamen"
 
-#: education/models.py:85
+#: models.py:85
 msgid "Partial Exam"
 msgstr "Deeltentamen"
 
-#: education/models.py:86
+#: models.py:86
 msgid "Resit"
 msgstr "Hertentamen"
 
-#: education/models.py:87
+#: models.py:87
 msgid "Practice Exam"
 msgstr "Oefententamen"
 
-#: education/models.py:88
+#: models.py:88
 msgid "Exam Answers"
 msgstr "Antwoorden tentamen"
 
-#: education/models.py:93
+#: models.py:93
 msgid "exam type"
 msgstr "type tentamen"
 
-#: education/models.py:98
+#: models.py:98
 msgid "exam name"
 msgstr "naam tentamen"
 
-#: education/models.py:104 education/models.py:158
+#: models.py:104 models.py:160
 msgid "uploader"
 msgstr "uploader"
 
-#: education/models.py:113 education/models.py:180
+#: models.py:113 models.py:182
 msgid "accepted"
 msgstr "geaccepteerd"
 
-#: education/models.py:118
+#: models.py:118
 msgid "exam date"
 msgstr "tentamendatum"
 
-#: education/models.py:146
+#: models.py:123 models.py:188
+msgid "Use the 'View on site' button to download the file for inspection."
+msgstr ""
+"Gebruik de ‘Toon op site’ knop om het bestand te downloaden voor controle."
+
+#: models.py:148
 msgid "exam"
 msgstr "tentamen"
 
-#: education/models.py:147
+#: models.py:149
 msgid "exams"
 msgstr "tentamens"
 
-#: education/models.py:153
+#: models.py:155
 msgid "summary name"
 msgstr "naam samenvatting"
 
-#: education/models.py:170
+#: models.py:172
 msgid "author"
 msgstr "auteur"
 
-#: education/models.py:196
+#: models.py:200
 msgid "summary"
 msgstr "samenvatting"
 
-#: education/models.py:197
+#: models.py:201
 msgid "summaries"
 msgstr "samenvattingen"
 
-#: education/templates/education/add_exam.html:4
-#: education/templates/education/add_exam.html:7
-#: education/templates/education/course.html:78
+#: templates/education/add_exam.html:4 templates/education/add_exam.html:5
+#: templates/education/add_exam.html:8 templates/education/course.html:79
 msgid "Submit Exam"
 msgstr "Tentamen Insturen"
 
-#: education/templates/education/add_exam.html:11
+#: templates/education/add_exam.html:12
 msgid "Exam submitted successfully."
 msgstr "Tentamen succesvol ingestuurd."
 
-#: education/templates/education/add_exam.html:37
-#: education/templates/education/add_summary.html:37
+#: templates/education/add_exam.html:38 templates/education/add_summary.html:38
 msgid "submit"
 msgstr "insturen"
 
-#: education/templates/education/add_summary.html:4
-#: education/templates/education/add_summary.html:7
-#: education/templates/education/course.html:81
+#: templates/education/add_summary.html:4
+#: templates/education/add_summary.html:5
+#: templates/education/add_summary.html:8 templates/education/course.html:82
 msgid "Submit Summary"
 msgstr "Samenvatting Insturen"
 
-#: education/templates/education/add_summary.html:11
+#: templates/education/add_summary.html:12
 msgid "Summary submitted successfully."
 msgstr "Samenvatting succesvol ingestuurd."
 
-#: education/templates/education/books.html:4
-#: education/templates/education/books.html:7
+#: templates/education/books.html:4 templates/education/books.html:5
+#: templates/education/books.html:8
 msgid "Book Sale"
 msgstr "Boekverkoop"
 
-#: education/templates/education/books.html:9
+#: templates/education/books.html:10
 #, python-format
 msgid ""
 "Thalia's book sale goes through bookstore Roelants. As a member of Thalia "
@@ -179,7 +182,7 @@ msgstr ""
 "gebruik je tijdens het afrekenen de code \"THALIAkorting\" om de korting op "
 "je bestelling te krijgen."
 
-#: education/templates/education/books.html:16
+#: templates/education/books.html:17
 msgid ""
 "It's also possible to order your books at the physical shops, but the "
 "discount is only eligible when using the website. It is useful to order your "
@@ -196,11 +199,11 @@ msgstr ""
 "Mocht er een boek ontbreken of er een ander probleem met de boeken zijn, "
 "stuur gerust een e-mail naar onderwijs@thalia.nu."
 
-#: education/templates/education/course.html:4
+#: templates/education/course.html:4 templates/education/course.html:5
 msgid "Course"
 msgstr "Vak"
 
-#: education/templates/education/course.html:14
+#: templates/education/course.html:15
 msgid ""
 "Thalia does not have any documents for this course, unfortunately. Are you "
 "in possession of exams or summaries for this course? Then let us know or add "
@@ -209,15 +212,15 @@ msgstr ""
 "Er zijn bij Thalia helaas geen documenten bekend over dit vak. Ben jij in "
 "het bezit van tentamens of samenvattingen over dit vak? Laat het ons weten!"
 
-#: education/templates/education/course.html:29
+#: templates/education/course.html:30
 msgid "Exams"
 msgstr "Tentamens"
 
-#: education/templates/education/course.html:29
+#: templates/education/course.html:30
 msgid "Summaries"
 msgstr "Samenvattingen"
 
-#: education/templates/education/course.html:45
+#: templates/education/course.html:46
 #, python-format
 msgid ""
 "These documents were collected for <a href=\"%(course_url)s\">"
@@ -226,7 +229,7 @@ msgstr ""
 "Deze documenten zijn van de cursus <a href=\"%(course_url)s\">"
 "%(course_name)s</a>, een voorloper van dit vak."
 
-#: education/templates/education/course.html:59
+#: templates/education/course.html:60
 #, python-format
 msgid ""
 "This is the overview for <b>%(name)s</b>. You can find all the exams and "
@@ -235,7 +238,7 @@ msgstr ""
 "Dit is de overzichtspagina voor <b>%(name)s</b>. Hier kun je per jaar alle "
 "bij Thalia bekende tentamens en samenvattingen terugvinden."
 
-#: education/templates/education/course.html:64
+#: templates/education/course.html:65
 msgid ""
 "Keep in mind that old exams and summaries may not always test the same "
 "material as this year."
@@ -243,20 +246,20 @@ msgstr ""
 "Houd er rekening mee dat oude tentamens en samenvattingen niet altijd "
 "representatief zijn voor wat er dit jaar wordt getoetst."
 
-#: education/templates/education/course.html:71
+#: templates/education/course.html:72
 msgid "Course code"
 msgstr "Cursus code"
 
-#: education/templates/education/course.html:73
+#: templates/education/course.html:74
 msgid "Period"
 msgstr "Periode"
 
-#: education/templates/education/courses.html:4
-#: education/templates/education/courses.html:7
+#: templates/education/courses.html:4 templates/education/courses.html:5
+#: templates/education/courses.html:8
 msgid "Course overview"
 msgstr "Vakkenoverzicht"
 
-#: education/templates/education/courses.html:9
+#: templates/education/courses.html:10
 msgid ""
 "This overview contains all courses for which Thalia has exams, summaries or "
 "other documents. Select a course to find out more.<br/> Can't find a course? "
@@ -267,19 +270,20 @@ msgstr ""
 "er een vak niet tussen? Laat dat dan weten aan de <a href=\"mailto:"
 "educacie@thalia.nu\">educatiecommissie</a>."
 
-#: education/templates/education/courses.html:21
+#: templates/education/courses.html:22
 msgid "all courses"
 msgstr "alle vakken"
 
-#: education/templates/education/student_participation.html:5
+#: templates/education/student_participation.html:5
+#: templates/education/student_participation.html:6
 msgid "Student Participation"
 msgstr "Medezeggenschap"
 
-#: education/templates/education/student_participation.html:9
+#: templates/education/student_participation.html:10
 msgid "Education Program Committee"
 msgstr "De Opleidingscommisie"
 
-#: education/templates/education/student_participation.html:11
+#: templates/education/student_participation.html:12
 msgid ""
 "<p>The Education Program Committee (EPC) is responsible for giving advice "
 "concerning education and exam regulations, that have to be approved every "
@@ -307,11 +311,11 @@ msgstr ""
 "kan je meer lezen over de studenten die in de OLC zitten op hun <a href="
 "\"http://olc.cs.ru.nl/\">eigen pagina</a>.</p>"
 
-#: education/templates/education/student_participation.html:19
+#: templates/education/student_participation.html:20
 msgid "Faculty Student Council"
 msgstr "De Facultaire Studentenraad"
 
-#: education/templates/education/student_participation.html:21
+#: templates/education/student_participation.html:22
 msgid ""
 "<p>The Faculty of Science has their own student participation organ that "
 "concerns itself with matters that are important to our faculty. This ranges "
@@ -337,11 +341,11 @@ msgstr ""
 "blijven. Je kan  <a href=\"ḧttp://www.ru.nl/fnwi/fsr/\">hier</a> meer over "
 "de FSR lezen.</p>"
 
-#: education/templates/education/student_participation.html:30
+#: templates/education/student_participation.html:31
 msgid "University Student Council"
 msgstr "De Universitaire Studentenraad"
 
-#: education/templates/education/student_participation.html:32
+#: templates/education/student_participation.html:33
 msgid ""
 "<p>The University Student Council (USC) is concerned with all issues that "
 "concern the entire university. One could think of the opening hours of the "
@@ -357,6 +361,6 @@ msgstr ""
 "de andere zes representeren verschillende studentenorganisaties. Je kan <a "
 "href=\"http://www.ru.nl/usr/\">hier</a> meer lezen over de USR."
 
-#: education/views.py:30
+#: views.py:30
 msgid "Summary"
 msgstr "Samenvatting"

website/education/migrations/0004_auto_20170227_1406.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-02-27 13:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('education', '0003_auto_20170225_1951'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exam',
+            name='file',
+            field=models.FileField(help_text="Use the 'View on site' button to download the file for inspection.", upload_to='education/files/exams/'),
+        ),
+        migrations.AlterField(
+            model_name='summary',
+            name='file',
+            field=models.FileField(help_text="Use the 'View on site' button to download the file for inspection.", upload_to='education/files/summary/'),
+        ),
+    ]

website/education/models.py

@@ -119,7 +119,9 @@ class Exam(models.Model, metaclass=ModelTranslateMeta):
     )
 
     file = models.FileField(
-        upload_to="education/files/exams/"
+        upload_to="education/files/exams/",
+        help_text=_('Use the \'View on site\' button to download '
+                    'the file for inspection.')
     )
 
     course = models.ForeignKey(
@@ -182,7 +184,9 @@ class Summary(models.Model, metaclass=ModelTranslateMeta):
     )
 
     file = models.FileField(
-        upload_to="education/files/summary/"
+        upload_to="education/files/summary/",
+        help_text=_('Use the \'View on site\' button to download '
+                    'the file for inspection.')
     )
 
     def __str__(self):