Skip to content

Commit 68a7b28

Browse files
committed
Add main_donors in dref final report
1 parent 980833a commit 68a7b28

File tree

4 files changed

+25
-1
lines changed

4 files changed

+25
-1
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 3.2.20 on 2023-08-09 10:49
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('dref', '0065_auto_20230728_0405'),
10+
]
11+
12+
operations = [
13+
migrations.AddField(
14+
model_name='dreffinalreport',
15+
name='main_donors',
16+
field=models.TextField(blank=True, null=True, verbose_name='Main Donors'),
17+
),
18+
]

dref/models.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,6 +1279,11 @@ class DrefFinalReport(models.Model):
12791279
null=True,
12801280
blank=True,
12811281
)
1282+
main_donors = models.TextField(
1283+
verbose_name=_("Main Donors"),
1284+
null=True,
1285+
blank=True
1286+
)
12821287
__financial_report_id = None
12831288

12841289
class Meta:

dref/serializers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,6 +1070,7 @@ def create(self, validated_data):
10701070
validated_data["total_operation_timeframe"] = dref.operation_timeframe
10711071
validated_data["operation_start_date"] = dref.date_of_approval
10721072
validated_data["appeal_code"] = dref.appeal_code
1073+
validated_data["total_dref_allocation"] = dref.amount_requested
10731074
validated_data["glide_code"] = dref.glide_code
10741075
validated_data["ifrc_appeal_manager_name"] = dref.ifrc_appeal_manager_name
10751076
validated_data["ifrc_appeal_manager_email"] = dref.ifrc_appeal_manager_email

dref/test_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ def test_dref_is_published(self, mock_now):
402402
Test for dref if is_published = True
403403
"""
404404

405-
initial_now = datetime(2023, 7, 28)
405+
initial_now = datetime.now()
406406
mock_now.return_value = initial_now
407407

408408
region = Region.objects.create(name=RegionName.AFRICA)

0 commit comments

Comments
 (0)