Merge to main, resolve conflict see HEA-809

Author: girumb

apps/baseline/admin.py

@@ -50,9 +50,9 @@
     WildFoodGathering,
 )
 
-admin.site.site_header = "HEA Baseline Database Administration"
-admin.site.index_title = "HEA Baseline"
-admin.site.site_title = "Administration"
+admin.site.site_header = "Livelihoods Database Administration"
+admin.site.index_title = "Livelihoods Database"
+admin.site.site_title = "Livelihoods Database Administration"
 
 
 class SourceOrganizationAdmin(admin.ModelAdmin):
@@ -204,7 +204,6 @@ def bss_uploaded_date_time(self, instance):
             return ""
 
     def get_fieldsets(self, request, obj=None):
-
         fieldsets = super().get_fieldsets(request, obj=obj)
         if obj and obj.geography:
             # Check if 'geography' field has a value
@@ -1015,7 +1014,6 @@ class EventAdmin(admin.ModelAdmin):
 
 
 class ExpandabilityFactorAdmin(admin.ModelAdmin):
-
     fields = (
         "livelihood_strategy",
         "wealth_group",
@@ -1048,7 +1046,6 @@ class ExpandabilityFactorAdmin(admin.ModelAdmin):
 
 
 class CopingStrategyAdmin(admin.ModelAdmin):
-
     fields = (
         "community",
         "leaders",

apps/baseline/migrations/0023_alter_wealthgroup_average_household_size.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.2.7 on 2025-12-29 07:04
+
+from django.db import migrations, models
+
+import common.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0022_alter_wealthgroup_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="wealthgroup",
+            name="average_household_size",
+            field=models.FloatField(
+                blank=True,
+                help_text="Average number of people per household in this Wealth Group",
+                null=True,
+                validators=[common.models.validate_positive],
+                verbose_name="Average household size",
+            ),
+        ),
+    ]

apps/baseline/migrations/0024_baselinewealthgroupcharacteristicvalue_and_more.py

@@ -0,0 +1,37 @@
+# Generated by Django 5.2.9 on 2026-01-13 17:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0023_alter_wealthgroup_average_household_size"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="BaselineWealthGroupCharacteristicValue",
+            fields=[],
+            options={
+                "verbose_name": "Baseline Wealth Group Characteristic Value",
+                "verbose_name_plural": "Baseline Wealth Group Characteristic Values",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("baseline.wealthgroupcharacteristicvalue",),
+        ),
+        migrations.CreateModel(
+            name="CommunityWealthGroupCharacteristicValue",
+            fields=[],
+            options={
+                "verbose_name": "Community Wealth Group Characteristic Value",
+                "verbose_name_plural": "Community Wealth Group Characteristic Values",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("baseline.wealthgroupcharacteristicvalue",),
+        ),
+    ]

apps/baseline/migrations/0025_alter_milkproduction_milking_animals.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.10 on 2026-02-01 19:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0024_baselinewealthgroupcharacteristicvalue_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="milkproduction",
+            name="milking_animals",
+            field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name="Number of milking animals"),
+        ),
+    ]

…ls_adults_to_household_labor_provider.py …ls_adults_to_household_labor_provider.pyapps/baseline/migrations/0023_add_boys_girls_adults_to_household_labor_provider.py renamed to apps/baseline/migrations/0026_add_boys_girls_adults_to_household_labor_provider.py apps/baseline/migrations/0023_add_boys_girls_adults_to_household_labor_provider.py renamed to apps/baseline/migrations/0026_add_boys_girls_adults_to_household_labor_provider.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("baseline", "0022_alter_wealthgroup_options"),
+        ("baseline", "0025_alter_milkproduction_milking_animals"),
     ]
 
     operations = [