Merge branch 'main' into HEA-984/Livelihood_activity_valid_instances_errors_for_income_not_rounding_error

Author: girumb

apps/baseline/admin.py

@@ -9,11 +9,15 @@
 from metadata.models import LivelihoodStrategyType
 
 from .forms import (
+    CommunityForm,
     FoodPurchaseForm,
     LivelihoodActivityForm,
+    LivelihoodStrategyForm,
     MilkProductionForm,
     OtherPurchaseForm,
     ReliefGiftOtherForm,
+    WealthGroupCharacteristicValueForm,
+    WealthGroupForm,
 )
 from .models import (
     ButterProduction,
@@ -218,6 +222,7 @@ def get_fieldsets(self, request, obj=None):
 
 
 class CommunityAdmin(GISModelAdminReadOnly):
+    form = CommunityForm
     fields = (
         "name",
         "full_name",
@@ -275,6 +280,7 @@ def get_fields(self, request, obj=None):
 
 
 class LivelihoodStrategyAdmin(admin.ModelAdmin):
+    form = LivelihoodStrategyForm
     fields = (
         "livelihood_zone_baseline",
         "strategy_type",
@@ -430,6 +436,7 @@ def get_country_name(self, obj):
 
 
 class WealthGroupCharacteristicValueAdmin(admin.ModelAdmin):
+    form = WealthGroupCharacteristicValueForm
     list_display = [
         "wealth_group",
         "get_wealth_characteristic_common_name",
@@ -441,6 +448,7 @@ class WealthGroupCharacteristicValueAdmin(admin.ModelAdmin):
     model = WealthGroupCharacteristicValue
 
     list_filter = (
+        ("wealth_group__livelihood_zone_baseline", admin.RelatedOnlyFieldListFilter),
         "wealth_group__wealth_group_category",
         ("wealth_group__livelihood_zone_baseline__livelihood_zone__country", admin.RelatedOnlyFieldListFilter),
         "wealth_characteristic__has_product",
@@ -760,6 +768,7 @@ def get_queryset(self, request):
 
 
 class WealthGroupAdmin(admin.ModelAdmin):
+    form = WealthGroupForm
     list_display = (
         "community",
         "wealth_group_category",
@@ -771,6 +780,7 @@ class WealthGroupAdmin(admin.ModelAdmin):
         *translation_fields("wealth_group_category__name"),
     )
     list_filter = (
+        ("livelihood_zone_baseline", admin.RelatedOnlyFieldListFilter),
         "livelihood_zone_baseline__source_organization",
         ("livelihood_zone_baseline__livelihood_zone__country", admin.RelatedOnlyFieldListFilter),
         *translation_fields("livelihood_zone_baseline__livelihood_zone__name"),

apps/baseline/autocomplete.py

@@ -0,0 +1,72 @@
+from dal import autocomplete
+from django.contrib.auth.mixins import LoginRequiredMixin
+
+from .models import Community, LivelihoodStrategy, LivelihoodZoneBaseline, WealthGroup
+
+
+class WealthGroupAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
+    #  autocomplete endpoint for WealthGroup FK fields.
+
+    def get_queryset(self):
+        qs = WealthGroup.objects.select_related(
+            "community",
+            "livelihood_zone_baseline__livelihood_zone",
+            "wealth_group_category",
+        )
+        if self.q:
+            qs = (
+                WealthGroup.objects.filter(community__name__icontains=self.q)
+                | WealthGroup.objects.filter(livelihood_zone_baseline__livelihood_zone__code__icontains=self.q)
+                | WealthGroup.objects.filter(wealth_group_category__code__icontains=self.q)
+            )
+        return qs
+
+
+class CommunityAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
+    # autocomplete endpoint for Community FK fields.
+
+    def get_queryset(self):
+        qs = Community.objects.select_related(
+            "livelihood_zone_baseline__livelihood_zone",
+        )
+        if self.q:
+            qs = (
+                Community.objects.filter(name__icontains=self.q)
+                | Community.objects.filter(full_name__icontains=self.q)
+                | Community.objects.filter(livelihood_zone_baseline__livelihood_zone__code__icontains=self.q)
+            )
+        return qs
+
+
+class LivelihoodZoneBaselineAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
+    # autocomplete endpoint for LivelihoodZoneBaseline FK fields
+
+    def get_queryset(self):
+        qs = LivelihoodZoneBaseline.objects.select_related(
+            "livelihood_zone",
+            "source_organization",
+        )
+        if self.q:
+            qs = (
+                LivelihoodZoneBaseline.objects.filter(livelihood_zone__code__icontains=self.q)
+                | LivelihoodZoneBaseline.objects.filter(livelihood_zone__name_en__icontains=self.q)
+                | LivelihoodZoneBaseline.objects.filter(livelihood_zone__alternate_code__icontains=self.q)
+            )
+        return qs
+
+
+class LivelihoodStrategyAutocomplete(LoginRequiredMixin, autocomplete.Select2QuerySetView):
+    # autocomplete endpoint for LivelihoodStrategy FK fields
+
+    def get_queryset(self):
+        qs = LivelihoodStrategy.objects.select_related(
+            "livelihood_zone_baseline__livelihood_zone",
+            "product",
+        )
+        if self.q:
+            qs = (
+                LivelihoodStrategy.objects.filter(strategy_type__icontains=self.q)
+                | LivelihoodStrategy.objects.filter(additional_identifier__icontains=self.q)
+                | LivelihoodStrategy.objects.filter(livelihood_zone_baseline__livelihood_zone__code__icontains=self.q)
+            )
+        return qs

apps/baseline/forms.py

@@ -1,12 +1,17 @@
+from dal import autocomplete
 from django import forms
 from django.utils.translation import gettext_lazy as _
 
 from baseline.models import (
+    Community,
     FoodPurchase,
     LivelihoodActivity,
+    LivelihoodStrategy,
     MilkProduction,
     OtherPurchase,
     ReliefGiftOther,
+    WealthGroup,
+    WealthGroupCharacteristicValue,
 )
 
 
@@ -18,6 +23,10 @@ class Meta:
             "livelihood_zone_baseline",
             "strategy_type",
         ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -43,6 +52,10 @@ class Meta:
             "livelihood_zone_baseline",
             "strategy_type",
         ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -57,6 +70,10 @@ class Meta:
             "livelihood_zone_baseline",
             "strategy_type",
         ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -71,6 +88,10 @@ class Meta:
             "livelihood_zone_baseline",
             "strategy_type",
         ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -85,7 +106,48 @@ class Meta:
             "livelihood_zone_baseline",
             "strategy_type",
         ]
+        widgets = {
+            "livelihood_strategy": autocomplete.ModelSelect2(url="livelihoodstrategy-autocomplete"),
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["unit_multiple"].label = _("Purchase size")
+
+
+class WealthGroupCharacteristicValueForm(forms.ModelForm):
+    class Meta:
+        model = WealthGroupCharacteristicValue
+        fields = "__all__"
+        widgets = {
+            "wealth_group": autocomplete.ModelSelect2(url="wealthgroup-autocomplete"),
+        }
+
+
+class WealthGroupForm(forms.ModelForm):
+    class Meta:
+        model = WealthGroup
+        fields = "__all__"
+        widgets = {
+            "livelihood_zone_baseline": autocomplete.ModelSelect2(url="livelihoodzonebaseline-autocomplete"),
+            "community": autocomplete.ModelSelect2(url="community-autocomplete"),
+        }
+
+
+class LivelihoodStrategyForm(forms.ModelForm):
+    class Meta:
+        model = LivelihoodStrategy
+        fields = "__all__"
+        widgets = {
+            "livelihood_zone_baseline": autocomplete.ModelSelect2(url="livelihoodzonebaseline-autocomplete"),
+        }
+
+
+class CommunityForm(forms.ModelForm):
+    class Meta:
+        model = Community
+        fields = "__all__"
+        widgets = {
+            "livelihood_zone_baseline": autocomplete.ModelSelect2(url="livelihoodzonebaseline-autocomplete"),
+        }