refactoring mode de saisi enseignement par statut (561c199e) · Commits · JACQUOT Frederic / OSE

admin/migration/v20ModeEnseignement.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ class v20ModeEnseignement extends AbstractMigration

		public function utile(): bool
		{
		return false;
		return true;

		return $this->manager->hasNewColumn('STATUT', 'MODE_REFERENTIEL_REALISE');
		}

data/ddl/table/STATUT.php

+4 −28

Original line number	Diff line number	Diff line
		@@ -669,32 +669,8 @@ return [
		'position' => 3,
		'commentaire' => NULL,
		],
		'MODE_REFERENTIEL_PREVISIONNEL' => [
		'name' => 'MODE_REFERENTIEL_PREVISIONNEL',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 85,
		'commentaire' => NULL,
		],
		'MODE_REFERENTIEL_REALISE' => [
		'name' => 'MODE_REFERENTIEL_REALISE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		'scale' => NULL,
		'precision' => NULL,
		'nullable' => TRUE,
		'default' => NULL,
		'position' => 86,
		'commentaire' => NULL,
		],
		'MODE_SERVICE_PREVISIONNEL' => [
		'name' => 'MODE_SERVICE_PREVISIONNEL',
		'MODE_ENSEIGNEMENT_PREVISIONNEL' => [
		'name' => 'MODE_ENSEIGNEMENT_PREVISIONNEL',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,
		@@ -705,8 +681,8 @@ return [
		'position' => 83,
		'commentaire' => NULL,
		],
		'MODE_SERVICE_REALISE' => [
		'name' => 'MODE_SERVICE_REALISE',
		'MODE_ENSEIGNEMENT_REALISE' => [
		'name' => 'MODE_ENSEIGNEMENT_REALISE',
		'type' => 'string',
		'bdd-type' => 'VARCHAR2',
		'length' => 50,

data/parametres.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ return [
		],


		/* Semestriel / calendaire */
		/* Semestriel / calendaire
		"modalite_services_prev_ens" => [
		"VALEUR" => "semestriel",
		"DESCRIPTION" => "Modalité de gestion des services (prévisionnel, enseignements)",
		@@ -81,7 +81,7 @@ return [
		"modalite_services_real_ref" => [
		"VALEUR" => "semestriel",
		"DESCRIPTION" => "Modalité de gestion des services (réalisé, référentiel)",
		],
		],*/

		/* Divers */
		"report_service" => [

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@ use UnicaenApp\Entity\HistoriqueAwareTrait;
		*/
		class Parametre implements HistoriqueAwareInterface
		{
		const SERVICES_MODALITE_SEMESTRIEL = 'semestriel';
		const SERVICES_MODALITE_CALENDAIRE = 'calendaire';

		const CONTRAT_FRANCHI_VALIDATION = 'validation';
		const CONTRAT_FRANCHI_DATE_RETOUR = 'date-retour';

module/Application/src/Form/ParametresForm.php

+1 −59

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ namespace Application\Form;

		use Application\Entity\Db\Formule;
		use Application\Entity\Db\Parametre;
		use Intervenant\Entity\Db\Statut;
		use Service\Entity\Db\TypeVolumeHoraire;
		use Application\Service\Traits\AnneeServiceAwareTrait;
		use Application\Service\Traits\DomaineFonctionnelServiceAwareTrait;
		@@ -332,65 +333,6 @@ class ParametresForm extends AbstractForm
		],
		]);

		$this->add([
		'type' => 'Select',
		'name' => 'modalite_services_prev_ens',
		'options' => [
		'value_options' => [
		Parametre::SERVICES_MODALITE_SEMESTRIEL => 'Par semestre (mode semestriel)',
		Parametre::SERVICES_MODALITE_CALENDAIRE => 'Par date et heure de cours (mode calendaire)',
		],
		],
		'attributes' => [
		'class' => 'selectpicker',
		'data-size' => 20,
		],
		]);

		$this->add([
		'type' => 'Select',
		'name' => 'modalite_services_prev_ref',
		'options' => [
		'value_options' => [
		Parametre::SERVICES_MODALITE_SEMESTRIEL => 'Par semestre (mode semestriel)',
		Parametre::SERVICES_MODALITE_CALENDAIRE => 'Par date et heure de cours (mode calendaire)',
		],
		],
		'attributes' => [
		'class' => 'selectpicker',
		'data-size' => 20,
		],
		]);

		$this->add([
		'type' => 'Select',
		'name' => 'modalite_services_real_ens',
		'options' => [
		'value_options' => [
		Parametre::SERVICES_MODALITE_SEMESTRIEL => 'Par semestre (mode semestriel)',
		Parametre::SERVICES_MODALITE_CALENDAIRE => 'Par date et heure de cours (mode calendaire)',
		],
		],
		'attributes' => [
		'class' => 'selectpicker',
		'data-size' => 20,
		],
		]);

		$this->add([
		'type' => 'Select',
		'name' => 'modalite_services_real_ref',
		'options' => [
		'value_options' => [
		Parametre::SERVICES_MODALITE_SEMESTRIEL => 'Par semestre (mode semestriel)',
		Parametre::SERVICES_MODALITE_CALENDAIRE => 'Par date et heure de cours (mode calendaire)',
		],
		],
		'attributes' => [
		'class' => 'selectpicker',
		'data-size' => 20,
		],
		]);

		$this->add([
		'type' => 'Select',