Compare commits

..

1 Commits

Author SHA1 Message Date
cacb7a0340 Display calendar item info on cancel page 2025-11-24 16:47:30 +01:00
8 changed files with 16 additions and 16 deletions

View File

@@ -1,6 +0,0 @@
kind: Feature
body: Add a counter for invitations awaiting reply
time: 2025-11-25T16:58:11.780678466+01:00
custom:
Issue: "459"
SchemaChange: No schema change

View File

@@ -0,0 +1,6 @@
kind: UX
body: Display calendar item info on cancel page
time: 2025-11-24T16:47:23.020302054+01:00
custom:
Issue: "460"
SchemaChange: No schema change

View File

@@ -47,16 +47,10 @@ class MyInvitationsController extends AbstractController
$paginator->getCurrentPageFirstItemNumber()
);
$invitationsWaiting = count($this->inviteRepository->findBy([
'user' => $user,
'status' => 'pending',
]));
$view = '@ChillCalendar/Invitations/listByUser.html.twig';
return $this->render($view, [
'invitations' => $invitations,
'invitationsWaiting' => $invitationsWaiting,
'paginator' => $paginator,
'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
]);

View File

@@ -162,6 +162,7 @@
{% endif %}
<div class="item-row separator">
{% if show_record_actions is not defined or show_record_actions %}
<ul class="record_actions">
{% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
{% if templates|length == 0 %}
@@ -245,7 +246,7 @@
</li>
{% endif %}
</ul>
{% endif %}
</div>
</div>

View File

@@ -6,6 +6,10 @@
{% block content %}
<div class="flex-table list-records context-accompanyingCourse">
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course', show_record_actions: false}) }}
</div>
{{ form_start(form) }}
{{ form_row(form.cancelReason) }}

View File

@@ -6,6 +6,10 @@
{% block content %}
<div class="flex-table list-records context-person">
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'person', show_record_actions: false}) }}
</div>
{{ form_start(form) }}
{{ form_row(form.cancelReason) }}

View File

@@ -8,8 +8,6 @@
<h1>{{ 'invite.list.title'|trans }}</h1>
<p>{{ 'invite.number of invitations waiting'|trans }}: <span class="badge rounded-pill bg-primary mt-3">{{ invitationsWaiting }}</span></p>
{% if invitations|length == 0 %}
<p class="chill-no-data-statement">
{{ "invite.list.none"|trans }}

View File

@@ -96,7 +96,6 @@ invite:
list:
none: Il n'y aucun invitation
title: Mes invitations
number of invitations waiting: Invitations en attente
# exports
Exports of calendar: Exports des rendez-vous