mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-25 21:28:33 +00:00
Compare commits
1 Commits
460-displa
...
459-invita
| Author | SHA1 | Date | |
|---|---|---|---|
| 42ac813b6f |
6
.changes/unreleased/Feature-20251125-165811.yaml
Normal file
6
.changes/unreleased/Feature-20251125-165811.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
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
|
||||
@@ -1,6 +0,0 @@
|
||||
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
|
||||
@@ -47,10 +47,16 @@ 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),
|
||||
]);
|
||||
|
||||
@@ -162,7 +162,6 @@
|
||||
{% 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 %}
|
||||
@@ -246,7 +245,7 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
{% 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) }}
|
||||
|
||||
@@ -6,10 +6,6 @@
|
||||
|
||||
{% 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) }}
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
<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 }}
|
||||
|
||||
@@ -96,6 +96,7 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user