Add way of making subsidy amount hidden from public

finances/forms.py

@@ -21,7 +21,8 @@ class SubsidyForm(forms.ModelForm):
     class Meta:
         model = Subsidy
         fields = ['organization', 'subsidy_type', 'description',
-                  'amount', 'status', 'date', 'date_until']
+                  'amount', 'amount_publicly_shown', 'status',
+                  'date', 'date_until']
 
 
 class WorkLogForm(forms.ModelForm):

finances/migrations/0008_subsidy_amount_publicly_shown.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-12-05 18:07
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finances', '0007_auto_20181011_2146'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subsidy',
+            name='amount_publicly_shown',
+            field=models.BooleanField(default=True),
+        ),
+    ]

finances/models.py

@@ -36,6 +36,7 @@ class Subsidy(models.Model):
     subsidy_type = models.CharField(max_length=256, choices=SUBSIDY_TYPES)
     description = models.TextField()
     amount = models.PositiveIntegerField(help_text="in € (rounded)")
+    amount_publicly_shown = models.BooleanField(default=True)
     status = models.CharField(max_length=32, choices=SUBSIDY_STATUS)
     date = models.DateField()
     date_until = models.DateField(blank=True, null=True)

finances/templates/finances/_subsidy_card.html

@@ -25,7 +25,7 @@
 	  <td>Description:</td><td>{{ subsidy.description }}</td>
 	</tr>
 	<tr>
-	  <td>Amount:</td><td>&euro;{{ subsidy.amount }}</td>
+	  <td>Amount:</td><td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}&euro;{{ subsidy.amount }}{% else %}-{% endif %}</td>
 	</tr>
 	<tr>
 	  <td>Date:</td><td>{{ subsidy.date }}</td>

finances/templates/finances/subsidy_list.html

@@ -72,7 +72,7 @@ $(document).ready(function($) {
 	<tr class="table-row" data-href="{% url 'finances:subsidy_details' pk=subsidy.id %}" style="cursor: pointer;">
 	  <td>{{ subsidy.organization }}</td>
 	  <td>{{ subsidy.get_subsidy_type_display }}</td>
-	  <td>&euro;{{ subsidy.amount }}</td>
+	  <td>{% if subsidy.amount_publicly_shown or perms.scipost.can_manage_subsidies %}&euro;{{ subsidy.amount }}{% else %}-{% endif %}</td>
 	  <td>{{ subsidy.date }}</td>
 	</tr>
 	{% empty %}

finances/views.py

@@ -66,7 +66,7 @@ class SubsidyListView(ListView):
         order_by = self.request.GET.get('order_by')
         ordering = self.request.GET.get('ordering')
         if order_by == 'amount':
-            qs = qs.order_by('amount')
+            qs = qs.filter(amount_publicly_shown=True).order_by('amount')
         elif order_by == 'date':
             qs = qs.order_by('date')
         if ordering == 'desc':