Merge remote-tracking branch 'origin/master'

admin/migration/v18Indicateurs.php

@@ -16,8 +16,6 @@ class v18Indicateurs extends AbstractMigration
 
     public function utile(): bool
     {
-        return true;
-
         return $this->manager->hasNew('table', 'TYPE_INDICATEUR');
     }
 

data/ddl/table/CORPS.php

@@ -109,7 +109,7 @@ return [
             'name'        => 'LIBELLE_LONG',
             'type'        => 'string',
             'bdd-type'    => 'VARCHAR2',
-            'length'      => 100,
+            'length'      => 150,
             'scale'       => NULL,
             'precision'   => NULL,
             'nullable'    => FALSE,

data/ddl/unique-constraint/INTERVENANT_CODE_UN.php

+<?php
+
+//@formatter:off
+
+return [
+    'name'    => 'INTERVENANT_CODE_UN',
+    'table'   => 'INTERVENANT',
+    'index'   => 'INTERVENANT_CODE_UN',
+    'columns' => [
+        'CODE',
+        'ANNEE_ID',
+        'STATUT_ID',
+        'HISTO_DESTRUCTION',
+    ],
+];
+
+//@formatter:on

data/ddl/unique-constraint/INTERVENANT_SOURCE_UN.php

+<?php
+
+//@formatter:off
+
+return [
+    'name'    => 'INTERVENANT_SOURCE_UN',
+    'table'   => 'INTERVENANT',
+    'index'   => 'INTERVENANT_SOURCE_UN1',
+    'columns' => [
+        'SOURCE_CODE',
+        'ANNEE_ID',
+        'HISTO_DESTRUCTION',
+        'STATUT_ID',
+    ],
+];
+
+//@formatter:on

data/ddl/unique-constraint/INTERVENANT_UTIL_CODE_UN.php

+<?php
+
+//@formatter:off
+
+return [
+    'name'    => 'INTERVENANT_UTIL_CODE_UN',
+    'table'   => 'INTERVENANT',
+    'index'   => 'INTERVENANT_UTIL_CODE_UN',
+    'columns' => [
+        'UTILISATEUR_CODE',
+        'ANNEE_ID',
+        'STATUT_ID',
+        'HISTO_DESTRUCTION',
+    ],
+];
+
+//@formatter:on

module/Application/src/Controller/OffreFormation/ElementPedagogiqueController.php

@@ -17,6 +17,7 @@ use Application\Service\Traits\ContextServiceAwareTrait;
 use Application\Service\Traits\StructureServiceAwareTrait;
 use Application\Service\Traits\VolumeHoraireEnsServiceAwareTrait;
 use UnicaenImport\Service\Traits\SchemaServiceAwareTrait;
+
 /**
  * Description of ElementPedagogiqueController
  *
@@ -307,7 +308,7 @@ class ElementPedagogiqueController extends AbstractController
 
         $form->setElementPedagogique($element);
         $form->setAttribute('action', $this->url()->fromRoute('of/element/modulateurs-centres-couts', ['elementPedagogique' => $element->getId()]));
-        $form->build();
+        $form->buildElements();
 
         return [
             'form' => $form,

module/Application/src/Form/OffreFormation/ElementPedagogiqueRechercheFieldset.php

@@ -44,6 +44,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     protected $queryBuilder;
 
 
+
     public function init()
     {
         $hydrator = new ElementPedagogiqueRechercheHydrator;
@@ -151,6 +152,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     public function populateOptions()
     {
         $data            = $this->getData();
@@ -161,12 +163,9 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     protected function getData()
     {
-        $key = $this->getServiceContext()->getAnnee()->getId();
-
-        if (!$this->getSessionContainer()->{$key}) {
-
         $sql = "
             SELECT DISTINCT
               s.id structure_id,
@@ -233,56 +232,63 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
             $result['relations'][$structureId][$niveauId][] = $etapeId;
         }
         asort($result['structures']);
+        asort($result['niveaux']);
         asort($result['etapes']);
-            $this->getSessionContainer()->{$key} = $result;
-        }
 
-        return $this->getSessionContainer()->{$key};
+        return $result;
     }
 
 
+
     public function getRelations()
     {
         return $this->relations;
     }
 
 
+
     public function getStructureName()
     {
         return $this->structureName;
     }
 
 
+
     public function getNiveauName()
     {
         return $this->niveauName;
     }
 
 
+
     public function getEtapeName()
     {
         return $this->etapeName;
     }
 
 
+
     public function getStructureEnabled()
     {
         return $this->structureEnabled;
     }
 
 
+
     public function getNiveauEnabled()
     {
         return $this->niveauEnabled;
     }
 
 
+
     public function getEtapeEnabled()
     {
         return $this->etapeEnabled;
     }
 
 
+
     public function setStructureEnabled($structureEnabled = true)
     {
         $this->structureEnabled = $structureEnabled;
@@ -291,6 +297,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     public function setNiveauEnabled($niveauEnabled = true)
     {
         $this->niveauEnabled = $niveauEnabled;
@@ -299,6 +306,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     public function setEtapeEnabled($etapeEnabled = true)
     {
         $this->etapeEnabled = $etapeEnabled;
@@ -307,6 +315,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     /**
      * @return string
      */
@@ -316,6 +325,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     /**
      * @param string $elementId
      *
@@ -330,6 +340,7 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
     }
 
 
+
     /**
      * Should return an array specification compatible with
      * {@link Laminas\InputFilter\Factory::createInputFilter()}.
@@ -359,6 +370,9 @@ class ElementPedagogiqueRechercheFieldset extends AbstractFieldset
 }
 
 
+
+
+
 /**
  *
  *
@@ -389,6 +403,7 @@ class ElementPedagogiqueRechercheHydrator implements HydratorInterface
     }
 
 
+
     /**
      * Extract values from an object
      *