diff --git a/assets/css/app.scss b/assets/css/app.scss
index ff6e8c5112a2d6b04986b0fd25dc632d3bcd744a..ea30a08ca67e952bf9172116fe27aa3d3279ba47 100644
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@@ -2,23 +2,26 @@
a:focus, button:focus {
outline: 1px dashed !important;
}
+.float-left {
+ float: left;
+}
+.mt-2 {
+ margin: 5px 0 0;
+}
+
+/* Bootstrap v5.3 */
.p-0 {
padding: 0!important;
}
-.nopadding {
- padding-left: 0 !important;
-}
.p-2 {
padding: 2rem;
}
.m-0 {
margin : 0!important;
}
-.float-left {
- float: left;
+.ps-0 {
+ padding-left: 0 !important;
}
-
-/* Bootstrap v5.3 */
.ms-2 {
margin-left: 2rem;
}
diff --git a/config/domain/notification/translations/messages.fr.yaml b/config/domain/notification/translations/messages.fr.yaml
index 4be0d288312527c7f8642d3c6010bc69cc56600d..45536494c7de83e1bbfc846fcd45d4cc94ea7234 100644
--- a/config/domain/notification/translations/messages.fr.yaml
+++ b/config/domain/notification/translations/messages.fr.yaml
@@ -24,8 +24,9 @@ notifications:
late_action: Rappel automatique
read: Lu
unread: Non Lu
- not_generates_notifications_label: Génération des notifications
+ generates_notifications: Génération des notifications
not_generates_notifications: Les actions de cet utilisateur ne génèrent pas de notification
+ email_modules: Recevoir des notifications par email
email_subject: Nouvelles notifications Madis
email_app_access: Accéder à madis
frequency:
diff --git a/config/domain/registry/translations/messages.fr.yaml b/config/domain/registry/translations/messages.fr.yaml
index 15955f08fd1261391aacd35cfbcbc71d50035586..6982102d1e05b39b4616989d152fe60fcfac485d 100644
--- a/config/domain/registry/translations/messages.fr.yaml
+++ b/config/domain/registry/translations/messages.fr.yaml
@@ -65,16 +65,16 @@ registry:
estimated_concerned_people: Nombre de personnes concernées
tools_if_inactif: Logiciels et supports
paper_processing: Traitement papier
- delay: Délai de conservation
+ shelflife: Délai de conservation
shelflife_name: Nom
shelflife_duration: Durée
shelflife_ultimate_fate: Sort final
data_origin: Origine des données
collecting_method: Moyens de la collecte
otherCollectingMethod: Autre moyen de collecte
- legalMentions: Mentions légales apposées
- consentRequest: Consentement demandé
- consentRequestFormat: Format de la demande du consentement
+ legal_mentions: Mentions légales apposées
+ consent_request: Consentement demandé
+ consent_request_format: Format de la demande du consentement
security_access_control: Contrôle d'accès
security_tracability: Traçabilité
security_saving: Sauvegarde
@@ -270,7 +270,7 @@ registry:
edit: Modifier "%name%"
list: Liste des violations
show: Visualiser "%name%"
- form:
+ label:
date: Date de la violation
in_progress: La violation est toujours en cours
violation_natures: Natures de la violation
@@ -443,3 +443,4 @@ registry:
new_submit: Créer l'évaluation de la structure
edit_submit: Modifier l'évaluation de la structure
add_participant: Ajouter un participant
+ delete_participant: Supprimer le participant
diff --git a/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php b/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
index 7f9960b675f4c2da80b2a8bce1063cecaec4d197..edc7558995817ccc9af73328dfe2a1d2658f0f7d 100644
--- a/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentConfigurationType.php
@@ -56,7 +56,7 @@ class TreatmentConfigurationType extends AbstractType
foreach ($tabProperties as $property => $value) {
$builder->add($property, CheckboxType::class, [
- 'label' => 'registry.treatment.show.' . $this->fromCamelCase($property),
+ 'label' => 'registry.treatment.label.' . $this->fromCamelCase($property),
'required' => false,
'data' => $value,
]);
diff --git a/src/Domain/Registry/Form/Type/TreatmentType.php b/src/Domain/Registry/Form/Type/TreatmentType.php
index 5c628b5c1d724bd8567495534b53f65b337cc523..5452c498d971fbb1381a79264a127a2651bf09be 100644
--- a/src/Domain/Registry/Form/Type/TreatmentType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentType.php
@@ -365,15 +365,15 @@ class TreatmentType extends AbstractType
'data' => $user ? $user->getFirstName() . ' ' . strtoupper($user->getLastName()) : '',
])
->add('legalMentions', CheckboxType::class, [
- 'label' => 'registry.treatment.label.legalMentions',
+ 'label' => 'registry.treatment.label.legal_mentions',
'required' => false,
])
->add('consentRequest', CheckboxType::class, [
- 'label' => 'registry.treatment.label.consentRequest',
+ 'label' => 'registry.treatment.label.consent_request',
'required' => false,
])
->add('consentRequestFormat', TextType::class, [
- 'label' => 'registry.treatment.label.consentRequestFormat',
+ 'label' => 'registry.treatment.label.consent_request_format',
'required' => false,
'purify_html' => true,
])
diff --git a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
index b7539764495e26b757e276129b841690c5cb709b..87d6535535a8baef859f471e854391667b9a7548 100644
--- a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
@@ -152,7 +152,7 @@ class TreatmentGenerator extends AbstractGenerator
$this->translator->trans('registry.treatment.label.legal_basis'),
$this->translator->trans('registry.treatment.label.legal_basis_justification'),
$this->translator->trans('registry.treatment.label.observation'),
- $this->translator->trans('registry.treatment.label.public_register_register'),
+ $this->translator->trans('registry.treatment.label.public_registry'),
$this->translator->trans('registry.treatment.label.exempt_AIPD'),
$this->translator->trans('registry.treatment.label.dpoMessage'),
];
@@ -251,7 +251,7 @@ class TreatmentGenerator extends AbstractGenerator
{
$detailsTrans = $this->translator->trans('registry.treatment.tab.details');
$concernedPeople = $this->translator->trans('registry.treatment.label.concerned_people');
- $delayTrans = $this->translator->trans('registry.treatment.label.delay');
+ $delayTrans = $this->translator->trans('registry.treatment.label.shelflife');
return [
$detailsTrans . ' - ' . $concernedPeople . ' - ' . $this->translator->trans('registry.treatment.label.concerned_people_particular'),
diff --git a/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php b/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
index 21655fccfdcf0640ee56162295b1c89dcbd4bfc9..823a115de620f733fd9e395f0293a275ad94a706 100644
--- a/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
+++ b/src/Domain/User/Form/Type/EmailNotificationPreferenceType.php
@@ -114,7 +114,7 @@ class EmailNotificationPreferenceType extends AbstractType
->add('notificationMask', ChoiceType::class, [
'mapped' => true,
- 'label' => false,
+ 'label' => 'notifications.label.email_modules',
'required' => false,
'choices' => $modules,
'expanded' => true,
diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig
index e759e24e8ff866867b1c27aa37e4b8ad8ef140fb..1aaae6c60a13d85de080ff77475378941a09d676 100644
--- a/templates/Aipd/Analyse_impact/pdf.html.twig
+++ b/templates/Aipd/Analyse_impact/pdf.html.twig
@@ -713,709 +713,659 @@
<div style="page-break-before: always;"></div>
<h3>6.3 Fiche de traitement</h3>
{% set traitement = object.conformiteTraitement.traitement %}
- <div class="row">
- {# LEFT#}
- <div class="col-md-6">
- {# GENERAL INFORMATIONS#}
- <div class="box box-solid box-info">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.tab.general'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.public_register'|trans }}</strong></td>
- <td>
- {% if traitement.public == true %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
- <td>{{ traitement.name }}</td>
- </tr>
- {% if traitement.service %}
- <tr>
- <td><strong>{{ 'registry.label.service'|trans }}</strong></td>
- <td>{{ traitement.service }}</td>
- </tr>
+ {# GENERAL #}
+ <div class="box box-solid box-info">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.tab.general'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
+ <td>
+ {% if traitement.public == true %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
- <tr>
- <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
- <td>{{ traitement.goal|nl2br }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
- <td>{% if traitement.author is not null %}{{ traitement.author|dictionary('registry_treatment_author') }}{% endif %}</td>
- </tr>
- {% if traitement.author != "processing_manager" %}
- <tr>
- <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
- <td>{{ traitement.coordonneesResponsableTraitement|nl2br }}</td>
- </tr>
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
+ <td>{{ traitement.name }}</td>
+ </tr>
+ {% if traitement.service %}
+ <tr>
+ <td><strong>{{ 'registry.label.service'|trans }}</strong></td>
+ <td>{{ traitement.service }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.goal'|trans }}</strong></td>
+ <td>{{ traitement.goal|nl2br }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.author'|trans }}</strong></td>
+ <td>{% if traitement.author is not null %}{{ traitement.author|dictionary('registry_treatment_author') }}{% endif %}</td>
+ </tr>
+ {% if traitement.author != "processing_manager" %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
+ <td>{{ traitement.coordonneesResponsableTraitement|nl2br }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
+ <td>{{ traitement.manager }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
+ <td>
+ {% if traitement.active %}
+ <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
+ {% else %}
+ <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
{% endif %}
- <tr>
- <td><strong>{{ 'registry.treatment.label.manager'|trans }}</strong></td>
- <td>{{ traitement.manager }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.active'|trans }}</strong></td>
- <td>
- {% if traitement.active %}
- <span class="badge bg-green">{{ 'global.label.active'|trans }}</span>
- {% else %}
- <span class="badge bg-red">{{ 'global.label.inactive'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
- <td>{{ traitement.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
- <td>{{ traitement.legalBasisJustification|nl2br }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
- <td>{{ traitement.observation|nl2br }}</td>
- </tr>
- </tbody>
- </table>
- </div>
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.legal_basis'|trans }}</strong></td>
+ <td>{{ traitement.legalBasis|dictionary('registry_treatment_legal_basis') }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.legal_basis_justification'|trans }}</strong></td>
+ <td>{{ traitement.legalBasisJustification|nl2br }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
+ <td>{{ traitement.observation|nl2br }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ {# DPO Statut #}
+ {% if traitement.dpoMessage is not null %}
+ <div class="box box-solid box-primary">
+ <div class="box-header with-border">
+ <h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
+ </div>
+ <div class="box-body">
+ {{ traitement.dpoMessage }}
</div>
+ </div>
+ {% endif %}
- {# DPO Message #}
- {% if traitement.dpoMessage is not null %}
- <div class="box box-solid box-primary">
- <div class="box-header with-border">
- <h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
- </div>
- <div class="box-body">
- {{ traitement.dpoMessage }}
- </div>
- </div>
- {% endif %}
+ {# DATA CATEGORY #}
+ <div class="box box-solid box-warning">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
+ <td>
+ <ul>
+ {% for category in traitement.dataCategories %}
+ <li>
+ {% if category.sensible %}<strong>{% endif %}
+ {{ category.name }}
+ {% if category.sensible %}</strong>{% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
+ <td>{{ traitement.dataCategoryOther|nl2br }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
- {# DATA CATEGORY#}
- <div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.data_category'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
- <td>
- <ul>
- {% for category in traitement.dataCategories %}
- <li>
- {% if category.sensible %}<strong>{% endif %}
- {{ category.name }}
- {% if category.sensible %}</strong>{% endif %}
- </li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.data_category_other'|trans }}</strong></td>
- <td>{{ traitement.dataCategoryOther|nl2br }}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
+ {# RECIPIENTS #}
+ <div class="box box-solid box-primary">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
+ <td>{{ traitement.recipientCategory|nl2br }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+ <td>
+ <ul>
+ {% for contractor in traitement.contractors %}
+ <li>{{ contractor }}</li>
+ {% endfor %}
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ {# SPECIFIC #}
+ <div class="box box-solid box-info">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+ <td>
+ {% if traitement.ExemptAIPD %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
+ <td>
+ {% if traitement.systematicMonitoring %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
+ <td>
+ {% if traitement.largeScaleCollection %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
+ <td>
+ {% if traitement.vulnerablePeople %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
+ <td>
+ {% if traitement.dataCrossing %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
+ <td>
+ {% if traitement.evaluationOrRating %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
+ <td>
+ {% if traitement.automatedDecisionsWithLegalEffect %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
+ <td>
+ {% if traitement.automaticExclusionService %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
+ <td>
+ {% if traitement.innovativeUse %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ {# DETAILS #}
+ <div class="box box-solid box-primary">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleParticular.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleParticular.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleParticular.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleUser.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleUser.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleUser.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleAgent.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleAgent.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleAgent.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleElected.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleElected.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleElected.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleCompany.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleCompany.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleCompany.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeoplePartner.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeoplePartner.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeoplePartner.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_usager'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleUsager.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleUsager.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleUsager.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
+ <td>
+ {% if traitement.concernedPeopleOther.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.concernedPeopleOther.comment is not empty %}
+ <p class="mt-2">{{ traitement.concernedPeopleOther.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
+ <td>{{ traitement.estimatedConcernedPeople }}</td>
+ </tr>
+ <tr>
+ <td><strong>
+
+ {% if traitement.collectivity.hasModuleTools %}
+ {{ 'global.label.linked_tool'|trans }}
+ {% else %}
+ {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+ {% endif %}
+ </strong></td>
+ <td>
+ {% if traitement.collectivity.hasModuleTools %}
+ {{ traitement.tools|map(t => t.name)|join(', ') }}
+ {% else %}
+ {{ traitement.software }}
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
+ <td>
+ {% if traitement.paperProcessing %}
+ <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
+ <td>
+ <ul>
+ {% for duration in traitement.shelfLifes %}
+ <li>{{ duration.name }} - {{ duration.duration }} - {{ duration.ultimateFate | dictionary('registry_treatment_ultimate_fate') }} </li>
+ {% endfor %}
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
+ <td>{{ traitement.dataOrigin }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
+ {# <td>{% if (traitement.collectingMethod is not null) %} #}
+ <td>
+ {% if (traitement.collectingMethod|length) %}
+ {{ traitement.collectingMethod|map(p => "#{p|dictionary('registry_treatment_collecting_method')}")|join(', ') }}
+ {% endif %}
+ </td>
+ </tr>
+ {% if traitement.otherCollectingMethod is not null %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
+ <td>{{ traitement.otherCollectingMethod }}</td>
+ </tr>
+ {% endif %}
+ </table>
+ </div>
+ </div>
+
+ {# SECURITY #}
+ <div class="box box-solid box-success">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
+ <td>
+ {% if traitement.securityAccessControl.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.securityAccessControl.comment is not empty %}
+ <p class="mt-2">{{ traitement.securityAccessControl.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+ <td>
+ {% if traitement.securitytracability.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.securitytracability.comment is not empty %}
+ <p class="mt-2">{{ traitement.securitytracability.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
+ <td>
+ {% if traitement.securitySaving.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.securitySaving.comment is not empty %}
+ <p class="mt-2">{{ traitement.securitySaving.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+ <td>
+ {% if traitement.securityUpdate.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.securityUpdate.comment is not empty %}
+ <p class="mt-2">{{ traitement.securityUpdate.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
+ <td>
+ {% if traitement.securityOther.check %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if traitement.securityOther.comment is not empty %}
+ <p class="mt-2">{{ traitement.securityOther.comment }}</p>
+ {% endif %}
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
+ <td>
+ {% if traitement.securityEntitledPersons %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
+ <td>
+ {% if traitement.securityOpenAccounts %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
+ <td>
+ {% if traitement.securitySpecificitiesDelivered %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
- {# RECIPIENTS#}
- <div class="box box-solid box-primary">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.recipients'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.recipient_category'|trans }}</strong></td>
- <td>{{ traitement.recipientCategory|nl2br }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
- <td>
- <ul>
- {% for contractor in traitement.contractors %}
- <li>{{ contractor }}</li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
+ {# LINKED MODULES #}
+ <div class="box box-solid box-warning">
+ <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
+ </div>
+ </div>
- {# SPECIFIC#}
- <div class="box box-solid box-info">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.systematicMonitoring %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.largeScaleCollection %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.vulnerablePeople %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.dataCrossing %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.evaluationOrRating %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.automatedDecisionsWithLegalEffect %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.automaticExclusionService %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
- <td>
- <ul>
- {% if traitement.innovativeUse %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
- </td>
- </tr>
- </table>
- </div>
+ {# TREATMENT CONFORMITY & AIPD #}
+ {% if traitement.collectivity.hasModuleConformiteTraitement %}
+ {# TREATMENT CONFORMITY #}
+ <div class="box box-solid box-success">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.conformite'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tr>
+ <td style="width: 35%">
+ <strong>{{ 'registry.conformite_traitement.label.conformite_traitement'|trans }}</strong>
+ </td>
+ <td>
+ {% if traitement.conformiteTraitement is not null %}
+ {{ getConformiteTraitementLabel(traitement.conformiteTraitement)|raw }}
+ {% else %}
+ <span class="label label-default" style="display: inline-block;">Non-réalisée</span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>{{ 'registry.conformite_traitement.label.conformite_reponse'|trans }}</strong>
+ </td>
+ <td>
+ {% if traitement.conformiteTraitement is not null %}
+ {% set nbTotal = traitement.conformiteTraitement.nbConformes + traitement.conformiteTraitement.nbNonConformesMineures + traitement.conformiteTraitement.nbNonConformesMajeures %}
+ {% set widthNbConforme = ((traitement.conformiteTraitement.nbConformes * 100) / nbTotal)|round %}
+ {% set widthnbNonConformesMineures = ((traitement.conformiteTraitement.nbNonConformesMineures * 100) / nbTotal)|round %}
+ {% set widthnbNonConformesMajeures = 100 - (widthNbConforme + widthnbNonConformesMineures) %}
+ <div class="stacked-bar-graph">
+ {% if widthNbConforme %}<span style="width:{{ widthNbConforme }}%" class="bar-conforme tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.conforme'|trans }} {{ traitement.conformiteTraitement.nbConformes }}</span></span>{% endif %}
+ {% if widthnbNonConformesMineures %}<span style="width:{{ widthnbNonConformesMineures }}%" class="bar-non-conforme-mineure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.minor_conforme'|trans }} {{ traitement.conformiteTraitement.nbNonConformesMineures }}</span></span>{% endif %}
+ {% if widthnbNonConformesMajeures %}<span style="width:{{ widthnbNonConformesMajeures }}%" class="bar-non-conforme-majeure tooltipchart"><span class="tooltipcharttext">{{ 'registry.conformite_traitement.label.tooltip.major_conforme'|trans }} {{ traitement.conformiteTraitement.nbNonConformesMajeures }}</span></span>{% endif %}
+ </div>
+ {% endif %}
+ </td>
+ </tr>
+ </table>
</div>
</div>
-
- {# RIGHT#}
- <div class="col-md-6">
- {# DETAILS#}
+ {# AIPD #}
+ {% if traitement.conformiteTraitement is not null and traitement.conformiteTraitement.lastAnalyseImpact is not null %}
<div class="box box-solid box-primary">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.details'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.concerned_people'|trans }}</strong></td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_particular'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleParticular.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleParticular.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_user'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleUser.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleUser.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_agent'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleAgent.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleAgent.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_elected'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleElected.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleElected.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_company'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleCompany.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleCompany.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_partner'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeoplePartner.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeoplePartner.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td class="concerned-people-type"><strong>{{ 'registry.treatment.label.concerned_people_other'|trans }}</strong></td>
- <td>
- {% if traitement.concernedPeopleOther.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.concernedPeopleOther.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.estimated_concerned_people'|trans }}</strong></td>
- <td>{{ traitement.estimatedConcernedPeople }}</td>
- </tr>
- <tr>
- <td><strong>
-
- {% if traitement.collectivity.hasModuleTools %}
- {{ 'global.label.linked_tool'|trans }}
- {% else %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
- {% endif %}
- </strong></td>
- <td>
- {% if traitement.collectivity.hasModuleTools %}
- {{ traitement.tools|map(t => t.name)|join(', ') }}
- {% else %}
- {{ traitement.software }}
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.paper_processing'|trans }}</strong></td>
- <td>
- {% if traitement.paperProcessing %}
- <span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-gray">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.delay'|trans }}</strong></td>
- <td>
- <ul>
- {% for duration in traitement.shelfLifes %}
- <li>{{ duration.name }} - {{ duration.duration }} - {{ duration.ultimateFate | dictionary('registry_treatment_ultimate_fate') }} </li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
- <td>{{ traitement.dataOrigin }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
- {# <td>{% if (traitement.collectingMethod is not null) %} #}
- <td>
- {% if (traitement.collectingMethod|length) %}
- {{ traitement.collectingMethod|map(p => "#{p|dictionary('registry_treatment_collecting_method')}")|join(', ') }}
- {% endif %}
- </td>
- </tr>
- {% if traitement.otherCollectingMethod is not null %}
- <tr>
- <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
- <td>{{ traitement.otherCollectingMethod }}</td>
- </tr>
- {% endif %}
- </table>
- </div>
- </div>
-
- {# SECURITY#}
- <div class="box box-solid box-success">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.last_aipd'|trans }}</h3></div>
<div class="box-body no-padding">
<table class="table">
- <tbody>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_access_control'|trans }}</strong></td>
- <td>
- {% if traitement.securityAccessControl.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.securityAccessControl.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
- <td>
- {% if traitement.securitytracability.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.securitytracability.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_saving'|trans }}</strong></td>
- <td>
- {% if traitement.securitySaving.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.securitySaving.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
- <td>
- {% if traitement.securityUpdate.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.securityUpdate.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_other'|trans }}</strong></td>
- <td>
- {% if traitement.securityOther.check %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ traitement.securityOther.comment }}</p>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
+ <td style="width: 35%">
+ <strong>{{ 'aipd.treatment.label.avis_aipd'|trans }}</strong>
</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_entitled_persons'|trans }}</strong></td>
<td>
- {% if traitement.securityEntitledPersons %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% set analyseImpact = traitement.conformiteTraitement.lastAnalyseImpact %}
+
+ {% set labelAipdColor = "label-default" %}
+ {% if analyseImpact.statut == "defavorable" %}
+ {% set labelAipdColor = "label-danger" %}
+ {% elseif analyseImpact.statut == "favorable_avec_reserves" %}
+ {% set labelAipdColor = "label-warning" %}
+ {% elseif analyseImpact.statut == "favorable" %}
+ {% set labelAipdColor = "label-success" %}
{% endif %}
+ {% set statut = analyseImpact.statut %}
+ {% set labelStatut = "aipd.analyse_impact.values." ~ traitement.conformiteTraitement.lastAnalyseImpact.statut %}
+ <span class="label {{ labelAipdColor }}" style="display: inline-block;">
+ {{ labelStatut|trans}}
+ </span>
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_open_accounts'|trans }}</strong></td>
<td>
- {% if traitement.securityOpenAccounts %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
+ <strong>{{ 'aipd.treatment.label.date_validation'|trans }}</strong>
</td>
- </tr>
- <tr>
- <td><strong>{{ 'registry.treatment.label.security_specificities_delivered'|trans }}</strong></td>
<td>
- {% if traitement.securitySpecificitiesDelivered %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% if analyseImpact.isValidated %}
+ {{ analyseImpact.dateValidation|date('d/m/Y') }}
{% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {{ 'aipd.treatment.label.validation_in_progress'|trans }}
{% endif %}
</td>
</tr>
- </tbody>
</table>
</div>
</div>
+ {% endif %}
+ {% endif %}
- {# PROOFS#}
- <div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.label.linked_proof'|trans }}</h3></div>
- <div class="box-body">
- {% set activeProofs = traitement.proofs|filter(proof => proof.deletedAt is null) -%}
-
- {% if activeProofs|length > 0 %}
- <ul>
- {% for proof in activeProofs %}
- <li>
- {{ proof.name }} ({{ proof.type|dictionary('registry_proof_type') }})
- {{ proof.comment }}
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <span><i>{{ 'global.label.no_linked_proof'|trans }}</i></span>
- {% endif %}
- </div>
- </div>
-
-
- {# REQUESTS #}
- <div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.label.linked_request'|trans }}</h3></div>
- <div class="box-body">
- {% set activeRequests = traitement.requests %}
-
- {% if activeRequests|length > 0 %}
- <ul>
- {% for request in activeRequests %}
- <li>
- {{ request.date|date('d/m/Y') }} | {{ request.applicant.lastName }} {{ request.applicant.firstName }} | {{ ("label.request_" ~ request.object)|trans }}
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <span><i>{{ 'global.label.no_linked_request'|trans }}</i></span>
- {% endif %}
- </div>
- </div>
-
- {# VIOLATIONS #}
- <div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.label.linked_violation'|trans }}</h3></div>
- <div class="box-body">
- {% set activeViolations = traitement.violations %}
-
- {% if activeViolations|length > 0 %}
- <ul>
- {% for violation in activeViolations %}
- <li>
- {{ violation.date|date('d/m/Y') }} | {{ violation.violationNatures|map(n => ("label.violation_" ~ n)|trans)|join(', ') }}
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <span><i>{{ 'global.label.no_linked_violation'|trans }}</i></span>
- {% endif %}
- </div>
- </div>
-
- {# Mesurements #}
- <div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.label.linked_mesurement'|trans }}</h3></div>
- <div class="box-body">
- {% if traitement.mesurements|length > 0 %}
- <ul>
- {% for mesurement in traitement.mesurements %}
- <li>
- {{ mesurement.name }}
- </li>
- {% endfor %}
- </ul>
- {% else %}
- <span><i>{{ 'global.label.no_linked_mesurement'|trans }}</i></span>
- {% endif %}
- </div>
- </div>
-
- {% if traitement.collectivity.hasModuleConformiteTraitement %}
- <div class="box box-solid box-success">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.conformite'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tr>
- <td style="width: 35%">
- <strong>Conformité</strong>
- </td>
- <td>
- {% if traitement.conformiteTraitement is not null %}
- {{ getConformiteTraitementLabel(traitement.conformiteTraitement)|raw }}
- {% else %}
- <span class="label label-default" style="display: inline-block;">Non-réalisée</span>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td>
- <strong>Conformité des questions</strong>
- </td>
- <td>
- {% if traitement.conformiteTraitement is not null %}
- {% set nbTotal = traitement.conformiteTraitement.nbConformes + traitement.conformiteTraitement.nbNonConformesMineures + traitement.conformiteTraitement.nbNonConformesMajeures %}
- {% set widthNbConforme = ((traitement.conformiteTraitement.nbConformes * 100) / nbTotal)|round %}
- {% set widthnbNonConformesMineures = ((traitement.conformiteTraitement.nbNonConformesMineures * 100) / nbTotal)|round %}
- {% set widthnbNonConformesMajeures = 100 - (widthNbConforme + widthnbNonConformesMineures) %}
- <div class="stacked-bar-graph">
- {% if widthNbConforme %}<span style="width:{{ widthNbConforme }}%" class="bar-conforme tooltipchart"><span class="tooltipcharttext">Conforme : {{ traitement.conformiteTraitement.nbConformes }}</span></span>{% endif %}
- {% if widthnbNonConformesMineures %}<span style="width:{{ widthnbNonConformesMineures }}%" class="bar-non-conforme-mineure tooltipchart"><span class="tooltipcharttext">Non-conforme mineure : {{ traitement.conformiteTraitement.nbNonConformesMineures }}</span></span>{% endif %}
- {% if widthnbNonConformesMajeures %}<span style="width:{{ widthnbNonConformesMajeures }}%" class="bar-non-conforme-majeure tooltipchart"><span class="tooltipcharttext">Non-conforme majeure : {{ traitement.conformiteTraitement.nbNonConformesMajeures }}</span></span>{% endif %}
- </div>
- {% endif %}
- </td>
- </tr>
- <tr>
- <td>
- <strong>Actions</strong>
- </td>
- <td>
- </td>
- </tr>
- </table>
- </div>
- </div>
- {% if traitement.conformiteTraitement is not null and traitement.conformiteTraitement.lastAnalyseImpact is not null %}
- <div class="box box-solid box-primary">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'registry.treatment.tab.last_aipd'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tr>
- <td style="width: 35%">
- <strong>Avis</strong>
- </td>
- <td>
- {% set analyseImpact = traitement.conformiteTraitement.lastAnalyseImpact %}
-
- {% set labelAipdColor = "label-default" %}
- {% if analyseImpact.statut == "defavorable" %}
- {% set labelAipdColor = "label-danger" %}
- {% elseif analyseImpact.statut == "favorable_avec_reserves" %}
- {% set labelAipdColor = "label-warning" %}
- {% elseif analyseImpact.statut == "favorable" %}
- {% set labelAipdColor = "label-success" %}
- {% endif %}
- {% set statut = analyseImpact.statut %}
- {% set labelStatut = "aipd.analyse_impact.values." ~ traitement.conformiteTraitement.lastAnalyseImpact.statut %}
- <span class="label {{ labelAipdColor }}" style="display: inline-block;">
- {{ labelStatut|trans}}
- </span>
- </td>
- </tr>
- <tr>
- <td>
- <strong>Date de validation</strong>
- </td>
- <td>
- {% if analyseImpact.isValidated %}
- {{ analyseImpact.dateValidation|date('d/m/Y') }}
- {% else %}
- En cours de validation
- {% endif %}
- </td>
- </tr>
- <tr>
- <td>
- <strong>Actions</strong>
- </td>
- <td>
- </td>
- </tr>
- </table>
- </div>
- </div>
+ {# HISTORIC #}
+ <div class="box box-solid box-default">
+ <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.tab.history'|trans }}</h3></div>
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {% if is_granted('ROLE_ADMIN') %}
+ <tr>
+ <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+ <td>
+ {{ traitement.collectivity }}
+ </td>
+ </tr>
{% endif %}
- {% endif %}
-
- {# HISTORIC#}
- <div class="box box-solid box-default">
- <div class="box-header with-border"><h3 class="box-title" style="color: white">{{ 'global.tab.history'|trans }}</h3></div>
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- {% if is_granted('ROLE_ADMIN') %}
- <tr>
- <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
- <td>
- {{ traitement.collectivity }}
- </td>
- </tr>
- {% endif %}
- <tr>
- <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
- <td>{{ traitement.createdAt|date('d/m/Y H:i') }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
- <td>{{ traitement.updatedAt|date('d/m/Y H:i') }}</td>
- </tr>
- <tr>
- <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
- <td>{{ traitement.updatedBy }}</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
+ <tr>
+ <td><strong>{{ 'global.label.created_at'|trans }}</strong></td>
+ <td>{{ traitement.createdAt|date('d/m/Y H:i') }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'global.label.updated_at'|trans }}</strong></td>
+ <td>{{ traitement.updatedAt|date('d/m/Y H:i') }}</td>
+ </tr>
+ <tr>
+ <td><strong>{{ 'global.label.updated_by'|trans }}</strong></td>
+ <td>{{ traitement.updatedBy }}</td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
</div>
diff --git a/templates/Documentation/Document/grid.html.twig b/templates/Documentation/Document/grid.html.twig
index 022e3e126114822edfaba34ba200c73d8184dd55..f05d20929be15ad0120ee5874922ad41e34d5e66 100644
--- a/templates/Documentation/Document/grid.html.twig
+++ b/templates/Documentation/Document/grid.html.twig
@@ -300,9 +300,9 @@
</div>
</div>
<div class="box-body">
- <blockquote>
- <small>{{ 'documentation.document.list.help'|trans }}</small>
- </blockquote>
+ <div class="callout callout-default text-muted">
+ {{ 'documentation.document.list.help'|trans }}
+ </div>
</div>
<!-- box-footer -->
</div>
diff --git a/templates/Documentation/Document/list.html.twig b/templates/Documentation/Document/list.html.twig
index 74f4b66f45e9ac205e7dc62eec0395e1552c8ca8..288d54a32b6e6136f7ab7a7e1fec33ab5681ef06 100644
--- a/templates/Documentation/Document/list.html.twig
+++ b/templates/Documentation/Document/list.html.twig
@@ -242,9 +242,9 @@
</div>
</div>
<div class="box-body">
- <blockquote>
- <small>{{ 'documentation.document.list.help'|trans }}</small>
- </blockquote>
+ <div class="callout callout-default text-muted">
+ {{ 'documentation.document.list.help'|trans }}
+ </div>
</div>
<!-- box-footer -->
</div>
diff --git a/templates/Registry/Conformite_organisation/_form.html.twig b/templates/Registry/Conformite_organisation/_form.html.twig
index 2c4dd3cf20ab822a1f3ca860beb2ed4affb19850..5485237239b50cef1f5f665c16ea06e87c44a013 100644
--- a/templates/Registry/Conformite_organisation/_form.html.twig
+++ b/templates/Registry/Conformite_organisation/_form.html.twig
@@ -9,12 +9,12 @@
{% import _self as formMacros %}
{% macro printParticipant(participant) %}
- <div class="js-collection-item col-md-6 nopadding">
+ <div class="js-collection-item col-md-6 ps-0">
<div class="box">
<div class="box-header with-border">
<div class="box-title"></div>
<div class="box-tools pull-right">
- <button aria-label="Supprimer le participant" title="Supprimer le participant" class="btn btn-box-tool js-remove-item" data-toggle="tooltip">
+ <button aria-label="{{ 'registry.conformite_organisation.action.delete_participant'|trans }}" class="btn btn-box-tool js-remove-item" data-toggle="tooltip">
<i aria-hidden="true" class="fa fa-times"></i>
</button>
</div>
diff --git a/templates/Registry/Conformite_traitement/list.html.twig b/templates/Registry/Conformite_traitement/list.html.twig
index 4f46734dd4669da6bd1c39a1b5c04c7ba5a7dad1..35a39bd3a5d96c20abfea3bbd07ccaefc1045c19 100644
--- a/templates/Registry/Conformite_traitement/list.html.twig
+++ b/templates/Registry/Conformite_traitement/list.html.twig
@@ -226,43 +226,3 @@
{{ include('_Utils/_datatable.html.twig') }}
{% endblock %}
-
-{% block style %}
- <style>
- .stacked-bar-graph .tooltipchart {
- position: relative;
- }
-
- .tooltipchart .tooltipcharttext {
- visibility: hidden;
- background-color: black;
- color: #fff;
- text-align: center;
- padding: 5px;
- border-radius: 6px;
- height: 30px;
- display: block;
- position: absolute;
- z-index: 2;
- top: 120%;
- left: 50%;
- transform: translateX(-50%);
- white-space: nowrap;
- }
-
- .tooltipchart:hover .tooltipcharttext {
- visibility: visible;
- }
-
- .tooltipchart .tooltipcharttext::after {
- content: " ";
- position: absolute;
- bottom: 100%; /* At the top of the tooltip */
- left: 50%;
- margin-left: -5px;
- border-width: 5px;
- border-style: solid;
- border-color: transparent transparent black transparent;
- }
- </style>
-{% endblock %}
diff --git a/templates/Registry/Contractor/pdf.html.twig b/templates/Registry/Contractor/pdf.html.twig
index 8b2421d31104a4f1d27e1508659fa8377194283a..33f380c1a9b8f1144d93262da3af8a4b9f6cf82b 100644
--- a/templates/Registry/Contractor/pdf.html.twig
+++ b/templates/Registry/Contractor/pdf.html.twig
@@ -170,17 +170,21 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# TOOLS #}
- {% if object.collectivity.isHasModuleTools %}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# TOOLS #}
+ {% if object.collectivity.isHasModuleTools %}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Contractor/pdf_all.html.twig b/templates/Registry/Contractor/pdf_all.html.twig
index 3e6859fbb40cee5f4c619d80948a66e3bd864c50..fffbd35428afca58b8a4d57499d10765e65f8f92 100644
--- a/templates/Registry/Contractor/pdf_all.html.twig
+++ b/templates/Registry/Contractor/pdf_all.html.twig
@@ -170,17 +170,21 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# TOOLS #}
- {% if object.collectivity.isHasModuleTools %}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# TOOLS #}
+ {% if object.collectivity.isHasModuleTools %}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Contractor/show.html.twig b/templates/Registry/Contractor/show.html.twig
index 34247ecd5f9d777f5ecaf252cc39356500b60e4e..ac2a04e71c6d511ec1165073e7b664f58ad43874 100644
--- a/templates/Registry/Contractor/show.html.twig
+++ b/templates/Registry/Contractor/show.html.twig
@@ -248,17 +248,21 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# TOOLS #}
- {% if object.collectivity.isHasModuleTools %}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# TOOLS #}
+ {% if object.collectivity.isHasModuleTools %}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
</div>
diff --git a/templates/Registry/Mesurement/_modal_form.html.twig b/templates/Registry/Mesurement/_modal_form.html.twig
index 9c5b733f3a13123f511fe6ffca19c6bb02d2fd3a..16ff965f681688f7e066aa1640bbc37095e68bc8 100644
--- a/templates/Registry/Mesurement/_modal_form.html.twig
+++ b/templates/Registry/Mesurement/_modal_form.html.twig
@@ -3,7 +3,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Fermer"><span aria-hidden="true">×</span></button>
- <h4 class="modal-title" id="myModalLabel">{{ 'registry.mesurement.action.create'|trans }}</h4>
+ <h4 class="modal-title" id="myModalLabel">{{ 'registry.mesurement.title.create'|trans }}</h4>
</div>
<div class="modal-body">
<form id="mesurement-modal-form" data-target="#mesurement-modal" action="{{ path('api_registry_mesurement_modal_create') }}" method="POST">
diff --git a/templates/Registry/Mesurement/pdf.html.twig b/templates/Registry/Mesurement/pdf.html.twig
index ca5894ef7dfc50cb81697c97261fc6ecbebcb087..341b754d4076e4f28bbbf4402f6de451c83e09b3 100644
--- a/templates/Registry/Mesurement/pdf.html.twig
+++ b/templates/Registry/Mesurement/pdf.html.twig
@@ -79,22 +79,26 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {% if object.collectivity.isHasModuleTools %}
- {# TOOLS #}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {% if object.collectivity.isHasModuleTools %}
+ {# TOOLS #}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Mesurement/pdf_all.html.twig b/templates/Registry/Mesurement/pdf_all.html.twig
index 17d03288833ff5348673283e8f49b5aa38f31a60..d7bcde7e19eccb529f62bae26701ee1e76a44e60 100644
--- a/templates/Registry/Mesurement/pdf_all.html.twig
+++ b/templates/Registry/Mesurement/pdf_all.html.twig
@@ -77,22 +77,26 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {% if object.collectivity.isHasModuleTools %}
- {# TOOLS #}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {% if object.collectivity.isHasModuleTools %}
+ {# TOOLS #}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Mesurement/show.html.twig b/templates/Registry/Mesurement/show.html.twig
index f2a98496c27975beb0c407a56e3bcdee62c90c7a..92f343650cfa0fc64a90a2b0d7033f0db0ee3eda 100644
--- a/templates/Registry/Mesurement/show.html.twig
+++ b/templates/Registry/Mesurement/show.html.twig
@@ -155,21 +155,25 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# TOOLS #}
- {% if object.collectivity.isHasModuleTools %}
- {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
- {% endif %}
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# TOOLS #}
+ {% if object.collectivity.isHasModuleTools %}
+ {% include '_Utils/_show_block_tools.html.twig' with { tools: object.tools } %}
+ {% endif %}
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Request/_form.html.twig b/templates/Registry/Request/_form.html.twig
index 3f6fa0b49ed65d4c65ba0e49dcf54546d2490844..58a530de53ae32b8c749fdf6ffd5c68096ffbff1 100644
--- a/templates/Registry/Request/_form.html.twig
+++ b/templates/Registry/Request/_form.html.twig
@@ -69,9 +69,9 @@
<div id="box-concerned-people" class="box box-solid box-success">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.request.tab.concerned_people'|trans }}</h3></div>
<div class="box-body">
- <blockquote>
- <small>{{ 'registry.request.label.help.concerned_people'|trans }}</small>
- </blockquote>
+ <div class="callout callout-default text-muted">
+ {{ 'registry.request.label.help.concerned_people'|trans }}
+ </div>
{{ form_row(form.concernedPeople.civility, {'attr': {'autocomplete': 'honorific-prefix'}}) }}
{{ form_row(form.concernedPeople.firstName, {'attr': {'autocomplete': 'given-name'}}) }}
{{ form_row(form.concernedPeople.lastName, {'attr': {'autocomplete': 'family-name'}}) }}
diff --git a/templates/Registry/Request/pdf.html.twig b/templates/Registry/Request/pdf.html.twig
index 3dcb1f77f98aac1d65e6ffcdf3b0bd1da2e88fe5..787a8efda28f59a02aff3670177a8d0df25dadba 100644
--- a/templates/Registry/Request/pdf.html.twig
+++ b/templates/Registry/Request/pdf.html.twig
@@ -197,13 +197,17 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Request/pdf_all.html.twig b/templates/Registry/Request/pdf_all.html.twig
index 6cd70a1cbea79ac1089eef2fcb8d2a3a5d951a05..15dede8d92a9c01677bbc8a5fabe8ad1a120fc7a 100644
--- a/templates/Registry/Request/pdf_all.html.twig
+++ b/templates/Registry/Request/pdf_all.html.twig
@@ -193,13 +193,17 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Request/show.html.twig b/templates/Registry/Request/show.html.twig
index 63c6e78f24271b6a6f897f800ca2de460270bb80..c602ee65ac89644378b3eba7f58e857a17c7638f 100644
--- a/templates/Registry/Request/show.html.twig
+++ b/templates/Registry/Request/show.html.twig
@@ -275,13 +275,17 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
</div>
diff --git a/templates/Registry/Tool/_form.html.twig b/templates/Registry/Tool/_form.html.twig
index e80ad5b460f5a2a2357223caa887bd4a444a454f..0922527eab26741227f92c09f570386247d279cc 100644
--- a/templates/Registry/Tool/_form.html.twig
+++ b/templates/Registry/Tool/_form.html.twig
@@ -1,5 +1,5 @@
{% if form.vars.value.createdAt.timestamp is defined %}
- {% set submitValue = submitValue|default('global.action.edit_submit'|trans) %}
+ {% set submitValue = submitValue|default('registry.tool.action.edit_submit'|trans) %}
{% else %}
{% set submitValue = submitValue|default('registry.tool.action.new_submit'|trans) %}
{% endif %}
@@ -27,7 +27,7 @@
</div>
</div>
</div>
-
+
{# RIGHT #}
<div class="col-md-6">
{# SECURITY #}
diff --git a/templates/Registry/Tool/pdf.html.twig b/templates/Registry/Tool/pdf.html.twig
index 105dce499e69d604f49c111dbfbad3fd9ca75cbf..fa49b84632b640002defc47d0905b05e8faaf7ae 100644
--- a/templates/Registry/Tool/pdf.html.twig
+++ b/templates/Registry/Tool/pdf.html.twig
@@ -169,15 +169,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Tool/show.html.twig b/templates/Registry/Tool/show.html.twig
index 24ae296faa8e07ad5cd1b23b0428ef1602e45d27..0774a2300703806a00fab74ecace82f76ad710b1 100644
--- a/templates/Registry/Tool/show.html.twig
+++ b/templates/Registry/Tool/show.html.twig
@@ -261,15 +261,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
</div>
diff --git a/templates/Registry/Treatment/_form.html.twig b/templates/Registry/Treatment/_form.html.twig
index b8be3d8797e1be41c2e8b7fdd524b5428f5d4ff8..a5c37d6b1419ba1b5900f615e4c45f1ba34ae688 100644
--- a/templates/Registry/Treatment/_form.html.twig
+++ b/templates/Registry/Treatment/_form.html.twig
@@ -163,7 +163,7 @@
{{ form_row(form.paperProcessing) }}
<div class="form-group">
- <label class="control-label">{{ 'registry.treatment.label.delay'|trans }}</label>
+ <label class="control-label">{{ 'registry.treatment.label.shelflife'|trans }}</label>
<div class="js-collection-wrapper"
data-prototype="{{ formMacros.printShelfLife(form.shelfLifes.vars.prototype)|e('html_attr') }}"
data-index="{{ form.shelfLifes|length }}"
diff --git a/templates/Registry/Treatment/configuration.html.twig b/templates/Registry/Treatment/configuration.html.twig
index 57d46a7cc8f34db33768b0652d1cae063f1fe02d..617cb2d66dd27b113de6dbc018aefa483d264d4d 100644
--- a/templates/Registry/Treatment/configuration.html.twig
+++ b/templates/Registry/Treatment/configuration.html.twig
@@ -41,17 +41,15 @@
</div>
<div class="box-body">
{{ form_row(form.name) }}
+ {{ form_row(form.service, {'label': 'registry.label.service'}) }}
{{ form_row(form.goal) }}
- <div id="author_group">
- {{ form_row(form.author) }}
- {{ form_row(form.coordonneesResponsableTraitement) }}
- </div>
+ {{ form_row(form.author) }}
+ {{ form_row(form.coordonneesResponsableTraitement) }}
{{ form_row(form.manager) }}
{{ form_row(form.active) }}
{{ form_row(form.legalBasis) }}
{{ form_row(form.legalBasisJustification) }}
{{ form_row(form.observation) }}
- {{ form_row(form.service) }}
</div>
</div>
@@ -61,7 +59,7 @@
<h3 class="box-title">{{ 'registry.treatment.tab.data_category'|trans }}</h3>
</div>
<div class="box-body">
- {{ form_row(form.dataCategories) }}
+ {{ form_row(form.dataCategories, {'label': 'registry.treatment.label.data_category'}) }}
{{ form_row(form.dataCategoryOther) }}
</div>
</div>
@@ -73,7 +71,7 @@
</div>
<div class="box-body">
{{ form_row(form.recipientCategory) }}
- {{ form_row(form.contractors) }}
+ {{ form_row(form.contractors, {'label': 'global.label.linked_contractor'}) }}
</div>
</div>
@@ -83,7 +81,7 @@
<h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3>
</div>
<div class="box-body">
- {{ form_row(form.exempt_AIPD) }}
+ {{ form_row(form.exempt_AIPD, {'label': 'registry.treatment.label.exempt_AIPD'}) }}
{{ form_row(form.systematicMonitoring) }}
{{ form_row(form.largeScaleCollection) }}
{{ form_row(form.vulnerablePeople) }}
@@ -101,8 +99,8 @@
<h3 class="box-title">{{ 'global.tab.history'|trans }}</h3>
</div>
<div class="box-body">
- {{ form_row(form.creator) }}
- {{ form_row(form.collectivity) }}
+ {{ form_row(form.creator, {'label': 'global.label.created_by'}) }}
+ {{ form_row(form.collectivity, {'label': 'global.label.organization'}) }}
</div>
</div>
</div>
@@ -149,11 +147,9 @@
</div>
</div>
{{ form_row(form.estimatedConcernedPeople) }}
- {{ form_row(form.tools) }}
+ {{ form_row(form.tools, {'label': 'global.label.linked_tool'}) }}
{{ form_row(form.paperProcessing) }}
-
{{ form_row(form.shelfLifes) }}
-
{{ form_row(form.dataOrigin) }}
{{ form_row(form.collectingMethod) }}
{{ form_row(form.legalMentions) }}
@@ -185,7 +181,7 @@
<h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3>
</div>
<div class="box-body">
- {{ form_row(form.proofs) }}
+ {{ form_row(form.proofs, {'label': 'global.label.linked_proof'}) }}
</div>
</div>
</div>
@@ -203,7 +199,4 @@
</div>
</div>
-
-
-
{% endblock %}
diff --git a/templates/Registry/Treatment/pdf.html.twig b/templates/Registry/Treatment/pdf.html.twig
index 798c3adce01153cea49323c45e9955981d83f838..4b676b0a7cb3d2db7438bd3d4abde5ef33535cbd 100644
--- a/templates/Registry/Treatment/pdf.html.twig
+++ b/templates/Registry/Treatment/pdf.html.twig
@@ -13,7 +13,7 @@
<table class="table">
<tbody>
<tr>
- <td><strong>{{ 'registry.treatment.label.public_register'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
<td>
{% if object.public == true %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
@@ -84,7 +84,7 @@
<h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
</div>
<div class="box-body">
- {{ object.dpoMessage }}
+ {{ object.dpoMessage }}
</div>
</div>
{% endif %}
@@ -147,102 +147,96 @@
<div class="box box-solid box-info" style="page-break-inside: avoid">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
<div class="box-body no-padding">
- <table class="table">
+ <table role="presentation" class="table">
<tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+ <td>
+ {% if object.ExemptAIPD %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
<tr>
<td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
<td>
- <ul>
- {% if object.systematicMonitoring %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.systematicMonitoring %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
<td>
- <ul>
- {% if object.largeScaleCollection %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.largeScaleCollection %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
<td>
- <ul>
- {% if object.vulnerablePeople %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.vulnerablePeople %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
<td>
- <ul>
- {% if object.dataCrossing %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.dataCrossing %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
<td>
- <ul>
- {% if object.evaluationOrRating %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.evaluationOrRating %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automatedDecisionsWithLegalEffect %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automatedDecisionsWithLegalEffect %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automaticExclusionService %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automaticExclusionService %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
<td>
- <ul>
- {% if object.innovativeUse %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.innovativeUse %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
</table>
@@ -263,7 +257,9 @@
<td class="col-md-4">
{% if object.concernedPeopleParticular.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleParticular.comment }}</p>
+ {% if object.concernedPeopleParticular.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -274,7 +270,9 @@
<td>
{% if object.concernedPeopleUser.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUser.comment }}</p>
+ {% if object.concernedPeopleUser.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -285,7 +283,9 @@
<td>
{% if object.concernedPeopleAgent.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleAgent.comment }}</p>
+ {% if object.concernedPeopleAgent.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -296,7 +296,9 @@
<td>
{% if object.concernedPeopleElected.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleElected.comment }}</p>
+ {% if object.concernedPeopleElected.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -307,7 +309,9 @@
<td>
{% if object.concernedPeopleCompany.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleCompany.comment }}</p>
+ {% if object.concernedPeopleCompany.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -318,7 +322,9 @@
<td>
{% if object.concernedPeoplePartner.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeoplePartner.comment }}</p>
+ {% if object.concernedPeoplePartner.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -329,7 +335,9 @@
<td>
{% if object.concernedPeopleUsager.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUsager.comment }}</p>
+ {% if object.concernedPeopleUsager.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -340,7 +348,9 @@
<td>
{% if object.concernedPeopleOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleOther.comment }}</p>
+ {% if object.concernedPeopleOther.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -385,7 +395,7 @@
<table class="table" style="border-top: #f4f4f4 1px solid">
<tbody>
<tr>
- <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.delay'|trans }}</strong></td>
+ <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
<td style="padding-top: 10px; width: 80%">
{% for method in object.shelfLifes %}
<div class="box box-default">
@@ -435,7 +445,7 @@
</tr>
{% endif %}
<tr>
- <td><strong>{{ 'registry.treatment.label.legalMentions'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
<td>
{% if object.legalMentions %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -445,7 +455,7 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequest'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
<td>
{% if object.consentRequest %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -456,7 +466,7 @@
</tr>
{% if object.consentRequestFormat is not null %}
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequestFormat'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
<td>{{ object.consentRequestFormat }}</td>
</tr>
{% endif %}
@@ -475,7 +485,9 @@
<td>
{% if object.securityAccessControl.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityAccessControl.comment }}</p>
+ {% if object.securityAccessControl.comment is not empty %}
+ <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -486,7 +498,9 @@
<td>
{% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitytracability.comment }}</p>
+ {% if object.securitytracability.comment is not empty %}
+ <p class="mt-2">{{ object.securitytracability.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -497,7 +511,9 @@
<td>
{% if object.securitySaving.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitySaving.comment }}</p>
+ {% if object.securitySaving.comment is not empty %}
+ <p class="mt-2">{{ object.securitySaving.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -508,7 +524,9 @@
<td>
{% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityUpdate.comment }}</p>
+ {% if object.securityUpdate.comment is not empty %}
+ <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -519,7 +537,9 @@
<td>
{% if object.securityOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityOther.comment }}</p>
+ {% if object.securityOther.comment is not empty %}
+ <p class="mt-2">{{ object.securityOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -563,15 +583,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Treatment/pdf_all.html.twig b/templates/Registry/Treatment/pdf_all.html.twig
index c514cbfc1ba1e4cced5bf9687a8ffc4eca148e57..621393077f1db9a52c22b59046137e8d86aff636 100644
--- a/templates/Registry/Treatment/pdf_all.html.twig
+++ b/templates/Registry/Treatment/pdf_all.html.twig
@@ -15,7 +15,7 @@
<table class="table">
<tbody>
<tr>
- <td><strong>{{ 'registry.treatment.label.public_register'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
<td>
{% if object.public == true %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
@@ -86,7 +86,7 @@
<h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
</div>
<div class="box-body">
- {{ object.dpoMessage }}
+ {{ object.dpoMessage }}
</div>
</div>
{% endif %}
@@ -149,102 +149,96 @@
<div class="box box-solid box-info" style="page-break-inside: avoid">
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.specific'|trans }}</h3></div>
<div class="box-body no-padding">
- <table class="table">
+ <table role="presentation" class="table">
<tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
+ <td>
+ {% if object.ExemptAIPD %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
+ </td>
+ </tr>
<tr>
<td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
<td>
- <ul>
- {% if object.systematicMonitoring %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.systematicMonitoring %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
<td>
- <ul>
- {% if object.largeScaleCollection %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.largeScaleCollection %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
<td>
- <ul>
- {% if object.vulnerablePeople %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.vulnerablePeople %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
<td>
- <ul>
- {% if object.dataCrossing %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.dataCrossing %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
<td>
- <ul>
- {% if object.evaluationOrRating %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.evaluationOrRating %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automatedDecisionsWithLegalEffect %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automatedDecisionsWithLegalEffect %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automaticExclusionService %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automaticExclusionService %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
<td>
- <ul>
- {% if object.innovativeUse %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.innovativeUse %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
</table>
@@ -265,7 +259,9 @@
<td class="col-md-4">
{% if object.concernedPeopleParticular.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleParticular.comment }}</p>
+ {% if object.concernedPeopleParticular.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -276,7 +272,9 @@
<td>
{% if object.concernedPeopleUser.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUser.comment }}</p>
+ {% if object.concernedPeopleUser.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -287,7 +285,9 @@
<td>
{% if object.concernedPeopleAgent.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleAgent.comment }}</p>
+ {% if object.concernedPeopleAgent.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -298,7 +298,9 @@
<td>
{% if object.concernedPeopleElected.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleElected.comment }}</p>
+ {% if object.concernedPeopleElected.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -309,7 +311,9 @@
<td>
{% if object.concernedPeopleCompany.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleCompany.comment }}</p>
+ {% if object.concernedPeopleCompany.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -320,7 +324,9 @@
<td>
{% if object.concernedPeoplePartner.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeoplePartner.comment }}</p>
+ {% if object.concernedPeoplePartner.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -331,7 +337,9 @@
<td>
{% if object.concernedPeopleUsager.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUsager.comment }}</p>
+ {% if object.concernedPeopleUsager.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -342,7 +350,9 @@
<td>
{% if object.concernedPeopleOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleOther.comment }}</p>
+ {% if object.concernedPeopleOther.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -387,7 +397,7 @@
<table class="table" style="border-top: #f4f4f4 1px solid">
<tbody>
<tr>
- <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.delay'|trans }}</strong></td>
+ <td style="vertical-align: top; padding-left: 8px; padding-top: 10px; width: 20%"><strong>{{ 'registry.treatment.label.shelflife'|trans }}</strong></td>
<td style="padding-top: 10px; width: 80%">
{% for method in object.shelfLifes %}
<div class="box box-default">
@@ -437,7 +447,7 @@
</tr>
{% endif %}
<tr>
- <td><strong>{{ 'registry.treatment.label.legalMentions'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
<td>
{% if object.legalMentions %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -447,7 +457,7 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequest'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
<td>
{% if object.consentRequest %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -458,7 +468,7 @@
</tr>
{% if object.consentRequestFormat is not null %}
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequestFormat'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
<td>{{ object.consentRequestFormat }}</td>
</tr>
{% endif %}
@@ -477,7 +487,9 @@
<td>
{% if object.securityAccessControl.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityAccessControl.comment }}</p>
+ {% if object.securityAccessControl.comment is not empty %}
+ <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -488,7 +500,9 @@
<td>
{% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitytracability.comment }}</p>
+ {% if object.securitytracability.comment is not empty %}
+ <p class="mt-2">{{ object.securitytracability.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -499,7 +513,9 @@
<td>
{% if object.securitySaving.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitySaving.comment }}</p>
+ {% if object.securitySaving.comment is not empty %}
+ <p class="mt-2">{{ object.securitySaving.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -510,7 +526,9 @@
<td>
{% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityUpdate.comment }}</p>
+ {% if object.securityUpdate.comment is not empty %}
+ <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -521,7 +539,9 @@
<td>
{% if object.securityOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityOther.comment }}</p>
+ {% if object.securityOther.comment is not empty %}
+ <p class="mt-2">{{ object.securityOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -565,15 +585,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Treatment/public_list.html.twig b/templates/Registry/Treatment/public_list.html.twig
index 96e67dc5d57e51bc48fb508e1bec874cfaf34d3c..1d5f31240a496d0a098c2e0583d3dba3f655d1fa 100644
--- a/templates/Registry/Treatment/public_list.html.twig
+++ b/templates/Registry/Treatment/public_list.html.twig
@@ -29,7 +29,7 @@
<div class="col-xs-12">
<div class="box box-solid">
<div class="box-body">
- {% if objects is empty %}
+ {% if objects is not empty %}
<table id="table" class="table table-bordered table-hover">
<thead>
<tr>
diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig
index 4456cc75932c9156ff872b80f3b4096c35851503..c4908a191e59efd81732a9bc566c0a2225fc5f52 100644
--- a/templates/Registry/Treatment/public_show.html.twig
+++ b/templates/Registry/Treatment/public_show.html.twig
@@ -493,7 +493,9 @@
<td>
{% if object.concernedPeopleParticular.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleParticular.comment }}</p>
+ {% if object.concernedPeopleParticular.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -508,7 +510,9 @@
<td>
{% if object.concernedPeopleUser.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUser.comment }}</p>
+ {% if object.concernedPeopleUser.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -523,7 +527,9 @@
<td>
{% if object.concernedPeopleAgent.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleAgent.comment }}</p>
+ {% if object.concernedPeopleAgent.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -538,7 +544,9 @@
<td>
{% if object.concernedPeopleElected.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleElected.comment }}</p>
+ {% if object.concernedPeopleElected.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -553,7 +561,9 @@
<td>
{% if object.concernedPeopleCompany.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleCompany.comment }}</p>
+ {% if object.concernedPeopleCompany.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -568,7 +578,9 @@
<td>
{% if object.concernedPeoplePartner.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeoplePartner.comment }}</p>
+ {% if object.concernedPeoplePartner.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -583,7 +595,9 @@
<td>
{% if object.concernedPeopleUsager.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUsager.comment }}</p>
+ {% if object.concernedPeopleUsager.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -598,7 +612,9 @@
<td>
{% if object.concernedPeopleOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleOther.comment }}</p>
+ {% if object.concernedPeopleOther.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -672,7 +688,7 @@
{% if (config.legalMentions == true) %}
<tr>
<td>
- <strong>{{ 'registry.treatment.label.legalMentions'|trans }}</strong>
+ <strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong>
</td>
<td>
{% if object.legalMentions == 1 %}
@@ -686,7 +702,7 @@
{% if (config.consentRequest == true) %}
<tr>
<td>
- <strong>{{ 'registry.treatment.label.consentRequest'|trans }}</strong>
+ <strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong>
</td>
<td>
{% if object.consentRequest == 1 %}
@@ -728,7 +744,9 @@
<td>
{% if object.securityAccessControl.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityAccessControl.comment }}</p>
+ {% if object.securityAccessControl.comment is not empty %}
+ <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -743,7 +761,9 @@
<td>
{% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitytracability.comment }}</p>
+ {% if object.securitytracability.comment is not empty %}
+ <p class="mt-2">{{ object.securitytracability.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -758,7 +778,9 @@
<td>
{% if object.securitySaving.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitySaving.comment }}</p>
+ {% if object.securitySaving.comment is not empty %}
+ <p class="mt-2">{{ object.securitySaving.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -773,7 +795,9 @@
<td>
{% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityUpdate.comment }}</p>
+ {% if object.securityUpdate.comment is not empty %}
+ <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -788,7 +812,9 @@
<td>
{% if object.securityOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityOther.comment }}</p>
+ {% if object.securityOther.comment is not empty %}
+ <p class="mt-2">{{ object.securityOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -842,14 +868,18 @@
</div>
</div>
{% endif %}
-
+
{# LINKED MODULES #}
{% if (object.proofs and config.proofs == true) %}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# PUBLIC PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# PUBLIC PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ </tbody>
+ </table>
</div>
</div>
{% endif %}
diff --git a/templates/Registry/Treatment/show.html.twig b/templates/Registry/Treatment/show.html.twig
index c52a5c4f6cd0880234bc18ca3952f0f33e7c9a28..c3fef5c6c401fd9914f9d25498410402c094bc88 100644
--- a/templates/Registry/Treatment/show.html.twig
+++ b/templates/Registry/Treatment/show.html.twig
@@ -80,7 +80,7 @@
<table role="presentation" class="table">
<tbody>
<tr>
- <td><strong>{{ 'registry.treatment.label.public_register'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.public_registry'|trans }}</strong></td>
<td>
{% if object.public == true %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
@@ -207,109 +207,91 @@
<tr>
<td><strong>{{ 'registry.treatment.label.exempt_AIPD'|trans }}</strong></td>
<td>
- <ul>
- {% if object.ExemptAIPD %}
- <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.ExemptAIPD %}
+ <span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.systematic_monitoring'|trans }}</strong></td>
<td>
- <ul>
- {% if object.systematicMonitoring %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.systematicMonitoring %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.large_scale_collection'|trans }}</strong></td>
<td>
- <ul>
- {% if object.largeScaleCollection %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.largeScaleCollection %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.vulnerable_people'|trans }}</strong></td>
<td>
- <ul>
- {% if object.vulnerablePeople %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.vulnerablePeople %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.data_crossing'|trans }}</strong></td>
<td>
- <ul>
- {% if object.dataCrossing %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.dataCrossing %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.evaluation_or_rating'|trans }}</strong></td>
<td>
- <ul>
- {% if object.evaluationOrRating %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.evaluationOrRating %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automated_decisions_with_legal_effect'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automatedDecisionsWithLegalEffect %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automatedDecisionsWithLegalEffect %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.automatic_exclusion_service'|trans }}</strong></td>
<td>
- <ul>
- {% if object.automaticExclusionService %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.automaticExclusionService %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
<tr>
<td><strong>{{ 'registry.treatment.label.innovative_use'|trans }}</strong></td>
<td>
- <ul>
- {% if object.innovativeUse %}
- <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
- {% else %}
- <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
- {% endif %}
- </ul>
+ {% if object.innovativeUse %}
+ <span class="badge bg-yellow">{{ 'global.label.yes'|trans }}</span>
+ {% else %}
+ <span class="badge bg-green">{{ 'global.label.no'|trans }}</span>
+ {% endif %}
</td>
</tr>
</table>
@@ -366,7 +348,9 @@
<td class="col-md-4">
{% if object.concernedPeopleParticular.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleParticular.comment }}</p>
+ {% if object.concernedPeopleParticular.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleParticular.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -377,7 +361,9 @@
<td>
{% if object.concernedPeopleUser.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUser.comment }}</p>
+ {% if object.concernedPeopleUser.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUser.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -388,7 +374,9 @@
<td>
{% if object.concernedPeopleAgent.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleAgent.comment }}</p>
+ {% if object.concernedPeopleAgent.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleAgent.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -399,7 +387,9 @@
<td>
{% if object.concernedPeopleElected.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleElected.comment }}</p>
+ {% if object.concernedPeopleElected.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleElected.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -410,7 +400,9 @@
<td>
{% if object.concernedPeopleCompany.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleCompany.comment }}</p>
+ {% if object.concernedPeopleCompany.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleCompany.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -421,7 +413,9 @@
<td>
{% if object.concernedPeoplePartner.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeoplePartner.comment }}</p>
+ {% if object.concernedPeoplePartner.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeoplePartner.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -432,7 +426,9 @@
<td>
{% if object.concernedPeopleUsager.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleUsager.comment }}</p>
+ {% if object.concernedPeopleUsager.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleUsager.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -443,7 +439,9 @@
<td>
{% if object.concernedPeopleOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.concernedPeopleOther.comment }}</p>
+ {% if object.concernedPeopleOther.comment is not empty %}
+ <p class="mt-2">{{ object.concernedPeopleOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -488,7 +486,7 @@
<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.delay'|trans }}</strong></td>
+ <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">
@@ -540,7 +538,7 @@
</tr>
{% endif %}
<tr>
- <td><strong>{{ 'registry.treatment.label.legalMentions'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.legal_mentions'|trans }}</strong></td>
<td>
{% if object.legalMentions %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -551,7 +549,7 @@
</tr>
{% if object.legalBasis == 'consent' %}
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequest'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
<td>
{% if object.consentRequest %}
<span class="badge bg-gray">{{ 'global.label.yes'|trans }}</span>
@@ -562,7 +560,7 @@
</tr>
{% if object.consentRequestFormat is not null %}
<tr>
- <td><strong>{{ 'registry.treatment.label.consentRequestFormat'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.consent_request_format'|trans }}</strong></td>
<td>{{ object.consentRequestFormat }}</td>
</tr>
{% endif %}
@@ -582,7 +580,9 @@
<td>
{% if object.securityAccessControl.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityAccessControl.comment }}</p>
+ {% if object.securityAccessControl.comment is not empty %}
+ <p class="mt-2">{{ object.securityAccessControl.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -593,7 +593,9 @@
<td>
{% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitytracability.comment }}</p>
+ {% if object.securitytracability.comment is not empty %}
+ <p class="mt-2">{{ object.securitytracability.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -604,7 +606,9 @@
<td>
{% if object.securitySaving.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securitySaving.comment }}</p>
+ {% if object.securitySaving.comment is not empty %}
+ <p class="mt-2">{{ object.securitySaving.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -615,7 +619,9 @@
<td>
{% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityUpdate.comment }}</p>
+ {% if object.securityUpdate.comment is not empty %}
+ <p class="mt-2">{{ object.securityUpdate.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -626,7 +632,9 @@
<td>
{% if object.securityOther.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- <p>{{ object.securityOther.comment }}</p>
+ {% if object.securityOther.comment is not empty %}
+ <p class="mt-2">{{ object.securityOther.comment }}</p>
+ {% endif %}
{% else %}
<span class="badge bg-yellow">{{ 'global.label.no'|trans }}</span>
{% endif %}
@@ -671,15 +679,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# REQUESTS #}
- {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
- {# VIOLATIONS #}
- {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# REQUESTS #}
+ {% include '_Utils/_show_block_requests.html.twig' with { requests: object.requests } %}
+ {# VIOLATIONS #}
+ {% include '_Utils/_show_block_violations.html.twig' with { violations: object.violations } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Violation/pdf.html.twig b/templates/Registry/Violation/pdf.html.twig
index 07bd9e6f963ff2925a3049d6489058c82efd3897..3d5afcbeeb70d57f1b6534a2ba892a89bdc580b9 100644
--- a/templates/Registry/Violation/pdf.html.twig
+++ b/templates/Registry/Violation/pdf.html.twig
@@ -141,15 +141,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Violation/pdf_all.html.twig b/templates/Registry/Violation/pdf_all.html.twig
index ffb488782e1992318ccb5944bd9920f61e632d93..4de2b7b805215a344356222e77512609adb48d57 100644
--- a/templates/Registry/Violation/pdf_all.html.twig
+++ b/templates/Registry/Violation/pdf_all.html.twig
@@ -139,15 +139,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/Registry/Violation/show.html.twig b/templates/Registry/Violation/show.html.twig
index c531fa17285b3fe12ce603dfc7064566679fb437..6e1099e4a4198d85aa1399c23e435e8210bc2fba 100644
--- a/templates/Registry/Violation/show.html.twig
+++ b/templates/Registry/Violation/show.html.twig
@@ -215,15 +215,19 @@
{# LINKED MODULES #}
<div class="box box-solid box-warning">
<div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
- {# TREATMENTS #}
- {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
- {# CONTRACTORS #}
- {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
- {# PROOFS #}
- {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
- {# MESUREMENTS #}
- {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: object.treatments } %}
+ {# CONTRACTORS #}
+ {% include '_Utils/_show_block_contractors.html.twig' with { contractors: object.contractors } %}
+ {# PROOFS #}
+ {% include '_Utils/_show_block_proofs.html.twig' with { proofs: object.proofs } %}
+ {# MESUREMENTS #}
+ {% include '_Utils/_show_block_mesurements.html.twig' with { mesurements: object.mesurements } %}
+ </tbody>
+ </table>
</div>
</div>
diff --git a/templates/User/Profile/notifications.html.twig b/templates/User/Profile/notifications.html.twig
index 83b8f1ab6039c5871aa1a1c86d1d52d4a65c03a8..2bed1fe6ef13563f4c210d11d786f2e3cfb3ab84 100644
--- a/templates/User/Profile/notifications.html.twig
+++ b/templates/User/Profile/notifications.html.twig
@@ -5,7 +5,7 @@
<div class="box-body">
{% if form.notGeneratesNotifications is defined %}
<div class="form-group">
- <label class="control-label">{{ 'notifications.label.not_generates_notifications_label'|trans }}</label>
+ <label class="control-label">{{ 'notifications.label.generates_notifications'|trans }}</label>
{{ form_widget(form.notGeneratesNotifications) }}
</div>
{% endif %}
@@ -107,10 +107,6 @@
{% endfor %}
</table>
</div>
- <!-- Fonctionnalité non testée -->
- {# <div class="form-group">
- <label class="control-label">Recevoir des notifications par email</label>
- {{ form_widget(form.emailNotificationPreference.notificationMask) }}
- </div> #}
+ {{ form_row(form.emailNotificationPreference.notificationMask) }}
</div>
</div>
diff --git a/templates/User/Profile/user_edit.html.twig b/templates/User/Profile/user_edit.html.twig
index 1311f9485a02aa70f35171830162ab7d53c5142c..5c6d5c8032e121200a8316990a9eea193fd64e08 100644
--- a/templates/User/Profile/user_edit.html.twig
+++ b/templates/User/Profile/user_edit.html.twig
@@ -100,9 +100,9 @@
<h3 class="box-title">{{ 'user.user.tab.optional'|trans }}</h3>
</div>
<div class="box-body">
- <blockquote>
- <small>{{ 'user.user.label.help.password'|trans }}</small>
- </blockquote>
+ <div class="callout callout-default text-muted">
+ {{ 'user.user.label.help.password'|trans }}
+ </div>
{{ form_row(form.plainPassword) }}
</div>
</div>
diff --git a/templates/User/User/_form.html.twig b/templates/User/User/_form.html.twig
index 41d10d402dcf63fcf733289dbe352dc8e04cac8d..a92c1438bf10f599eb23ee294fef7fc10ee4cd7c 100644
--- a/templates/User/User/_form.html.twig
+++ b/templates/User/User/_form.html.twig
@@ -62,9 +62,9 @@
<h3 class="box-title">{{ 'user.user.tab.optional'|trans }}</h3>
</div>
<div class="box-body">
- <blockquote>
- <small>{{ 'user.user.label.help.password'|trans }}</small>
- </blockquote>
+ <div class="callout callout-default text-muted">
+ {{ 'user.user.label.help.password'|trans }}
+ </div>
{{ form_row(form.plainPassword) }}
</div>
</div>
diff --git a/templates/_Utils/_show_block_contractors.html.twig b/templates/_Utils/_show_block_contractors.html.twig
index bf0f29e3ae6a61e31974949a0da292c05b1564f2..9f5826b16dbf309b8d6e796ccafd42878737b55a 100644
--- a/templates/_Utils/_show_block_contractors.html.twig
+++ b/templates/_Utils/_show_block_contractors.html.twig
@@ -1,15 +1,20 @@
-{% set activeContractors = object.contractors -%}
+<tr>
+ <td><strong>{{ 'global.label.linked_contractor'|trans }}</strong></td>
+ <td>
+ {% set activeContractors = object.contractors -%}
-{% if activeContractors|length > 0 %}
- <ul>
- {% for contractor in activeContractors %}
- <li>
- <a href="{{ path('registry_contractor_show', { id: contractor.id }) }}">
- {{ contractor.name }}
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_contractor'|trans }}</i></span>
-{% endif %}
+ {% if activeContractors|length > 0 %}
+ <ul>
+ {% for contractor in activeContractors %}
+ <li>
+ <a href="{{ path('registry_contractor_show', { id: contractor.id }) }}">
+ {{ contractor.name }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_contractor'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_mesurements.html.twig b/templates/_Utils/_show_block_mesurements.html.twig
index ed11d83cf6d09d2d0bd9806714902b25684ede12..d12c7596688d977ca6772bad2e745a47dc65f082 100644
--- a/templates/_Utils/_show_block_mesurements.html.twig
+++ b/templates/_Utils/_show_block_mesurements.html.twig
@@ -1,13 +1,18 @@
-{% if mesurements|length > 0 %}
- <ul>
- {% for mesurement in mesurements %}
- <li>
- <a href="{{ path('registry_mesurement_show', { id: mesurement.id }) }}">
- {{ mesurement.name }}
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_mesurement'|trans }}</i></span>
-{% endif %}
+<tr>
+ <td><strong>{{ 'global.label.linked_mesurement'|trans }}</strong></td>
+ <td>
+ {% if mesurements|length > 0 %}
+ <ul>
+ {% for mesurement in mesurements %}
+ <li>
+ <a href="{{ path('registry_mesurement_show', { id: mesurement.id }) }}">
+ {{ mesurement.name }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_mesurement'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_proofs.html.twig b/templates/_Utils/_show_block_proofs.html.twig
index 0d1fe5900de46e7388a24079e27b6b856072b2e6..e0f57c83dab293cebeaaa0b23b0d6233fe74fe55 100644
--- a/templates/_Utils/_show_block_proofs.html.twig
+++ b/templates/_Utils/_show_block_proofs.html.twig
@@ -1,16 +1,21 @@
-{% set activeProofs = object.proofs|filter(proof => proof.deletedAt is null) -%}
+<tr>
+ <td><strong>{{ 'global.label.linked_proof'|trans }}</strong></td>
+ <td>
+ {% set activeProofs = object.proofs|filter(proof => proof.deletedAt is null) -%}
-{% if activeProofs|length > 0 %}
- <ul>
- {% for proof in activeProofs %}
- <li>
- <a href="{{ path('registry_proof_download', { id: proof.id }) }}">
- {{ proof.name }} ({{ proof.type|dictionary('registry_proof_type') }})
- </a>
- {{ proof.comment }}
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_proof'|trans }}</i></span>
-{% endif %}
+ {% if activeProofs|length > 0 %}
+ <ul>
+ {% for proof in activeProofs %}
+ <li>
+ <a href="{{ path('registry_proof_download', { id: proof.id }) }}">
+ {{ proof.name }} ({{ proof.type|dictionary('registry_proof_type') }})
+ </a>
+ {{ proof.comment }}
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_proof'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_requests.html.twig b/templates/_Utils/_show_block_requests.html.twig
index 53be43a2582c9b8153e0d0db0aee1cb9b1dc3ffa..e6b5f92d9960b7f5bed96de0508e5d97363f1dab 100644
--- a/templates/_Utils/_show_block_requests.html.twig
+++ b/templates/_Utils/_show_block_requests.html.twig
@@ -1,15 +1,20 @@
-{% set activeRequests = object.requests %}
+<tr>
+ <td><strong>{{ 'global.label.linked_request'|trans }}</strong></td>
+ <td>
+ {% set activeRequests = object.requests %}
-{% if activeRequests|length > 0 %}
- <ul>
- {% for request in activeRequests %}
- <li>
- <a href="{{ path('registry_treatment_request_show', { id: request.id }) }}">
- {{ request.date|date('d/m/Y') }} | {{ request.applicant.lastName }} {{ request.applicant.firstName }} | {{ ("label.request_" ~ request.object)|trans }}
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_request'|trans }}</i></span>
-{% endif %}
+ {% if activeRequests|length > 0 %}
+ <ul>
+ {% for request in activeRequests %}
+ <li>
+ <a href="{{ path('registry_treatment_request_show', { id: request.id }) }}">
+ {{ request.date|date('d/m/Y') }} | {{ request.applicant.lastName }} {{ request.applicant.firstName }} | {{ ("label.request_" ~ request.object)|trans }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_request'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_tools.html.twig b/templates/_Utils/_show_block_tools.html.twig
index 761dfbf41f49a2d383d9992c19685d1062692bef..73337605bcee68b78e6439e14c9cc8cc49e13cb7 100644
--- a/templates/_Utils/_show_block_tools.html.twig
+++ b/templates/_Utils/_show_block_tools.html.twig
@@ -1,13 +1,18 @@
-{% if tools|length > 0 %}
- <ul>
- {% for tool in tools %}
- <li>
- <a href="{{ path('registry_tool_show', { id: tool.id }) }}">
- {{ tool.name }}
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_tool'|trans }}</i></span>
-{% endif %}
+<tr>
+ <td><strong>{{ 'global.label.linked_tool'|trans }}</strong></td>
+ <td>
+ {% if tools|length > 0 %}
+ <ul>
+ {% for tool in tools %}
+ <li>
+ <a href="{{ path('registry_tool_show', { id: tool.id }) }}">
+ {{ tool.name }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_tool'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_treatments.html.twig b/templates/_Utils/_show_block_treatments.html.twig
index 5b0049f7c9a49f046c028e9596d53518d34f2d70..b6e1abd2cf6ac798b9fc125438248a69d0b62a33 100644
--- a/templates/_Utils/_show_block_treatments.html.twig
+++ b/templates/_Utils/_show_block_treatments.html.twig
@@ -1,15 +1,20 @@
-{% set activeTreatments = object.treatments|filter(treatment => treatment.active) -%}
+<tr>
+ <td><strong>{{ 'global.label.linked_treatment'|trans }}</strong></td>
+ <td>
+ {% set activeTreatments = object.treatments|filter(treatment => treatment.active) -%}
-{% if activeTreatments|length > 0 %}
- <ul>
- {% for treatment in activeTreatments %}
- <li>
- <a href="{{ path('registry_treatment_show', { id: treatment.id }) }}">
- {{ treatment.name }} ({{ treatment.legalBasis|dictionary('registry_treatment_legal_basis') }})
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_treatment'|trans }}</i></span>
-{% endif %}
+ {% if activeTreatments|length > 0 %}
+ <ul>
+ {% for treatment in activeTreatments %}
+ <li>
+ <a href="{{ path('registry_treatment_show', { id: treatment.id }) }}">
+ {{ treatment.name }} ({{ treatment.legalBasis|dictionary('registry_treatment_legal_basis') }})
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_treatment'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_block_violations.html.twig b/templates/_Utils/_show_block_violations.html.twig
index 80d55ee88da2d7834a9fa811747207492c332578..cdbb5009faa84bef515e3659d10641333773291f 100644
--- a/templates/_Utils/_show_block_violations.html.twig
+++ b/templates/_Utils/_show_block_violations.html.twig
@@ -1,15 +1,20 @@
-{% set activeViolations = object.violations %}
+<tr>
+ <td><strong>{{ 'global.label.linked_violation'|trans }}</strong></td>
+ <td>
+ {% set activeViolations = object.violations %}
-{% if activeViolations|length > 0 %}
- <ul>
- {% for violation in activeViolations %}
- <li>
- <a href="{{ path('registry_treatment_violation_show', { id: violation.id }) }}">
- {{ violation.date|date('d/m/Y') }} | {{ violation.violationNatures|map(n => n|dictionary('registry_violation_nature'))|join(', ') }}
- </a>
- </li>
- {% endfor %}
- </ul>
-{% else %}
- <span><i>{{ 'global.label.no_linked_violation'|trans }}</i></span>
-{% endif %}
+ {% if activeViolations|length > 0 %}
+ <ul>
+ {% for violation in activeViolations %}
+ <li>
+ <a href="{{ path('registry_treatment_violation_show', { id: violation.id }) }}">
+ {{ violation.date|date('d/m/Y') }} | {{ violation.violationNatures|map(n => n|dictionary('registry_violation_nature'))|join(', ') }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ <span><i>{{ 'global.label.no_linked_violation'|trans }}</i></span>
+ {% endif %}
+ </td>
+</tr>
diff --git a/templates/_Utils/_show_public_block_proofs.html.twig b/templates/_Utils/_show_public_block_proofs.html.twig
index 4b710688727a1813da7ba8660b85a871afd74772..35a7fc0eaee1ab99875eccde1033cf596c97e74c 100644
--- a/templates/_Utils/_show_public_block_proofs.html.twig
+++ b/templates/_Utils/_show_public_block_proofs.html.twig
@@ -1,6 +1,6 @@
-<div class="box box-solid box-warning">
- <div class="box-header with-border"><h3 class="box-title">{{ 'global.tab.linked_modules'|trans }}</h3></div>
- <div class="box-body">
+<tr>
+ <td><strong>{{ 'global.label.linked_proof'|trans }}</strong></td>
+ <td>
{% set activeProofs = object.proofs|filter(proof => proof.deletedAt is null) -%}
{% if activeProofs|length > 0 %}
@@ -15,5 +15,5 @@
{% else %}
<span><i>{{ 'global.label.no_linked_proof'|trans }}</i></span>
{% endif %}
- </div>
-</div>
+ </td>
+</tr>