diff --git a/finances/templates/finances/_subsidy_card.html b/finances/templates/finances/_subsidy_card.html index 8cfdee9cc2ce3aeed540b4784cd2a0f81f6201de..6917c2d2cc92e7a472c0116ce333bdaf63e697c1 100644 --- a/finances/templates/finances/_subsidy_card.html +++ b/finances/templates/finances/_subsidy_card.html @@ -41,6 +41,10 @@ <tr> <td>Renewable?</td><td>{% if subsidy.renewable == True %}Yes, renewal action date: <span class="bg-{{ subsidy.renewal_action_date_color_class }}">{{ subsidy.renewal_action_date }}</span>{% elif subsidy.renewable == None %}Undetermined [please update]{% else %}No{% endif %}</td> </tr> + <tr> + <td>Status</td> + <td>{{ subsidy.get_status_display }}</td> + </tr> {% endif %} </table> diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html index 9a1aa7b96840f91d54ca5e04724dd73aea8d140c..9254d7e2ec86fc233bb27cd81e5134d2ea197fcd 100644 --- a/finances/templates/finances/subsidy_list.html +++ b/finances/templates/finances/subsidy_list.html @@ -54,6 +54,7 @@ $(document).ready(function($) { {% endif %} </th> {% if perms.scipost.can_manage_subsidies %} + <th>Status</th> <th><span class="small" style="writing-mode: vertical-lr;">attachments?</span></th> {% endif %} <th>From date @@ -96,6 +97,7 @@ $(document).ready(function($) { {% if subsidy.renewed_by.all|length > 0 %}<br/><span class="small text-muted">Renewed by:<ul class="list-unstyled">{% for newsub in subsidy.renewed_by.all %}<li>{{ newsub }}</li>{% endfor %}</ul></span>{% endif %} </td> <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td> {% if perms.scipost.can_manage_subsidies %} + <td>{{ subsidy.get_status_display }}</td> <td>{% if subsidy.attachments.all|length > 0 %}<i class="fa fa-check-circle text-success"></i>{% else %}<i class="fa fa-times-circle text-danger"></i>{% endif %}</td> {% endif %} <td>{{ subsidy.date }}</td>