diff --git a/data/ddl/table/TAG.php b/data/ddl/table/TAG.php index d31898dd0e101b873ab05d74075f53298e28bf98..75860272c58bb358db7421be029992a7dfc7b26b 100644 --- a/data/ddl/table/TAG.php +++ b/data/ddl/table/TAG.php @@ -13,7 +13,7 @@ return [ 'name' => 'CODE', 'type' => 'string', 'bdd-type' => 'VARCHAR2', - 'length' => 3, + 'length' => 10, 'scale' => NULL, 'precision' => NULL, 'nullable' => FALSE, diff --git a/module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Tag.dcm.xml b/module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Tag.dcm.xml index f352388cf8e3362e3bbc11e4ee27ace0d19c1772..690e2b4f1ec06e036cc41e324d50082bb2a08056 100755 --- a/module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Tag.dcm.xml +++ b/module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Tag.dcm.xml @@ -11,7 +11,7 @@ <id name="id" type="integer" column="ID"> <generator strategy="SEQUENCE"/> </id> - <field name="code" type="string" column="CODE" length="3" nullable="false"/> + <field name="code" type="string" column="CODE" length="10" nullable="false"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> <field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/> <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/> diff --git a/module/Referentiel/src/View/Helper/ReferentielsViewHelper.php b/module/Referentiel/src/View/Helper/ReferentielsViewHelper.php index 170cbdfe1e4f0287cb094d90b1d3fde908b8d975..3059fdb374917657d5b5f787d70231724d4ebcc4 100755 --- a/module/Referentiel/src/View/Helper/ReferentielsViewHelper.php +++ b/module/Referentiel/src/View/Helper/ReferentielsViewHelper.php @@ -38,27 +38,35 @@ class ReferentielsViewHelper extends AbstractViewHelper private bool $horodatage = false; private array $columns = [ - 'intervenant' => [ + 'intervenant' => [ 'visibility' => false, 'head-text' => "<th>Intervenant</th>", ], - 'structure' => [ + 'structure' => [ 'visibility' => true, 'head-text' => "<th title=\"Structure\">Structure</th>", ], - 'fonction' => [ + 'fonction' => [ 'visibility' => true, 'head-text' => "<th title=\"Fonction référentiel\">Fonction</th>", ], - 'commentaires' => [ + 'commentaires' => [ 'visibility' => true, 'head-text' => "<th title=\">Commentaires éventuels\">Commentaires</th>", ], - 'heures' => [ + 'motif-non-paiement' => [ + 'visibility' => false, + 'head-text' => "<th title=\"Nombre d'heures\">Motif de non paiement</th>", + ], + 'tags' => [ + 'visibility' => false, + 'head-text' => "<th>Tag</th>", + ], + 'heures' => [ 'visibility' => true, 'head-text' => "<th title=\"Nombre d'heures\">Heures</th>", ], - 'annee' => [ + 'annee' => [ 'visibility' => false, 'head-text' => "<th>Année univ.</th>", ], @@ -132,9 +140,7 @@ class ReferentielsViewHelper extends AbstractViewHelper $canEditTag = $this->getView()->isAllowed($this->getIntervenant(), Privileges::TAG_EDITION); $this->columns['tags']['visibility'] = ($canEditTag || $canViewTag) ? true : false; - $this->columns['tags']['head-text'] = '<th>Tag</th>'; $this->columns['motif-non-paiement']['visibility'] = ($canEditMNP || $canViewMNP) ? true : false; - $this->columns['motif-non-paiement']['head-text'] = '<th>Motif de non paiement</th>'; $attribs = [