From f51e81855b52fa602453fa63be31f9a57ff9f42e Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 22 Feb 2019 19:54:51 +0100
Subject: [PATCH] Include renewal action date in Subsidy list
---
finances/models.py | 8 ++++++++
finances/templates/finances/subsidy_list.html | 7 ++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/finances/models.py b/finances/models.py
index 52778c3aa..cb3585131 100644
--- a/finances/models.py
+++ b/finances/models.py
@@ -2,6 +2,8 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+import datetime
+
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
@@ -54,6 +56,12 @@ class Subsidy(models.Model):
def get_absolute_url(self):
return reverse('finances:subsidy_details', args=(self.id,))
+ @property
+ def renewal_action_date(self):
+ if self.date_until:
+ return self.date_until - datetime.timedelta(days=122)
+ return None
+
class SubsidyAttachment(models.Model):
"""
diff --git a/finances/templates/finances/subsidy_list.html b/finances/templates/finances/subsidy_list.html
index 152bbf6b9..a3668a149 100644
--- a/finances/templates/finances/subsidy_list.html
+++ b/finances/templates/finances/subsidy_list.html
@@ -4,7 +4,6 @@
{% load staticfiles %}
-
{% block headsup %}
<script type="text/javascript">
$(document).ready(function($) {
@@ -77,6 +76,9 @@ $(document).ready(function($) {
<a href="{% url 'finances:subsidies' %}"><i class="fa fa-sort-desc"></i></a>
{% endif %}
</th>
+ {% if perms.scipost.can_manage_subsidies %}
+ <th>Renewal:<br/>take action on</th>
+ {% endif %}
</tr>
</thead>
<tbody>
@@ -87,6 +89,9 @@ $(document).ready(function($) {
<td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}€{{ subsidy.amount }}{% else %}-{% endif %}</td>
<td>{{ subsidy.date }}</td>
<td>{{ subsidy.date_until }}</td>
+ {% if perms.scipost.can_manage_subsidies %}
+ <td>{{ subsidy.renewal_action_date }}</td>
+ {% endif %}
</tr>
{% empty %}
<tr>
--
GitLab