diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0af6447a717c63bc10cbbafae998ad249293c043..37fc895a4805816d412f3e45df285796478ddad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ CHANGELOG
- [Accessibilité] Mise à jour du schéma pluriannuel et du plan d'actions 2024.
- [Plan du site] Mise à jour des pages liées à l'accessibilité.
- [Traitements] Déplacement du consentement demandé et du format du bloc détails au bloc informations générales.
+- [Traitements] Repositionnement des mesures de sécurité et confidentialité par ordre alphabétique.
- [Indice de maturité] Modification du bouton de modification pour s'afficher que s'il y a des préconisations dans la synthèse d'un indice de maturité.
- [Bilan] Modification de l'affichage des données du dernier indice de maturité dans le bilan.
- [AIPD] Modification des dates des avis des acteurs pour ne rien afficher par défaut dans le PDF d'une AIPD.
diff --git a/config/api_platform/serialization/treatment.yaml b/config/api_platform/serialization/treatment.yaml
index 424d1e8ab9fe45189e5c2b2ed19ba0f47e31ad40..dd26b6bf45773efc713bfe2c7a1957a0758dbe0a 100644
--- a/config/api_platform/serialization/treatment.yaml
+++ b/config/api_platform/serialization/treatment.yaml
@@ -30,10 +30,10 @@ App\Domain\Registry\Model\Treatment:
groups: ['treatment_read']
securityAccessControl:
groups: ['treatment_read']
- securitySaving:
- groups: ['treatment_read']
securityUpdate:
groups: ['treatment_read']
+ securitySaving:
+ groups: ['treatment_read']
securityOther:
groups: ['treatment_read']
securityEntitledPersons:
diff --git a/config/domain/registry/validation/treatment.yaml b/config/domain/registry/validation/treatment.yaml
index 4dcd5f8dcfacf96925f3f5020736b913463f6817..35ded7a70cfa11baa12741838dac1b073312a84a 100644
--- a/config/domain/registry/validation/treatment.yaml
+++ b/config/domain/registry/validation/treatment.yaml
@@ -46,11 +46,11 @@ App\Domain\Registry\Model\Treatment:
groups: ['default']
securityAccessControl:
- Valid: ~
- securityTracability:
+ securityUpdate:
- Valid: ~
securitySaving:
- Valid: ~
- securityUpdate:
+ securityTracability:
- Valid: ~
securityOther:
- Valid: ~
diff --git a/src/Domain/Admin/Cloner/TreatmentCloner.php b/src/Domain/Admin/Cloner/TreatmentCloner.php
index 4acda8f15e1774a68b5c841d5305914aac64fee6..2f1ba108b03bdf9626f0ebf88086c65ad46688a2 100644
--- a/src/Domain/Admin/Cloner/TreatmentCloner.php
+++ b/src/Domain/Admin/Cloner/TreatmentCloner.php
@@ -89,14 +89,14 @@ class TreatmentCloner extends AbstractCloner
if (null !== $referent->getSecurityAccessControl()) {
$treatment->setSecurityAccessControl($referent->getSecurityAccessControl());
}
- if (null !== $referent->getSecurityTracability()) {
- $treatment->setSecurityTracability($referent->getSecurityTracability());
+ if (null !== $referent->getSecurityUpdate()) {
+ $treatment->setSecurityUpdate($referent->getSecurityUpdate());
}
if (null !== $referent->getSecuritySaving()) {
$treatment->setSecuritySaving($referent->getSecuritySaving());
}
- if (null !== $referent->getSecurityUpdate()) {
- $treatment->setSecurityUpdate($referent->getSecurityUpdate());
+ if (null !== $referent->getSecurityTracability()) {
+ $treatment->setSecurityTracability($referent->getSecurityTracability());
}
if (null !== $referent->getSecurityOther()) {
$treatment->setSecurityOther($referent->getSecurityOther());
diff --git a/src/Domain/Registry/Controller/TreatmentController.php b/src/Domain/Registry/Controller/TreatmentController.php
index 587e621863c5927a66afffcfd009f8eb7c019644..0d7723165d6c8b02f90a0d8ff3b07d52c4e860ff 100644
--- a/src/Domain/Registry/Controller/TreatmentController.php
+++ b/src/Domain/Registry/Controller/TreatmentController.php
@@ -372,9 +372,9 @@ class TreatmentController extends CRUDController
'gestionnaire' => $treatment->getManager(),
'sousTraitant' => $contractors,
'controleAcces' => $treatment->getSecurityAccessControl()->isCheck() ? $yes : $no,
- 'tracabilite' => $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
- 'saving' => $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
'update' => $treatment->getSecurityUpdate()->isCheck() ? $yes : $no,
+ 'saving' => $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
+ 'tracabilite' => $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
'other' => $treatment->getSecurityOther()->isCheck() ? $yes : $no,
'entitledPersons' => $treatment->isSecurityEntitledPersons() ? $yes : $no,
'openAccounts' => $treatment->isSecurityOpenAccounts() ? $yes : $no,
diff --git a/src/Domain/Registry/Form/Type/TreatmentType.php b/src/Domain/Registry/Form/Type/TreatmentType.php
index f5ff4bc12cd04bc59c549a78e00d03374b84b3c2..833a6a9969996ee2d1704f02b7c55f556533bf73 100644
--- a/src/Domain/Registry/Form/Type/TreatmentType.php
+++ b/src/Domain/Registry/Form/Type/TreatmentType.php
@@ -229,16 +229,16 @@ class TreatmentType extends LinkableType
'label' => 'registry.treatment.label.security_access_control',
'required' => false,
])
- ->add('securityTracability', ComplexChoiceAreaType::class, [
- 'label' => 'registry.treatment.label.security_tracability',
+ ->add('securityUpdate', ComplexChoiceAreaType::class, [
+ 'label' => 'registry.treatment.label.security_update',
'required' => false,
])
->add('securitySaving', ComplexChoiceAreaType::class, [
'label' => 'registry.treatment.label.security_saving',
'required' => false,
])
- ->add('securityUpdate', ComplexChoiceAreaType::class, [
- 'label' => 'registry.treatment.label.security_update',
+ ->add('securityTracability', ComplexChoiceAreaType::class, [
+ 'label' => 'registry.treatment.label.security_tracability',
'required' => false,
])
->add('securityOther', ComplexChoiceAreaType::class, [
diff --git a/src/Domain/Registry/Model/Treatment.php b/src/Domain/Registry/Model/Treatment.php
index 01d959a4504d31e00977f3f56a72f528345d3521..49052fead9543a43261ff39fd5eb9b358473f3d9 100644
--- a/src/Domain/Registry/Model/Treatment.php
+++ b/src/Domain/Registry/Model/Treatment.php
@@ -149,11 +149,11 @@ class Treatment implements LoggableSubject, CollectivityRelated
private $securityAccessControl;
/**
- * FR: Tracabilité (mesure de sécurité).
+ * FR: Mises à jour (mesure de sécurité).
*
* @var ComplexChoice
*/
- private $securityTracability;
+ private $securityUpdate;
/**
* FR: Sauvegarde (mesure de sécurité).
@@ -163,11 +163,11 @@ class Treatment implements LoggableSubject, CollectivityRelated
private $securitySaving;
/**
- * FR: Mises à jour (mesure de sécurité).
+ * FR: Tracabilité (mesure de sécurité).
*
* @var ComplexChoice
*/
- private $securityUpdate;
+ private $securityTracability;
/**
* FR: Autres (mesure de sécurité).
@@ -432,9 +432,9 @@ class Treatment implements LoggableSubject, CollectivityRelated
$this->dataCategories = [];
$this->securityAccessControl = new ComplexChoice();
- $this->securityTracability = new ComplexChoice();
- $this->securitySaving = new ComplexChoice();
$this->securityUpdate = new ComplexChoice();
+ $this->securitySaving = new ComplexChoice();
+ $this->securityTracability = new ComplexChoice();
$this->securityOther = new ComplexChoice();
$this->securityEntitledPersons = false;
$this->securityOpenAccounts = false;
@@ -697,14 +697,14 @@ class Treatment implements LoggableSubject, CollectivityRelated
$this->securityAccessControl = $securityAccessControl;
}
- public function getSecurityTracability(): ComplexChoice
+ public function getSecurityUpdate(): ComplexChoice
{
- return $this->securityTracability;
+ return $this->securityUpdate;
}
- public function setSecurityTracability(ComplexChoice $securityTracability): void
+ public function setSecurityUpdate(ComplexChoice $securityUpdate): void
{
- $this->securityTracability = $securityTracability;
+ $this->securityUpdate = $securityUpdate;
}
public function getSecuritySaving(): ComplexChoice
@@ -717,14 +717,14 @@ class Treatment implements LoggableSubject, CollectivityRelated
$this->securitySaving = $securitySaving;
}
- public function getSecurityUpdate(): ComplexChoice
+ public function getSecurityTracability(): ComplexChoice
{
- return $this->securityUpdate;
+ return $this->securityTracability;
}
- public function setSecurityUpdate(ComplexChoice $securityUpdate): void
+ public function setSecurityTracability(ComplexChoice $securityTracability): void
{
- $this->securityUpdate = $securityUpdate;
+ $this->securityTracability = $securityTracability;
}
public function getSecurityOther(): ComplexChoice
diff --git a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
index 50a7376e178c0aa785ab95be59ec4727ee950439..75169e99bfae794deefa84260f699d85ab5eb535 100644
--- a/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Csv/TreatmentGenerator.php
@@ -337,12 +337,12 @@ class TreatmentGenerator extends AbstractGenerator
return [
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_access_control'),
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_access_control') . ' - Commentaire',
- $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability'),
- $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability') . ' - Commentaire',
- $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving'),
- $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving') . ' - Commentaire',
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_update'),
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_update') . ' - Commentaire',
+ $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving'),
+ $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_saving') . ' - Commentaire',
+ $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability'),
+ $securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_tracability') . ' - Commentaire',
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_other'),
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_other') . ' - Commentaire',
$securityTrans . ' - ' . $this->translator->trans('registry.treatment.label.security_entitled_persons'),
@@ -359,12 +359,12 @@ class TreatmentGenerator extends AbstractGenerator
return [
$treatment->getSecurityAccessControl()->isCheck() ? $yes : $no,
$treatment->getSecurityAccessControl()->getComment(),
- $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
- $treatment->getSecurityTracability()->getComment(),
- $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
- $treatment->getSecuritySaving()->getComment(),
$treatment->getSecurityUpdate()->isCheck() ? $yes : $no,
$treatment->getSecurityUpdate()->getComment(),
+ $treatment->getSecuritySaving()->isCheck() ? $yes : $no,
+ $treatment->getSecuritySaving()->getComment(),
+ $treatment->getSecurityTracability()->isCheck() ? $yes : $no,
+ $treatment->getSecurityTracability()->getComment(),
$treatment->getSecurityOther()->isCheck() ? $yes : $no,
$treatment->getSecurityOther()->getComment(),
$treatment->isSecurityEntitledPersons() ? $yes : $no,
diff --git a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
index 8dcf5b005010055c9ea55d5e4a45488f36138558..e2f7bb821f7f74526f75cf2418967649e8314b80 100644
--- a/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
+++ b/src/Domain/Reporting/Generator/Word/TreatmentGenerator.php
@@ -93,14 +93,14 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
if ($treatment->getSecurityAccessControl()->isCheck()) {
++$security['accessControl'];
}
- if ($treatment->getSecurityTracability()->isCheck()) {
- ++$security['tracability'];
+ if ($treatment->getSecurityUpdate()->isCheck()) {
+ ++$security['update'];
}
if ($treatment->getSecuritySaving()->isCheck()) {
++$security['saving'];
}
- if ($treatment->getSecurityUpdate()->isCheck()) {
- ++$security['update'];
+ if ($treatment->getSecurityTracability()->isCheck()) {
+ ++$security['tracability'];
}
}
}
@@ -429,9 +429,9 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
$treatment->getSecurityAccessControl()->getComment(),
],
[
- 'Traçabilité',
- $treatment->getSecurityTracability()->isCheck() ? 'Oui' : 'Non',
- $treatment->getSecurityTracability()->getComment(),
+ 'Mise à jour',
+ $treatment->getSecurityUpdate()->isCheck() ? 'Oui' : 'Non',
+ $treatment->getSecurityUpdate()->getComment(),
],
[
'Sauvegarde',
@@ -439,9 +439,9 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
$treatment->getSecuritySaving()->getComment(),
],
[
- 'Mise à jour',
- $treatment->getSecurityUpdate()->isCheck() ? 'Oui' : 'Non',
- $treatment->getSecurityUpdate()->getComment(),
+ 'Traçabilité',
+ $treatment->getSecurityTracability()->isCheck() ? 'Oui' : 'Non',
+ $treatment->getSecurityTracability()->getComment(),
],
[
'Autres',
@@ -581,14 +581,14 @@ class TreatmentGenerator extends AbstractGenerator implements ImpressionGenerato
if ($item->getSecurityAccessControl()->isCheck()) {
$cell->addListItem('Contrôle d\'accès', null, [], [], ['spaceAfter' => 0]);
}
- if ($item->getSecurityTracability()->isCheck()) {
- $cell->addListItem('Traçabilité', null, [], [], ['spaceAfter' => 0]);
+ if ($item->getSecurityUpdate()->isCheck()) {
+ $cell->addListItem('Mise à jour', null, [], [], ['spaceAfter' => 0]);
}
if ($item->getSecuritySaving()->isCheck()) {
$cell->addListItem('Sauvegarde', null, [], [], ['spaceAfter' => 0]);
}
- if ($item->getSecurityUpdate()->isCheck()) {
- $cell->addListItem('Mise à jour', null, [], [], ['spaceAfter' => 0]);
+ if ($item->getSecurityTracability()->isCheck()) {
+ $cell->addListItem('Traçabilité', null, [], [], ['spaceAfter' => 0]);
}
if ($item->getSecurityOther()->isCheck()) {
$cell->addListItem('Autres', null, [], [], ['spaceAfter' => 0]);
diff --git a/src/Domain/Reporting/Metrics/UserMetric.php b/src/Domain/Reporting/Metrics/UserMetric.php
index c42f1eaaa620d4485a73ed387e2a441b7f56e051..ed37ce0ddf8b2057574e24bef8c851a562141e54 100644
--- a/src/Domain/Reporting/Metrics/UserMetric.php
+++ b/src/Domain/Reporting/Metrics/UserMetric.php
@@ -181,7 +181,7 @@ class UserMetric implements MetricInterface
'yes' => 0,
'no' => 0,
],
- 'securityTracability' => [
+ 'securityUpdate' => [
'yes' => 0,
'no' => 0,
],
@@ -189,7 +189,7 @@ class UserMetric implements MetricInterface
'yes' => 0,
'no' => 0,
],
- 'securityUpdate' => [
+ 'securityTracability' => [
'yes' => 0,
'no' => 0,
],
@@ -375,20 +375,20 @@ class UserMetric implements MetricInterface
} else {
++$data['treatment']['value']['data']['securityAccessControl']['no'];
}
- if ($treatment->getSecurityTracability()->isCheck()) {
- ++$data['treatment']['value']['data']['securityTracability']['yes'];
+ if ($treatment->getSecurityUpdate()->isCheck()) {
+ ++$data['treatment']['value']['data']['securityUpdate']['yes'];
} else {
- ++$data['treatment']['value']['data']['securityTracability']['no'];
+ ++$data['treatment']['value']['data']['securityUpdate']['no'];
}
if ($treatment->getSecuritySaving()->isCheck()) {
++$data['treatment']['value']['data']['securitySaving']['yes'];
} else {
++$data['treatment']['value']['data']['securitySaving']['no'];
}
- if ($treatment->getSecurityUpdate()->isCheck()) {
- ++$data['treatment']['value']['data']['securityUpdate']['yes'];
+ if ($treatment->getSecurityTracability()->isCheck()) {
+ ++$data['treatment']['value']['data']['securityTracability']['yes'];
} else {
- ++$data['treatment']['value']['data']['securityUpdate']['no'];
+ ++$data['treatment']['value']['data']['securityTracability']['no'];
}
}
}
diff --git a/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml b/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
index c28e29cf62c8654a31b40029a8f9f54cc419c1e8..a3be0a80af1a8435553f583480c2cdcb3ccbca55 100644
--- a/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
+++ b/src/Infrastructure/ORM/Registry/Mapping/Treatment.orm.xml
@@ -69,9 +69,9 @@
<field name="consentRequestFormat" column="consent_request_format" type="text" nullable="true"/>
<embedded name="securityAccessControl" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_access_control_"/>
- <embedded name="securityTracability" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_tracability_"/>
- <embedded name="securitySaving" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_saving_"/>
<embedded name="securityUpdate" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_update_"/>
+ <embedded name="securitySaving" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_saving_"/>
+ <embedded name="securityTracability" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_tracability_"/>
<embedded name="securityOther" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="security_other_"/>
<embedded name="concernedPeopleParticular" class="App\Domain\Registry\Model\Embeddable\ComplexChoice" column-prefix="concerned_people_particular_"/>
diff --git a/src/Infrastructure/ORM/Registry/Repository/Treatment.php b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
index 2b51c40e86d15a8c11ce69fbfbcd3eb7266faeb4..9a1283728b47f37b5ecbda557a38e2f5498a93bf 100644
--- a/src/Infrastructure/ORM/Registry/Repository/Treatment.php
+++ b/src/Infrastructure/ORM/Registry/Repository/Treatment.php
@@ -313,14 +313,14 @@ class Treatment extends CRUDRepository implements Repository\Treatment
case 'controleAcces':
$queryBuilder->addOrderBy('o.securityAccessControl.check', $orderDir);
break;
- case 'tracabilite':
- $queryBuilder->addOrderBy('o.securityTracability.check', $orderDir);
+ case 'update':
+ $queryBuilder->addOrderBy('o.securityUpdate.check', $orderDir);
break;
case 'saving':
$queryBuilder->addOrderBy('o.securitySaving.check', $orderDir);
break;
- case 'update':
- $queryBuilder->addOrderBy('o.securityUpdate.check', $orderDir);
+ case 'tracabilite':
+ $queryBuilder->addOrderBy('o.securityTracability.check', $orderDir);
break;
case 'other':
$queryBuilder->addOrderBy('o.securityOther.check', $orderDir);
@@ -444,17 +444,17 @@ class Treatment extends CRUDRepository implements Repository\Treatment
$queryBuilder->andWhere('o.securityAccessControl.check = :access_control')
->setParameter('access_control', $search);
break;
- case 'tracabilite':
- $queryBuilder->andWhere('o.securityTracability.check = :tracabilite')
- ->setParameter('tracabilite', $search);
+ case 'update':
+ $queryBuilder->andWhere('o.securityUpdate.check = :update')
+ ->setParameter('update', $search);
break;
case 'saving':
$queryBuilder->andWhere('o.securitySaving.check = :saving')
->setParameter('saving', $search);
break;
- case 'update':
- $queryBuilder->andWhere('o.securityUpdate.check = :update')
- ->setParameter('update', $search);
+ case 'tracabilite':
+ $queryBuilder->andWhere('o.securityTracability.check = :tracabilite')
+ ->setParameter('tracabilite', $search);
break;
case 'other':
$queryBuilder->andWhere('o.securityOther.check = :other')
diff --git a/templates/Aipd/Analyse_impact/pdf.html.twig b/templates/Aipd/Analyse_impact/pdf.html.twig
index d3defafa29d719a7025c103b46e463f579d935c2..88455be6a0ee74faa1177e49edd7a275436dbb60 100644
--- a/templates/Aipd/Analyse_impact/pdf.html.twig
+++ b/templates/Aipd/Analyse_impact/pdf.html.twig
@@ -765,113 +765,149 @@
<div style="page-break-before: always;"></div>
<h3>6.3 Fiche de traitement</h3>
{% set traitement = object.conformiteTraitement.traitement %}
+
+ {# DPO Statut #}
+ <div class="box box-solid box-default">
+ <div class="box-header with-border">
+ <h3 class="box-title">{{ 'registry.treatment.tab.statut_dpo'|trans }}</h3>
+ </div>
+ <div class="box-body no-padding">
+ <table role="presentation" class="table">
+ <tbody>
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.statut'|trans }}</strong></td>
+ <td>
+ {% if traitement.statut is defined and traitement.statut %}
+ {{ traitement.statut|dictionary('treatment_statut') }}
+ {% endif %}
+ </td>
+ </tr>
+ {% if traitement.dpoMessage is not null %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.dpoMessage'|trans }}</strong></td>
+ <td>{{ traitement.dpoMessage }}</td>
+ </tr>
+ {% endif %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+
{# 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 %}
- </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>
+ <td><strong>{{ 'registry.treatment.label.name'|trans }}</strong></td>
+ <td>{{ traitement.name }}</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" %}
+ {% if traitement.collectivity.isServicesEnabled %}
+ <tr>
+ <td><strong>{{ 'registry.label.service'|trans }}</strong></td>
+ <td>{{ traitement.service }}</td>
+ </tr>
+ {% endif %}
<tr>
- <td><strong>{{ 'registry.treatment.label.coordonnees_responsable_traitement'|trans }}</strong></td>
- <td>{{ traitement.coordonneesResponsableTraitement|nl2br }}</td>
+ <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 %}
+ </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>
+ {% if traitement.legalBasis == 'consent' %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.consent_request'|trans }}</strong></td>
+ <td>
+ {% if traitement.consentRequest %}
+ <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.consent_request_format'|trans }}</strong></td>
+ <td>{{ traitement.consentRequestFormat }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.observation'|trans }}</strong></td>
+ <td>{{ traitement.observation|nl2br }}</td>
+ </tr>
+ <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 %}
+ </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 %}
- </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 %}
-
{# 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 class="ps-1">
- {% for category in traitement.dataCategories %}
- <li>
- {% if category.sensible %}<strong>{% endif %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.data_category'|trans }}</strong></td>
+ <td>
+ <ul class="ps-1">
+ {% 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>
+ </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>
@@ -883,20 +919,20 @@
<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 class="ps-1">
- {% for contractor in traitement.contractors %}
- <li>{{ contractor }}</li>
- {% endfor %}
- </ul>
- </td>
- </tr>
+ <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 class="ps-1">
+ {% for contractor in traitement.contractors %}
+ <li>{{ contractor }}</li>
+ {% endfor %}
+ </ul>
+ </td>
+ </tr>
</tbody>
</table>
</div>
@@ -908,96 +944,97 @@
<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>
+ <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>
+ </tbody>
</table>
</div>
</div>
@@ -1008,199 +1045,205 @@
<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>
+ <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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
-
+ </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 %}
- {{ 'global.label.linked_tool'|trans }}
+ <ul class="ps-1">
+ {% for tool in traitement.tools %}
+ <li>{{ tool.name }}</li>
+ {% endfor %}
+ </ul>
{% else %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
+ {{ traitement.software }}
{% 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>
+ </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>
</tbody>
</table>
<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.shelflife'|trans }}</strong></td>
- <td style="padding-top: 10px; width: 80%">
- {% for method in traitement.shelfLifes %}
- <div class="box box-default">
- <div class="box-body no-padding">
- <table class="table">
- <tbody>
- <tr>
- <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
- <td>{{ method.name }}</td>
- </tr>
- <tr>
- <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
- <td>{{ method.duration }}</td>
- </tr>
- <tr>
- <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
- <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
- </tr>
- </tbody>
- </table>
+ <tr>
+ <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 traitement.shelfLifes %}
+ <div class="box box-default">
+ <div class="box-body no-padding">
+ <table class="table">
+ <tbody>
+ <tr>
+ <th class="text-bold" style="width: 40%">{{ 'registry.treatment.label.shelflife_name'|trans }}</th>
+ <td>{{ method.name }}</td>
+ </tr>
+ <tr>
+ <th class="text-bold">{{ 'registry.treatment.label.shelflife_duration'|trans }}</th>
+ <td>{{ method.duration }}</td>
+ </tr>
+ <tr>
+ <th class="text-bold">{{ 'registry.treatment.label.shelflife_ultimate_fate'|trans }}</th>
+ <td>{{ method.ultimateFate|dictionary('registry_treatment_ultimate_fate') }}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- </div>
- {% endfor %}
- </td>
- </tr>
+ {% endfor %}
+ </td>
+ </tr>
</tbody>
</table>
<table class="table">
<tbody>
- <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>
- <ul class="ps-1">
- {% for method in traitement.collectingMethod %}
- <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
- {% endfor %}
- </ul>
- </td>
- </tr>
- {% if traitement.otherCollectingMethod is not null %}
<tr>
- <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
- <td>{{ traitement.otherCollectingMethod }}</td>
+ <td><strong>{{ 'registry.treatment.label.data_origin'|trans }}</strong></td>
+ <td>{{ traitement.dataOrigin }}</td>
</tr>
- {% endif %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.collecting_method'|trans }}</strong></td>
+ <td>
+ <ul class="ps-1">
+ {% for method in traitement.collectingMethod %}
+ <li>{{ method|dictionary('registry_treatment_collecting_method') }}</li>
+ {% endfor %}
+ </ul>
+ </td>
+ </tr>
+ {% if traitement.otherCollectingMethod is not null %}
+ <tr>
+ <td><strong>{{ 'registry.treatment.label.otherCollectingMethod'|trans }}</strong></td>
+ <td>{{ traitement.otherCollectingMethod }}</td>
+ </tr>
+ {% endif %}
+ </tbody>
</table>
</div>
</div>
@@ -1211,101 +1254,101 @@
<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>
+ <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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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 %}
- {% 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>
+ </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>
@@ -1317,6 +1360,8 @@
<div class="box-body no-padding">
<table class="table">
<tbody>
+ {# TREATMENTS #}
+ {% include '_Utils/_show_block_treatments.html.twig' with { treatments: traitement.treatments } %}
{# REQUESTS #}
{% include '_Utils/_show_block_requests.html.twig' with { requests: traitement.requests } %}
{# VIOLATIONS #}
@@ -1449,26 +1494,26 @@
<div class="box-body no-padding">
<table class="table">
<tbody>
- {% if is_granted('ROLE_REFERENT') %}
+ {% if is_granted('ROLE_REFERENT') %}
+ <tr>
+ <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
+ <td>
+ {{ traitement.collectivity }}
+ </td>
+ </tr>
+ {% endif %}
<tr>
- <td><strong>{{ 'global.label.organization'|trans }}</strong></td>
- <td>
- {{ traitement.collectivity }}
- </td>
+ <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>
- {% 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>
diff --git a/templates/Registry/Treatment/_form.html.twig b/templates/Registry/Treatment/_form.html.twig
index 2639d2f339c5e1676ab635aa2f32becf7c6bbdbc..0c47318d82366ea4013b879dc2158f1bbeb93147 100644
--- a/templates/Registry/Treatment/_form.html.twig
+++ b/templates/Registry/Treatment/_form.html.twig
@@ -186,9 +186,9 @@
<div class="box-header with-border"><h3 class="box-title">{{ 'registry.treatment.tab.security'|trans }}</h3></div>
<div class="box-body">
{{ form_row(form.securityAccessControl) }}
- {{ form_row(form.securityTracability) }}
- {{ form_row(form.securitySaving) }}
{{ form_row(form.securityUpdate) }}
+ {{ form_row(form.securitySaving) }}
+ {{ form_row(form.securityTracability) }}
{{ form_row(form.securityOther) }}
{{ form_row(form.securityEntitledPersons) }}
{{ form_row(form.securityOpenAccounts) }}
diff --git a/templates/Registry/Treatment/configuration.html.twig b/templates/Registry/Treatment/configuration.html.twig
index f3a134f1ad5e47aac4c390c712c298cca156ee38..8322ecfb1b234ec7f512d45fbae4a0d40e37a0d3 100644
--- a/templates/Registry/Treatment/configuration.html.twig
+++ b/templates/Registry/Treatment/configuration.html.twig
@@ -166,9 +166,9 @@
</div>
<div class="box-body">
{{ form_row(form.securityAccessControl) }}
- {{ form_row(form.securityTracability) }}
- {{ form_row(form.securitySaving) }}
{{ form_row(form.securityUpdate) }}
+ {{ form_row(form.securitySaving) }}
+ {{ form_row(form.securityTracability) }}
{{ form_row(form.securityOther) }}
{{ form_row(form.securityEntitledPersons) }}
{{ form_row(form.securityOpenAccounts) }}
diff --git a/templates/Registry/Treatment/list.html.twig b/templates/Registry/Treatment/list.html.twig
index b1bcc8ce871f0ae538eeb0381610516d2e8e4ef3..68bd1b6f88f0b1adf4ce7cdd59c2ed5b226a5c5c 100644
--- a/templates/Registry/Treatment/list.html.twig
+++ b/templates/Registry/Treatment/list.html.twig
@@ -150,8 +150,8 @@
</select>
</th>
<th scope="col">
- <select class="form-control" id="search_tracabilite" style="width: 100%;">
- <option value="">{{ 'registry.treatment.label.security_tracability'|trans }}</option>
+ <select class="form-control" id="search_update" style="width: 100%;">
+ <option value="">{{ 'registry.treatment.label.security_update'|trans }}</option>
<option value="1">{{ 'global.label.yes'|trans }}</option>
<option value="0">{{ 'global.label.no'|trans }}</option>
</select>
@@ -164,8 +164,8 @@
</select>
</th>
<th scope="col">
- <select class="form-control" id="search_update" style="width: 100%;">
- <option value="">{{ 'registry.treatment.label.security_update'|trans }}</option>
+ <select class="form-control" id="search_tracabilite" style="width: 100%;">
+ <option value="">{{ 'registry.treatment.label.security_tracability'|trans }}</option>
<option value="1">{{ 'global.label.yes'|trans }}</option>
<option value="0">{{ 'global.label.no'|trans }}</option>
</select>
@@ -264,9 +264,9 @@
<th scope="col">{{ 'global.label.linked_contractor'|trans }}</th>
<th scope="col">{{ 'registry.treatment.list.sensitive_data'|trans }}</th>
<th scope="col">{{ 'registry.treatment.label.security_access_control'|trans }}</th>
- <th scope="col">{{ 'registry.treatment.label.security_tracability'|trans }}</th>
- <th scope="col">{{ 'registry.treatment.label.security_saving'|trans }}</th>
<th scope="col">{{ 'registry.treatment.label.security_update'|trans }}</th>
+ <th scope="col">{{ 'registry.treatment.label.security_saving'|trans }}</th>
+ <th scope="col">{{ 'registry.treatment.label.security_tracability'|trans }}</th>
<th scope="col">{{ 'registry.treatment.label.security_other'|trans }}</th>
<th scope="col" style="max-width: 60px;">{{ 'registry.treatment.list.entitled_persons'|trans }}</th>
<th scope="col" style="max-width: 60px;">{{ 'registry.treatment.list.open_accounts'|trans }}</th>
@@ -316,9 +316,9 @@
{"data": "sousTraitant", "visible": false, "orderable": true},
{"data": "sensitiveData", "visible": true},
{"data": "controleAcces", "visible": false},
- {"data": "tracabilite", "visible": false},
- {"data": "saving", "visible": false},
{"data": "update", "visible": false},
+ {"data": "saving", "visible": false},
+ {"data": "tracabilite", "visible": false},
{"data": "other", "visible": false},
{"data": "entitledPersons", "visible": false},
{"data": "openAccounts", "visible": false},
@@ -347,9 +347,9 @@
{"data": "sousTraitant", "visible": false, "orderable": true},
{"data": "sensitiveData", "visible": true},
{"data": "controleAcces", "visible": false},
- {"data": "tracabilite", "visible": false},
- {"data": "saving", "visible": false},
{"data": "update", "visible": false},
+ {"data": "saving", "visible": false},
+ {"data": "tracabilite", "visible": false},
{"data": "other", "visible": false},
{"data": "entitledPersons", "visible": false},
{"data": "openAccounts", "visible": false},
@@ -380,9 +380,9 @@
{"data": "sousTraitant", "visible": false, "orderable": true},
{"data": "sensitiveData", "visible": true},
{"data": "controleAcces", "visible": false},
- {"data": "tracabilite", "visible": false},
- {"data": "saving", "visible": false},
{"data": "update", "visible": false},
+ {"data": "saving", "visible": false},
+ {"data": "tracabilite", "visible": false},
{"data": "other", "visible": false},
{"data": "entitledPersons", "visible": false},
{"data": "openAccounts", "visible": false},
@@ -580,8 +580,8 @@
oTable.column(col + 9).search($(this).val()).draw() ;
});
- $('#search_tracabilite').off('change');
- $('#search_tracabilite').change(function(){
+ $('#search_update').off('change');
+ $('#search_update').change(function(){
oTable.column(col + 10).search($(this).val()).draw() ;
});
@@ -590,8 +590,8 @@
oTable.column(col + 11).search($(this).val()).draw() ;
});
- $('#search_update').off('change');
- $('#search_update').change(function(){
+ $('#search_tracabilite').off('change');
+ $('#search_tracabilite').change(function(){
oTable.column(col + 12).search($(this).val()).draw() ;
});
diff --git a/templates/Registry/Treatment/pdf.html.twig b/templates/Registry/Treatment/pdf.html.twig
index 7b75994afe29c188784709f05037feed8e12ac62..1913f8cea32ca82e36e878d0126b4bee69c78df0 100644
--- a/templates/Registry/Treatment/pdf.html.twig
+++ b/templates/Registry/Treatment/pdf.html.twig
@@ -394,13 +394,15 @@
<td>{{ object.estimatedConcernedPeople }}</td>
</tr>
<tr>
- <td><strong>
+ <td>
+ <strong>
{% if object.collectivity.hasModuleTools %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
- {% else %}
{{ 'global.label.linked_tool'|trans }}
+ {% else %}
+ {{ 'registry.treatment.label.tools_if_inactif'|trans }}
{% endif %}
- </strong></td>
+ </strong>
+ </td>
<td>
{% if object.collectivity.hasModuleTools %}
<ul class="ps-1">
@@ -513,12 +515,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
<td>
- {% if object.securitytracability.check %}
+ {% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securitytracability.comment is not empty %}
- <p class="mt-2">{{ object.securitytracability.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>
@@ -539,12 +541,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
<td>
- {% if object.securityUpdate.check %}
+ {% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securityUpdate.comment is not empty %}
- <p class="mt-2">{{ object.securityUpdate.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>
diff --git a/templates/Registry/Treatment/pdf_all.html.twig b/templates/Registry/Treatment/pdf_all.html.twig
index 1111d07e0292ce52f8aa5e6bf18ce02a7fe253c3..99acc3e9a69b0c9ae7bea6d43e03580fb70bf32e 100644
--- a/templates/Registry/Treatment/pdf_all.html.twig
+++ b/templates/Registry/Treatment/pdf_all.html.twig
@@ -396,13 +396,15 @@
<td>{{ object.estimatedConcernedPeople }}</td>
</tr>
<tr>
- <td><strong>
+ <td>
+ <strong>
{% if object.collectivity.hasModuleTools %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
- {% else %}
{{ 'global.label.linked_tool'|trans }}
+ {% else %}
+ {{ 'registry.treatment.label.tools_if_inactif'|trans }}
{% endif %}
- </strong></td>
+ </strong>
+ </td>
<td>
{% if object.collectivity.hasModuleTools %}
<ul class="ps-1">
@@ -515,12 +517,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
<td>
- {% if object.securitytracability.check %}
+ {% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securitytracability.comment is not empty %}
- <p class="mt-2">{{ object.securitytracability.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>
@@ -541,12 +543,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
<td>
- {% if object.securityUpdate.check %}
+ {% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securityUpdate.comment is not empty %}
- <p class="mt-2">{{ object.securityUpdate.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>
diff --git a/templates/Registry/Treatment/public_show.html.twig b/templates/Registry/Treatment/public_show.html.twig
index 77d2b7ccd592262f40664ea2665d0fde419bb394..51bc589d2d7b1cf15b07e6da90c786ece24eb9f9 100644
--- a/templates/Registry/Treatment/public_show.html.twig
+++ b/templates/Registry/Treatment/public_show.html.twig
@@ -644,9 +644,9 @@
<td>
<strong>
{% if object.collectivity.hasModuleTools %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
- {% else %}
{{ 'global.label.linked_tool'|trans }}
+ {% else %}
+ {{ 'registry.treatment.label.tools_if_inactif'|trans }}
{% endif %}
</strong>
</td>
@@ -759,9 +759,9 @@
{# SECURITY #}
{% if (
config.securityAccessControl == true
- or config.securityTracability == true
- or config.securitySaving == true
or config.securityUpdate == true
+ or config.securitySaving == true
+ or config.securityTracability == true
or config.securityOther == true
or config.securityEntitledPersons == true
) %}
@@ -789,16 +789,16 @@
</td>
</tr>
{% endif %}
- {% if (config.securityTracability == true) %}
+ {% if (config.securityUpdate == true) %}
<tr>
<td>
- <strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong>
+ <strong>{{ 'registry.treatment.label.security_update'|trans }}</strong>
</td>
<td>
- {% if object.securitytracability.check %}
+ {% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securitytracability.comment is not empty %}
- <p class="mt-2">{{ object.securitytracability.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>
@@ -823,16 +823,16 @@
</td>
</tr>
{% endif %}
- {% if (config.securityUpdate == true) %}
+ {% if (config.securityTracability == true) %}
<tr>
<td>
- <strong>{{ 'registry.treatment.label.security_update'|trans }}</strong>
+ <strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong>
</td>
<td>
- {% if object.securityUpdate.check %}
+ {% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securityUpdate.comment is not empty %}
- <p class="mt-2">{{ object.securityUpdate.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>
diff --git a/templates/Registry/Treatment/show.html.twig b/templates/Registry/Treatment/show.html.twig
index 4034bf72cdaeea2fa35e9acf4f32f75dd528ea05..41992c9bdc69d4f6bdce65f4e1492620b56dd33d 100644
--- a/templates/Registry/Treatment/show.html.twig
+++ b/templates/Registry/Treatment/show.html.twig
@@ -472,9 +472,9 @@
<td>
<strong>
{% if object.collectivity.hasModuleTools %}
- {{ 'registry.treatment.label.tools_if_inactif'|trans }}
- {% else %}
{{ 'global.label.linked_tool'|trans }}
+ {% else %}
+ {{ 'registry.treatment.label.tools_if_inactif'|trans }}
{% endif %}
</strong>
</td>
@@ -590,12 +590,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
<td>
- {% if object.securitytracability.check %}
+ {% if object.securityUpdate.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securitytracability.comment is not empty %}
- <p class="mt-2">{{ object.securitytracability.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>
@@ -616,12 +616,12 @@
</td>
</tr>
<tr>
- <td><strong>{{ 'registry.treatment.label.security_update'|trans }}</strong></td>
+ <td><strong>{{ 'registry.treatment.label.security_tracability'|trans }}</strong></td>
<td>
- {% if object.securityUpdate.check %}
+ {% if object.securitytracability.check %}
<span class="badge bg-green">{{ 'global.label.yes'|trans }}</span>
- {% if object.securityUpdate.comment is not empty %}
- <p class="mt-2">{{ object.securityUpdate.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>
diff --git a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
index b0b2ef1b0dd840a5be108105d5876573016a00ea..c6e4c7f88bd4615849076a52c767893b12f19c8e 100644
--- a/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
+++ b/tests/Domain/Admin/Cloner/TreatmentClonerTest.php
@@ -94,18 +94,18 @@ class TreatmentClonerTest extends TestCase
$this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityAccessControl);
$this->assertFalse($securityAccessControl->isCheck());
$this->assertNull($securityAccessControl->getComment());
- $securityTracability = $cloned->getSecurityTracability();
- $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityTracability);
- $this->assertFalse($securityTracability->isCheck());
- $this->assertNull($securityTracability->getComment());
- $securitySaving = $cloned->getSecuritySaving();
- $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securitySaving);
- $this->assertFalse($securitySaving->isCheck());
- $this->assertNull($securitySaving->getComment());
$securityUpdate = $cloned->getSecurityUpdate();
$this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityUpdate);
$this->assertFalse($securityUpdate->isCheck());
$this->assertNull($securityUpdate->getComment());
+ $securitySaving = $cloned->getSecuritySaving();
+ $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securitySaving);
+ $this->assertFalse($securitySaving->isCheck());
+ $this->assertNull($securitySaving->getComment());
+ $securityTracability = $cloned->getSecurityTracability();
+ $this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityTracability);
+ $this->assertFalse($securityTracability->isCheck());
+ $this->assertNull($securityTracability->getComment());
$securityOther = $cloned->getSecurityOther();
$this->assertInstanceOf(Model\Embeddable\ComplexChoice::class, $securityOther);
$this->assertFalse($securityOther->isCheck());
@@ -155,15 +155,15 @@ class TreatmentClonerTest extends TestCase
$securityAccessControl = $referent->getSecurityAccessControl();
$securityAccessControl->setCheck(true);
$securityAccessControl->setComment('comment');
- $securityTracability = $referent->getSecurityTracability();
- $securityTracability->setCheck(true);
- $securityTracability->setComment('comment');
- $securitySaving = $referent->getSecuritySaving();
- $securitySaving->setCheck(true);
- $securitySaving->setComment('comment');
$securityUpdate = $referent->getSecurityUpdate();
$securityUpdate->setCheck(true);
$securityUpdate->setComment('comment');
+ $securitySaving = $referent->getSecuritySaving();
+ $securitySaving->setCheck(true);
+ $securitySaving->setComment('comment');
+ $securityTracability = $referent->getSecurityTracability();
+ $securityTracability->setCheck(true);
+ $securityTracability->setComment('comment');
$securityOther = $referent->getSecurityOther();
$securityOther->setCheck(true);
$securityOther->setComment('comment');
@@ -205,20 +205,20 @@ class TreatmentClonerTest extends TestCase
$this->assertEquals($referentSecurityAccessControl->isCheck(), $clonedSecurityAccessControl->isCheck());
$this->assertEquals($referentSecurityAccessControl->getComment(), $clonedSecurityAccessControl->getComment());
- $referentSecurityTracability = $referent->getSecurityTracability();
- $clonedSecurityTracability = $cloned->getSecurityTracability();
- $this->assertEquals($referentSecurityTracability->isCheck(), $clonedSecurityTracability->isCheck());
- $this->assertEquals($referentSecurityTracability->getComment(), $clonedSecurityTracability->getComment());
+ $referentSecurityUpdate = $referent->getSecurityUpdate();
+ $clonedSecurityUpdate = $cloned->getSecurityUpdate();
+ $this->assertEquals($referentSecurityUpdate->isCheck(), $clonedSecurityUpdate->isCheck());
+ $this->assertEquals($referentSecurityUpdate->getComment(), $clonedSecurityUpdate->getComment());
$referentSecuritySaving = $referent->getSecuritySaving();
$clonedSecuritySaving = $cloned->getSecuritySaving();
$this->assertEquals($referentSecuritySaving->isCheck(), $clonedSecuritySaving->isCheck());
$this->assertEquals($referentSecuritySaving->getComment(), $clonedSecuritySaving->getComment());
- $referentSecurityUpdate = $referent->getSecurityUpdate();
- $clonedSecurityUpdate = $cloned->getSecurityUpdate();
- $this->assertEquals($referentSecurityUpdate->isCheck(), $clonedSecurityUpdate->isCheck());
- $this->assertEquals($referentSecurityUpdate->getComment(), $clonedSecurityUpdate->getComment());
+ $referentSecurityTracability = $referent->getSecurityTracability();
+ $clonedSecurityTracability = $cloned->getSecurityTracability();
+ $this->assertEquals($referentSecurityTracability->isCheck(), $clonedSecurityTracability->isCheck());
+ $this->assertEquals($referentSecurityTracability->getComment(), $clonedSecurityTracability->getComment());
$referentSecurityOther = $referent->getSecurityOther();
$clonedSecurityOther = $cloned->getSecurityOther();
diff --git a/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php b/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
index 493824178254f4d82b83b880bb34472c131e9541..304116e7acd2416992036af715389a22230fe9f4 100644
--- a/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
+++ b/tests/Domain/Registry/Form/Type/TreatmentTypeTest.php
@@ -118,9 +118,9 @@ class TreatmentTypeTest extends FormTypeHelper
'contractors' => EntityType::class,
'shelfLifes' => CollectionType::class,
'securityAccessControl' => ComplexChoiceAreaType::class,
- 'securityTracability' => ComplexChoiceAreaType::class,
- 'securitySaving' => ComplexChoiceAreaType::class,
'securityUpdate' => ComplexChoiceAreaType::class,
+ 'securitySaving' => ComplexChoiceAreaType::class,
+ 'securityTracability' => ComplexChoiceAreaType::class,
'securityOther' => ComplexChoiceAreaType::class,
'systematicMonitoring' => CheckboxType::class,
'largeScaleCollection' => CheckboxType::class,
@@ -189,9 +189,9 @@ class TreatmentTypeTest extends FormTypeHelper
'tools' => EntityType::class,
'shelfLifes' => CollectionType::class,
'securityAccessControl' => ComplexChoiceAreaType::class,
- 'securityTracability' => ComplexChoiceAreaType::class,
- 'securitySaving' => ComplexChoiceAreaType::class,
'securityUpdate' => ComplexChoiceAreaType::class,
+ 'securitySaving' => ComplexChoiceAreaType::class,
+ 'securityTracability' => ComplexChoiceAreaType::class,
'securityOther' => ComplexChoiceAreaType::class,
'systematicMonitoring' => CheckboxType::class,
'largeScaleCollection' => CheckboxType::class,
diff --git a/tests/Domain/Registry/Model/TreatmentTest.php b/tests/Domain/Registry/Model/TreatmentTest.php
index 9b596178ec5d1a0a35f1ada1407a557e106d87f9..3e07fa182fa885b7450821b29ceb63bd5299bfff 100644
--- a/tests/Domain/Registry/Model/TreatmentTest.php
+++ b/tests/Domain/Registry/Model/TreatmentTest.php
@@ -51,9 +51,9 @@ class TreatmentTest extends TestCase
$this->assertEquals(new ArrayCollection(), $model->getContractors());
$this->assertEquals([], $model->getShelfLifes());
$this->assertInstanceOf(ComplexChoice::class, $model->getSecurityAccessControl());
- $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityTracability());
- $this->assertInstanceOf(ComplexChoice::class, $model->getSecuritySaving());
$this->assertInstanceOf(ComplexChoice::class, $model->getSecurityUpdate());
+ $this->assertInstanceOf(ComplexChoice::class, $model->getSecuritySaving());
+ $this->assertInstanceOf(ComplexChoice::class, $model->getSecurityTracability());
$this->assertInstanceOf(ComplexChoice::class, $model->getSecurityOther());
$this->assertFalse($model->isSystematicMonitoring());
$this->assertFalse($model->isLargeScaleCollection());