From c1f24e023abeb9fff245ae11e815f68f01f75518 Mon Sep 17 00:00:00 2001
From: amickan <amickan1990@gmail.com>
Date: Thu, 24 Oct 2024 16:25:40 +0200
Subject: [PATCH 1/3] Update image detail and job progress animation

---
 .../templates/algorithms/algorithmimage_detail.html    | 10 +++-------
 app/grandchallenge/components/models.py                |  2 ++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
index 641784703..5e9659df2 100644
--- a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
+++ b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
@@ -108,15 +108,11 @@ <h2>Algorithm Container Image</h2>
             </span>
         </dd>
 
-        <dt>Requires GPU</dt>
-        <dd>
-            <span class="badge badge-{{ object.requires_gpu|yesno:'success,danger' }}">
-                {{ object.requires_gpu }}
-            </span>
-        </dd>
+        <dt>Requires GPU Type</dt>
+        <dd>{{ object.algorithm.job_requires_gpu_type }}</dd>
 
         <dt>Requires Memory</dt>
-        <dd>{{ object.requires_memory_gb }} GB</dd>
+        <dd>{{ object.algorithm.job_requires_memory_gb }} GB</dd>
 
         <dt>Comment</dt>
         <dd>{{ object.comment }}</dd>
diff --git a/app/grandchallenge/components/models.py b/app/grandchallenge/components/models.py
index 7c128afb8..edc142c99 100644
--- a/app/grandchallenge/components/models.py
+++ b/app/grandchallenge/components/models.py
@@ -1707,6 +1707,7 @@ def animate(self):
             self.EXECUTED,
             self.PARSING,
             self.EXECUTING_PREREQUISITES,
+            self.VALIDATING_INPUTS,
         }
 
     @property
@@ -1728,6 +1729,7 @@ def status_context(self):
             self.EXECUTED,
             self.PARSING,
             self.EXECUTING_PREREQUISITES,
+            self.VALIDATING_INPUTS,
         }:
             return "info"
         else:

From a92043fea6d2af333825930293296918ff860372 Mon Sep 17 00:00:00 2001
From: amickan <amickan1990@gmail.com>
Date: Thu, 24 Oct 2024 16:32:39 +0200
Subject: [PATCH 2/3] Update algorithm image detail template

---
 .../templates/algorithms/algorithmimage_detail.html         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
index 5e9659df2..f36b6c0a4 100644
--- a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
+++ b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
@@ -109,7 +109,11 @@ <h2>Algorithm Container Image</h2>
         </dd>
 
         <dt>Requires GPU Type</dt>
-        <dd>{{ object.algorithm.job_requires_gpu_type }}</dd>
+        <dd>
+            <span class="badge badge-{% if object.algorithm.job_requires_gpu_type %}info{% else %}danger{% endif %}">
+                {% if object.algorithm.job_requires_gpu_type %}{{ object.algorithm.job_requires_gpu_type }}{% else %}No GPU{% endif %}
+            </span>
+        </dd>
 
         <dt>Requires Memory</dt>
         <dd>{{ object.algorithm.job_requires_memory_gb }} GB</dd>

From bf9b2c72fbdad32018d18a226698d81b64dfccda Mon Sep 17 00:00:00 2001
From: amickan <amickan1990@gmail.com>
Date: Fri, 25 Oct 2024 09:26:43 +0200
Subject: [PATCH 3/3] Also update method detail page

---
 .../templates/algorithms/algorithmimage_detail.html      | 2 +-
 .../evaluation/templates/evaluation/method_detail.html   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
index f36b6c0a4..495ff3ce7 100644
--- a/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
+++ b/app/grandchallenge/algorithms/templates/algorithms/algorithmimage_detail.html
@@ -111,7 +111,7 @@ <h2>Algorithm Container Image</h2>
         <dt>Requires GPU Type</dt>
         <dd>
             <span class="badge badge-{% if object.algorithm.job_requires_gpu_type %}info{% else %}danger{% endif %}">
-                {% if object.algorithm.job_requires_gpu_type %}{{ object.algorithm.job_requires_gpu_type }}{% else %}No GPU{% endif %}
+                {{ object.algorithm.get_job_requires_gpu_type_display }}
             </span>
         </dd>
 
diff --git a/app/grandchallenge/evaluation/templates/evaluation/method_detail.html b/app/grandchallenge/evaluation/templates/evaluation/method_detail.html
index 91b9e34b2..a2b31d52d 100644
--- a/app/grandchallenge/evaluation/templates/evaluation/method_detail.html
+++ b/app/grandchallenge/evaluation/templates/evaluation/method_detail.html
@@ -104,7 +104,14 @@ <h2>Evaluation Method</h2>
         </dd>
 
         <dt>Requires Memory</dt>
-        <dd>{{ object.requires_memory_gb }} GB</dd>
+        <dd>{{ object.phase.evaluation_requires_memory_gb }} GB</dd>
+
+        <dt>Requires GPU Type</dt>
+        <dd>
+            <span class="badge badge-{% if object.phase.evaluation_requires_gpu_type %}info{% else %}danger{% endif %}">
+                {{ object.phase.get_evaluation_requires_gpu_type_display }}
+            </span>
+        </dd>
 
         <dt>Comment</dt>
         <dd>{{ object.comment }}</dd>