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

Feature/search feedback message #215

Merged
merged 3 commits into from
May 17, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions src/open_inwoner/scss/components/Form/ButtonRadio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

&:checked ~ .button-radio__button {
color: var(--color-primary);
cursor: default;
JostCrow marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand All @@ -14,6 +15,7 @@
color: var(--color-gray-lighter);
display: inline-block;
padding: 12px;
cursor: pointer;
}

&:first-child {
Expand Down
30 changes: 30 additions & 0 deletions src/open_inwoner/search/tests/test_feedback.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import urllib

from django.contrib import messages
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _

from django_webtest import WebTest
from furl import furl

from open_inwoner.accounts.tests.factories import UserFactory
from open_inwoner.pdc.tests.factories import CategoryFactory, TagFactory
Expand Down Expand Up @@ -149,3 +152,30 @@ def test_positive_feedback_is_saved_with_unauthenticated_user_and_with_filters(
self.assertTrue(feedback.positive)
self.assertEqual(feedback.remark, self.feedback.remark)
self.assertIsNone(feedback.searched_by)

def test_feedback_form_not_displayed_after_submit(self):
params = {"query": self.feedback.search_query}
url = furl(reverse("search:search")).add(params).url
get_response = self.app.get(url)

self.assertIsNotNone(get_response.html.find(id="feedback_form"))
self.assertEqual(list(get_response.context["messages"]), [])

feedback_form = get_response.forms["feedback_form"]
feedback_form["remark"] = self.feedback.remark
feedback_form["positive"] = "true"

post_response = feedback_form.submit().follow()

self.assertIsNone(post_response.html.find(id="feedback_form"))
post_messages = list(post_response.context["messages"])
self.assertEqual(len(post_messages), 1)

message = post_messages[0]
self.assertEqual(message.level, messages.SUCCESS)
self.assertEqual(
message.message,
_(
"Thank you for your feedback. It will help us to improve our search engine"
),
)
9 changes: 9 additions & 0 deletions src/open_inwoner/search/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib import messages
from django.core.paginator import InvalidPage, Paginator
from django.http import Http404
from django.http.response import HttpResponseRedirect
Expand Down Expand Up @@ -116,4 +117,12 @@ def form_valid(self, form):
[f"{key}: {', '.join(value)}" for key, value in search_data.items()]
)
form.save()

messages.add_message(
self.request,
messages.SUCCESS,
_(
"Thank you for your feedback. It will help us to improve our search engine"
),
)
return HttpResponseRedirect(http_referer)
4 changes: 2 additions & 2 deletions src/open_inwoner/templates/pages/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h1 class="h1 search-results__title">
{% endif %}
{% endrender_form %}

{% if results %}
{% if results and not messages %}
<div class="grid">
{% spaceless %}<aside class="grid__sidebar">
&nbsp;
Expand All @@ -64,7 +64,7 @@ <h1 class="h1 search-results__title">
<aside class="feedback">
<h4 class="h4">{% trans "Feedback" %}</h4>
<p class="p">{% trans "Heeft u gevonden wat u zocht?" %}</p>
{% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" %}
{% render_form form=feedback_form method="POST" form_action=request.get_full_path id="feedback_form" show_notifications=True %}
{% csrf_token %}
{{ feedback_form.errors }}
<div class="feedback__options">
Expand Down