From 545d4b5fc09fdaa10dc9f4c5bded311e51fcb40e Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Wed, 23 Nov 2022 18:01:45 +0100 Subject: [PATCH] =?UTF-8?q?Gel=20/=20Fermeture=20:=20indiquer=20dans=20la?= =?UTF-8?q?=20modale=20de=20confirmation=20les=20cr=C3=A9neaux=20=C3=A0=20?= =?UTF-8?q?venir=20du=20membre=20(#640)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Before closing account, display period_position & upcoming_shifts counts * Before pausing account, display period_position & upcoming_shifts counts * Pluralize créneaux depending on list length --- .../views/Profile/show_content.html.twig | 2 +- app/Resources/views/member/show.html.twig | 14 +++++++++++++- .../Controller/MembershipController.php | 1 + src/AppBundle/Entity/Membership.php | 16 +++++++++++++++- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/app/Resources/views/Profile/show_content.html.twig b/app/Resources/views/Profile/show_content.html.twig index 85d5058bc..08804d02e 100644 --- a/app/Resources/views/Profile/show_content.html.twig +++ b/app/Resources/views/Profile/show_content.html.twig @@ -48,7 +48,7 @@ {% if display_swipe_cards_settings %}
  • - credit_cardBadge{% if beneficiary.swipeCards | length > 1%}s{% endif %} + credit_cardBadge{% if beneficiary.swipeCards | length > 1 %}s{% endif %}
    {% include "member/_partial/swipe_card.html.twig" with { member: member, showBadgeImage: true } %} diff --git a/app/Resources/views/member/show.html.twig b/app/Resources/views/member/show.html.twig index 43e8eb78e..ef5dba537 100644 --- a/app/Resources/views/member/show.html.twig +++ b/app/Resources/views/member/show.html.twig @@ -241,8 +241,14 @@
    pause_circle_filledGel immédiat du compte
    -

    Attention, le gel immédiat sera effectif dés aujourd'hui, interdisant l'accès au magasin

    +

    Attention, le gel immédiat sera effectif dés aujourd'hui, interdisant l'accès au magasin.

    De plus, à la fin du cycle, les heures effectuées ne seront pas décomptées.

    +
      + {% if use_fly_and_fixed %} +
    • Ce membre a {{ period_positions | length }} créneau{% if period_positions | length > 1 %}x{% endif %} fixe.
      • + {% endif %} +
    • Ce membre a {{ in_progress_and_upcoming_shifts | length }} créneau{% if in_progress_and_upcoming_shifts | length > 1 %}x{% endif %} à venir.
      • +
    Retour à la raison @@ -292,6 +298,12 @@ remove_circle_outlineFermeture du compte membre

    Attention, vous êtes sur le point de fermer le compte du membre.

    +
      + {% if use_fly_and_fixed %} +
    • Ce membre a {{ period_positions | length }} créneau{% if period_positions | length > 1 %}x{% endif %} fixe.
      • + {% endif %} +
    • Ce membre a {{ in_progress_and_upcoming_shifts | length }} créneau{% if in_progress_and_upcoming_shifts | length > 1 %}x{% endif %} à venir.
      • +
    Retour à la raison diff --git a/src/AppBundle/Controller/MembershipController.php b/src/AppBundle/Controller/MembershipController.php index 7399fa18f..8f6882d06 100644 --- a/src/AppBundle/Controller/MembershipController.php +++ b/src/AppBundle/Controller/MembershipController.php @@ -168,6 +168,7 @@ public function showAction(Membership $member) 'delete_form' => $deleteForm->createView(), 'time_log_form' => $timeLogForm->createView(), 'period_positions' => $period_positions, + 'in_progress_and_upcoming_shifts' => $member->getInProgressAndUpcomingShifts(), )); } diff --git a/src/AppBundle/Entity/Membership.php b/src/AppBundle/Entity/Membership.php index 1bb3da7aa..7fe1385e7 100644 --- a/src/AppBundle/Entity/Membership.php +++ b/src/AppBundle/Entity/Membership.php @@ -486,6 +486,8 @@ public function getCycleShiftsDuration($cycleOffset = 0, $excludeDismissed = fal /** * Get all shifts for all beneficiaries + * @param bool $excludeDismissed + * @return ArrayCollection|\Doctrine\Common\Collections\Collection */ public function getAllShifts($excludeDismissed = false) { @@ -504,6 +506,19 @@ public function getAllShifts($excludeDismissed = false) } } + /** + * Get all in progress & upcoming shifts for all beneficiaries + * @param bool $excludeDismissed + * @return ArrayCollection|\Doctrine\Common\Collections\Collection + */ + public function getInProgressAndUpcomingShifts($excludeDismissed = false) + { + $now = new DateTime('now'); + return $this->getAllShifts($excludeDismissed)->filter(function($shift) use ($now) { + return $shift->getStart() > $now; + }); + } + /** * Get all reserved shifts for all beneficiaries */ @@ -518,7 +533,6 @@ public function getReservedShifts() return $shifts; } - /** * Get shifts of a specific cycle * @param $cycleOffset int to chose a cycle (0 for current cycle, 1 for next, -1 for previous)