From 59062d9977824edfcfed75889e03b21d23e3d364 Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 6 Feb 2021 14:46:56 +0000 Subject: [PATCH] . --- longs/tables.py | 52 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/longs/tables.py b/longs/tables.py index 45f5d9b6..f8680380 100755 --- a/longs/tables.py +++ b/longs/tables.py @@ -15,17 +15,18 @@ class LongImageColumn(tables.Column): obj = value.first() if obj is None: - return format_html('No image') + return format_html("No image") return obj.get_thumbnail()[0] - #image_object = obj.image - #try: + # image_object = obj.image + # try: # thumbnailer = get_thumbnailer(image_object) # return format_html('', thumbnailer["exam-list"]) - #except InvalidImageFormatError: + # except InvalidImageFormatError: # return format_html('Invalid image url', image_object) + class LongSeriesImageColumn(tables.Column): def render(self, value): obj = value.first() @@ -38,43 +39,36 @@ class LongSeriesImageColumn(tables.Column): return format_html('Invalid image url', image_object) - class LongTable(tables.Table): - edit = tables.LinkColumn('longs:long_update', - text='Edit', - args=[A('pk')], - orderable=False) - view = tables.LinkColumn('longs:long_detail', - text='View', - args=[A('pk')], - orderable=False) - clone = tables.LinkColumn('longs:long_clone', - text='Clone', - args=[A('pk')], - orderable=False) + edit = tables.LinkColumn( + "longs:long_update", text="Edit", args=[A("pk")], orderable=False + ) + view = tables.LinkColumn( + "longs:long_detail", text="View", args=[A("pk")], orderable=False + ) + clone = tables.LinkColumn( + "longs:long_clone", text="Clone", args=[A("pk")], orderable=False + ) series = LongImageColumn("Images", orderable=False) class Meta: model = Long template_name = "django_tables2/bootstrap4.html" - fields = ("normal", "abnormality", "region", "examination", - "laterality", "site", "created_date", "author") + fields = ("examination", "created_date", "author") sequence = ("view", "series") + class LongSeriesTable(tables.Table): - edit = tables.LinkColumn('longs:long_series_update', - text='Edit', - args=[A('pk')], - orderable=False) - view = tables.LinkColumn('longs:long_series_detail', - text='View', - args=[A('pk')], - orderable=False) + edit = tables.LinkColumn( + "longs:long_series_update", text="Edit", args=[A("pk")], orderable=False + ) + view = tables.LinkColumn( + "longs:long_series_detail", text="View", args=[A("pk")], orderable=False + ) images = LongSeriesImageColumn("Images", orderable=False) class Meta: model = Long template_name = "django_tables2/bootstrap4.html" - fields = ("normal", "abnormality", "region", "examination", - "laterality", "site", "created_date", "author") + fields = ("modality", "examination", "long", "description", "author") sequence = ("view", "images") \ No newline at end of file