Skip to content
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

Mijn Berichten demo (VNG Hackathon 2024) #1442

Draft
wants to merge 44 commits into
base: develop
Choose a base branch
from
Draft
Changes from 2 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
5a732e5
[#2798] Updated attempt at MijnTaken / TasksPlugin for OIP
alextreme Oct 6, 2024
29126f7
[#2798] Flake8 cleanup
alextreme Oct 6, 2024
1df2ce8
Setup basic Mijn Berichten urls and views
swrichards Oct 7, 2024
8c38c70
Add a mock Bericht object and model
swrichards Oct 7, 2024
4b4b752
[#2799] First set-up for front-end services-berichten
jiromaykin Oct 7, 2024
4116f90
[#2798] Only showing block if there are tasks
alextreme Oct 7, 2024
7a1eefc
Merge pull request #1425 from maykinmedia/swr/mijn-services-hackathon…
swrichards Oct 8, 2024
243695e
[#2799] Rebase
jiromaykin Oct 7, 2024
6f2239a
[#2799] First version of some styling for berichtenlist and detail
jiromaykin Oct 8, 2024
6cab617
[#2799] iSorted
jiromaykin Oct 8, 2024
56c9a16
Merge pull request #1426 from maykinmedia/feature/2799-frontend-mijnb…
swrichards Oct 8, 2024
22f3abe
Add objects-api-client-django pinned to Hackathon branch
swrichards Oct 8, 2024
61abd02
Connect Berichten views to Objects API
swrichards Oct 8, 2024
7179da6
Merge pull request #1424 from maykinmedia/issue/2798-tasks-cms-plugin…
alextreme Oct 8, 2024
e7e91b5
[#2798] Only show open tasks
alextreme Oct 8, 2024
7b6c2a1
Add objects-api-client-django pinned to Hackathon branch
swrichards Oct 8, 2024
3af2ab8
Connect Berichten views to Objects API
swrichards Oct 8, 2024
663fe21
Merge pull request #1429 from maykinmedia/swr/hackathon-fetch-objects
swrichards Oct 8, 2024
6117076
Merge pull request #1430 from maykinmedia/issue/mijn-taken-filter-on-…
alextreme Oct 8, 2024
2c52058
Update bericht opened status upon accessing detail page
swrichards Oct 9, 2024
5b7c7da
Add a URL to mark a bericht as unread
swrichards Oct 9, 2024
a6bd263
[#2799] Improved template for detailbericht + added menu items
jiromaykin Oct 8, 2024
d0826c2
Merge branch 'mijn-services-hackathon-2024' into issue/2799-design-mi…
jiromaykin Oct 9, 2024
0f97264
Merge pull request #1433 from maykinmedia/swr/hackathon-update-berich…
alextreme Oct 9, 2024
df3bdce
[#2799] Improved list template
jiromaykin Oct 9, 2024
a426754
[#2799] Improved template for detailbericht + added menu items
jiromaykin Oct 8, 2024
9db01c0
[#2799] Adjusted breadcrumb
jiromaykin Oct 9, 2024
dbfc2e3
Merge pull request #1432 from maykinmedia/issue/2799-design-mijnberic…
swrichards Oct 9, 2024
4c6f3fb
[#2799] Cleaned-up code and margins
jiromaykin Oct 9, 2024
c717882
Update bericht opened status upon accessing detail page
swrichards Oct 9, 2024
e466df9
Add a URL to mark a bericht as unread
swrichards Oct 9, 2024
ade2fc3
[#2799] Improved template for detailbericht + added menu items
jiromaykin Oct 8, 2024
f4b3beb
Merge branch 'mijn-services-hackathon-2024' into issue/2799-final-hac…
jiromaykin Oct 10, 2024
5cb9706
Merge pull request #1434 from maykinmedia/issue/2799-final-hackathon-…
swrichards Oct 10, 2024
5989412
Fix serialization of bericht dates to Javascript code
swrichards Oct 10, 2024
a30eab2
Add mark unread button to Bericht detail
swrichards Oct 10, 2024
f3c5134
Update Mijn Berichten link with template tag
swrichards Oct 10, 2024
ea0e446
Remove handeling block from Bericht detail
swrichards Oct 10, 2024
f04cecf
Merge pull request #1435 from maykinmedia/swr/hackathon-ui-tweaks
alextreme Oct 10, 2024
91c82fb
Improved acess checks for Bericht views
swrichards Oct 10, 2024
707ecf5
Add bericht download functionality
swrichards Oct 11, 2024
9072cdd
Better UI logic for handling missing einddatum handelingstermijn
swrichards Oct 11, 2024
cedfcdb
Merge pull request #1436 from maykinmedia/swr/better-access-checks
alextreme Oct 11, 2024
d289785
Merge pull request #1437 from maykinmedia/swr/download-bericht-attach…
alextreme Oct 14, 2024
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
4 changes: 2 additions & 2 deletions src/open_inwoner/berichten/urls.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from django.urls import path

from .views import BerichtDetailView, BerichtListView, mark_bericht_as_unread
from .views import BerichtDetailView, BerichtListView, MarkBerichtUnreadView

app_name = "berichten"

urlpatterns = [
path("<uuid:object_uuid>/", BerichtDetailView.as_view(), name="detail"),
path(
"<uuid:object_uuid>/mark-unread",
mark_bericht_as_unread,
MarkBerichtUnreadView.as_view(),
name="mark-bericht-unread",
),
path("", BerichtListView.as_view(), name="list"),
4 changes: 2 additions & 2 deletions src/open_inwoner/berichten/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .bericht_detail import BerichtDetailView, mark_bericht_as_unread
from .bericht_detail import BerichtDetailView, MarkBerichtUnreadView
from .bericht_list import BerichtListView

__all__ = ["BerichtDetailView", "BerichtListView", "mark_bericht_as_unread"]
__all__ = ["BerichtDetailView", "BerichtListView", "MarkBerichtUnreadView"]
23 changes: 12 additions & 11 deletions src/open_inwoner/berichten/views/bericht_detail.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import logging

from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.utils.functional import cached_property
@@ -11,13 +9,17 @@
from view_breadcrumbs import BaseBreadcrumbMixin

from open_inwoner.berichten.services import BerichtenService
from open_inwoner.berichten.views.mixins import BerichtAccessMixin
from open_inwoner.utils.views import CommonPageMixin

logger = logging.getLogger(__name__)


class BerichtDetailView(
CommonPageMixin, BaseBreadcrumbMixin, TemplateView, LoginRequiredMixin
CommonPageMixin,
BaseBreadcrumbMixin,
TemplateView,
BerichtAccessMixin,
):

template_name = "pages/berichten/detail.html"
@@ -35,16 +37,15 @@ def page_title(self):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
service = BerichtenService()
bericht = service.fetch_bericht(self.kwargs["object_uuid"])
context["bericht"] = bericht
if not bericht.geopend:
context["bericht"] = self.bericht
if not self.bericht.geopend:
service.update_object(self.kwargs["object_uuid"], {"geopend": True})

return context


@login_required
def mark_bericht_as_unread(request, object_uuid):
service = BerichtenService()
service.update_object(object_uuid, {"geopend": False})
return HttpResponseRedirect(reverse("berichten:list"))
class MarkBerichtUnreadView(BerichtAccessMixin):
def get(self, *args, **kwargs):
service = BerichtenService()
service.update_object(self.kwargs["object_uuid"], {"geopend": False})
return HttpResponseRedirect(reverse("berichten:list"))
12 changes: 9 additions & 3 deletions src/open_inwoner/berichten/views/bericht_list.py
Original file line number Diff line number Diff line change
@@ -8,12 +8,18 @@
from view_breadcrumbs import BaseBreadcrumbMixin

from open_inwoner.berichten.services import BerichtenService
from open_inwoner.berichten.views.mixins import RequireBsnMixin
from open_inwoner.utils.views import CommonPageMixin

logger = logging.getLogger(__name__)


class BerichtListView(CommonPageMixin, BaseBreadcrumbMixin, TemplateView):
class BerichtListView(
CommonPageMixin,
BaseBreadcrumbMixin,
RequireBsnMixin,
TemplateView,
):

template_name = "pages/berichten/list.html"

@@ -29,7 +35,7 @@ def page_title(self):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
service = BerichtenService()
if self.request.user.is_authenticated and (bsn := self.request.user.bsn):
context["berichten"] = service.fetch_berichten_for_bsn(bsn)
bsn = self.request.user.bsn if hasattr(self.request.user, "bsn") else None
context["berichten"] = service.fetch_berichten_for_bsn(bsn) if bsn else []

return context
54 changes: 54 additions & 0 deletions src/open_inwoner/berichten/views/mixins.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
from django.contrib.auth.mixins import AccessMixin
from django.http import HttpRequest
from django.template.response import TemplateResponse
from django.views import View

from open_inwoner.berichten.api_models import Bericht
from open_inwoner.berichten.services import BerichtenService


class RequireBsnMixin(AccessMixin, View):

request: HttpRequest
bericht: Bericht

def dispatch(self, request, *args, **kwargs):
if not request.user.is_authenticated:
return self.handle_no_permission()

if not request.user.bsn:
return self.handle_no_permission()

return super().dispatch(request, *args, **kwargs)

def handle_no_permission(self):
if self.request.user.is_authenticated:
return TemplateResponse(self.request, "pages/cases/403.html")

return super().handle_no_permission()


class BerichtAccessMixin(AccessMixin, View):

request: HttpRequest
bericht: Bericht

def dispatch(self, request, *args, **kwargs):
if not (bsn := getattr(request.user, "bsn", None)):
return super().handle_no_permission()

service = BerichtenService()
self.bericht = service.fetch_bericht(self.kwargs["object_uuid"])
if (
self.bericht.identificatie.type != "bsn"
or self.bericht.identificatie.value != bsn
):
return self.handle_no_permission()

return super().dispatch(request, *args, **kwargs)

def handle_no_permission(self):
if self.request.user.is_authenticated:
return TemplateResponse(self.request, "pages/cases/403.html")

return super().handle_no_permission()