Skip to content

Feat: UI templates for the districts application #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 28, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions pems/districts/templates/districts/district.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,24 @@
<h1>District {{ district }}</h1>
<p>URL of route: {% url "districts:district" district %}</p>
{% extends "districts/index.html" %}

{% block headline %}
District {{ url_district }} - {{ district_query.name }}
{% endblock headline %}

{% block district-content %}
<div class="row">
<div class="col-lg-4 border">
<h2>Form</h2>
</div>
<div class="col-lg-8 border">
<h2>Chart</h2>
</div>
</div>
<div class="row">
<div class="col-lg-4 border">
<h2>Details for {{ district_query.name }}</h2>
</div>
<div class="col-lg-8 border">
<h2>Map</h2>
</div>
</div>
{% endblock district-content %}
41 changes: 40 additions & 1 deletion pems/districts/templates/districts/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,46 @@
{% extends "core/base.html" %}

{% block headline %}
Districts
{% endblock headline %}

{% block inner-content %}
<p>Districts</p>
<div class="container p-t-lg">
<div class="row">
<div class="col-lg-2 pb-lg-5" role="complementary">
<!-- Side navigation -->
<nav aria-labelledby="navigation-list" class="side-navigation">
<ul class="list-navigation">
{% for district in district_queryset %}
<li>
<a href="{% url 'districts:district' district.number %}">District {{ district.number }}</a>
</li>
{% endfor %}
</ul>
</nav>
</div>
<div class="col-lg-10 pb-lg-5">

{% block district-content %}
<div class="row">
<div class="col-lg-4 border">
<h2>Form</h2>
</div>
<div class="col-lg-8 border">
<h2>Chart</h2>
</div>
</div>
<div class="row">
<div class="col-lg-4 border">
<h2>Details</h2>
</div>
<div class="col-lg-8 border">
<h2>Map</h2>
</div>
</div>
{% endblock district-content %}

</div>
</div>
</div>
{% endblock inner-content %}
11 changes: 10 additions & 1 deletion pems/districts/views.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
from django.views.generic import TemplateView

from .models import District


class IndexView(TemplateView):
template_name = "districts/index.html"

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["district_queryset"] = District.objects.all()
return context


class DistrictView(TemplateView):
template_name = "districts/district.html"

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
district = self.kwargs.get("district")
context["district"] = district
context["url_district"] = district
context["district_queryset"] = District.objects.all()
context["district_query"] = District.objects.all().get(number=district)
return context
24 changes: 23 additions & 1 deletion tests/pytest/pems/districts/test_views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
import pytest

from pems.districts import views
from pems.districts.models import District


class TestIndexViewView:
@pytest.fixture
def view(app_request):
v = views.IndexView()
v.setup(app_request)

return v

@pytest.mark.django_db
def test_get_context_data(self, view):

context = view.get_context_data()

assert set(context["district_queryset"]) == set(District.objects.all())

def test_template_name(self, view):
assert view.template_name == "districts/index.html"


class TestDistrictView:
Expand All @@ -11,11 +31,13 @@ def view(app_request):

return v

@pytest.mark.django_db
@pytest.mark.usefixtures("model_District")
def test_get_context_data(self, view):

context = view.get_context_data()

assert context["district"] == 1
assert context["url_district"] == 1

def test_template_name(self, view):
assert view.template_name == "districts/district.html"
Loading