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.

Sign up for GitHub

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

💄 [#2241] Make appointment list conform to design #1114

Merged
merged 2 commits into from
Mar 29, 2024
Merged

💄 [#2241] Make appointment list conform to design #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36aebc8
:lipstick: [#2241] Make appointment list conform to design
stevenbal Mar 25, 2024
97a9c86
:ok_hand: [#2241] PR feedback
stevenbal Mar 28, 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
24 changes: 12 additions & 12 deletions src/open_inwoner/accounts/tests/test_profile_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,9 @@ def setUp(self):
name="Hoofdkantoor",
timeZone="Europe/Amsterdam",
addressCity="Amsterdam",
addressLine1="Hoofdkantoor",
addressLine2="Dam 1",
addressZip="1234 ZZ",
),
)
self.appointment_idcard = AppointmentFactory.build(
Expand All @@ -1184,7 +1186,9 @@ def setUp(self):
name="Hoofdkantoor",
timeZone="America/New_York",
addressCity="New York",
addressLine1="Hoofdkantoor",
addressLine2="Wall Street 1",
addressZip="1111 AA",
),
)

Expand Down Expand Up @@ -1252,13 +1256,11 @@ def test_render_list_if_appointments_are_found(self, m):
passport_appointment = PQ(cards[0]).find("ul").children()

self.assertEqual(passport_appointment[0].text, "Aanvraag paspoort")
self.assertEqual(
PQ(passport_appointment[1]).text(), "woensdag 1 januari 2020 13:00"
)
self.assertEqual(PQ(passport_appointment[2]).text(), "foo")
self.assertEqual(PQ(passport_appointment[1]).text(), "Datum\n1 januari 2020")
self.assertEqual(PQ(passport_appointment[2]).text(), "Tijd\n13:00 uur")
self.assertEqual(PQ(passport_appointment[3]).text(), "Locatie\nHoofdkantoor")
self.assertEqual(PQ(passport_appointment[4]).text(), "Amsterdam")
self.assertEqual(PQ(passport_appointment[5]).text(), "Dam 1")
self.assertEqual(PQ(passport_appointment[4]).text(), "Dam 1")
self.assertEqual(PQ(passport_appointment[5]).text(), "1234 ZZ Amsterdam")
self.assertEqual(
PQ(cards[0]).find("a").attr("href"),
f"{self.config.booking_base_url}{self.appointment_passport.publicId}",
Expand All @@ -1267,13 +1269,11 @@ def test_render_list_if_appointments_are_found(self, m):
id_card_appointment = PQ(cards[1]).find("ul").children()

self.assertEqual(id_card_appointment[0].text, "Aanvraag ID kaart")
self.assertEqual(
PQ(id_card_appointment[1]).text(), "vrijdag 6 maart 2020 11:30"
)
self.assertEqual(PQ(id_card_appointment[2]).text(), "bar")
self.assertEqual(PQ(id_card_appointment[1]).text(), "Datum\n6 maart 2020")
self.assertEqual(PQ(id_card_appointment[2]).text(), "Tijd\n11:30 uur")
self.assertEqual(PQ(id_card_appointment[3]).text(), "Locatie\nHoofdkantoor")
self.assertEqual(PQ(id_card_appointment[4]).text(), "New York")
self.assertEqual(PQ(id_card_appointment[5]).text(), "Wall Street 1")
self.assertEqual(PQ(id_card_appointment[4]).text(), "Wall Street 1")
self.assertEqual(PQ(id_card_appointment[5]).text(), "1111 AA New York")
self.assertEqual(
PQ(cards[1]).find("a").attr("href"),
f"{self.config.booking_base_url}{self.appointment_idcard.publicId}",
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/components/templates/components/List/ListItem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load link_tags %}
<li class="list-item{% if active %} list-item--active{% endif %}{% if compact %} list-item--compact{% endif %}">
<li class="list-item{% if active %} list-item--active{% endif %}{% if compact %} list-item--compact{% endif %}{% if extra_compact %} list-item--extra-compact{% endif %}">
{% if href %}<a class="link" href="{{ href }}">{% endif %}
{% if caption %}<p class="p list-item__caption">{{ caption }}</p>{% endif %}
stevenbal marked this conversation as resolved.
Show resolved Hide resolved
{% if strong %}
Expand Down
22 changes: 22 additions & 0 deletions src/open_inwoner/scss/components/Card/CardGrid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.card__grid {
& .grid {
grid-row-gap: var(--spacing-medium);
grid-column-gap: var(--spacing-extra-large);

// Tablets
@media (min-width: 500px) and (max-width: 767px) {
flex-direction: row;
flex-wrap: wrap;

.column {
flex-basis: calc(50% - var(--spacing-large));
}
}

.column--start-4 {
@media (min-width: 768px) and (max-width: 900px) {
grid-column-start: 1;
}
}
}
}
21 changes: 0 additions & 21 deletions src/open_inwoner/scss/components/Cases/Cases.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,6 @@
.cases {
margin-top: var(--spacing-giant);

&__grid .grid {
grid-row-gap: var(--spacing-medium);
grid-column-gap: var(--spacing-extra-large);

// Tablets
@media (min-width: 500px) and (max-width: 767px) {
flex-direction: row;
flex-wrap: wrap;

.column {
flex-basis: calc(50% - var(--spacing-large));
}
}

.column--start-4 {
@media (min-width: 768px) and (max-width: 900px) {
grid-column-start: 1;
}
}
}

/// cards on cases list
.card {
.cases__link {
Expand Down
10 changes: 10 additions & 0 deletions src/open_inwoner/scss/components/List/_ListItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
padding: 0.5em 0;
}

&--extra-compact {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naming things is hard 🙃

border-top: none;
border-bottom: none;
padding: 0;
}

& .list-item__caption {
line-height: var(--font-line-height-body-small);
}

&--compact:first-child {
padding-top: 0;
}
Expand Down
1 change: 1 addition & 0 deletions src/open_inwoner/scss/components/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import './Button/Button.scss';
@import './Button/ButtonRow.scss';
@import './Card/Card.scss';
@import './Card/CardGrid.scss';
@import './Card/LocationCardList.scss';
@import './CardContainer/CardContainer.scss';
@import './Cases/Cases.scss';
Expand Down
2 changes: 1 addition & 1 deletion src/open_inwoner/templates/pages/cases/list_inner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h1 class="utrecht-heading-1" id="cases">{{ page_title }} ({{ paginator.count }})</h1>
<p class="cases__title_text">{{ title_text }}</p>

<div class="cases__grid">
<div class="card__grid">
{% render_grid %}
{% if not cases %}
<b>{% trans "U heeft op dit moment nog geen lopende aanvragen." %}</b>
Expand Down
21 changes: 12 additions & 9 deletions src/open_inwoner/templates/pages/profile/appointments.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,30 @@
{% extends 'master.html' %}
{% load i18n tz form_tags anchor_menu_tags list_tags icon_tags grid_tags utils %}
{% load i18n tz list_tags icon_tags grid_tags utils %}

{% block content %}

<h1 class="utrecht-heading-1" id="title">{% trans "Mijn afspraken" %}</h2>
<h1 class="utrecht-heading-1" id="title">{% trans "Mijn balie-afspraken" %}</h1>

{% if appointments %}
<p class="tabled__key">{% trans "Een overzicht van uw afspraken" %}</p>

<div class="card__grid">
{% render_grid %}
{% for appointment in appointments %}
{% render_column start=forloop.counter_0|multiply:4 span=4 %}
<div class="card card--compact card--stretch appointment-info">
stevenbal marked this conversation as resolved.
Show resolved Hide resolved
<div class="card__body">
{% render_list %}
{% with branch=appointment.branch %}
<h2 class="card__heading-2">{{ appointment.title }}</h2>
{% timezone appointment.branch.timeZone %}
{% list_item text=appointment.start|date:"l j F Y H:i" compact=True strong=False %}
{% timezone branch.timeZone %}
{% list_item text=appointment.start|date:"j F Y" caption=_("Datum") compact=True strong=False %}
{% list_item text=appointment.start|date:"H:i"|add:" "|add:_("uur") caption=_("Tijd") compact=True strong=False %}
{% endtimezone %}
{% list_item text=appointment.notes compact=True strong=False %}
{% list_item text=appointment.branch.name caption=_("Locatie") compact=True strong=False %}
{% list_item text=appointment.branch.addressCity compact=True strong=False %}
{% list_item text=appointment.branch.addressLine2 compact=True strong=False %}
{% list_item text=branch.addressLine1 caption=_("Locatie") extra_compact=True strong=False %}
{% list_item text=branch.addressLine2 extra_compact=True strong=False %}
{% list_item text=branch.addressZip|add:" "|add:branch.addressCity extra_compact=True strong=False %}
{% endwith %}
{% endrender_list %}

<a href="{{ appointment.url }}" class="link link--icon link--secondary"
Expand All @@ -34,7 +37,7 @@ <h2 class="card__heading-2">{{ appointment.title }}</h2>
{% endrender_column %}
{% endfor %}
{% endrender_grid %}
</section>
</div>
{% else %}
<p class="tabled__key">{% trans "Geen afspraken beschikbaar" %}</p>
{% endif %}
Expand Down
Loading