Ajout des niveaux dans les métiers et les corps + modification imports des corps (2644d894) · Commits · open-source / emc2

config/autoload/unicaen-db-import.global.php

+20 −18

Original line number	Diff line number	Diff line
		@@ -148,6 +148,25 @@ return [
		],
		],
		],
		[
		'name' => 'Import_CORPS',
		'source' => [
		'name' => 'Corps des agents remontés depuis OCTOPUS',
		'select' => 'SELECT ID, C_CORPS as CODE, C_CATEGORIE as CATEGORIE, LIB_COURT, LIB_LONG, HISTO_DESTRUCTION as HISTO FROM CORPS',
		'connection' => 'octopus',
		'source_code_column' => 'ID',
		// 'columns' => ['LIB_COURT', 'LIB_LONG', 'C_CORPS', 'C_CATEGORIE', 'HISTO_DESTRUCTION'],
		],
		'intermediate_table' => 'src_corps',
		'destination' => [
		'name' => 'Corps des agents remonté depuis OCTOPUS',
		'table' => 'corps',
		'connection' => 'default',
		'source_code_column' => 'id',
		// 'columns' => ['code', 'categorie', 'lib_court', 'lib_long', 'histo'],
		'columns' => ['code', 'categorie', 'lib_court', 'lib_long', 'histo'],
		],
		],
		// [
		// 'name' => 'Import_STRUCTURE',
		// 'source' => [
		@@ -238,24 +257,7 @@ return [
		// 'columns' => ['lib_court', 'lib_long', 'code', 'histo'],
		// ],
		// ],
		// [
		// 'name' => 'Import_CORPS',
		// 'source' => [
		// 'name' => 'Corps des agents remonté depuis OCTOPUS',
		// 'select' => 'SELECT * FROM V_PREECOG_CORPS',
		// 'connection' => 'octopus',
		// 'source_code_column' => 'ID',
		// 'columns' => ['LIB_COURT', 'LIB_LONG', 'CODE', 'CATEGORIE', 'HISTO'],
		// ],
		// 'intermediate_table' => 'src_corps',
		// 'destination' => [
		// 'name' => 'Corps des agents remonté depuis OCTOPUS',
		// 'table' => 'corps',
		// 'connection' => 'default',
		// 'source_code_column' => 'id',
		// 'columns' => ['lib_court', 'lib_long', 'code', 'categorie', 'histo'],
		// ],
		// ],

		],

		],

module/Application/config/merged/corps.config.php

+29 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,10 @@ use Application\Form\Categorie\CategorieForm;
		use Application\Form\Categorie\CategorieFormFactory;
		use Application\Form\Categorie\CategorieHydrator;
		use Application\Form\Categorie\CategorieHydratorFactory;
		use Application\Form\ModifierNiveau\ModifierNiveauForm;
		use Application\Form\ModifierNiveau\ModifierNiveauFormFactory;
		use Application\Form\ModifierNiveau\ModifierNiveauHydrator;
		use Application\Form\ModifierNiveau\ModifierNiveauHydratorFactory;
		use Application\Provider\Privilege\CorpsPrivileges;
		use Application\Service\Categorie\CategorieService;
		use Application\Service\Categorie\CategorieServiceFactory;
		@@ -30,12 +34,21 @@ return [
		[
		'controller' => CorpsController::class,
		'action' => [
		'index'
		'index',
		],
		'privileges' => [
		CorpsPrivileges::CORPS_INDEX,
		],
		],
		[
		'controller' => CorpsController::class,
		'action' => [
		'modifier-niveau',
		],
		'privileges' => [
		CorpsPrivileges::CORPS_MODIFIER,
		],
		],
		[
		'controller' => CategorieController::class,
		'action' => [
		@@ -85,7 +98,19 @@ return [
		],
		],
		'may_terminate' => true,
		'child_routes' => [],
		'child_routes' => [
		'modifier-niveau' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-niveau/:corps',
		'defaults' => [
		'controller' => CorpsController::class,
		'action' => 'modifier-niveau',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		'categorie' => [
		/ CATEGORIE *************************************************************************************/
		@@ -171,11 +196,13 @@ return [
		'form_elements' => [
		'factories' => [
		CategorieForm::class => CategorieFormFactory::class,
		ModifierNiveauForm::class => ModifierNiveauFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		CategorieHydrator::class => CategorieHydratorFactory::class,
		ModifierNiveauHydrator::class => ModifierNiveauHydratorFactory::class,
		],
		]

module/Application/config/module.config.php

+0 −3

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@ use Application\Form\ModifierLibelle\ModifierLibelleForm;
		use Application\Form\ModifierLibelle\ModifierLibelleFormFactory;
		use Application\Form\ModifierLibelle\ModifierLibelleHydrator;
		use Application\Provider\Privilege\ActivitePrivileges;
		use Application\Provider\Privilege\AdministrationPrivileges;
		use Application\Provider\Privilege\AgentPrivileges;
		use Application\Provider\Privilege\ApplicationPrivileges;
		use Application\Provider\Privilege\CompetencePrivileges;
		@@ -27,7 +26,6 @@ use Application\Provider\Privilege\StructurePrivileges;
		use Application\Provider\Privilege\SynchroPrivileges;
		use Application\Provider\Privilege\ValidationPrivileges;
		use Application\View\Helper\ActionIconViewHelper;
		use Autoform\Provider\Privilege\FormulairePrivileges;
		use Autoform\Provider\Privilege\IndexPrivileges;
		use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
		use Doctrine\ORM\Mapping\Driver\XmlDriver;
		@@ -38,7 +36,6 @@ use UnicaenUtilisateur\Provider\Privilege\RolePrivileges;
		use UnicaenUtilisateur\Provider\Privilege\UtilisateurPrivileges;
		use UnicaenUtilisateur\Service\Role\RoleService;
		use UnicaenUtilisateur\Service\Role\RoleServiceFactory;
		use UnicaenValidation\Provider\Privilege\ValidationinstancePrivileges;
		use UnicaenValidation\Provider\Privilege\ValidationtypePrivileges;
		use Zend\Router\Http\Literal;

module/Application/src/Application/Controller/CorpsController.php

+30 −0

Original line number	Diff line number	Diff line
		@@ -2,10 +2,12 @@

		namespace Application\Controller;

		use Application\Form\ModifierNiveau\ModifierNiveauFormAwareTrait;
		use Application\Service\Categorie\CategorieServiceAwareTrait;
		use Application\Service\Corps\CorpsServiceAwareTrait;
		use Application\Service\Correspondance\CorrespondanceServiceAwareTrait;
		use Application\Service\Grade\GradeServiceAwareTrait;
		use Zend\Http\Request;
		use Zend\Mvc\Controller\AbstractActionController;
		use Zend\View\Model\ViewModel;

		@@ -14,6 +16,7 @@ class CorpsController extends AbstractActionController {
		use CorpsServiceAwareTrait;
		use CorrespondanceServiceAwareTrait;
		use GradeServiceAwareTrait;
		use ModifierNiveauFormAwareTrait;

		public function indexAction()
		{
		@@ -29,4 +32,31 @@ class CorpsController extends AbstractActionController {
		"grades" => $grades,
		]);
		}

		public function modifierNiveauAction()
		{
		$corps = $this->getCorpsService()->getRequestedCorps($this);

		$form = $this->getModifierNiveauForm();
		$form->setAttribute('action', $this->url()->fromRoute('corps/modifier-niveau', ['corps' => $corps->getId()], ['fragment' => 'corps'], true));
		$form->bind($corps);

		/** @var Request $request */
		$request = $this->getRequest();
		if ($request->isPost()) {
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getCorpsService()->update($corps);
		}
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setVariables([
		'title' => "Modification du niveau du corps ".$corps->getLibelleLong(),
		'form' => $form,
		]);
		return $vm;
		}
		}
		No newline at end of file

module/Application/src/Application/Controller/CorpsControllerFactory.php

+7 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Application\Controller;

		use Application\Form\ModifierNiveau\ModifierNiveauForm;
		use Application\Service\Categorie\CategorieService;
		use Application\Service\Corps\CorpsService;
		use Application\Service\Correspondance\CorrespondanceService;
		@@ -27,12 +28,18 @@ class CorpsControllerFactory {
		$correspondanceService = $container->get(CorrespondanceService::class);
		$gradeService = $container->get(GradeService::class);

		/**
		* @var ModifierNiveauForm $modifierNiveauForm
		*/
		$modifierNiveauForm = $container->get('FormElementManager')->get(ModifierNiveauForm::class);

		/** @var CorpsController $controller */
		$controller = new CorpsController();
		$controller->setCategorieService($categorieService);
		$controller->setCorpsService($corpsService);
		$controller->setCorrespondanceService($correspondanceService);
		$controller->setGradeService($gradeService);
		$controller->setModifierNiveauForm($modifierNiveauForm);
		return $controller;
		}
		}
		No newline at end of file