diff --git a/templates/Registry/Treatment/configuration.html.twig b/templates/Registry/Treatment/configuration.html.twig index 617cb2d66dd27b113de6dbc018aefa483d264d4d..b55e3f0e6199a9f2e96013facae7e7e18a99d935 100644 --- a/templates/Registry/Treatment/configuration.html.twig +++ b/templates/Registry/Treatment/configuration.html.twig @@ -149,7 +149,7 @@ {{ form_row(form.estimatedConcernedPeople) }} {{ form_row(form.tools, {'label': 'global.label.linked_tool'}) }} {{ form_row(form.paperProcessing) }} - {{ form_row(form.shelfLifes) }} + {{ form_row(form.shelfLifes, {'label': 'registry.treatment.label.shelflife'}) }} {{ form_row(form.dataOrigin) }} {{ form_row(form.collectingMethod) }} {{ form_row(form.legalMentions) }} diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig index c4908a191e59efd81732a9bc566c0a2225fc5f52..aecaf3997ef55910d9d35ee8f4bfdc09942da70e 100644 --- a/templates/Registry/Treatment/public_show.html.twig +++ b/templates/Registry/Treatment/public_show.html.twig @@ -91,7 +91,7 @@ </td> </tr> {% endif %} - {% if (object.author == "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true) %} + {% if (object.author != "processing_manager" and object.coordonneesResponsableTraitement and config.coordonneesResponsableTraitement == true) %} <tr> <td> <strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong> @@ -661,7 +661,43 @@ </td> </tr> {% endif %} - + {% if (object.shelfLifes and config.shelfLifes == true) %} + </tbody> + </table> + <table style="border-top: #f4f4f4 1px solid"> + <tbody> + <tr> + <td class="col-sm-2" style="vertical-align: top; padding-left: 10px; padding-top: 10px"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td> + <td class="col-sm-10" style="padding-top: 10px"> + {% for method in object.shelfLifes %} + <div class="box box-default"> + <div class="box-body no-padding"> + <table class="table"> + <tbody> + <tr> + <th scope="row" class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th> + <td>{{ method.name }}</td> + </tr> + <tr> + <th scope="row" class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th> + <td>{{ method.duration }}</td> + </tr> + <tr> + <th scope="row" class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th> + <td>{% if method.ultimateFate %}{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}{% else %}Non déterminé{% endif %}</td> + </tr> + </tbody> + </table> + </div> + </div> + {% endfor %} + </td> + </tr> + </tbody> + </table> + <table class="table"> + <tbody> + {% endif %} {% if (object.dataOrigin and config.dataOrigin == true) %} <tr> <td> @@ -716,7 +752,7 @@ {% if (object.consentRequestFormat and config.consentRequestFormat == true) %} <tr> <td> - <strong>{{ 'registry.treatment.label.consentRequest_format'|trans }}</strong> + <strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong> </td> <td>{{ object.consentRequestFormat }}</td> </tr> diff --git a/templates/_footer.html.twig b/templates/_footer.html.twig index fb3a88cd73a3e34ff5cdf9d8d38898336bd69962..f24b0f8f86dd526bd2d0c401e7c9a19e15ac0b11 100644 --- a/templates/_footer.html.twig +++ b/templates/_footer.html.twig @@ -4,12 +4,14 @@ {% if app.user %}: {{ app.user.collectivity }}{% endif %} </p> - <ul class="list-unstyled list-inline"> - {% if app.user %} + {% if app.user %} + <ul class="list-unstyled list-inline"> <li class="no-padding"><a href="{{ path('page_sitemap') }}">{{ 'page.sitemap.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li> <li class="no-padding"><a href="{{ path('page_declaration') }}">Accessibilité<!-- : {{ 'page.declaration.result'|trans }}--></a><span aria-hidden="true" style="padding: 0 5px;">|</span></li> <li class="no-padding"><a href="{{ path('page_credit') }}">{{ 'page.credit.title'|trans }}</a><span aria-hidden="true" style="padding: 0 5px;">|</span></li> - {% endif %} - <li class="no-padding">v{{ app_version }}</li> - </ul> + <li class="no-padding">v{{ app_version }}</li> + </ul> + {% else %} + <p class="no-margin"><!-- Accessibilité : {{ 'page.declaration.result'|trans }}--></p> + {% endif %} </footer>