repalce rapid - long

This commit is contained in:
Ross
2021-02-02 09:35:29 +00:00
parent 38134e5fbc
commit b681a27640
28 changed files with 276 additions and 276 deletions
+24 -24
View File
@@ -19,9 +19,9 @@ import string
image_storage = FileSystemStorage(
# Physical file location ROOT
location=u"{0}/rapids/".format(settings.MEDIA_ROOT),
location=u"{0}/longs/".format(settings.MEDIA_ROOT),
# Url for file
base_url=u"{0}rapids/".format(settings.MEDIA_URL),
base_url=u"{0}longs/".format(settings.MEDIA_URL),
)
def image_directory_path(instance, filename):
@@ -81,7 +81,7 @@ class Sign(tagulous.models.TagModel):
class Answer(models.Model):
question = models.ForeignKey(
"Rapid", related_name="answers", on_delete=models.CASCADE
"Long", related_name="answers", on_delete=models.CASCADE
)
answer = models.TextField(max_length=500)
answer_compare = models.TextField(max_length=500)
@@ -113,7 +113,7 @@ class Answer(models.Model):
self.answer_compare = s
class Rapid(models.Model):
class Long(models.Model):
#author = models.ForeignKey('auth.User', on_delete=models.CASCADE)
#image = models.ImageField()
question = models.TextField(null=True, blank=True)
@@ -174,7 +174,7 @@ class Rapid(models.Model):
author = models.ManyToManyField(settings.AUTH_USER_MODEL,
blank=True,
help_text='Author of question',
related_name="rapid_authored_questions")
related_name="long_authored_questions")
scrapped = models.BooleanField(
default=False,
@@ -186,7 +186,7 @@ class Rapid(models.Model):
def get_absolute_url(self):
return reverse('rapids:rapid_detail', kwargs={'pk': self.pk})
return reverse('longs:long_detail', kwargs={'pk': self.pk})
def get_authors(self):
"""Returns a comma seperated text list of authors"""
@@ -295,8 +295,8 @@ class Rapid(models.Model):
#return self.GetImages()
class RapidImage(models.Model):
rapid = models.ForeignKey(Rapid,
class LongImage(models.Model):
long = models.ForeignKey(Long,
related_name="images",
on_delete=models.CASCADE)
image = models.ImageField(upload_to=image_directory_path, storage=image_storage)
@@ -306,7 +306,7 @@ class RapidImage(models.Model):
def image_tag(self):
if self.image:
return mark_safe(
'<img src="{}" class="admin-rapid-image" /><span class="admin-rapid-image-info">Click and hold to zoom<span>'
'<img src="{}" class="admin-long-image" /><span class="admin-long-image-info">Click and hold to zoom<span>'
.format(self.image.url))
else:
return ""
@@ -315,46 +315,46 @@ class RapidImage(models.Model):
class Note(models.Model):
rapid = models.ForeignKey(Rapid,
related_name="rapid_notes",
long = models.ForeignKey(Long,
related_name="long_notes",
on_delete=models.CASCADE,
null=True)
#author = models.ForeignKey(User,
author = models.ForeignKey( settings.AUTH_USER_MODEL,
related_name="rapid_notes",
related_name="long_notes",
on_delete=models.CASCADE)
note = models.TextField()
created_on = models.DateTimeField(auto_now_add=True)
def get_absolute_url(self):
self.pk = self.rapid_id
return reverse('rapids:rapid_detail', kwargs={'pk': self.pk})
self.pk = self.long_id
return reverse('longs:long_detail', kwargs={'pk': self.pk})
def __str__(self):
return "{} [{}] {}".format(self.rapid, self.author, self.created_on)
return "{} [{}] {}".format(self.long, self.author, self.created_on)
class RapidCreationDefault(models.Model):
class LongCreationDefault(models.Model):
#author = models.OneToOneField(User,
author = models.OneToOneField(
settings.AUTH_USER_MODEL,
related_name="rapid_default",
related_name="long_default",
on_delete=models.CASCADE)
site = models.ManyToManyField(
Site,
blank=True,
default=1,
help_text="Default site to use when creating a new rapid")
help_text="Default site to use when creating a new long")
def get_absolute_url(self):
return reverse('rapids:rapid_create')
return reverse('longs:long_create')
class Exam(models.Model):
name = models.CharField(max_length=200)
exam_questions = SortedManyToManyField(
Rapid, related_name="exams", blank="true"
Long, related_name="exams", blank="true"
)
active = models.BooleanField(
@@ -377,13 +377,13 @@ class Exam(models.Model):
return self.name
def get_absolute_url(self):
return reverse("rapids:exam_overview", kwargs={"pk": self.pk})
return reverse("longs:exam_overview", kwargs={"pk": self.pk})
def get_exam_name(self):
return self.name
def get_json_url(self):
return reverse("rapids:exam_json", args=(self.pk,))
return reverse("longs:exam_json", args=(self.pk,))
def get_question_index(self, question):
return list(self.exam_questions.all()).index(question)
@@ -392,10 +392,10 @@ class CidUserAnswer(models.Model):
"""User answers by candidate"""
question = models.ForeignKey(
Rapid, related_name="cid_user_answers", on_delete=models.CASCADE
Long, related_name="cid_user_answers", on_delete=models.CASCADE
)
# For rapids the answer can be normal in which case the below field is true
# For longs the answer can be normal in which case the below field is true
normal = models.BooleanField(default=False)
answer = models.TextField(max_length=500, blank=True)