chg ! labels according to beneficiary group

Author: vitali-yanushchyk-valor

src/country_workspace/admin/beneficiary_group.py

@@ -20,8 +20,5 @@ class BeneficiaryGroupAdmin(BaseModelAdmin):
     def has_add_permission(self, request: HttpRequest) -> bool:
         return False
 
-    def has_delete_permission(self, request: HttpRequest, obj: BeneficiaryGroup = None) -> bool:
-        return False
-
     def has_change_permission(self, request: HttpRequest, obj: BeneficiaryGroup = None) -> bool:
         return False

src/country_workspace/admin/program.py

@@ -20,9 +20,9 @@ class ProgramAdmin(BaseModelAdmin):
     list_display = (
         "name",
         "sector",
-        "beneficiary_group",
         "status",
         "active",
+        "beneficiary_group",
         "beneficiary_validator",
         "household_checker",
         "individual_checker",

src/country_workspace/management/commands/demo.py

@@ -52,7 +52,7 @@ def handle(self, *args: Any, **options: Any) -> None:
         sys.path.append(str(test_utils_dir.absolute()))
 
         import vcr
-        from testutils.factories import BatchFactory, HouseholdFactory
+        from testutils.factories import BatchFactory, HouseholdFactory, IndividualFactory
         from vcr.record_mode import RecordMode
 
         from country_workspace.contrib.hope.sync.office import sync_all
@@ -86,4 +86,7 @@ def handle(self, *args: Any, **options: Any) -> None:
         for co in Office.objects.filter(active=True):
             for p in co.programs.filter():
                 b = BatchFactory(country_office=co, name=f"Batch {p}", program=p)
-                HouseholdFactory.create_batch(10, batch=b)
+                if p.beneficiary_group.master_detail:
+                    HouseholdFactory.create_batch(10, batch=b)
+                else:
+                    IndividualFactory.create_batch(10, batch=b, household=None)

src/country_workspace/workspaces/admin/hh_ind.py

@@ -59,10 +59,24 @@ class BeneficiaryBaseAdmin(AdminAutoCompleteSearchMixin, SelectedProgramMixin, W
         actions.bulk_update_export,
         actions.calculate_checksum,
     ]
-    title = None
-    title_plural = None
     list_per_page = 20
 
+    @property
+    def title_group(self) -> str | None:
+        return self._get_title_label("group_label")
+
+    @property
+    def title_group_plural(self) -> str | None:
+        return self._get_title_label("group_label_plural")
+
+    @property
+    def title_member(self) -> str | None:
+        return self._get_title_label("member_label")
+
+    @property
+    def title_member_plural(self) -> str | None:
+        return self._get_title_label("member_label_plural")
+
     def has_validate_permission(self, request: HttpRequest) -> bool:
         return request.user.has_perm("country_workspace.validate_beneficiary")
 
@@ -85,12 +99,21 @@ def get_queryset(self, request: HttpRequest) -> "QuerySet[Beneficiary]":
         return qs
 
     def get_common_context(self, request: HttpRequest, pk: str | None = None, **kwargs: Any) -> dict[str, Any]:
-        ret = super().get_common_context(request, pk, **kwargs)
-        ret["datachecker"] = self.get_checker(request, ret.get("original"))
-        ret["modeladmin"] = self
-        ret["title_plural"] = self.title_plural
-        ret.update(**kwargs)
-        return ret
+        context = super().get_common_context(request, pk, **kwargs)
+        return {
+            **context,
+            "modeladmin": self,
+            "datachecker": self.get_checker(request, context.get("original")),
+            "title_group": self.title_group,
+            "title_group_plural": self.title_group_plural,
+            "title_member": self.title_member,
+            "title_member_plural": self.title_member_plural,
+            **kwargs,
+        }
+
+    def _get_title_label(self, attr: str) -> str | None:
+        program = state.program
+        return getattr(program.beneficiary_group, attr) if program else None
 
     @button(
         label=_("Validate"),
@@ -201,7 +224,6 @@ def _changeform_view(  # noqa: PLR0912
             form = form_class(prefix="flex_field", initial=initials)
 
         context["show_save_invalid"] = True
-        context["title"] = self.title
         context["checker_form"] = form
         context["has_change_permission"] = self.has_change_permission(request)
 

src/country_workspace/workspaces/admin/household.py

@@ -5,7 +5,6 @@
 from django.contrib.admin import register
 from django.http import HttpRequest
 from django.urls import reverse
-from django.utils.translation import gettext as _
 
 from ...state import state
 from ..models import CountryHousehold
@@ -26,15 +25,17 @@ class CountryHouseholdAdmin(BeneficiaryBaseAdmin):
     list_display = ["name", "batch"]
     search_fields = ("name",)
     ordering = ("name",)
-    title = _("Household")
-    title_plural = _("Households")
     list_per_page = 20
     list_filter = (
         ("batch", CWLinkedAutoCompleteFilter.factory(parent=None)),
         WIsValidFilter,
     )
     actions = [*BeneficiaryBaseAdmin.actions, push_to_hope]
 
+    @property
+    def title_plural(self) -> str:
+        return super().title_group_plural
+
     def get_list_display(self, request: HttpRequest) -> list[str]:
         program: "CountryProgram | None"
         if program := self.get_selected_program(request):
@@ -53,8 +54,9 @@ def get_queryset(self, request: HttpRequest) -> "QuerySet[CountryHousehold]":
             .filter(batch__country_office=state.tenant, batch__program=state.program)
         )
 
-    @link(change_list=False, html_attrs={"title": "Shows related individuals."})
+    @link(change_list=False, html_attrs={"title": "Shows related members."})
     def members(self, btn: LinkButton) -> None:
         base = reverse("workspace:workspaces_countryindividual_changelist")
         obj = btn.context["original"]
         btn.href = f"{base}?household__exact={obj.pk}"
+        btn.label = self.title_member_plural

src/country_workspace/workspaces/admin/individual.py

@@ -4,7 +4,6 @@
 from django.contrib.admin import AdminSite, register
 from django.db.models import Model, QuerySet
 from django.http import HttpRequest
-from django.utils.translation import gettext as _
 
 from ...state import state
 from ..models import CountryHousehold, CountryIndividual, CountryProgram
@@ -33,8 +32,10 @@ class CountryIndividualAdmin(BeneficiaryBaseAdmin):
         "user_fields",
     ]
     ordering = ("name",)
-    title = _("Individual")
-    title_plural = _("Individuals")
+
+    @property
+    def title_plural(self) -> str:
+        return super().title_member_plural
 
     def __init__(self, model: Model, admin_site: "AdminSite") -> None:
         self._selected_household = None

src/country_workspace/workspaces/admin/program.py

@@ -150,6 +150,20 @@ def changelist_view(self, request: HttpRequest, extra_context: dict[str, None] |
         url = reverse("workspace:workspaces_countryprogram_change", args=[state.program.pk])
         return HttpResponseRedirect(url)
 
+    def changeform_view(
+        self,
+        request: "HttpRequest",
+        object_id: str | None = None,
+        form_url: str = "",
+        extra_context: dict[str, Any] | None = None,
+    ) -> HttpResponse:
+        if obj := self.get_object(request, object_id):
+            extra_context["btnlabels"] = {
+                "individual_columns": f"{obj.beneficiary_group.member_label} Columns",
+                "household_columns": f"{obj.beneficiary_group.group_label} Columns",
+            }
+        return super().changeform_view(request, object_id, form_url, extra_context=extra_context)
+
     def _configure_columns(
         self,
         request: HttpResponse,

src/country_workspace/workspaces/templates/workspace/admin_extra_buttons/includes/button.html

@@ -1,5 +1,15 @@
-{% spaceless %}<li>
-<a href="{{ button.url }}{% if is_popup %}&_popup=1{% endif %}"
-        {% include "admin_extra_buttons/includes/attrs.html" with button=button %}>
-    {% if button.icon %}<i class="{{ button.icon }}"></i>&nbsp;{% endif %}{{ button.label }}</a>
-</li>{% endspaceless %}
+{% spaceless %}
+<li>
+    <a href="{{ button.url }}{% if is_popup %}&_popup=1{% endif %}"
+            {% include "admin_extra_buttons/includes/attrs.html" with button=button %}>
+        {% if button.icon %}<i class="{{ button.icon }}"></i> {% endif %}
+        {% if button.label == "Individual Columns" %}
+            {{ btnlabels.individual_columns|default:button.label }}
+        {% elif button.label == "Household Columns" %}
+            {{ btnlabels.household_columns|default:button.label }}
+        {% else %}
+            {{ button.label }}
+        {% endif %}
+    </a>
+</li>
+{% endspaceless %}

src/country_workspace/workspaces/templates/workspace/admin_extra_buttons/includes/change_form_buttons.html

@@ -2,6 +2,6 @@
 {% get_changeform_buttons adminform.model_admin as buttons %}
 {% for button in buttons %}
     {% if button.can_render and button.change_form %}
-        {{ button }}
+        {% include "workspace/admin_extra_buttons/includes/button.html" with button=button btnlabels=btnlabels is_popup=is_popup %}
     {% endif %}
 {% endfor %}

src/country_workspace/workspaces/templates/workspace/household/change_form.html

@@ -2,6 +2,6 @@
 {% load admin_modify i18n static workspace_modify workspace_urls %}
 {% block page-title %}
     {% url "workspace:workspaces_countryhousehold_changelist" as wcl %}
-        &rsaquo; <a href="{% add_preserved_filters wcl %}">Households</a>{% admin_url modeladmin %}
+        &rsaquo; <a href="{% add_preserved_filters wcl %}">{{ title_group_plural }}</a>{% admin_url modeladmin %}
         &rsaquo; {{ original }}{% admin_url original %}
 {% endblock page-title %}