Skip to content

Quickly access yearly view for given room #220

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

Open
domi4484 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Quickly access yearly view for given room #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95226eb
Quickly access yearly view for given room
domi4484 May 11, 2026
9e3b09d
Use stored apartment filter only if not explicitly set in URL
domi4484 May 11, 2026
313de16
Remove unuseful check
domi4484 May 11, 2026
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
6 changes: 5 additions & 1 deletion assets/controllers/reservations_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ export default class extends Controller {
}
this.getLocalTableSetting('interval', 'reservations-intervall', 'int');
this.getLocalTableSetting('holidayCountry', 'reservations-table-holidaycountry');
this.getLocalTableSetting('apartment', 'reservations-apartment', 'int');
// Use stored apartment filter only if not explicitly set in URL
const isExplicitYearlyApartmentLink = /\/view\/yearly\/\d+$/.test(window.location.pathname);
Copy link
Copy Markdown
Owner

@developeregrem developeregrem May 13, 2026

Choose a reason for hiding this comment

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

The only thing I would change is to not have a hard coded url path here. If you change the url in ReservationServiceController some will forget this place here probably.
Maybe you can pass a variable to twig in the ReservationServiceController, if direct access is detected and set a data-* attribut on the select element which is checked in the stimulus controller?

if (!isExplicitYearlyApartmentLink) {
this.getLocalTableSetting('apartment', 'reservations-apartment', 'int');
}
this.loadTableSettings(this.tableSettingsUrl, true);
}

Expand Down
8 changes: 6 additions & 2 deletions src/Controller/ReservationServiceController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,14 @@ public function indexAction(ManagerRegistry $doctrine, RequestStack $requestStac
/**
* Triggered by the buttons to switch reservation view table/yearly.
*/
#[Route('/view/{show}', name: 'start.toggle.view', methods: ['GET'])]
public function indexActionToggle(RequestStack $requestStack, string $show): Response
#[Route('/view/{show}/{apartmentId}', name: 'start.toggle.view', defaults: ['apartmentId' => null], requirements: ['show' => 'table|yearly', 'apartmentId' => '\\d+'], methods: ['GET'])]
public function indexActionToggle(RequestStack $requestStack, Request $request, string $show, ?int $apartmentId = null): Response
{
if ('yearly' === $show) {
if (null !== $apartmentId) {
$requestStack->getSession()->set('reservation-overview-apartment', $apartmentId);
}

$requestStack->getSession()->set('reservation-overview', 'yearly');
} else {
$requestStack->getSession()->set('reservation-overview', 'table');
Expand Down
9 changes: 8 additions & 1 deletion templates/Reservations/reservation_table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,14 @@
<td class="text-center room-info"
data-bs-container="body" data-bs-toggle="popover" data-bs-placement="right"
data-bs-content="{{ roomInfo }}" data-bs-trigger="hover"
>{{ row.apartment.number }}{% if row.apartment.roomCategory is not null and row.apartment.roomCategory.acronym|length > 0 %} ({{ row.apartment.roomCategory.acronym }}){% endif %}</td>
>
<a href="{{ path('start.toggle.view', {
show: 'yearly',
apartmentId: row.apartment.id
}) }}" title="{{ 'reservation.table.view.yearly'|trans }}">
{{ row.apartment.number }}{% if row.apartment.roomCategory is not null and row.apartment.roomCategory.acronym|length > 0 %} ({{ row.apartment.roomCategory.acronym }}){% endif %}
</a>
</td>
{% endif %}

{# ── Cells ── #}
Expand Down