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

[BUG] route : front_suivi_signalement_user_response #2320

Merged
merged 4 commits into from
Mar 21, 2024
Merged

[BUG] route : front_suivi_signalement_user_response #2320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14d0e8b
controle user on front_suivi_signalement_user_response #2247
numew Mar 6, 2024
87e2f9b
fix based on comment and tests #2248
numew Mar 8, 2024
4ddbd6e
harmonisation libelles #2248
numew Mar 11, 2024
92ab118
change libelle #2248
numew Mar 19, 2024
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
2 changes: 1 addition & 1 deletion templates/back/table_result.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{% endif %}
<small class="{{ classe }}">{{ signalement.lastSuiviBy }}</small> <br>
{% else %}
Aucun
Utilisateur inconnu
numew marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion templates/front/suivi_signalement.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
{% for suivi in signalement.suivis|reverse %}
<div class="fr-grid-row fr-grid-row--middle fr-stripped fr-rounded fr-p-5v {% if not suivi.createdBy %}fr-background-alt--orange-terre-battue{% endif %}">
<div class="fr-col-12 fr-col-md-2">
<small>[{{ suivi.createdBy ? (suivi.createdBy.partner ? suivi.createdBy.partner.nom : (suivi.createdBy.email ? (suivi.createdBy.email is same as signalement.mailOccupant ? 'OCCUPANT' : 'DECLARANT') : 'Aucun')): (suivi.createdAt|date('Y') >= 2024) ? 'Aucun' : 'Vous' }}]</small>
<small>[{{ suivi.createdBy ? (suivi.createdBy.partner ? suivi.createdBy.partner.nom : (suivi.createdBy.email ? (suivi.createdBy.email is same as signalement.mailOccupant ? 'OCCUPANT' : 'DECLARANT') : 'Aucun')): (suivi.createdAt|date('Y') >= 2024) ? 'Utilisateur inconnu' : 'Vous' }}]</small>
numew marked this conversation as resolved.
Show resolved Hide resolved
<br>
<small>{{ suivi.createdAt|date('d/m/Y') }}</small>
</div>
Expand Down
Loading