adaptation de la mise en page pour BS5 (8a1c7d15) · Commits · lib / unicaen / evenement

config/merged/evenement.config.php

+2 −0

Changes for config/merged/evenement.config.php: 2 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ use UnicaenEvenement\Service\EvenementCollection\EvenementCollectionServiceFacto
		use UnicaenEvenement\Service\EvenementGestion\EvenementGestionService;
		use UnicaenEvenement\Service\EvenementGestion\EvenementGestionServiceFactory;
		use UnicaenEvenement\View\Helper\EvenementViewHelper;
		use UnicaenEvenement\View\Helper\JournalViewHelper;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Laminas\Mvc\Console\Router\Simple;
		use Laminas\Router\Http\Literal;
		@@ -151,6 +152,7 @@ return [
		'view_helpers' => [
		'invokables' => [
		'evenement' => EvenementViewHelper::class,
		'journal' => JournalViewHelper::class,
		],
		],

+1 −1

Changes for config/merged/index.config.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ return [
		'route' => 'unicaen-evenement',
		'resource' => PrivilegeController::getResourceId(IndexController::class, 'index'),
		'order' => 11002,
		'icon' => 'fas fa-angle-right',
		// 'icon' => 'fas fa-angle-right',
		'pages' => [
		],
		],

+3 −0

Changes for src/UnicaenEvenement/Controller/EvenementController.php: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ class EvenementController extends AbstractActionController {
		]);
		}
		catch (Exception $e) {
		var_dump($e);
		die();
		return new JsonModel([
		'message' => "Une erreur est survenue lors du traitement des évènements sélectionnés.",
		'status' => 'error',
		@@ -66,6 +68,7 @@ class EvenementController extends AbstractActionController {

		try {
		foreach ($evenements as $evenement) {
		$evenement->setDateTraitement(null);
		$evenement = $this->evenementGestionService->changerEtatEvent($evenement, $etat);
		$etat = $evenement->getEtat();
		$data[$evenement->getId()] = [$etat->getCode(), $etat->getLibelle()];

+4 −4

Changes for src/UnicaenEvenement/Entity/Db/Evenement.php: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -232,10 +232,10 @@ class Evenement {
		}

		/**
		* @param DateTime $dateTraitement
		* @param DateTime\|null $dateTraitement
		* @return self
		*/
		public function setDateTraitement(DateTime $dateTraitement) : Evenement
		public function setDateTraitement(?DateTime $dateTraitement) : Evenement
		{
		$this->dateTraitement = $dateTraitement;

		@@ -251,10 +251,10 @@ class Evenement {
		}

		/**
		* @param DateTime $dateFin
		* @param DateTime\|null $dateFin
		* @return Evenement
		*/
		public function setDateFin(DateTime $dateFin): Evenement
		public function setDateFin(?DateTime $dateFin): Evenement
		{
		$this->dateFin = $dateFin;
		return $this;

+2 −15

Changes for src/UnicaenEvenement/Entity/Db/Type.php: 2 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -6,19 +6,6 @@ class Type {

		const COLLECTION = 'collection';

		// Services
		const SYNCHRO_OCTOPUS = 'synchro_octopus';

		// ENTRETIEN PROFESSIONNEL
		const RAPPEL_CAMPAGNE_AVANCEMENT = 'rappel_campagne';
		const RAPPEL_ENTRETIEN_PROFESSIONNEL = 'rappel_entretienpro';
		const RAPPEL_PAS_OBSERVATION_ENTRETIEN_PROFESSIONNEL = 'rappel_pas_observation_entretienpro';


		// FORMATION
		const NOTIFICATION_FORMATION_OUVERTE = 'notification_formation_ouverte';
		const RAPPEL_FORMATION_AGENT_AVANT = 'rappel_formation_agent_avant';

		/** @var integer */
		private $id;
		/** @var string */
		@@ -87,10 +74,10 @@ class Type {
		}

		/**
		* @param string $description
		* @param string\|null $description
		* @return Type
		*/
		public function setDescription(string $description) : Type
		public function setDescription(?string $description) : Type
		{
		$this->description = $description;