Download as
Browse Code »

Commit a6c415ac2c2cf04eb780628f8326f183caae2078

Authored by juliotoscano
1 parent d35cde0e
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

exam_form #362

Showing 3 changed files with 13 additions and 2 deletions   Show diff stats
1 from django.contrib import admin 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 class ExamAdmin(admin.ModelAdmin): 5 class ExamAdmin(admin.ModelAdmin):
6 list_display = ['name', 'slug','begin_date','limit_date'] 6 list_display = ['name', 'slug','begin_date','limit_date']
@@ -17,3 +17,5 @@ class AnswersStudentAdmin(admin.ModelAdmin): @@ -17,3 +17,5 @@ class AnswersStudentAdmin(admin.ModelAdmin):
17 admin.site.register(Exam, ExamAdmin) 17 admin.site.register(Exam, ExamAdmin)
18 admin.site.register(Answer, AnswerAdmin) 18 admin.site.register(Answer, AnswerAdmin)
19 admin.site.register(AnswersStudent, AnswersStudentAdmin) 19 admin.site.register(AnswersStudent, AnswersStudentAdmin)
  20 +admin.site.register(Question)
  21 +admin.site.register(Alternative)
@@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm): @@ -25,7 +25,7 @@ class ExamForm(forms.ModelForm):
25 25
26 class Meta: 26 class Meta:
27 model = Exam 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 widgets = { 30 widgets = {
31 'name': forms.TextInput(attrs={'placeholder': 'Exam?'}), 31 'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
exam/models.py
  Diff comments   View file @a6c415a
@@ -45,3 +45,12 @@ class AnswersStudent(models.Model): @@ -45,3 +45,12 @@ class AnswersStudent(models.Model):
45 45
46 def __str__(self): 46 def __str__(self):
47 return str(self.student) + str("/") + str(self.exam) 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 \ No newline at end of file 57 \ No newline at end of file