Loading doc/release-notes/v6.x.md +4 −2 Changes for doc/release-notes/v6.x.md: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -18,12 +18,14 @@ git fetch --tags && git checkout --force XXXXXXXXXXXXXXXXXXXXXXXXXXXXX && bash . ```sql -- Modif table ACTEUR -- Modif table acteur alter table acteur add acteur_ecoledoct_id bigint; alter table acteur add constraint acteur_ecole_doct_id_fk foreign key (acteur_ecoledoct_id) references ecole_doct; alter table acteur add principal boolean default false not null; alter table acteur add exterieur boolean default false not null; alter table acteur add ordre smallint default 1 not null; -- Index manquant sur individu_rech create index individu_rech_haystack_index on individu_rech (haystack asc); create table discipline_sise Loading module/Application/config/module.config.php +3 Changes for module/Application/config/module.config.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -314,6 +314,8 @@ return array( ], 'public_files' => [ 'head_scripts' => [ '050_select2' => "/vendor/select2-4.0.13/dist/js/select2.min.js", '050_select2_fr' => "/vendor/select2-4.0.13/dist/js/i18n/fr.js", '060_uploader' => "/vendor/jquery.ui.widget.js", '061_uploader' => "/vendor/jquery.iframe-transport.js", '062_uploader' => "/vendor/jquery.fileupload.js", Loading @@ -329,6 +331,7 @@ return array( '200_fa' => '/vendor/fontawesome-free-5.12.0-web/css/all.min.css', '300_bs' => '/vendor/bootstrap-select-1.14.0-beta3/css/bootstrap-select.min.css', '400_faa' => '/vendor/font-awesome-animation.min.css', '500_select2' => "/vendor/select2-4.0.13/dist/css/select2.min.css", '900_faa' => '/css/rapport-activite.css', ], 'printable_stylesheets' => [ Loading module/Application/src/Application/Controller/UtilisateurController.php +6 −5 Changes for module/Application/src/Application/Controller/UtilisateurController.php: 6 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Controller; use Application\Entity\Db\Utilisateur; use Application\Filter\NomCompletFormatter; use Application\Form\CreationUtilisateurForm; use Application\Form\InitCompteForm; use Application\Form\InitCompteFormAwareTrait; Loading Loading @@ -187,21 +188,21 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle $type = $this->params()->fromQuery('type'); if (($term = $this->params()->fromQuery('term'))) { $rows = $this->individuService->getRepository()->findByText($term, $type); $f = new NomCompletFormatter(true); $result = []; foreach ($rows as $row) { $prenoms = implode(' ', array_filter([$row['prenom1'], $row['prenom2'], $row['prenom3']])); $prenoms23 = implode(' ', array_filter([$row['prenom2'], $row['prenom3']])); // mise en forme attendue par l'aide de vue FormSearchAndSelect $label = $row['nom_usuel'] . ' ' . $prenoms; $label = trim($f->filter($row) . ' ' . $prenoms23); $extra = $row['email'] ?: $row['source_code']; $result[] = array( 'id' => $row['id'], // identifiant unique de l'item 'label' => $label, // libellé de l'item 'text' => $label, // pour Select2.js 'extra' => $extra, // infos complémentaires (facultatives) sur l'item ); } usort($result, function ($a, $b) { return strcmp($a['label'], $b['label']); }); usort($result, fn($a, $b) => $a['label'] <=> $b['label']); return new JsonModel($result); } Loading module/Application/src/Application/Filter/NomCompletFormatter.php +3 −9 Changes for module/Application/src/Application/Filter/NomCompletFormatter.php: 3 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -98,15 +98,9 @@ class NomCompletFormatter extends AbstractFilter $civilite = $value->civilite; } elseif (is_array($value)) { /* @var $value array */ foreach (['nom_usuel', 'nom_patronymique', 'prenom', 'civilite'] as $prop) { if (!array_key_exists($prop, $value)) { throw new \LogicException("Le tableau à formatter doit posséder la clé '$prop'."); } } $nomUsuel = $value['nom_usuel']; $nomPatro = $value['nom_patronymique']; $prenom = $value['prenom']; $nomUsuel = $value['nom_usuel'] ?? $value['nomUsuel'] ?? '?'; $nomPatro = $value['nom_patronymique'] ?? $value['nomPatronymique'] ?? '?'; $prenom = $value['prenom1']; $civilite = $value['civilite']; } else { Loading module/Application/tests/ApplicationFunctionalTest/Service/Workflow/WorkflowServiceAbstractTest.php +1 −1 Changes for module/Application/tests/ApplicationFunctionalTest/Service/Workflow/WorkflowServiceAbstractTest.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -360,7 +360,7 @@ abstract class WorkflowServiceAbstractTest extends AbstractControllerTestCase protected function _franchir_etape_validation_depot_version_corrigee_directeurs() { $directeurs = $this->these->getActeursByRoleCode(Role::CODE_DIRECTEUR_THESE); $directeurs = $this->these->getActeursNonHistorisesByRoleCode(Role::CODE_DIRECTEUR_THESE); // création d'une validation par directeur $validations = []; Loading Loading
doc/release-notes/v6.x.md +4 −2 Changes for doc/release-notes/v6.x.md: 4 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -18,12 +18,14 @@ git fetch --tags && git checkout --force XXXXXXXXXXXXXXXXXXXXXXXXXXXXX && bash . ```sql -- Modif table ACTEUR -- Modif table acteur alter table acteur add acteur_ecoledoct_id bigint; alter table acteur add constraint acteur_ecole_doct_id_fk foreign key (acteur_ecoledoct_id) references ecole_doct; alter table acteur add principal boolean default false not null; alter table acteur add exterieur boolean default false not null; alter table acteur add ordre smallint default 1 not null; -- Index manquant sur individu_rech create index individu_rech_haystack_index on individu_rech (haystack asc); create table discipline_sise Loading
module/Application/config/module.config.php +3 Changes for module/Application/config/module.config.php: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -314,6 +314,8 @@ return array( ], 'public_files' => [ 'head_scripts' => [ '050_select2' => "/vendor/select2-4.0.13/dist/js/select2.min.js", '050_select2_fr' => "/vendor/select2-4.0.13/dist/js/i18n/fr.js", '060_uploader' => "/vendor/jquery.ui.widget.js", '061_uploader' => "/vendor/jquery.iframe-transport.js", '062_uploader' => "/vendor/jquery.fileupload.js", Loading @@ -329,6 +331,7 @@ return array( '200_fa' => '/vendor/fontawesome-free-5.12.0-web/css/all.min.css', '300_bs' => '/vendor/bootstrap-select-1.14.0-beta3/css/bootstrap-select.min.css', '400_faa' => '/vendor/font-awesome-animation.min.css', '500_select2' => "/vendor/select2-4.0.13/dist/css/select2.min.css", '900_faa' => '/css/rapport-activite.css', ], 'printable_stylesheets' => [ Loading
module/Application/src/Application/Controller/UtilisateurController.php +6 −5 Changes for module/Application/src/Application/Controller/UtilisateurController.php: 6 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Application\Controller; use Application\Entity\Db\Utilisateur; use Application\Filter\NomCompletFormatter; use Application\Form\CreationUtilisateurForm; use Application\Form\InitCompteForm; use Application\Form\InitCompteFormAwareTrait; Loading Loading @@ -187,21 +188,21 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle $type = $this->params()->fromQuery('type'); if (($term = $this->params()->fromQuery('term'))) { $rows = $this->individuService->getRepository()->findByText($term, $type); $f = new NomCompletFormatter(true); $result = []; foreach ($rows as $row) { $prenoms = implode(' ', array_filter([$row['prenom1'], $row['prenom2'], $row['prenom3']])); $prenoms23 = implode(' ', array_filter([$row['prenom2'], $row['prenom3']])); // mise en forme attendue par l'aide de vue FormSearchAndSelect $label = $row['nom_usuel'] . ' ' . $prenoms; $label = trim($f->filter($row) . ' ' . $prenoms23); $extra = $row['email'] ?: $row['source_code']; $result[] = array( 'id' => $row['id'], // identifiant unique de l'item 'label' => $label, // libellé de l'item 'text' => $label, // pour Select2.js 'extra' => $extra, // infos complémentaires (facultatives) sur l'item ); } usort($result, function ($a, $b) { return strcmp($a['label'], $b['label']); }); usort($result, fn($a, $b) => $a['label'] <=> $b['label']); return new JsonModel($result); } Loading
module/Application/src/Application/Filter/NomCompletFormatter.php +3 −9 Changes for module/Application/src/Application/Filter/NomCompletFormatter.php: 3 added lines, 9 removed lines. Original line number Diff line number Diff line Loading @@ -98,15 +98,9 @@ class NomCompletFormatter extends AbstractFilter $civilite = $value->civilite; } elseif (is_array($value)) { /* @var $value array */ foreach (['nom_usuel', 'nom_patronymique', 'prenom', 'civilite'] as $prop) { if (!array_key_exists($prop, $value)) { throw new \LogicException("Le tableau à formatter doit posséder la clé '$prop'."); } } $nomUsuel = $value['nom_usuel']; $nomPatro = $value['nom_patronymique']; $prenom = $value['prenom']; $nomUsuel = $value['nom_usuel'] ?? $value['nomUsuel'] ?? '?'; $nomPatro = $value['nom_patronymique'] ?? $value['nomPatronymique'] ?? '?'; $prenom = $value['prenom1']; $civilite = $value['civilite']; } else { Loading
module/Application/tests/ApplicationFunctionalTest/Service/Workflow/WorkflowServiceAbstractTest.php +1 −1 Changes for module/Application/tests/ApplicationFunctionalTest/Service/Workflow/WorkflowServiceAbstractTest.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -360,7 +360,7 @@ abstract class WorkflowServiceAbstractTest extends AbstractControllerTestCase protected function _franchir_etape_validation_depot_version_corrigee_directeurs() { $directeurs = $this->these->getActeursByRoleCode(Role::CODE_DIRECTEUR_THESE); $directeurs = $this->these->getActeursNonHistorisesByRoleCode(Role::CODE_DIRECTEUR_THESE); // création d'une validation par directeur $validations = []; Loading