From 281984bbc90cb8c23a3fb0be2facb7892089ffa3 Mon Sep 17 00:00:00 2001
From: Chris van Run <chrisvanrun@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:24:40 +0200
Subject: [PATCH] Show result text in job list (#3506)

Closes: #3495
---
 .../templates/algorithms/job_list_row.html    |  5 +++
 app/grandchallenge/algorithms/views.py        |  4 +++
 app/grandchallenge/core/static/css/core.css   |  4 +++
 app/tests/algorithms_tests/test_views.py      | 29 ----------------
 app/tests/archives_tests/test_views.py        | 33 +------------------
 5 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/app/grandchallenge/algorithms/templates/algorithms/job_list_row.html b/app/grandchallenge/algorithms/templates/algorithms/job_list_row.html
index a3bbb24a7a..49c4fc88c3 100644
--- a/app/grandchallenge/algorithms/templates/algorithms/job_list_row.html
+++ b/app/grandchallenge/algorithms/templates/algorithms/job_list_row.html
@@ -54,6 +54,11 @@
 {{ object.comment }}
 <split></split>
 
+<div class="child-p-mb-0 text-left">
+    {{ object.rendered_result_text }}
+</div>
+
+<split></split>
 <ul class="list-unstyled mb-0 text-left">
     {% if object.error_message %}
 
diff --git a/app/grandchallenge/algorithms/views.py b/app/grandchallenge/algorithms/views.py
index a89280210c..810680e4ec 100644
--- a/app/grandchallenge/algorithms/views.py
+++ b/app/grandchallenge/algorithms/views.py
@@ -653,6 +653,10 @@ class JobsList(PaginatedTableListView):
             sort_field="comment",
             optional_condition=lambda obj: bool(obj.comment),
         ),
+        Column(
+            title="Result",
+            optional_condition=lambda obj: bool(obj.rendered_result_text),
+        ),
         Column(title="Results"),
         Column(title="Viewer"),
     ]
diff --git a/app/grandchallenge/core/static/css/core.css b/app/grandchallenge/core/static/css/core.css
index 3ccec06e4b..0b72ebea6b 100644
--- a/app/grandchallenge/core/static/css/core.css
+++ b/app/grandchallenge/core/static/css/core.css
@@ -10,6 +10,10 @@ p {
     line-height: 1.6;
 }
 
+.child-p-mb-0 > p {
+    margin-bottom: 0;
+}
+
 .jumbotron {
     text-shadow: 0.1rem 0.1rem 0.2rem #000000;
 }
diff --git a/app/tests/algorithms_tests/test_views.py b/app/tests/algorithms_tests/test_views.py
index d92face07f..db6842660c 100644
--- a/app/tests/algorithms_tests/test_views.py
+++ b/app/tests/algorithms_tests/test_views.py
@@ -5,7 +5,6 @@
 
 import pytest
 from django.contrib.auth.models import Group
-from django.contrib.humanize.templatetags.humanize import naturaltime
 from django.core.files.base import ContentFile
 from django.utils import timezone
 from django.utils.text import slugify
@@ -20,9 +19,6 @@
     InterfaceKind,
 )
 from grandchallenge.subdomains.utils import reverse
-from grandchallenge.workstations.templatetags.workstations import (
-    workstation_session_control_data,
-)
 from tests.algorithms_tests.factories import (
     AlgorithmFactory,
     AlgorithmImageFactory,
@@ -1413,13 +1409,6 @@ def test_job_list_row_template_ajax_renders(client):
         time_limit=algorithm.time_limit,
     )
 
-    ctrl_data = workstation_session_control_data(
-        workstation=algorithm.workstation,
-        context_object=algorithm,
-        algorithm_job=job,
-        config=algorithm.workstation_config,
-    )
-
     headers = {"HTTP_X_REQUESTED_WITH": "XMLHttpRequest"}
 
     response = get_view_for_user(
@@ -1444,28 +1433,10 @@ def test_job_list_row_template_ajax_renders(client):
         "algorithms:job-detail",
         kwargs={"slug": job.algorithm_image.algorithm.slug, "pk": job.pk},
     )
-    job_created = str(naturaltime(job.created))
 
     response_content = json.loads(response.content.decode("utf-8"))
 
     assert response.status_code == 200
-
     assert response_content["recordsTotal"] == 1
-
     assert len(response_content["data"]) == 1
-
     assert job_details_url in response_content["data"][0][0]
-
-    assert job_created in response_content["data"][0][1]
-
-    assert editor.username in response_content["data"][0][2]
-
-    assert job.get_status_display() in response_content["data"][0][3]
-
-    assert "Result and images are private" in response_content["data"][0][4]
-
-    assert job.comment in response_content["data"][0][5]
-
-    assert "Empty" in response_content["data"][0][6]
-
-    assert ctrl_data in response_content["data"][0][7]
diff --git a/app/tests/archives_tests/test_views.py b/app/tests/archives_tests/test_views.py
index 6ef08bdc8b..8ce137b1fd 100644
--- a/app/tests/archives_tests/test_views.py
+++ b/app/tests/archives_tests/test_views.py
@@ -3,7 +3,6 @@
 from pathlib import Path
 
 import pytest
-from django.contrib.humanize.templatetags.humanize import naturaltime
 from guardian.shortcuts import assign_perm, remove_perm
 from requests import put
 
@@ -15,9 +14,6 @@
 from grandchallenge.cases.widgets import WidgetChoices
 from grandchallenge.components.models import ComponentInterface, InterfaceKind
 from grandchallenge.subdomains.utils import reverse
-from grandchallenge.workstations.templatetags.workstations import (
-    workstation_session_control_data,
-)
 from tests.algorithms_tests.factories import AlgorithmJobFactory, Job
 from tests.archives_tests.factories import (
     ArchiveFactory,
@@ -1352,7 +1348,7 @@ def make_request():
 
 
 @pytest.mark.django_db
-def test_job_list_row_template_ajax_renders(client):
+def test_item_job_list_row_template_ajax_renders(client):
     archive = ArchiveFactory()
     editor = UserFactory()
     archive.add_editor(editor)
@@ -1372,15 +1368,6 @@ def test_job_list_row_template_ajax_renders(client):
     )
     job.inputs.set([civ])
 
-    algorithm = job.algorithm_image.algorithm
-
-    ctrl_data = workstation_session_control_data(
-        workstation=algorithm.workstation,
-        context_object=algorithm,
-        algorithm_job=job,
-        config=algorithm.workstation_config,
-    )
-
     headers = {"HTTP_X_REQUESTED_WITH": "XMLHttpRequest"}
 
     response = get_view_for_user(
@@ -1406,28 +1393,10 @@ def test_job_list_row_template_ajax_renders(client):
         "algorithms:job-detail",
         kwargs={"slug": job.algorithm_image.algorithm.slug, "pk": job.pk},
     )
-    job_created = str(naturaltime(job.created))
 
     response_content = json.loads(response.content.decode("utf-8"))
 
     assert response.status_code == 200
-
     assert response_content["recordsTotal"] == 1
-
     assert len(response_content["data"]) == 1
-
     assert job_details_url in response_content["data"][0][0]
-
-    assert job_created in response_content["data"][0][1]
-
-    assert algorithm.title in response_content["data"][0][2]
-
-    assert job.get_status_display() in response_content["data"][0][3]
-
-    assert "Result and images are private" in response_content["data"][0][4]
-
-    assert job.comment in response_content["data"][0][5]
-
-    assert "Empty" in response_content["data"][0][6]
-
-    assert ctrl_data in response_content["data"][0][7]