-
+
{% for day in days %}
-
{% if other_user.is_active %}
- {% render_form id="message-form" form=form method="POST" enctype="multipart/form-data" %}
+ {% render_form id="message-form" form=form method="POST" action=request.get_full_path enctype="multipart/form-data" async_selector=".messages" %}
{% csrf_token %}
{% hidden form.receiver %}
diff --git a/src/open_inwoner/components/templatetags/form_tags.py b/src/open_inwoner/components/templatetags/form_tags.py
index d9ee40de1b..dfb0465a61 100644
--- a/src/open_inwoner/components/templatetags/form_tags.py
+++ b/src/open_inwoner/components/templatetags/form_tags.py
@@ -65,6 +65,7 @@ def render_form(parser, token):
- secondary: bool | If the secondary button should be styled like a secondary button or not.
- no_actions: bool | If you want to auto-generate the submit buttons.
- horizontal: bool | If you want the label next to the fields.
+ - async_selector: string | Specifies selector for element to replace asynchronously on submit.
Extra context:
- contents: string | The html content between all the open and closing tags.
@@ -120,6 +121,7 @@ def form(context, form_object, secondary=True, **kwargs):
- secondary: bool | If the secondary button should be styled like a secondary button or not.
- no_actions: bool | If you want to auto-generate the submit buttons.
- horizontal: bool | If you want the label next to the fields.
+ - async_selector: string | Specifies selector for element to replace asynchronously on submit.
Extra context:
- auto_render: True | Telling the template that the form should be rendered.
diff --git a/src/open_inwoner/components/templatetags/messages_tags.py b/src/open_inwoner/components/templatetags/messages_tags.py
index c356eb43b5..4c9cd941be 100644
--- a/src/open_inwoner/components/templatetags/messages_tags.py
+++ b/src/open_inwoner/components/templatetags/messages_tags.py
@@ -12,8 +12,9 @@
register = template.Library()
-@register.inclusion_tag("components/Messages/Messages.html")
+@register.inclusion_tag("components/Messages/Messages.html", takes_context=True)
def messages(
+ context,
message_list: MessageQuerySet,
me: User,
form: Form,
@@ -77,6 +78,7 @@ def get_messages_by_date(message_list: MessageQuerySet) -> List[dict]:
]
return {
+ **context.flatten(),
"days": get_messages_by_date(message_list),
"form": form,
"me": me,
diff --git a/src/open_inwoner/components/tests/test_messages.py b/src/open_inwoner/components/tests/test_messages.py
index 0e571b9c30..9f39bc6474 100644
--- a/src/open_inwoner/components/tests/test_messages.py
+++ b/src/open_inwoner/components/tests/test_messages.py
@@ -115,18 +115,17 @@ def test_message_days(self):
self.config,
)
- # def test_my_sender_id(self):
- # TODO: Test is failing. For sven to take a look
- # """
- # Tests that:
- # - Message tags receive the correct value for `ours`.
- # """
- # self.assertSelector(f"#message-{self.message_1.pk}.message--ours", self.config)
- # self.assertSelector(f"#message-{self.message_2.pk}.message--ours", self.config)
- # self.assertSelector(
- # f"#message-{self.message_3.pk}.message--theirs", self.config
- # )
- # self.assertSelector(f"#message-{self.message_4.pk}.message--ours", self.config)
+ def test_my_sender_id(self):
+ """
+ Tests that:
+ - Message tags receive the correct value for `ours`.
+ """
+ self.assertSelector(f"#message-{self.message_1.pk}.message--ours", self.config)
+ self.assertSelector(f"#message-{self.message_2.pk}.message--ours", self.config)
+ self.assertSelector(
+ f"#message-{self.message_3.pk}.message--theirs", self.config
+ )
+ self.assertSelector(f"#message-{self.message_4.pk}.message--ours", self.config)
def test_subject(self):
"""
diff --git a/src/open_inwoner/js/components/accessibility/read.js b/src/open_inwoner/js/components/accessibility/read.js
index 4ab46711c2..04407b3f00 100644
--- a/src/open_inwoner/js/components/accessibility/read.js
+++ b/src/open_inwoner/js/components/accessibility/read.js
@@ -13,7 +13,7 @@ class ReadOut {
}
let voices = []
- function populateVoiceList() {
+ const populateVoiceList = () => {
voices = this.speechSynthesis.getVoices()
// console.log(voices)
}
diff --git a/src/open_inwoner/js/components/index.js b/src/open_inwoner/js/components/index.js
index d30bab5107..c5d7cf2cc0 100644
--- a/src/open_inwoner/js/components/index.js
+++ b/src/open_inwoner/js/components/index.js
@@ -1,3 +1,5 @@
+import 'htmx.org'
+
import './accessibility'
import './actions'
import './anchor-menu'
@@ -19,3 +21,5 @@ import './questionnaire'
import './search'
import './toggle'
import './session'
+
+window.htmx = require('htmx.org')