diff --git a/lowfat/admin.py b/lowfat/admin.py index e80a5442..6a053b52 100644 --- a/lowfat/admin.py +++ b/lowfat/admin.py @@ -140,6 +140,7 @@ class ClaimantAdmin(ExportMixin, SimpleHistoryAdmin): "attended_inaugural_meeting", "attended_collaborations_workshop", "notes_from_admin", + "supplier_number", ], }, ), @@ -161,7 +162,7 @@ class ClaimantAdmin(ExportMixin, SimpleHistoryAdmin): 'affiliation', 'funding', 'funding_notes', - 'work_description' + 'work_description', ] list_filter = [ 'fellow', diff --git a/lowfat/migrations/0160_alter_claimant_application_year_and_more.py b/lowfat/migrations/0160_alter_claimant_application_year_and_more.py new file mode 100644 index 00000000..c6ac1c19 --- /dev/null +++ b/lowfat/migrations/0160_alter_claimant_application_year_and_more.py @@ -0,0 +1,54 @@ +# Generated by Django 4.2 on 2024-07-18 15:49 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lowfat', '0159_auto_20230824_1428'), + ] + + operations = [ + migrations.AlterField( + model_name='claimant', + name='application_year', + field=models.IntegerField(default=2024), + ), + migrations.AlterField( + model_name='claimant', + name='inauguration_grant_expiration', + field=models.DateField(default=datetime.date(2026, 3, 31)), + ), + migrations.AlterField( + model_name='expense', + name='status', + field=models.CharField(choices=[('S', 'Submitted'), ('C', 'Processing'), ('A', 'Approved'), ('R', 'Rejected'), ('X', 'Removed')], default='S', max_length=1), + ), + migrations.AlterField( + model_name='fund', + name='status', + field=models.CharField(choices=[('U', 'Unprocessed'), ('P', 'Processing'), ('A', 'Approved'), ('M', 'Approved by machine'), ('R', 'Rejected'), ('F', 'Archived'), ('C', 'Cancelled'), ('X', 'Removed')], default='U', max_length=1), + ), + migrations.AlterField( + model_name='historicalclaimant', + name='application_year', + field=models.IntegerField(default=2024), + ), + migrations.AlterField( + model_name='historicalclaimant', + name='inauguration_grant_expiration', + field=models.DateField(default=datetime.date(2026, 3, 31)), + ), + migrations.AlterField( + model_name='historicalexpense', + name='status', + field=models.CharField(choices=[('S', 'Submitted'), ('C', 'Processing'), ('A', 'Approved'), ('R', 'Rejected'), ('X', 'Removed')], default='S', max_length=1), + ), + migrations.AlterField( + model_name='historicalfund', + name='status', + field=models.CharField(choices=[('U', 'Unprocessed'), ('P', 'Processing'), ('A', 'Approved'), ('M', 'Approved by machine'), ('R', 'Rejected'), ('F', 'Archived'), ('C', 'Cancelled'), ('X', 'Removed')], default='U', max_length=1), + ), + ] diff --git a/lowfat/migrations/0161_claimant_supplier_number_and_more.py b/lowfat/migrations/0161_claimant_supplier_number_and_more.py new file mode 100644 index 00000000..338e85a9 --- /dev/null +++ b/lowfat/migrations/0161_claimant_supplier_number_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2 on 2024-08-30 15:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lowfat', '0160_alter_claimant_application_year_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='claimant', + name='supplier_number', + field=models.CharField(blank=True, max_length=120), + ), + migrations.AddField( + model_name='historicalclaimant', + name='supplier_number', + field=models.CharField(blank=True, max_length=120), + ), + ] diff --git a/lowfat/models/claimant.py b/lowfat/models/claimant.py index 186d4569..95c37fef 100644 --- a/lowfat/models/claimant.py +++ b/lowfat/models/claimant.py @@ -303,6 +303,10 @@ class Meta: null=True, blank=True ) + supplier_number = models.CharField( + max_length=MAX_CHAR_LENGTH, + blank=True + ) # Application screencast_url = models.CharField( diff --git a/lowfat/templates/lowfat/claimant_detail.html b/lowfat/templates/lowfat/claimant_detail.html index 0ddb9cf0..7e619767 100644 --- a/lowfat/templates/lowfat/claimant_detail.html +++ b/lowfat/templates/lowfat/claimant_detail.html @@ -177,6 +177,12 @@

{{ claimant.work_description | markdown | safe }} {% endif %} + {% if user.is_staff or claimant and user == claimant.user %} + + Supplier Number + {{ claimant.supplier_number | markdown | safe }} + + {% endif %}