Merge branch 'master' into alc-recherche-intervenant (5b29d2dd) · Commits · open-source / OSE

admin/actions/update-employeur.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ foreach ($listFiles as $file) {
		$nomCommercial = (!empty($data[5])) ? $data[5] : '';
		$nomCommercial .= (!empty($data[6])) ? ' ' . $data[6] : '';
		$nomCommercial .= (!empty($data[7])) ? ' ' . $data[7] : '';
		$nomCommercial = str_replace("'", "''", $nomCommercial);
		$nomCommercial = str_replace("''", "'", $nomCommercial);
		//RAISON_SOCIALE
		$nomJuridique = $data[4];
		//SIREN
		@@ -124,7 +124,7 @@ foreach ($listFiles as $file) {
		} elseif (!empty($nomPropre)) {
		$raisonSociale = $nomPropre;
		}
		$raisonSociale = str_replace("'", "''", $raisonSociale);
		$raisonSociale = str_replace("''", "'", $raisonSociale);
		//Si pas de raison sociale et pas de nom commercial on passe
		if (empty($raisonSociale) && empty($nomCommercial)) {
		continue;

+23 −9

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Application;

		use Application\Provider\Privilege\Privileges;
		use Service\Controller\ModificationServiceDuController;
		use UnicaenAuth\Guard\PrivilegeController;

		return [
		@@ -40,9 +41,9 @@ return [
		'gestion' => [
		'pages' => [
		'pilotage' => [
		'label' => 'Pilotage',
		'title' => 'Pilotage',
		'icon' => 'fas fa-tachometer',
		'label' => 'Pilotage et indicateurs',
		'title' => 'Pilotage et indicateurs',
		'icon' => 'fas fa-chart-line',
		'route' => 'pilotage',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Pilotage', 'index'),
		'pages' => [
		@@ -53,6 +54,19 @@ return [
		'route' => 'pilotage/ecarts-etats',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Pilotage', 'ecartsEtats'),
		],
		'modification-service-du-export-csv' => [
		'label' => "Modifications de service dû (CSV)",
		'title' => "Modifications de service dû (CSV)",
		'route' => 'modification-service-du/export-csv',
		'resource' => PrivilegeController::getResourceId(ModificationServiceDuController::class, 'export-csv'),
		],
		'indicateurs' => [
		'label' => 'Liste des indicateurs de suivi',
		'title' => 'Liste des indicateurs de suivi',
		'description' => 'Liste des indicateurs de suivi',
		'route' => 'indicateur',
		'resource' => PrivilegeController::getResourceId('Indicateur\Controller\Indicateur', 'index'),
		],
		],
		'order' => 20,
		'color' => '#00A020',

+0 −15

Original line number	Diff line number	Diff line
		@@ -110,21 +110,6 @@ return [
		],
		],

		'navigation' => [
		'gestion' => [
		'pages' => [
		'indicateurs' => [
		'label' => "Indicateurs",
		'icon' => 'fas fa-chart-line',
		'title' => "Indicateurs",
		'route' => 'indicateur',
		'resource' => PrivilegeController::getResourceId('Indicateur\Controller\Indicateur', 'index'),
		'order' => 10,
		'color' => '#217DD8',
		],
		],
		],
		],

		'guards' => [
		[

+6 −18

Original line number	Diff line number	Diff line
		@@ -57,19 +57,7 @@ return [
		],

		'navigation' => [
		'gestion' => [
		'pages' => [
		'modification-service-du-export-csv' => [
		'label' => "Modifications de service dû (CSV)",
		'icon' => 'fas fa-fill',
		'title' => "Modifications de service dû (CSV)",
		'route' => 'modification-service-du/export-csv',
		'resource' => PrivilegeController::getResourceId(ModificationServiceDuController::class, 'export-csv'),
		'order' => 45,
		'color' => '#45DAE0',
		],
		],
		],

		'administration' => [
		'pages' => [
		'rh' => [