Merge remote-tracking branch 'origin/main' into HEA-1083/Add_other_livestock_production_strategy_type

Author: Copilot

apps/baseline/viewsets.py

@@ -1902,6 +1902,11 @@ class LivelihoodActivitySummaryViewSet(AggregatingViewSet):
         percentage_kcals_sum_slice
         percentage_kcals_sum_slice_percentage_of_row
 
+    The slice_percentage_of_row fields represent the percentage of the total row value that is contributed by the
+    slice.  Note that if the slice field (product or strategy type) is also included in the &fields parameter, then the
+    slice_percentage_of_row values will either be 0 or 100%, depending on whether the value for that field in this
+    row matches the slice.
+
     You can filter by any calculated slice or row aggregate by prefixing its name with `min_` or `max_`. For example:
 
         &min_income_sum_slice_percentage_of_row=52

apps/metadata/migrations/0018_alter_seasonalactivitytype_activity_category.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.14 on 2026-05-28 15:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0017_seasonalactivitytype_has_product_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="seasonalactivitytype",
+            name="activity_category",
+            field=models.CharField(
+                choices=[
+                    ("climatology", "Climatology"),
+                    ("stress_period", "Stress Periods"),
+                    ("crop", "Crops"),
+                    ("livestock", "Livestock"),
+                    ("fishing", "Fishing"),
+                    ("other_income", "Employment and Other Income"),
+                    ("other", "Other"),
+                ],
+                max_length=20,
+                verbose_name="Activity Category",
+            ),
+        ),
+    ]

apps/metadata/models.py

@@ -227,10 +227,12 @@ class SeasonalActivityType(ReferenceData):
     """
 
     class SeasonalActivityCategory(models.TextChoices):
-        SEASON = "season", _("Season")
+        CLIMATOLOGY = "climatology", _("Climatology")
+        STRESS_PERIODS = "stress_period", _("Stress Periods")
         CROP = "crop", _("Crops")
         LIVESTOCK = "livestock", _("Livestock")
         FISHING = "fishing", _("Fishing")
+        OTHER_INCOME = "other_income", _("Employment and Other Income")
         OTHER = "other", _("Other")
 
     activity_category = models.CharField(

apps/metadata/tests/factories.py

@@ -118,7 +118,7 @@ class Meta:
     code = factory.Iterator(["AC1", "AC2", "AC3", "AC4"])
     activity_category = factory.Iterator(
         [
-            SeasonalActivityType.SeasonalActivityCategory.SEASON,
+            SeasonalActivityType.SeasonalActivityCategory.CLIMATOLOGY,
             SeasonalActivityType.SeasonalActivityCategory.CROP,
             SeasonalActivityType.SeasonalActivityCategory.LIVESTOCK,
             SeasonalActivityType.SeasonalActivityCategory.OTHER,