StatutIntervenant => Statut (WIP) (bcb4635a) · Commits · JACQUOT Frederic / OSE

module/Application/autoload_classmap.php

+0 −991

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/config/administration.config.php

+3 −3

Changes for module/Application/config/administration.config.php: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -141,11 +141,11 @@ return [
		'order' => 80,
		'border - color' => '#111',
		'pages' => [
		'statut-intervenant' => [
		'statut' => [
		'label' => 'Edition des statuts des intervenants',
		'icon' => 'fa fa-graduation-cap',
		'route' => 'statut-intervenant',
		'resource' => PrivilegeController::getResourceId('Application\Controller\StatutIntervenant', 'index'),
		'route' => 'statut',
		'resource' => PrivilegeController::getResourceId('Intervenant\Controller\Statut', 'index'),
		'order' => 90,
		'border-color' => '#BBCF55',
		],

module/Application/config/pieces.config.php

+1 −1

Changes for module/Application/config/pieces.config.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ return [
		'modifier-type-piece-jointe-statut' => [
		'type' => 'Segment',
		'options' => [
		'route' => '/modifier-type-piece-jointe-statut/:typePieceJointe/:statutIntervenant[/:typePieceJointeStatut]',
		'route' => '/modifier-type-piece-jointe-statut/:typePieceJointe/:statut[/:typePieceJointeStatut]',
		'defaults' => [
		'action' => 'modifier-type-piece-jointe-statut',
		],

module/Application/src/Controller/DroitsController.php

+8 −8

Changes for module/Application/src/Controller/DroitsController.php: 8 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		@@ -12,13 +12,13 @@ use Application\Service\Traits\AffectationServiceAwareTrait;
		use Application\Service\Traits\ContextServiceAwareTrait;
		use Application\Service\Traits\RoleServiceAwareTrait;
		use Application\Service\Traits\SourceServiceAwareTrait;
		use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
		use Intervenant\Service\StatutServiceAwareTrait;
		use Application\Service\Traits\StructureServiceAwareTrait;
		use Application\Form\Droits\Traits\RoleFormAwareTrait;
		use Application\Service\Traits\UtilisateurServiceAwareTrait;
		use Application\Traits\DoctrineCacheAwareTrait;
		use UnicaenAuth\Service\Traits\PrivilegeServiceAwareTrait;
		use Application\Entity\Db\Statut;
		use Intervenant\Entity\Db\Statut;
		use UnicaenAuth\Entity\Db\Privilege;

		/**
		@@ -30,7 +30,7 @@ use UnicaenAuth\Entity\Db\Privilege;
		class DroitsController extends AbstractController
		{
		use RoleServiceAwareTrait;
		use StatutIntervenantServiceAwareTrait;
		use StatutServiceAwareTrait;
		use PrivilegeServiceAwareTrait;
		use AffectationServiceAwareTrait;
		use StructureServiceAwareTrait;
		@@ -153,8 +153,8 @@ class DroitsController extends AbstractController
		}

		if ($rsFilter == 's' \|\| !$rsFilter) {
		$qb = $this->getServiceStatutIntervenant()->finderByHistorique();
		$statuts = $this->getServiceStatutIntervenant()->getList($qb);
		$qb = $this->getServiceStatut()->finderByHistorique();
		$statuts = $this->getServiceStatut()->getList($qb);
		} else {
		$statuts = [];
		}
		@@ -167,7 +167,7 @@ class DroitsController extends AbstractController
		public function privilegesModifierAction()
		{
		$role = $this->context()->roleFromPost();
		$statut = $this->context()->statutIntervenantFromPost('statut');
		$statut = $this->context()->statutFromPost('statut');
		$privilege = $this->getServicePrivilege()->get($this->params()->fromPost('privilege'));
		$action = $this->params()->fromPost('action');
		$cc = $this->getCacheContainer(PrivilegeService::class);
		@@ -333,8 +333,8 @@ class DroitsController extends AbstractController
		$options['roles']['options']['r-' . $role->getCode()] = (string)$role;
		}

		$qb = $this->getServiceStatutIntervenant()->finderByHistorique();
		$statuts = $this->getServiceStatutIntervenant()->getList($qb);
		$qb = $this->getServiceStatut()->finderByHistorique();
		$statuts = $this->getServiceStatut()->getList($qb);
		foreach ($statuts as $statut) {
		$options['statuts']['options']['s-' . $statut->getCode()] = (string)$statut;
		}

module/Application/src/Controller/IntervenantController.php

+3 −3

Changes for module/Application/src/Controller/IntervenantController.php: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ use Application\Service\Traits\FormuleResultatServiceAwareTrait;
		use Application\Service\Traits\LocalContextServiceAwareTrait;
		use Application\Service\Traits\RegleStructureValidationServiceAwareTrait;
		use Application\Service\Traits\SourceServiceAwareTrait;
		use Application\Service\Traits\StatutIntervenantServiceAwareTrait;
		use Intervenant\Service\StatutServiceAwareTrait;
		use Application\Service\Traits\TypeVolumeHoraireServiceAwareTrait;
		use Application\Service\Traits\UtilisateurServiceAwareTrait;
		use Application\Service\Traits\ValidationServiceAwareTrait;
		@@ -61,7 +61,7 @@ class IntervenantController extends AbstractController
		use FormuleResultatServiceAwareTrait;
		use RegleStructureValidationServiceAwareTrait;
		use RegleStructureValidationFormAwareTrait;
		use StatutIntervenantServiceAwareTrait;
		use StatutServiceAwareTrait;
		use SourceServiceAwareTrait;
		use UtilisateurServiceAwareTrait;
		use DossierServiceAwareTrait;
		@@ -317,7 +317,7 @@ class IntervenantController extends AbstractController
		if ($actionDetail == 'dupliquer') {
		$intervenant = $intervenant->dupliquer();
		$intervenant->setSource($this->getServiceSource()->getOse());
		$intervenant->setStatut($this->getServiceStatutIntervenant()->getAutres());
		$intervenant->setStatut($this->getServiceStatut()->getAutres());
		}

		$canEdit = $this->isAllowed($intervenant, Privileges::INTERVENANT_EDITION);