Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'draft-periods-without-creator' into 'master'

Browse Source 
Display too draft periods without creator in periods of a person

See merge request Chill-Projet/chill-bundles!526
This commit is contained in:
Julien Fastré 2023-04-25 12:30:22 +00:00
commit 1eb78d7273
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
View File

@ -174,7 +174,10 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
->andWhere( ->andWhere(
$qb->expr()->orX( $qb->expr()->orX(
$qb->expr()->neq('ap.step', ':draft'), $qb->expr()->neq('ap.step', ':draft'),
$qb->expr()->eq('ap.createdBy', ':creator') $qb->expr()->orX(
$qb->expr()->eq('ap.createdBy', ':creator'),
$qb->expr()->isNull('ap.createdBy')
)
) )
) )
->setParameter('draft', AccompanyingPeriod::STEP_DRAFT) ->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)

3
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_draft_periods_list.html.twig
View File

@ -22,6 +22,7 @@
<div class="col-md-10"> <div class="col-md-10">
<h1>{{ 'My accompanying periods in draft'|trans }}</h1> <h1>{{ 'My accompanying periods in draft'|trans }}</h1>
<p class="help-text">{{ 'Display draft periods created by me'|trans }}</p>
<div class="flex-table accompanyingcourse-list"> <div class="flex-table accompanyingcourse-list">
{% for period in accompanyingPeriods %} {% for period in accompanyingPeriods %}
@ -31,7 +32,9 @@
{% endfor %} {% endfor %}
</div> </div>
{% if accompanyingPeriods|length > 0 %}
{{ chill_pagination(pagination) }} {{ chill_pagination(pagination) }}
{% endif %}
</div> </div>

1
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -966,6 +966,7 @@ Linked evaluations: Évaluations associées
# Accompanying period per user # Accompanying period per user
My accompanying periods: Mes parcours My accompanying periods: Mes parcours
My accompanying periods in draft: Mes parcours brouillons My accompanying periods in draft: Mes parcours brouillons
Display draft periods created by me: Affiche les parcours en attente de confirmation. Ils ne sont visibles que par moi-même. Ces parcours restent disponibles 15 jours après leur création, avant d'être supprimés automatiquement.
Number of periods: Nombre de parcours Number of periods: Nombre de parcours
workflow: workflow: