Merge pull request #1387 from IFRCGo/hot-fix/emergency-3w-model

Hot fix/emergency 3w model

Author: szabozoltan69

deployments/migrations/0061_auto_20220331_1121.py

@@ -0,0 +1,43 @@
+# Generated by Django 2.2.27 on 2022-03-31 11:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0060_auto_20220323_1527'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='disabled_femal_0_1',
+            new_name='disabled_female_0_1_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='disabled_male_0_1',
+            new_name='disabled_male_0_1_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='disabled_other_0_1',
+            new_name='disabled_other_0_1_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='female_0_1',
+            new_name='female_0_1_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='male_0_1',
+            new_name='male_0_1_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='other_0_1',
+            new_name='other_0_1_count',
+        ),
+    ]

deployments/migrations/0062_auto_20220331_1143.py

@@ -0,0 +1,43 @@
+# Generated by Django 2.2.27 on 2022-03-31 11:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('deployments', '0061_auto_20220331_1121'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='female_unknown_age',
+            new_name='female_unknown_age_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='male_unknown_age',
+            new_name='male_unknown_age_count',
+        ),
+        migrations.RenameField(
+            model_name='emergencyprojectactivity',
+            old_name='other_unknown_age',
+            new_name='other_unknown_age_count',
+        ),
+        migrations.AddField(
+            model_name='emergencyprojectactivity',
+            name='disabled_female_unknown_age_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Disabled Female Unknown Age'),
+        ),
+        migrations.AddField(
+            model_name='emergencyprojectactivity',
+            name='disabled_male_unknown_age_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Disabled Male Unknown Age'),
+        ),
+        migrations.AddField(
+            model_name='emergencyprojectactivity',
+            name='disabled_other_unknown_age_count',
+            field=models.IntegerField(blank=True, null=True, verbose_name='Disabled Other Unknown Age'),
+        ),
+    ]

deployments/models.py

@@ -722,47 +722,51 @@ class PeopleHouseholds(TextChoices):
     male_count = models.IntegerField(verbose_name=_('Men'), null=True, blank=True)
     female_count = models.IntegerField(verbose_name=_('Female'), null=True, blank=True)
     # -- Age group
-    male_unknown_age = models.IntegerField(verbose_name=_('Male Unknown Age'), null=True, blank=True)
-    female_unknown_age = models.IntegerField(verbose_name=_('Female Unknown Age'), null=True, blank=True)
-    other_unknown_age = models.IntegerField(verbose_name=_('Other Unknown Age'), null=True, blank=True)
+    male_unknown_age_count = models.IntegerField(verbose_name=_('Male Unknown Age'), null=True, blank=True)
+    female_unknown_age_count = models.IntegerField(verbose_name=_('Female Unknown Age'), null=True, blank=True)
+    other_unknown_age_count = models.IntegerField(verbose_name=_('Other Unknown Age'), null=True, blank=True)
     # -- When is_simplified_report is False
-    male_0_1 = models.IntegerField(verbose_name=_('Boys 0-1'), null=True, blank=True)
+    male_0_1_count = models.IntegerField(verbose_name=_('Boys 0-1'), null=True, blank=True)
     male_2_5_count = models.IntegerField(verbose_name=_('Boys 2-5'), null=True, blank=True)
     male_6_12_count = models.IntegerField(verbose_name=_('Boys 6-12'), null=True, blank=True)
     male_13_17_count = models.IntegerField(verbose_name=_('Boys 13-17'), null=True, blank=True)
     male_18_59_count = models.IntegerField(verbose_name=_('Men 18-29'), null=True, blank=True)
     male_60_plus_count = models.IntegerField(verbose_name=_('Older Men 60+'), null=True, blank=True)
-    female_0_1 = models.IntegerField(verbose_name=_('Girls 0-1'), null=True, blank=True)
+    female_0_1_count = models.IntegerField(verbose_name=_('Girls 0-1'), null=True, blank=True)
     female_2_5_count = models.IntegerField(verbose_name=_('Girls 2-5'), null=True, blank=True)
     female_6_12_count = models.IntegerField(verbose_name=_('Girls 6-12'), null=True, blank=True)
     female_13_17_count = models.IntegerField(verbose_name=_('Girls 13-17'), null=True, blank=True)
     female_18_59_count = models.IntegerField(verbose_name=_('Women 18-29'), null=True, blank=True)
     female_60_plus_count = models.IntegerField(verbose_name=_('Older Women 60+'), null=True, blank=True)
-    other_0_1 = models.IntegerField(verbose_name=_('Others/Unknown 0-1'), null=True, blank=True)
+    other_0_1_count = models.IntegerField(verbose_name=_('Others/Unknown 0-1'), null=True, blank=True)
     other_2_5_count = models.IntegerField(verbose_name=_('Others/Unknown 2-5'), null=True, blank=True)
     other_6_12_count = models.IntegerField(verbose_name=_('Others/Unknown 6-12'), null=True, blank=True)
     other_13_17_count = models.IntegerField(verbose_name=_('Others/Unknown 13-17'), null=True, blank=True)
     other_18_59_count = models.IntegerField(verbose_name=_('Others/Unknown 18-29'), null=True, blank=True)
     other_60_plus_count = models.IntegerField(verbose_name=_('Others/Unknown 60+'), null=True, blank=True)
     # -- When is_disaggregated_for_disabled is True
-    disabled_male_0_1 = models.IntegerField(verbose_name=_('Disabled Boys 0-1'), null=True, blank=True)
+    disabled_male_0_1_count = models.IntegerField(verbose_name=_('Disabled Boys 0-1'), null=True, blank=True)
     disabled_male_2_5_count = models.IntegerField(verbose_name=_('Disabled Boys 2-5'), null=True, blank=True)
     disabled_male_6_12_count = models.IntegerField(verbose_name=_('Disabled Boys 6-12'), null=True, blank=True)
     disabled_male_13_17_count = models.IntegerField(verbose_name=_('Disabled Boys 13-17'), null=True, blank=True)
     disabled_male_18_59_count = models.IntegerField(verbose_name=_('Disabled Men 18-29'), null=True, blank=True)
     disabled_male_60_plus_count = models.IntegerField(verbose_name=_('Disabled Older Men 60+'), null=True, blank=True)
-    disabled_femal_0_1 = models.IntegerField(verbose_name=_('Disabled Girls 0-1'), null=True, blank=True)
+    disabled_female_0_1_count = models.IntegerField(verbose_name=_('Disabled Girls 0-1'), null=True, blank=True)
     disabled_female_2_5_count = models.IntegerField(verbose_name=_('Disabled Girls 2-5'), null=True, blank=True)
     disabled_female_6_12_count = models.IntegerField(verbose_name=_('Disabled Girls 6-12'), null=True, blank=True)
     disabled_female_13_17_count = models.IntegerField(verbose_name=_('Disabled Girls 13-17'), null=True, blank=True)
     disabled_female_18_59_count = models.IntegerField(verbose_name=_('Disabled Women 18-29'), null=True, blank=True)
     disabled_female_60_plus_count = models.IntegerField(verbose_name=_('Disabled Older Women 60+'), null=True, blank=True)
-    disabled_other_0_1 = models.IntegerField(verbose_name=_('Disabled Others/Unknown 0-1'), null=True, blank=True)
+    disabled_other_0_1_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 0-1'), null=True, blank=True)
     disabled_other_2_5_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 2-5'), null=True, blank=True)
     disabled_other_6_12_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 6-12'), null=True, blank=True)
     disabled_other_13_17_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 13-17'), null=True, blank=True)
     disabled_other_18_59_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 18-29'), null=True, blank=True)
     disabled_other_60_plus_count = models.IntegerField(verbose_name=_('Disabled Others/Unknown 60+'), null=True, blank=True)
+    disabled_male_unknown_age_count = models.IntegerField(verbose_name=_('Disabled Male Unknown Age'), null=True, blank=True)
+    disabled_female_unknown_age_count = models.IntegerField(verbose_name=_('Disabled Female Unknown Age'), null=True, blank=True)
+    disabled_other_unknown_age_count = models.IntegerField(verbose_name=_('Disabled Other Unknown Age'), null=True, blank=True)
+
     # More Details
     details = models.TextField(verbose_name=_('details'), blank=True, null=True)
     supplies = JSONField(verbose_name=_('supplies'), default=dict)  # key: count (key: System defined id)