Merge branch 'main' into HEA-984/Livelihood_activity_valid_instances_errors_for_income_not_rounding_error

Author: girumb

apps/baseline/admin.py

@@ -13,8 +13,11 @@
     FoodPurchaseForm,
     LivelihoodActivityForm,
     LivelihoodStrategyForm,
+    MeatProductionForm,
     MilkProductionForm,
+    OtherCashIncomeForm,
     OtherPurchaseForm,
+    PaymentInKindForm,
     ReliefGiftOtherForm,
     WealthGroupCharacteristicValueForm,
     WealthGroupForm,
@@ -333,6 +336,134 @@ def get_extra(self, request, obj=None, **kwargs):
 
 class LivelihoodActivityAdmin(admin.ModelAdmin):
     form = LivelihoodActivityForm
+
+    # Maps strategy_type to the subclass accessor name, its form, extra fieldsets,
+    # and any extra fields to append to the base "Quantity" fieldset.
+    _SUBCLASS_CONFIG = {
+        LivelihoodStrategyType.MILK_PRODUCTION: {
+            "accessor": "milkproduction",
+            "form": MilkProductionForm,
+            "quantity_extra": ["quantity_butter_production"],
+            "extra_fieldsets": [
+                (
+                    "Milk source",
+                    {
+                        "fields": [
+                            "milking_animals",
+                            "lactation_days",
+                            "daily_production",
+                            "type_of_milk_consumed",
+                            "type_of_milk_sold_or_other_uses",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.MEAT_PRODUCTION: {
+            "accessor": "meatproduction",
+            "form": MeatProductionForm,
+            "extra_fieldsets": [
+                (
+                    "Meat source",
+                    {
+                        "fields": [
+                            "animals_slaughtered",
+                            "carcass_weight",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.FOOD_PURCHASE: {
+            "accessor": "foodpurchase",
+            "form": FoodPurchaseForm,
+            "extra_fieldsets": [
+                (
+                    "Purchases",
+                    {
+                        "fields": [
+                            "unit_multiple",
+                            "times_per_month",
+                            "months_per_year",
+                            "times_per_year",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.PAYMENT_IN_KIND: {
+            "accessor": "paymentinkind",
+            "form": PaymentInKindForm,
+            "extra_fieldsets": [
+                (
+                    "Payment",
+                    {
+                        "fields": [
+                            "payment_product",
+                            "payment_per_time",
+                            "people_per_household",
+                            "times_per_month",
+                            "months_per_year",
+                            "times_per_year",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.RELIEF_GIFT_OTHER: {
+            "accessor": "reliefgiftother",
+            "form": ReliefGiftOtherForm,
+            "extra_fieldsets": [
+                (
+                    "Relief",
+                    {
+                        "fields": [
+                            "unit_multiple",
+                            "times_per_month",
+                            "months_per_year",
+                            "times_per_year",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.OTHER_CASH_INCOME: {
+            "accessor": "othercashincome",
+            "form": OtherCashIncomeForm,
+            "extra_fieldsets": [
+                (
+                    "Income",
+                    {
+                        "fields": [
+                            "payment_per_time",
+                            "people_per_household",
+                            "times_per_month",
+                            "months_per_year",
+                            "times_per_year",
+                        ]
+                    },
+                ),
+            ],
+        },
+        LivelihoodStrategyType.OTHER_PURCHASE: {
+            "accessor": "otherpurchase",
+            "form": OtherPurchaseForm,
+            "extra_fieldsets": [
+                (
+                    "Purchases",
+                    {
+                        "fields": [
+                            "unit_multiple",
+                            "times_per_month",
+                            "months_per_year",
+                            "times_per_year",
+                        ]
+                    },
+                ),
+            ],
+        },
+    }
+
     list_display = (
         "wealth_group",
         "strategy_type",
@@ -365,6 +496,41 @@ class LivelihoodActivityAdmin(admin.ModelAdmin):
         *translation_fields("livelihood_strategy__season__name__icontains"),
     )
 
+    def get_object(self, request, object_id, from_field=None):
+        obj = super().get_object(request, object_id, from_field)
+        if obj is None:
+            return None
+        config = self._SUBCLASS_CONFIG.get(obj.strategy_type)
+        if config:
+            try:
+                return getattr(obj, config["accessor"])
+            except AttributeError:
+                pass
+        return obj
+
+    def get_form(self, request, obj=None, change=False, **kwargs):
+        if obj is not None:
+            config = self._SUBCLASS_CONFIG.get(obj.strategy_type)
+            if config and config.get("form"):
+                return config["form"]
+        return super().get_form(request, obj, change, **kwargs)
+
+    def get_fieldsets(self, request, obj=None):
+        fieldsets = deepcopy(self.fieldsets)
+        if obj is None:
+            return fieldsets
+        config = self._SUBCLASS_CONFIG.get(obj.strategy_type)
+        if not config:
+            return fieldsets
+        for extra_field in config.get("quantity_extra", []):
+            for fs in fieldsets:
+                if fs[0] == "Quantity":
+                    fs[1]["fields"].append(extra_field)
+                    break
+        for i, extra_fs in enumerate(config.get("extra_fieldsets", []), start=1):
+            fieldsets.insert(i, extra_fs)
+        return fieldsets
+
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.select_related(

apps/baseline/forms.py

@@ -7,8 +7,11 @@
     FoodPurchase,
     LivelihoodActivity,
     LivelihoodStrategy,
+    MeatProduction,
     MilkProduction,
+    OtherCashIncome,
     OtherPurchase,
+    PaymentInKind,
     ReliefGiftOther,
     WealthGroup,
     WealthGroupCharacteristicValue,
@@ -116,6 +119,45 @@ def __init__(self, *args, **kwargs):
         self.fields["unit_multiple"].label = _("Purchase size")
 
 
+class MeatProductionForm(LivelihoodActivityForm):
+    class Meta:
+        model = MeatProduction
+        exclude = [
+            "livelihood_zone_baseline",
+            "strategy_type",
+        ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
+
+
+class PaymentInKindForm(LivelihoodActivityForm):
+    class Meta:
+        model = PaymentInKind
+        exclude = [
+            "livelihood_zone_baseline",
+            "strategy_type",
+        ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
+
+
+class OtherCashIncomeForm(LivelihoodActivityForm):
+    class Meta:
+        model = OtherCashIncome
+        exclude = [
+            "livelihood_zone_baseline",
+            "strategy_type",
+        ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
+
+
 class WealthGroupCharacteristicValueForm(forms.ModelForm):
     class Meta:
         model = WealthGroupCharacteristicValue

apps/baseline/migrations/0029_alter_meatproduction_animals_slaughtered_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.11 on 2026-02-26 07:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0028_paymentinkind_payment_product"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="meatproduction",
+            name="animals_slaughtered",
+            field=models.PositiveSmallIntegerField(
+                blank=True, null=True, verbose_name="Number of animals slaughtered"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="meatproduction",
+            name="carcass_weight",
+            field=models.FloatField(blank=True, null=True, verbose_name="Carcass weight per animal"),
+        ),
+    ]

apps/baseline/models.py

@@ -1721,14 +1721,25 @@ class MeatProduction(LivelihoodActivity):
     """
 
     # Production calculation /validation is `input_quantity` * `item_yield`
-    animals_slaughtered = models.PositiveSmallIntegerField(verbose_name=_("Number of animals slaughtered"))
-    carcass_weight = models.FloatField(verbose_name=_("Carcass weight per animal"))
+    animals_slaughtered = models.PositiveSmallIntegerField(
+        verbose_name=_("Number of animals slaughtered"), null=True, blank=True
+    )
+    carcass_weight = models.FloatField(verbose_name=_("Carcass weight per animal"), null=True, blank=True)
+
+    def clean(self):
+        super().clean()
+        # If animals were slaughtered, carcass weight must be recorded
+        if self.animals_slaughtered and self.animals_slaughtered > 0 and self.carcass_weight is None:
+            raise ValidationError(_("Carcass weight is required when animals slaughtered"))
 
     def validate_quantity_produced(self):
-        if self.quantity_produced and self.quantity_produced != self.animals_slaughtered * self.carcass_weight:
-            raise ValidationError(
-                _("Quantity Produced for a Meat Production must be animals slaughtered multiplied by carcass weight")
-            )
+        if self.quantity_produced is not None and self.animals_slaughtered and self.carcass_weight is not None:
+            if self.quantity_produced != self.animals_slaughtered * self.carcass_weight:
+                raise ValidationError(
+                    _(
+                        "Quantity Produced for a Meat Production must be animals slaughtered multiplied by carcass weight"
+                    )
+                )
 
     class Meta:
         verbose_name = LivelihoodStrategyType.MEAT_PRODUCTION.label

apps/baseline/tests/test_viewsets.py

@@ -3851,6 +3851,34 @@ def test_html(self):
         df = pd.read_html(content)[0].fillna("")
         self.assertEqual(len(df), self.num_records + 1)
 
+    def test_filter_by_country(self):
+        country = CountryFactory(
+            iso3166a2="AA",
+            iso3166a3="AAA",
+            iso3166n3=911,
+            iso_en_ro_name="A Country",
+            iso_en_name="AA Country",
+            name="AA Country",
+        )
+        PaymentInKindFactory(livelihood_zone_baseline__livelihood_zone__country=country)
+        response = self.client.get(self.url, {"country": country.iso3166a2})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 1)
+        response = self.client.get(self.url, {"country": country.iso_en_ro_name})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 1)
+
+    def test_filter_by_livelihood_zone(self):
+        livelihood_zone = LivelihoodZoneFactory(code="MW01")
+        PaymentInKindFactory(livelihood_zone_baseline__livelihood_zone=livelihood_zone)
+        response = self.client.get(self.url, {"livelihood_zone": "MW01"})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 1)
+        # Case-insensitive match
+        response = self.client.get(self.url, {"livelihood_zone": "mw01"})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.json()), 1)
+
 
 class ReliefGiftsOtherViewSetTestCase(APITestCase):
     @classmethod