Suppression de toute notion de FormuleTestStructure (ebb636d8) · Commits · JACQUOT Frederic / OSE

admin/migration/FormuleMigrationVolumeHoraireStructuresTestVersCode.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ class FormuleMigrationVolumeHoraireStructuresTestVersCode extends AbstractMigrat
		public function utile(): bool
		{
		return
		//$this->manager->hasOldColumn('FORMULE_TEST_VOLUME_HORAIRE', 'STRUCTURE_TEST_ID')
		//&&
		$this->manager->hasOldColumn('FORMULE_TEST_VOLUME_HORAIRE', 'STRUCTURE_TEST_ID')
		&&
		(
		$this->manager->hasNewColumn('FORMULE_TEST_VOLUME_HORAIRE', 'STRUCTURE_CODE')
		\|\|

data/ddl.php

+0 −118

Original line number	Diff line number	Diff line
		@@ -6606,17 +6606,6 @@
		'default' => '1',
		'commentaire' => NULL,
		),
		'STRUCTURE_TEST_ID' =>
		array (
		'name' => 'STRUCTURE_TEST_ID',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => NULL,
		'nullable' => true,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'TYPE_VOLUME_HORAIRE_ID' =>
		array (
		'name' => 'TYPE_VOLUME_HORAIRE_ID',
		@@ -6839,50 +6828,6 @@
		),
		),
		),
		'FORMULE_TEST_STRUCTURE' =>
		array (
		'name' => 'FORMULE_TEST_STRUCTURE',
		'temporary' => false,
		'logging' => true,
		'commentaire' => 'sequence=FTEST_STRUCTURE_ID_SEQ;',
		'sequence' => 'FTEST_STRUCTURE_ID_SEQ',
		'columns' =>
		array (
		'ID' =>
		array (
		'name' => 'ID',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => NULL,
		'nullable' => false,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'LIBELLE' =>
		array (
		'name' => 'LIBELLE',
		'type' => 'VARCHAR2',
		'length' => 80,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => false,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'UNIVERSITE' =>
		array (
		'name' => 'UNIVERSITE',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => false,
		'default' => '0',
		'commentaire' => NULL,
		),
		),
		),
		'FORMULE_TEST_VOLUME_HORAIRE' =>
		array (
		'name' => 'FORMULE_TEST_VOLUME_HORAIRE',
		@@ -6914,17 +6859,6 @@
		'default' => NULL,
		'commentaire' => NULL,
		),
		'STRUCTURE_TEST_ID' =>
		array (
		'name' => 'STRUCTURE_TEST_ID',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => NULL,
		'nullable' => true,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'REFERENTIEL' =>
		array (
		'name' => 'REFERENTIEL',
		@@ -19884,16 +19818,6 @@
		0 => 'ID',
		),
		),
		'FORMULE_TEST_STRUCTURE_PK' =>
		array (
		'name' => 'FORMULE_TEST_STRUCTURE_PK',
		'table' => 'FORMULE_TEST_STRUCTURE',
		'index' => 'FORMULE_TEST_STRUCTURE_PK',
		'columns' =>
		array (
		0 => 'ID',
		),
		),
		'FORMULE_TEST_VOLUME_HORAIRE_PK' =>
		array (
		'name' => 'FORMULE_TEST_VOLUME_HORAIRE_PK',
		@@ -38948,18 +38872,6 @@ WHERE
		'FORMULE_ID' => 'ID',
		),
		),
		'FTI_FORMULE_TEST_STRUCTURE_FK' =>
		array (
		'name' => 'FTI_FORMULE_TEST_STRUCTURE_FK',
		'table' => 'FORMULE_TEST_INTERVENANT',
		'rtable' => 'FORMULE_TEST_STRUCTURE',
		'delete_rule' => 'CASCADE',
		'index' => NULL,
		'columns' =>
		array (
		'STRUCTURE_TEST_ID' => 'ID',
		),
		),
		'FTI_TYPE_INTERVENANT_FK' =>
		array (
		'name' => 'FTI_TYPE_INTERVENANT_FK',
		@@ -43954,16 +43866,6 @@ WHERE
		2 => 'ETAT_VOLUME_HORAIRE_ID',
		),
		),
		'FORMULE_TEST_STRUCTURE__UN' =>
		array (
		'name' => 'FORMULE_TEST_STRUCTURE__UN',
		'table' => 'FORMULE_TEST_STRUCTURE',
		'index' => 'FORMULE_TEST_STRUCTURE__UN',
		'columns' =>
		array (
		0 => 'LIBELLE',
		),
		),
		'FORMULE__UN' =>
		array (
		'name' => 'FORMULE__UN',
		@@ -48502,26 +48404,6 @@ END;',
		0 => 'ID',
		),
		),
		'FORMULE_TEST_STRUCTURE_PK' =>
		array (
		'name' => 'FORMULE_TEST_STRUCTURE_PK',
		'unique' => true,
		'table' => 'FORMULE_TEST_STRUCTURE',
		'columns' =>
		array (
		0 => 'ID',
		),
		),
		'FORMULE_TEST_STRUCTURE__UN' =>
		array (
		'name' => 'FORMULE_TEST_STRUCTURE__UN',
		'unique' => true,
		'table' => 'FORMULE_TEST_STRUCTURE',
		'columns' =>
		array (
		0 => 'LIBELLE',
		),
		),
		'FORMULE_TEST_VOLUME_HORAIRE_PK' =>
		array (
		'name' => 'FORMULE_TEST_VOLUME_HORAIRE_PK',

module/Application/src/Application/Entity/Db/FormuleTestIntervenant.php

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ namespace Application\Entity\Db;
		use Application\Entity\Db\Traits\AnneeAwareTrait;
		use Application\Entity\Db\Traits\EtatVolumeHoraireAwareTrait;
		use Application\Entity\Db\Traits\FormuleAwareTrait;
		use Application\Entity\Db\Traits\FormuleTestStructureAwareTrait;
		use Application\Entity\Db\Traits\TypeIntervenantAwareTrait;
		use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
		use Application\Hydrator\FormuleTestIntervenantHydrator;

module/Application/src/Application/Entity/Db/FormuleTestStructure.php

deleted100644 → 0

+0 −92

Original line number	Diff line number	Diff line
		<?php

		namespace Application\Entity\Db;

		class FormuleTestStructure
		{

		/**
		* @var integer
		*/
		private $id;

		/**
		* @var string
		*/
		private $libelle;

		/**
		* @var boolean
		*/
		private $universite = false;



		/**
		* @return int
		*/
		public function getId()
		{
		return $this->id;
		}



		/**
		* @return string
		*/
		public function getLibelle()
		{
		return $this->libelle;
		}



		/**
		* @param string $libelle
		*
		* @return FormuleTestStructure
		*/
		public function setLibelle(string $libelle): FormuleTestStructure
		{
		$this->libelle = $libelle;

		return $this;
		}



		/**
		* @return bool
		*/
		public function isUniversite(): bool
		{
		return $this->universite;
		}



		/**
		* @param bool $universite
		*
		* @return FormuleTestStructure
		*/
		public function setUniversite(bool $universite): FormuleTestStructure
		{
		$this->universite = $universite;

		return $this;
		}



		/**
		* Retourne la représentation littérale de cet objet.
		*
		* @return string
		*/
		public function __toString()
		{
		return $this->getLibelle();
		}
		}

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.FormuleTestStructure.dcm.xml

deleted100644 → 0

+0 −13

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
		<entity name="Application\Entity\Db\FormuleTestStructure" table="FORMULE_TEST_STRUCTURE">
		<id name="id" type="integer" column="ID">
		<generator strategy="SEQUENCE"/>
		<sequence-generator sequence-name="FTEST_STRUCTURE_ID_SEQ" allocation-size="1" initial-value="1"/>
		</id>
		<field name="libelle" type="string" column="LIBELLE" length="80" nullable="false"/>
		<field name="universite" type="boolean" column="UNIVERSITE" nullable="false"/>
		</entity>
		</doctrine-mapping>