Commit a6c415ac2c2cf04eb780628f8326f183caae2078
1 parent
d35cde0e
Exists in
master
and in
5 other branches
exam_form #362
Showing
3 changed files
with
13 additions
and
2 deletions
Show diff stats
exam/admin.py
1 | 1 | from django.contrib import admin |
2 | 2 | |
3 | -from .models import Exam, Answer, AnswersStudent | |
3 | +from .models import Exam, Answer, AnswersStudent, Question, Alternative | |
4 | 4 | |
5 | 5 | class ExamAdmin(admin.ModelAdmin): |
6 | 6 | list_display = ['name', 'slug','begin_date','limit_date'] |
... | ... | @@ -17,3 +17,5 @@ class AnswersStudentAdmin(admin.ModelAdmin): |
17 | 17 | admin.site.register(Exam, ExamAdmin) |
18 | 18 | admin.site.register(Answer, AnswerAdmin) |
19 | 19 | admin.site.register(AnswersStudent, AnswersStudentAdmin) |
20 | +admin.site.register(Question) | |
21 | +admin.site.register(Alternative) | ... | ... |
exam/forms.py
... | ... | @@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm): |
25 | 25 | |
26 | 26 | class Meta: |
27 | 27 | model = Exam |
28 | - fields = ['name','begin_date','limit_date','students','all_students'] | |
28 | + fields = ['name','begin_date','limit_date','students','all_students', 'begin_exam', 'end_exam'] | |
29 | 29 | |
30 | 30 | widgets = { |
31 | 31 | 'name': forms.TextInput(attrs={'placeholder': 'Exam?'}), | ... | ... |
exam/models.py
... | ... | @@ -45,3 +45,12 @@ class AnswersStudent(models.Model): |
45 | 45 | |
46 | 46 | def __str__(self): |
47 | 47 | return str(self.student) + str("/") + str(self.exam) |
48 | + | |
49 | +class Question(models.Model): | |
50 | + exam = models.ForeignKey(Exam, verbose_name=_('Exam'), related_name='question_exam') | |
51 | + statement = models.TextField(_("Statement"), blank=False) | |
52 | + | |
53 | +class Alternative(models.Model): | |
54 | + question = models.ForeignKey(Question, verbose_name=_("Question"), related_name="alternative_question") | |
55 | + statement = models.TextField(_("Statement"), blank=False) | |
56 | + answer = models.BooleanField(_("answer"), default=False) | |
48 | 57 | \ No newline at end of file | ... | ... |