From d5ca1c94224b13cb52328a24cf55a3ef84b6f541 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Mon, 25 Mar 2024 17:38:41 +0100
Subject: [PATCH] reorder submission fellows table columns
---
.../submissions/pool/_hx_submission_fellow_row.html | 6 +++---
.../templates/submissions/pool/_submission_fellows.html | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/scipost_django/submissions/templates/submissions/pool/_hx_submission_fellow_row.html b/scipost_django/submissions/templates/submissions/pool/_hx_submission_fellow_row.html
index 45540f802..197cff462 100644
--- a/scipost_django/submissions/templates/submissions/pool/_hx_submission_fellow_row.html
+++ b/scipost_django/submissions/templates/submissions/pool/_hx_submission_fellow_row.html
@@ -2,6 +2,7 @@
{% load ethics_extras %}
{% get_fellow_readiness submission fellowship as readiness %}
+{% get_fellow_qualification_expertise_level_display submission fellowship as expertise_level %}
<tr>
<td>
@@ -24,7 +25,8 @@
</td>
{% endif %}
- <td>{% get_fellow_qualification_expertise_level_display submission fellowship %}</td>
+ <td>{{ expertise_level }}</td>
+ <td>{{ readiness.get_status_display }}</td>
{% if "edadmin" in user_roles or "active_senior_fellow" in user_roles %}
<td>
@@ -103,6 +105,4 @@
</td>
{% endif %}
{% endif %}
-
- <td>{{ readiness.get_status_display }}</td>
</tr>
diff --git a/scipost_django/submissions/templates/submissions/pool/_submission_fellows.html b/scipost_django/submissions/templates/submissions/pool/_submission_fellows.html
index 91f6c41dd..e220f0b7c 100644
--- a/scipost_django/submissions/templates/submissions/pool/_submission_fellows.html
+++ b/scipost_django/submissions/templates/submissions/pool/_submission_fellows.html
@@ -29,6 +29,7 @@
</th>
<th>Workload</th>
<th>Qualification</th>
+ <th>Readiness to take charge</th>
{% if "edadmin" in user_roles or "active_senior_fellow" in user_roles %}
<th>
@@ -39,8 +40,6 @@
{% if "edadmin" in user_roles %}<th>Actions</th>{% endif %}
{% endif %}
-
- <th>Readiness to take charge</th>
</tr>
</thead>
<tbody>
--
GitLab