clean up
This commit is contained in:
@@ -352,7 +352,6 @@ class Case(models.Model, AuthorMixin):
|
|||||||
help_text="If a case should be freely available to browse", default=True
|
help_text="If a case should be freely available to browse", default=True
|
||||||
)
|
)
|
||||||
|
|
||||||
#series = SortedManyToManyField("Series", related_name="case")
|
|
||||||
series = models.ManyToManyField("Series", through="SeriesDetail", related_name="case")
|
series = models.ManyToManyField("Series", through="SeriesDetail", related_name="case")
|
||||||
|
|
||||||
notes = GenericRelation(QuestionNote)
|
notes = GenericRelation(QuestionNote)
|
||||||
|
|||||||
@@ -422,7 +422,6 @@ class ExamQuestionDetail(models.Model):
|
|||||||
class Exam(ExamBase):
|
class Exam(ExamBase):
|
||||||
app_name = "longs"
|
app_name = "longs"
|
||||||
|
|
||||||
#exam_questions = SortedManyToManyField(Long, related_name="exams", blank="true")
|
|
||||||
exam_questions = models.ManyToManyField(Long, through=ExamQuestionDetail, related_name="exams")
|
exam_questions = models.ManyToManyField(Long, through=ExamQuestionDetail, related_name="exams")
|
||||||
|
|
||||||
time_limit = models.IntegerField(
|
time_limit = models.IntegerField(
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ from django.urls import reverse
|
|||||||
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from sortedm2m.fields import SortedManyToManyField
|
|
||||||
|
|
||||||
from generic.models import CidUser, CidUserGroup, ExamBase, ExamCollection, ExamUserStatus, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup
|
from generic.models import CidUser, CidUserGroup, ExamBase, ExamCollection, ExamUserStatus, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup
|
||||||
|
|
||||||
import reversion
|
import reversion
|
||||||
@@ -149,7 +147,6 @@ class ExamQuestionDetail(models.Model):
|
|||||||
class Exam(ExamBase):
|
class Exam(ExamBase):
|
||||||
app_name = "physics"
|
app_name = "physics"
|
||||||
|
|
||||||
#exam_questions = SortedManyToManyField(Question, related_name="exams", blank="true")
|
|
||||||
exam_questions = models.ManyToManyField(Question, through=ExamQuestionDetail, related_name="exams")
|
exam_questions = models.ManyToManyField(Question, through=ExamQuestionDetail, related_name="exams")
|
||||||
|
|
||||||
time_limit = models.IntegerField(
|
time_limit = models.IntegerField(
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ from django.urls import reverse
|
|||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
from django.utils.html import mark_safe
|
from django.utils.html import mark_safe
|
||||||
|
|
||||||
from sortedm2m.fields import SortedManyToManyField
|
|
||||||
|
|
||||||
import string
|
import string
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
from helpers.images import get_image_hash, image_as_base64
|
from helpers.images import get_image_hash, image_as_base64
|
||||||
@@ -614,7 +612,6 @@ class ExamQuestionDetail(models.Model):
|
|||||||
class Exam(ExamBase):
|
class Exam(ExamBase):
|
||||||
app_name = "rapids"
|
app_name = "rapids"
|
||||||
|
|
||||||
#exam_questions = SortedManyToManyField(Rapid, related_name="exams", blank="true")
|
|
||||||
exam_questions = models.ManyToManyField(Rapid, through=ExamQuestionDetail, related_name="exams")
|
exam_questions = models.ManyToManyField(Rapid, through=ExamQuestionDetail, related_name="exams")
|
||||||
|
|
||||||
time_limit = models.IntegerField(
|
time_limit = models.IntegerField(
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ from django.urls import reverse
|
|||||||
|
|
||||||
from django.utils.translation import gettext_lazy as _
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
|
||||||
from sortedm2m.fields import SortedManyToManyField
|
|
||||||
|
|
||||||
from generic.models import CidUser, CidUserGroup, ExamBase, ExamCollection, ExamUserStatus, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup
|
from generic.models import CidUser, CidUserGroup, ExamBase, ExamCollection, ExamUserStatus, QuestionBase, QuestionNote, UserAnswerBase, UserUserGroup
|
||||||
|
|
||||||
import reversion
|
import reversion
|
||||||
@@ -167,7 +165,6 @@ class ExamQuestionDetail(models.Model):
|
|||||||
class Exam(ExamBase):
|
class Exam(ExamBase):
|
||||||
app_name = "sbas"
|
app_name = "sbas"
|
||||||
|
|
||||||
#exam_questions = SortedManyToManyField(Question, related_name="exams", blank="true")
|
|
||||||
exam_questions = models.ManyToManyField(Question, through=ExamQuestionDetail, related_name="exams")
|
exam_questions = models.ManyToManyField(Question, through=ExamQuestionDetail, related_name="exams")
|
||||||
|
|
||||||
time_limit = models.IntegerField(
|
time_limit = models.IntegerField(
|
||||||
|
|||||||
Reference in New Issue
Block a user