Merge branch 'feature/education-exam-answers' into 'master'

Add exam document type for answers

Closes #87

See merge request !384

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: 2016-11-23 21:49+0100\n"
-"PO-Revision-Date: 2016-11-23 21:54+0100\n"
+"POT-Creation-Date: 2017-02-25 19:52+0100\n"
+"PO-Revision-Date: 2017-02-25 19:53+0100\n"
 "Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: education/admin.py:30
 msgid "Mark exams as accepted"
@@ -54,7 +54,7 @@ msgstr "EC"
 msgid "period"
 msgstr "periode"
 
-#: education/models.py:77 education/models.py:126 education/models.py:174
+#: education/models.py:77 education/models.py:127 education/models.py:175
 msgid "course"
 msgstr "vak"
 
@@ -82,47 +82,51 @@ msgstr "Hertentamen"
 msgid "Practice Exam"
 msgstr "Oefententamen"
 
-#: education/models.py:92
+#: education/models.py:88
+msgid "Exam Answers"
+msgstr "Antwoorden tentamen"
+
+#: education/models.py:93
 msgid "exam type"
 msgstr "type tentamen"
 
-#: education/models.py:97
+#: education/models.py:98
 msgid "exam name"
 msgstr "naam tentamen"
 
-#: education/models.py:103 education/models.py:157
+#: education/models.py:104 education/models.py:158
 msgid "uploader"
 msgstr "uploader"
 
-#: education/models.py:112 education/models.py:179
+#: education/models.py:113 education/models.py:180
 msgid "accepted"
 msgstr "geaccepteerd"
 
-#: education/models.py:117
+#: education/models.py:118
 msgid "exam date"
 msgstr "tentamendatum"
 
-#: education/models.py:145
+#: education/models.py:146
 msgid "exam"
 msgstr "tentamen"
 
-#: education/models.py:146
+#: education/models.py:147
 msgid "exams"
 msgstr "tentamens"
 
-#: education/models.py:152
+#: education/models.py:153
 msgid "summary name"
 msgstr "naam samenvatting"
 
-#: education/models.py:169
+#: education/models.py:170
 msgid "author"
 msgstr "auteur"
 
-#: education/models.py:195
+#: education/models.py:196
 msgid "summary"
 msgstr "samenvatting"
 
-#: education/models.py:196
+#: education/models.py:197
 msgid "summaries"
 msgstr "samenvattingen"
 
@@ -356,9 +360,3 @@ msgstr ""
 #: education/views.py:30
 msgid "Summary"
 msgstr "Samenvatting"
-
-#~ msgid "Mark exams as unaccepted"
-#~ msgstr "Mark tentamens als niet geaccepteerd"
-
-#~ msgid "Mark summaries as unaccepted"
-#~ msgstr "Mark samenvattingen als niet geaccepteerd"

website/education/migrations/0003_auto_20170225_1951.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-02-25 18:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('education', '0002_auto_20161109_2024'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='exam',
+            name='type',
+            field=models.CharField(choices=[('document', 'Document'), ('exam', 'Exam'), ('partial', 'Partial Exam'), ('resit', 'Resit'), ('practice', 'Practice Exam'), ('answers', 'Exam Answers')], max_length=40, verbose_name='exam type'),
+        ),
+    ]

website/education/models.py

@@ -84,7 +84,8 @@ class Exam(models.Model, metaclass=ModelTranslateMeta):
         ('exam', _('Exam')),
         ('partial', _('Partial Exam')),
         ('resit', _('Resit')),
-        ('practice', _('Practice Exam')))
+        ('practice', _('Practice Exam')),
+        ('answers', _('Exam Answers')))
 
     type = models.CharField(
         max_length=40,