diff --git a/data/privileges.php b/data/privileges.php index 937ba6c79c9471e6940557515b35f97da09b2cc2..12682f34b6d0ab60d7832bae80da1e64180b183c 100644 --- a/data/privileges.php +++ b/data/privileges.php @@ -419,13 +419,6 @@ return [ 'grade-edition' => 'Édition grades', ], ], - 'export-rh' => [ - 'libelle' => 'Export RH', - 'privileges' => [ - 'prise-en-charge' => 'Prise en charge d\'un intervenant', - 'renouvellement' => 'Renouvellement d\'un intervenant', - 'synchronisation' => 'Synchronisation d\'un intervenant', - ], - ], + ]; \ No newline at end of file diff --git a/module/Application/src/Application/Provider/Privilege/Privileges.php b/module/Application/src/Application/Provider/Privilege/Privileges.php index d03ff5aa92301898cbb45265e76efccaf7f4228d..025a106bf1715c57fee678ed5c239c9284198e0c 100755 --- a/module/Application/src/Application/Provider/Privilege/Privileges.php +++ b/module/Application/src/Application/Provider/Privilege/Privileges.php @@ -226,8 +226,5 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges const UNICAEN_TBL_UPDATE_ACTUPROC = 'unicaen-tbl-update-actuproc'; const WORKFLOW_DEPENDANCES_EDITION = 'workflow-dependances-edition'; const WORKFLOW_DEPENDANCES_VISUALISATION = 'workflow-dependances-visualisation'; - const EXPORT_RH_PEC = 'export-rh-prise-en-charge'; - const EXPORT_RH_REN = 'export-rh-renouvellement'; - const EXPORT_RH_SYNC = 'export-rh-synchronisation'; - + } \ No newline at end of file diff --git a/module/Application/view/application/intervenant/voir.phtml b/module/Application/view/application/intervenant/voir.phtml index b63006a09949e23f56b8a91d48f137d20ee5c38f..480dff17a5793ecebfdb3d52bb7dcac54c6e5803 100755 --- a/module/Application/view/application/intervenant/voir.phtml +++ b/module/Application/view/application/intervenant/voir.phtml @@ -35,7 +35,7 @@ if ($this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_EDITION)) ]; } -if ($this->isAllowed($intervenant, Privileges::EXPORT_RH_SYNC)) { +if ($this->isAllowed($intervenant, \ExportRh\Assertion\ExportRhAssertion::PRIV_CAN_INTERVENANT_EXPORT_RH)) { $tabs[] = [ 'id' => 'export-rh', 'label' => '<span class="glyphicon glyphicon-export"></span> Export RH', diff --git a/module/ExportRh/config/module.config.php b/module/ExportRh/config/module.config.php index ec61cb09da87a59b0ac8337b9c4bf99ce60432cc..00235d46fbb24c5cd4a9e3568391f93241fa2f4a 100644 --- a/module/ExportRh/config/module.config.php +++ b/module/ExportRh/config/module.config.php @@ -145,14 +145,14 @@ return [ [ 'controller' => Controller\AdministrationController::class, 'action' => ['index', 'chercher-intervenant-rh'], - 'privileges' => [Privileges::EXPORT_RH_SYNC], + 'privileges' => [Privileges::INTERVENANT_EXPORTER], //'assertion' => Assertion\AgrementAssertion::class, ], [ 'controller' => Controller\ExportRhController::class, 'action' => ['exporter', 'prise-en-charge', 'renouvellement', 'synchroniser'], - 'privileges' => [Privileges::EXPORT_RH_SYNC], + 'privileges' => [Privileges::INTERVENANT_EXPORTER], 'assertion' => ExportRhAssertion::class, ], @@ -163,7 +163,7 @@ return [ 'allow' => [ [ 'privileges' => [ - Privileges::EXPORT_RH_SYNC, + Privileges::INTERVENANT_EXPORTER, ExportRhAssertion::PRIV_CAN_INTERVENANT_EXPORT_RH, ], 'resources' => 'Intervenant', diff --git a/module/ExportRh/src/Assertion/ExportRhAssertion.php b/module/ExportRh/src/Assertion/ExportRhAssertion.php index e7f95e7bd663815d3e87f149938b9c611c4ad0fc..7237cc48f272b531b4653ead3474063a054c79bd 100644 --- a/module/ExportRh/src/Assertion/ExportRhAssertion.php +++ b/module/ExportRh/src/Assertion/ExportRhAssertion.php @@ -68,7 +68,7 @@ class ExportRhAssertion extends AbstractAssertion protected function assertIntervenantExportRh(Intervenant $intervenant) { - if (!$this->getRole()->hasPrivilege(Privileges::EXPORT_RH_SYNC)) { + if (!$this->getRole()->hasPrivilege(Privileges::INTERVENANT_EXPORTER)) { return false; } diff --git a/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php b/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php index 70e21dcbdde37caeb440e97fb27028a5761c1f41..a774325e9f07cedd841c607706436f46e23b8142 100644 --- a/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php +++ b/module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php @@ -280,7 +280,7 @@ class SihamConnecteur implements ConnecteurRhInterface 'noVoie' => ' ', 'natureVoie' => '', 'nomVoie' => ' ', - 'commune' => $dossierIntervenant->getAdresseCommune(), + 'ville' => $dossierIntervenant->getAdresseCommune(), 'codePostal' => $dossierIntervenant->getAdresseCodePostal(), 'codePays' => $dossierIntervenant->getAdressePays()->getCode(),