Merge pull request #1497 from IFRCGo/feature/3w-add-annual-figures-1189

Adding 2 total fields to AnnualSplit

Author: szabozoltan69

deployments/migrations/0067_annualsplit.py

@@ -20,9 +20,11 @@ class Migration(migrations.Migration):
                 ('target_male', models.IntegerField(blank=True, null=True, verbose_name='target male')),
                 ('target_female', models.IntegerField(blank=True, null=True, verbose_name='target female')),
                 ('target_other', models.IntegerField(blank=True, null=True, verbose_name='target other')),
+                ('target_total', models.IntegerField(blank=True, null=True, verbose_name='target total')),
                 ('reached_male', models.IntegerField(blank=True, null=True, verbose_name='reached male')),
                 ('reached_female', models.IntegerField(blank=True, null=True, verbose_name='reached female')),
                 ('reached_other', models.IntegerField(blank=True, null=True, verbose_name='reached other')),
+                ('reached_total', models.IntegerField(blank=True, null=True, verbose_name='reached total')),
                 ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='annual_splits', to='deployments.Project', verbose_name='project')),
             ],
             options={

deployments/models.py

@@ -527,9 +527,11 @@ class AnnualSplit(models.Model):
     target_male = models.IntegerField(verbose_name=_('target male'), null=True, blank=True)
     target_female = models.IntegerField(verbose_name=_('target female'), null=True, blank=True)
     target_other = models.IntegerField(verbose_name=_('target other'), null=True, blank=True)
+    target_total = models.IntegerField(verbose_name=_('target total'), null=True, blank=True)
     reached_male = models.IntegerField(verbose_name=_('reached male'), null=True, blank=True)
     reached_female = models.IntegerField(verbose_name=_('reached female'), null=True, blank=True)
     reached_other = models.IntegerField(verbose_name=_('reached other'), null=True, blank=True)
+    reached_total = models.IntegerField(verbose_name=_('reached total'), null=True, blank=True)
 
     class Meta:
         verbose_name = _('Annual Split')

deployments/serializers.py

@@ -341,8 +341,11 @@ class Meta:
 class AnnualSplitSerializer(ModelSerializer):
     class Meta:
         model = AnnualSplit
-        fields = ('year', 'budget_amount', 'target_male', 'target_female', 'target_other',
-                  'reached_male', 'reached_female', 'reached_other',)
+        fields = (
+            'year', 'budget_amount',
+            'target_male', 'target_female', 'target_other', 'target_total',
+            'reached_male', 'reached_female', 'reached_other', 'reached_total',
+        )
 
 
 class ProjectSerializer(EnumSupportSerializerMixin, ModelSerializer):