.
This commit is contained in:
+3
-2
@@ -2,7 +2,7 @@ from longs.models import Exam
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
# Register your models here.
|
# Register your models here.
|
||||||
from .models import Examination, Sign, Condition, Plane, Contrast
|
from .models import Examination, Sign, Condition, Plane, Contrast, QuestionNote
|
||||||
#from .models import Examination, Sign, Site, Condition
|
#from .models import Examination, Sign, Site, Condition
|
||||||
|
|
||||||
admin.site.register(Examination)
|
admin.site.register(Examination)
|
||||||
@@ -10,4 +10,5 @@ admin.site.register(Sign)
|
|||||||
#admin.site.register(Site)
|
#admin.site.register(Site)
|
||||||
admin.site.register(Condition)
|
admin.site.register(Condition)
|
||||||
admin.site.register(Plane)
|
admin.site.register(Plane)
|
||||||
admin.site.register(Contrast)
|
admin.site.register(Contrast)
|
||||||
|
admin.site.register(QuestionNote)
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
# Generated by Django 3.1.3 on 2021-05-03 18:08
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('contenttypes', '0002_remove_content_type_name'),
|
||||||
|
('generic', '0009_contrast'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QuestionNote',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('object_id', models.PositiveIntegerField()),
|
||||||
|
('author', models.CharField(blank=True, max_length=200)),
|
||||||
|
('note', models.TextField()),
|
||||||
|
('created_on', models.DateTimeField(auto_now_add=True)),
|
||||||
|
('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
||||||
+22
-1
@@ -8,6 +8,9 @@ import tagulous.models
|
|||||||
from sortedm2m.fields import SortedManyToManyField
|
from sortedm2m.fields import SortedManyToManyField
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
from django.contrib.contenttypes.fields import GenericForeignKey
|
||||||
|
from django.contrib.contenttypes.models import ContentType
|
||||||
|
|
||||||
class Plane(models.Model):
|
class Plane(models.Model):
|
||||||
plane = models.CharField(max_length=200)
|
plane = models.CharField(max_length=200)
|
||||||
|
|
||||||
@@ -93,4 +96,22 @@ class ExamBase(models.Model):
|
|||||||
return reverse("{}:exam_json".format(self.app_name), args=(self.pk,))
|
return reverse("{}:exam_json".format(self.app_name), args=(self.pk,))
|
||||||
|
|
||||||
def get_question_index(self, question):
|
def get_question_index(self, question):
|
||||||
return list(self.exam_questions.all()).index(question)
|
return list(self.exam_questions.all()).index(question)
|
||||||
|
|
||||||
|
|
||||||
|
class QuestionNote(models.Model):
|
||||||
|
content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
|
||||||
|
object_id = models.PositiveIntegerField()
|
||||||
|
question = GenericForeignKey('content_type', 'object_id')
|
||||||
|
#author = models.ForeignKey(User,
|
||||||
|
|
||||||
|
author = models.CharField(max_length=200, blank=True)
|
||||||
|
note = models.TextField()
|
||||||
|
created_on = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
#def get_absolute_url(self):
|
||||||
|
# self.pk = self.rapid_id
|
||||||
|
# return reverse('rapids:question_detail', kwargs={'pk': self.pk})
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "{} [{}] {}".format(self.author, self.created_on, self.note)
|
||||||
+1
-1
@@ -533,4 +533,4 @@ class CidUserAnswer(models.Model):
|
|||||||
mark = 0
|
mark = 0
|
||||||
else:
|
else:
|
||||||
mark = "unmarked"
|
mark = "unmarked"
|
||||||
return mark
|
return mark
|
||||||
|
|||||||
Reference in New Issue
Block a user