Skip to content

Commit 302c86a

Browse files
Merge pull request #2526 from IFRCGo/feature/migration-considerations
Add migration consideratons to FormComponentResponse
2 parents 34a3f59 + 631b3bf commit 302c86a

File tree

5 files changed

+90
-1
lines changed

5 files changed

+90
-1
lines changed

per/drf_views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ def get(self, request, pk, format=None):
292292
"Epidemic Considerations",
293293
"Urban Considerations",
294294
"Climate and env considerations",
295+
"Migration Considerations",
295296
"PER process cycle",
296297
"Work-plan development date planned",
297298
"Work-plan revision date planned",
@@ -332,6 +333,7 @@ def get(self, request, pk, format=None):
332333
per.assess_preparedness_of_country,
333334
per.assess_urban_aspect_of_country,
334335
per.assess_climate_environment_of_country,
336+
per.assess_migration_aspect_of_country,
335337
per.assessment_number,
336338
per.workplan_development_date,
337339
per.workplan_revision_date,
@@ -369,6 +371,7 @@ def get(self, request, pk, format=None):
369371
"Consideration notes epidemic",
370372
"Consideration notes urban",
371373
"Consideration notes climate",
374+
"Consideration notes migration",
372375
"Component rating",
373376
"Component notes",
374377
]
@@ -422,6 +425,7 @@ def get(self, request, pk, format=None):
422425
co.epi_considerations,
423426
co.urban_considerations,
424427
co.climate_environmental_considerations,
428+
co.migration_considerations,
425429
co.rating.title if co.rating else None,
426430
co.notes,
427431
]
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Generated by Django 4.2.19 on 2025-07-31 09:40
2+
3+
import tinymce.models
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
("per", "0124_alter_opslearningpromptresponsecache_type"),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name="formcomponent",
16+
name="migration_considerations_guidance",
17+
field=tinymce.models.HTMLField(blank=True, default="", verbose_name="Migration Considerations"),
18+
),
19+
migrations.AddField(
20+
model_name="formcomponent",
21+
name="migration_considerations_guidance_ar",
22+
field=tinymce.models.HTMLField(blank=True, default="", null=True, verbose_name="Migration Considerations"),
23+
),
24+
migrations.AddField(
25+
model_name="formcomponent",
26+
name="migration_considerations_guidance_en",
27+
field=tinymce.models.HTMLField(blank=True, default="", null=True, verbose_name="Migration Considerations"),
28+
),
29+
migrations.AddField(
30+
model_name="formcomponent",
31+
name="migration_considerations_guidance_es",
32+
field=tinymce.models.HTMLField(blank=True, default="", null=True, verbose_name="Migration Considerations"),
33+
),
34+
migrations.AddField(
35+
model_name="formcomponent",
36+
name="migration_considerations_guidance_fr",
37+
field=tinymce.models.HTMLField(blank=True, default="", null=True, verbose_name="Migration Considerations"),
38+
),
39+
migrations.AddField(
40+
model_name="formcomponentresponse",
41+
name="migration_considerations",
42+
field=models.TextField(blank=True, null=True, verbose_name="Migration Considerations"),
43+
),
44+
migrations.AddField(
45+
model_name="formcomponentresponse",
46+
name="migration_considerations_ar",
47+
field=models.TextField(blank=True, null=True, verbose_name="Migration Considerations"),
48+
),
49+
migrations.AddField(
50+
model_name="formcomponentresponse",
51+
name="migration_considerations_en",
52+
field=models.TextField(blank=True, null=True, verbose_name="Migration Considerations"),
53+
),
54+
migrations.AddField(
55+
model_name="formcomponentresponse",
56+
name="migration_considerations_es",
57+
field=models.TextField(blank=True, null=True, verbose_name="Migration Considerations"),
58+
),
59+
migrations.AddField(
60+
model_name="formcomponentresponse",
61+
name="migration_considerations_fr",
62+
field=models.TextField(blank=True, null=True, verbose_name="Migration Considerations"),
63+
),
64+
migrations.AddField(
65+
model_name="overview",
66+
name="assess_migration_aspect_of_country",
67+
field=models.BooleanField(
68+
blank=True, null=True, verbose_name="Do you want to assess the migration aspects of your National Society?"
69+
),
70+
),
71+
]

per/models.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class FormComponentStatus(models.TextChoices):
107107
climate_environmental_considerations_guidance = HTMLField(
108108
verbose_name=_("Climate and Environmental Considerations "), blank=True, default=""
109109
)
110+
migration_considerations_guidance = HTMLField(verbose_name=_("Migration Considerations"), blank=True, default="")
110111

111112
def __str__(self):
112113
return f"Component {self.component_num} - {self.title}"
@@ -140,6 +141,7 @@ class FormComponentResponse(models.Model):
140141
climate_environmental_considerations = models.TextField(
141142
verbose_name=_("Climate Environmental Considerations"), null=True, blank=True
142143
)
144+
migration_considerations = models.TextField(verbose_name=_("Migration Considerations"), null=True, blank=True)
143145
notes = models.TextField(verbose_name=_("Notes"), null=True, blank=True)
144146

145147

@@ -320,6 +322,9 @@ class AssessmentMethod(models.TextChoices):
320322
assess_climate_environment_of_country = models.BooleanField(
321323
verbose_name=_("Do you want to assess the climate and environment of your National Society?"), null=True, blank=True
322324
)
325+
assess_migration_aspect_of_country = models.BooleanField(
326+
verbose_name=_("Do you want to assess the migration aspects of your National Society?"), null=True, blank=True
327+
)
323328

324329
# Previous PER Assessment
325330
date_of_previous_assessment = models.DateField(verbose_name=_("Date of previous assessment"), null=True, blank=True)

per/serializers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ class Meta:
103103
"epi_considerations_guidance",
104104
"climate_environmental_considerations_guidance",
105105
"urban_considerations_guidance",
106+
"migration_considerations_guidance",
106107
)
107108

108109

@@ -738,6 +739,7 @@ class Meta:
738739
"urban_considerations",
739740
"epi_considerations",
740741
"climate_environmental_considerations",
742+
"migration_considerations",
741743
)
742744

743745

per/translation.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class FormComponentTO(TranslationOptions):
3838
"urban_considerations_guidance",
3939
"epi_considerations_guidance",
4040
"climate_environmental_considerations_guidance",
41+
"migration_considerations_guidance",
4142
)
4243

4344

@@ -73,7 +74,13 @@ class OverviewTO(TranslationOptions):
7374

7475
@register(FormComponentResponse)
7576
class FormComponentResponseTO(TranslationOptions):
76-
fields = ("urban_considerations", "epi_considerations", "climate_environmental_considerations", "notes")
77+
fields = (
78+
"urban_considerations",
79+
"epi_considerations",
80+
"climate_environmental_considerations",
81+
"migration_considerations",
82+
"notes",
83+
)
7784

7885

7986
@register(PerComponentRating)

0 commit comments

Comments
 (0)