From aef75d1a5cac0d6f3c8ba4d4dfaa3eca7ed0d461 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Thu, 10 Aug 2023 11:36:54 +0300 Subject: [PATCH] By-laws on LawLibrary --- .../liiweb/municipal_legislation.html | 23 +++++++++++++ .../open_by_laws/municipal_by_laws_list.html | 34 +++++++++++++++++++ lawlibrary/templates/peachjam/_header.html | 6 ++++ lawlibrary/urls.py | 21 ++++++++++++ lawlibrary/views/legislation.py | 15 ++++++++ open_by_laws/views/by_laws.py | 11 ++++++ 6 files changed, 110 insertions(+) create mode 100644 lawlibrary/templates/liiweb/municipal_legislation.html create mode 100644 lawlibrary/templates/open_by_laws/municipal_by_laws_list.html diff --git a/lawlibrary/templates/liiweb/municipal_legislation.html b/lawlibrary/templates/liiweb/municipal_legislation.html new file mode 100644 index 000000000..de33f8d4c --- /dev/null +++ b/lawlibrary/templates/liiweb/municipal_legislation.html @@ -0,0 +1,23 @@ +{% extends "peachjam/layouts/main.html" %} +{% load i18n %} +{% block title %}{{ locality_legislation_title }}{% endblock %} +{% block page-content %} +
+
+

{{ locality_legislation_title }}

+
+ {% for group in municipality_groups %} +
+ +
+ {% endfor %} +
+
+
+{% endblock %} diff --git a/lawlibrary/templates/open_by_laws/municipal_by_laws_list.html b/lawlibrary/templates/open_by_laws/municipal_by_laws_list.html new file mode 100644 index 000000000..46eb68568 --- /dev/null +++ b/lawlibrary/templates/open_by_laws/municipal_by_laws_list.html @@ -0,0 +1,34 @@ +{% extends "liiweb/legislation_list.html" %} +{% load i18n %} +{% block title %} + {% blocktrans with locality=locality.name %}{{ locality }} By-laws{% endblocktrans %} +{% endblock %} +{% block breadcrumbs %} + +{% endblock %} +{% block page-heading %} +

{% blocktrans with locality=locality.name %}{{ locality }} By-laws{% endblocktrans %}

+{% endblock %} +{% block legislation-nav %} + +{% endblock %} diff --git a/lawlibrary/templates/peachjam/_header.html b/lawlibrary/templates/peachjam/_header.html index 14de65d0e..e4ca84bd8 100644 --- a/lawlibrary/templates/peachjam/_header.html +++ b/lawlibrary/templates/peachjam/_header.html @@ -27,6 +27,12 @@ {% trans 'Provincial Legislation' %} +
  • + + {% trans 'Municipal By-laws' %} + +
  • diff --git a/lawlibrary/urls.py b/lawlibrary/urls.py index 949d5375e..a2915ca97 100644 --- a/lawlibrary/urls.py +++ b/lawlibrary/urls.py @@ -2,6 +2,7 @@ from lawlibrary import views from liiweb.views import LocalityLegislationListView +from open_by_laws.views import MunicipalByLawsView urlpatterns = [ path("", views.HomePageView.as_view(), name="home_page"), @@ -41,5 +42,25 @@ LocalityLegislationListView.as_view(variant="all"), name="locality_legislation_list_all", ), + path( + "legislation/municipal", + views.MunicipalLegislationView.as_view(), + name="municipal_legislation", + ), + path( + "bylaws/", + MunicipalByLawsView.as_view(), + name="municipal_by_laws", + ), + path( + "bylaws//repealed", + MunicipalByLawsView.as_view(variant="repealed"), + name="municipal_by_laws_legislation_list_repealed", + ), + path( + "bylaws//all", + MunicipalByLawsView.as_view(variant="all"), + name="municipal_by_laws_legislation_list_all", + ), path("", include("liiweb.urls")), ] diff --git a/lawlibrary/views/legislation.py b/lawlibrary/views/legislation.py index eb4a0e3ed..b971a70e7 100644 --- a/lawlibrary/views/legislation.py +++ b/lawlibrary/views/legislation.py @@ -1,5 +1,7 @@ from liiweb.views import LegislationListView as BaseLegislationListView from liiweb.views import LocalityLegislationView as BaseLocalityLegislationView +from peachjam.helpers import chunks +from peachjam.models import Locality class LegislationListView(BaseLegislationListView): @@ -12,3 +14,16 @@ def get_context_data(self, **kwargs): return super().get_context_data( locality_legislation_title="Provincial Legislation", **kwargs ) + + +class MunicipalLegislationView(BaseLocalityLegislationView): + navbar_link = "legislation/municipal" + template_name = "liiweb/municipal_legislation.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["locality_legislation_title"] = "Municipal By-laws" + codes = "cpt eth jhb wc015 wc041 wc023 wc013 wc033 wc012 ec443 wc011".split() + municipalities = Locality.objects.filter(code__in=codes) + context["municipality_groups"] = list(chunks(municipalities, 2)) + return context diff --git a/open_by_laws/views/by_laws.py b/open_by_laws/views/by_laws.py index 5c555e48e..960e16c16 100644 --- a/open_by_laws/views/by_laws.py +++ b/open_by_laws/views/by_laws.py @@ -1,5 +1,16 @@ +from django.shortcuts import get_object_or_404 + from liiweb.views.legislation import LocalityLegislationListView +from peachjam.models import Locality class MunicipalByLawsView(LocalityLegislationListView): template_name = "open_by_laws/municipal_by_laws_list.html" + navbar_link = "legislation/municipal" + + def get(self, *args, **kwargs): + self.municipality = get_object_or_404(Locality, code=kwargs["code"]) + return super().get(*args, **kwargs) + + def get_context_data(self, **kwargs): + return super().get_context_data(municipality=self.municipality, **kwargs)