From 83a793dac92c0c9dba4e7f36e5a065abc2aafe99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr> Date: Wed, 17 Feb 2021 11:47:54 +0100 Subject: [PATCH] =?UTF-8?q?Petite=20am=C3=A9lioration=20de=20l'affichage?= =?UTF-8?q?=20des=20diff=C3=A9rentiels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ src/UnicaenImport/Entity/Differentiel/Ligne.php | 2 +- .../View/Helper/DifferentielLigne/DifferentielLigne.php | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f67d49a..db21d58 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +3.1.4 (17/02/2021) +------------------ +- Petite amélioration de l'affichage des différentiels + 3.1.3 (16/02/2021) ------------------ - Affichage + précis du diff si autre que update diff --git a/src/UnicaenImport/Entity/Differentiel/Ligne.php b/src/UnicaenImport/Entity/Differentiel/Ligne.php index 55774e2..d0c4901 100644 --- a/src/UnicaenImport/Entity/Differentiel/Ligne.php +++ b/src/UnicaenImport/Entity/Differentiel/Ligne.php @@ -88,7 +88,7 @@ class Ligne unset($data['IMPORT_ACTION']); $this->source = $entityManager->find(Source::class, (integer)$data['SOURCE_ID']); - unset($data['SOURCE_ID']); + //unset($data['SOURCE_ID']); $this->sourceCode = $data['SOURCE_CODE']; unset($data['SOURCE_CODE']); diff --git a/src/UnicaenImport/View/Helper/DifferentielLigne/DifferentielLigne.php b/src/UnicaenImport/View/Helper/DifferentielLigne/DifferentielLigne.php index 75c38f5..e7c2236 100644 --- a/src/UnicaenImport/View/Helper/DifferentielLigne/DifferentielLigne.php +++ b/src/UnicaenImport/View/Helper/DifferentielLigne/DifferentielLigne.php @@ -2,6 +2,7 @@ namespace UnicaenImport\View\Helper\DifferentielLigne; +use UnicaenImport\Entity\Db\Source; use UnicaenImport\Options\Traits\ModuleOptionsAwareTrait; use Zend\Filter\Word\UnderscoreToCamelCase; use Zend\View\Helper\AbstractHelper; @@ -177,6 +178,8 @@ class DifferentielLigne extends AbstractHelper } else { return 'valide pour toujours'; } + case 'SOURCE_ID': + return 'Source devient ' . $this->ligne->getEntityManager()->find(Source::class, $value);; default: $column = str_replace('_', ' ', strtolower($column)); -- GitLab