Skip to content
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

Jump to bottom

Membre (coté admin) : pouvoir afficher l'historique de ses postes fixes annulés #1038

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Membre (coté admin) : pouvoir afficher l'historique de ses postes fixes annulés #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaaf1a5
Admin member: display periodpositionfreelog section
raphodn Oct 18, 2023
9c8d086
Add parameter to show / hide section
raphodn Oct 18, 2023
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
14 changes: 13 additions & 1 deletion app/Resources/views/member/show.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,19 @@
<i class="material-icons">delete_sweep</i>Historique des créneaux annulés
</div>
<div class="collapsible-body">
{% include "member/_partial/shift_free_logs.html.twig" with { shiftFreeLogs: membership_service.getShiftFreeLogs(member), custom_styles: "max-height:500px;overflow:scroll;" } %}
{% include "member/_partial/shift_free_logs.html.twig" with { shiftFreeLogs: membership_service.getShiftFreeLogs(member), from_admin: true, custom_styles: "max-height:500px;overflow:scroll;" } %}
</div>
</li>
{% endif %}

<!-- Postes fixes annulés -->
{% if use_fly_and_fixed and admin_member_display_period_position_free_log %}
<li id="periodpositionfreelogs">
<div class="collapsible-header {% if frontend_cookie and frontend_cookie.periodpositionfreelogs_show is defined and frontend_cookie.user_show.shifts_open is defined and frontend_cookie.user_show.periodpositionfreelogs_open %}active{% endif %}">
<i class="material-icons">delete_sweep</i>Historique des postes fixes annulés
</div>
<div class="collapsible-body">
{% include "member/_partial/period_position_free_logs.html.twig" with { periodPositionFreeLogs: membership_service.getPeriodPositionFreeLogs(member), from_admin: true, custom_styles: "max-height:500px;overflow:scroll;" } %}
</div>
</li>
{% endif %}
Expand Down
1 change: 1 addition & 0 deletions app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ twig:
beneficiary_flying_icon: '%beneficiary_flying_icon%'
# admin: member
admin_member_display_shift_free_log: '%admin_member_display_shift_free_log%'
admin_member_display_period_position_free_log: '%admin_member_display_period_position_free_log%'
# swipe card
display_swipe_cards_settings: '%display_swipe_cards_settings%'
display_freeze_account: '%display_freeze_account%'
Expand Down
1 change: 1 addition & 0 deletions app/config/parameters.yml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ parameters:

# Admin: member
admin_member_display_shift_free_log: true
admin_member_display_period_position_free_log: true
forbid_own_shift_book_admin: false
forbid_own_shift_free_admin: false
forbid_own_shift_validate_admin: false
Expand Down
Loading