diff --git a/atlas/models.py b/atlas/models.py index d21ad9ef..cfaf9a6b 100644 --- a/atlas/models.py +++ b/atlas/models.py @@ -100,7 +100,9 @@ class SynMixin(object): return "[Primary]" else: syns = self.synonym.filter(primary=True) - return ", ".join([f"{s.name}" for s in syns]) + return ", ".join( + [f"{s.name}" for s in syns] + ) def get_link(self): return format_html("{}", self.get_absolute_url(), self.name) @@ -115,6 +117,7 @@ class Finding(SynMixin, models.Model): def get_absolute_url(self): return reverse("atlas:finding_detail", kwargs={"pk": self.pk}) + class Condition(SynMixin, models.Model): name = models.CharField(max_length=255, unique=True) @@ -128,6 +131,7 @@ class Condition(SynMixin, models.Model): def get_absolute_url(self): return reverse("atlas:condition_detail", kwargs={"pk": self.pk}) + class Subspecialty(models.Model): name = models.CharField(max_length=255) @@ -137,6 +141,7 @@ class Subspecialty(models.Model): def get_absolute_url(self): return reverse("atlas:subspecialty_detail", kwargs={"pk": self.pk}) + class Differential(models.Model): condition = models.ForeignKey(Condition, on_delete=models.CASCADE) case = models.ForeignKey( @@ -235,7 +240,7 @@ class Case(models.Model): def __str__(self): examinations = [series.get_examination() for series in self.series.all()] - return f"{self.pk}/{self.title} {self.condition}, {', '.join(examinations)}" + return f"{self.pk}:{self.title} {'/'.join(self.condition.all())}, {', '.join(examinations)}" class SeriesImage(models.Model): @@ -339,9 +344,9 @@ class Series(models.Model): def get_absolute_url(self): return reverse("series:question_detail", kwargs={"pk": self.pk}) -# def get_string(self): -# examination = self.get_examination_full() -# return + # def get_string(self): + # examination = self.get_examination_full() + # return def get_author_objects(self): """Returns a comma seperated text list of authors""" @@ -374,18 +379,12 @@ class Series(models.Model): return reverse("atlas:series_detail", kwargs={"pk": self.pk}) def get_image_urls(self, findings=False): - images = [ - f"{REMOTE_URL}{i.image.url}" - for i in self.images.all() - ] + images = [f"{REMOTE_URL}{i.image.url}" for i in self.images.all()] return ",".join(images) def get_image_url_array(self, findings=False): - images = [ - f"{REMOTE_URL}{i.image.url}" - for i in self.images.all() - ] + images = [f"{REMOTE_URL}{i.image.url}" for i in self.images.all()] return json.dumps(images)