Tâche #25106 (4886e86a) · Commits · open-source / OSE

data/ddl.php

+0 −33

Changes for data/ddl.php: 0 added lines, 33 removed lines.
Original line number	Diff line number	Diff line
		@@ -17243,39 +17243,6 @@
		'default' => NULL,
		'commentaire' => NULL,
		),
		'PUBLIQUE' =>
		array (
		'name' => 'PUBLIQUE',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => false,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'OBLIGATOIRE' =>
		array (
		'name' => 'OBLIGATOIRE',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => false,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'SAISIE_PAR_ENSEIGNANT' =>
		array (
		'name' => 'SAISIE_PAR_ENSEIGNANT',
		'type' => 'NUMBER',
		'length' => 0,
		'scale' => '0',
		'precision' => 1,
		'nullable' => false,
		'default' => NULL,
		'commentaire' => NULL,
		),
		'HISTO_CREATION' =>
		array (
		'name' => 'HISTO_CREATION',

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

+0 −3

Changes for module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.TypeModulateur.dcm.xml: 0 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,9 +14,6 @@
		<field name="histoDestruction" type="datetime" column="HISTO_DESTRUCTION" nullable="true"/>
		<field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>
		<field name="libelle" type="string" column="LIBELLE" length="30" nullable="false"/>
		<field name="obligatoire" type="boolean" column="OBLIGATOIRE" nullable="false"/>
		<field name="publique" type="boolean" column="PUBLIQUE" nullable="false"/>
		<field name="saisieParEnseignant" type="boolean" column="SAISIE_PAR_ENSEIGNANT" nullable="false"/>
		<many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">
		<join-columns>
		<join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>

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

+3 −100

Changes for module/Application/src/Application/Entity/Db/TypeModulateur.php: 3 added lines, 100 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Application\Entity\Db;

		use UnicaenApp\Entity\HistoriqueAwareInterface;
		use UnicaenApp\Entity\HistoriqueAwareTrait;
		use Zend\Permissions\Acl\Resource\ResourceInterface;
		@@ -26,21 +27,6 @@ class TypeModulateur implements HistoriqueAwareInterface, ResourceInterface
		*/
		protected $libelle;

		/**
		* @var boolean
		*/
		protected $obligatoire;

		/**
		* @var boolean
		*/
		protected $publique;

		/**
		* @var boolean
		*/
		protected $saisieParEnseignant;

		/**
		* @var integer
		*/
		@@ -141,90 +127,6 @@ class TypeModulateur implements HistoriqueAwareInterface, ResourceInterface



		/**
		* Set obligatoire
		*
		* @param boolean $obligatoire
		*
		* @return TypeModulateur
		*/
		public function setObligatoire($obligatoire)
		{
		$this->obligatoire = $obligatoire;

		return $this;
		}



		/**
		* Get obligatoire
		*
		* @return boolean
		*/
		public function getObligatoire()
		{
		return $this->obligatoire;
		}



		/**
		* Set publique
		*
		* @param boolean $publique
		*
		* @return TypeModulateur
		*/
		public function setPublique($publique)
		{
		$this->publique = $publique;

		return $this;
		}



		/**
		* Get publique
		*
		* @return boolean
		*/
		public function getPublique()
		{
		return $this->publique;
		}



		/**
		* Set saisieParEnseignant
		*
		* @param boolean $saisieParEnseignant
		*
		* @return TypeModulateur
		*/
		public function setSaisieParEnseignant($saisieParEnseignant)
		{
		$this->saisieParEnseignant = $saisieParEnseignant;

		return $this;
		}



		/**
		* Get saisieParEnseignant
		*
		* @return boolean
		*/
		public function getSaisieParEnseignant()
		{
		return $this->saisieParEnseignant;
		}



		/**
		* Get id
		*
		@@ -311,10 +213,11 @@ class TypeModulateur implements HistoriqueAwareInterface, ResourceInterface
		return $this->structure;
		}



		public function getResourceId()
		{
		return "TypeModulateur";
		}


		}

module/Application/src/Application/Form/Modulateur/TypeModulateurSaisieForm.php

+0 −27

Changes for module/Application/src/Application/Form/Modulateur/TypeModulateurSaisieForm.php: 0 added lines, 27 removed lines.
Original line number	Diff line number	Diff line
		@@ -46,27 +46,6 @@ class typeModulateurSaisieForm extends AbstractForm
		],
		'type' => 'Text',
		]);
		$this->add([
		'name' => 'publique',
		'options' => [
		'label' => 'Publique ?',
		],
		'type' => 'Checkbox',
		]);
		$this->add([
		'name' => 'obligatoire',
		'options' => [
		'label' => 'Obligatoire ?',
		],
		'type' => 'Checkbox',
		]);
		$this->add([
		'name' => 'saisie-par-enseignant',
		'options' => [
		'label' => 'Saisie par l\'enseignant ?',
		],
		'type' => 'Checkbox',
		]);
		$this->add(new Csrf('security'));
		$this->add([
		'name' => 'submit',
		@@ -124,9 +103,6 @@ class typeModulateurHydrator implements HydratorInterface
		{
		$object->setCode($data['code']);
		$object->setLibelle($data['libelle']);
		$object->setPublique($data['publique']);
		$object->setObligatoire($data['obligatoire']);
		$object->setSaisieParEnseignant($data['saisie-par-enseignant']);

		return $object;
		}
		@@ -146,9 +122,6 @@ class typeModulateurHydrator implements HydratorInterface
		'id' => $object->getId(),
		'code' => $object->getCode(),
		'libelle' => $object->getLibelle(),
		'publique' => $object->getPublique(),
		'obligatoire' => $object->getObligatoire(),
		'saisie-par-enseignant' => $object->getSaisieParEnseignant(),
		];

		return $data;

module/Application/view/application/modulateur/index.phtml

+0 −18

Changes for module/Application/view/application/modulateur/index.phtml: 0 added lines, 18 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,12 +9,6 @@
		use Application\Provider\Privilege\Privileges;
		use UnicaenApp\Util;

		function affBooleen($flg)
		{
		// affiche booléen avec des glypheIcon
		return ($flg ? '<span class="glyphicon glyphicon-ok text-success"></span>' : '<span class="glyphicon glyphicon-remove text-danger refuse"></span>');
		}

		$this->headTitle()->append("Modulateurs des taux horaires");

		$canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::MODULATEUR_EDITION));
		@@ -59,18 +53,6 @@ foreach ($typeModulateurs as $tm) {
		<div class="panel-body">
		<div class="row">
		<div class="col-md-3">
		<div class="row">
		<div class="col-md-9">Publique :</div>
		<div class="col-md-3"><?= affBooleen($tm->getPublique()) ?></div>
		</div>
		<div class="row">
		<div class="col-md-9">Obligatoire :</div>
		<div class="col-md-3"><?= affBooleen($tm->getObligatoire()) ?></div>
		</div>
		<div class="row">
		<div class="col-md-9">Saisie par ens:</div>
		<div class="col-md-3"><?= affBooleen($tm->getSaisieParEnseignant()) ?></div>
		</div>
		<table class="table table-bordered table-condensed table-extra-condensed" style="margin-top:0.5em; margin-bottom:1px;">
		<?php foreach ($typeModulateurStructures
		as $tms) { ?>