From 6d248ab47bf24c2b8eb7ebe6254505b6a9271329 Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 3 Nov 2021 10:55:51 +0100 Subject: [PATCH 1/4] Activity link added to admin homepage --- .../Menu/AdminMenuBuilder.php | 48 +++++++++++++++++++ .../translations/messages.fr.yml | 5 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php diff --git a/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php new file mode 100644 index 000000000..ce7618b6d --- /dev/null +++ b/src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php @@ -0,0 +1,48 @@ +security = $security; + } + + public static function getMenuIds(): array + { + return ['admin_index', 'admin_section', 'admin_activity']; + } + + public function buildMenu($menuId, MenuItem $menu, array $parameters) + { + if (!$this->security->isGranted('ROLE_ADMIN')) { + return; + } + + if (in_array($menuId, ['admin_index', 'admin_section'])) { + $menu->addChild('Activities', [ + 'route' => 'chill_admin_activity_index' + ]) + ->setExtras([ + 'order' => 2000, + 'explain' => "Activity configuration" + ]); + } else { + $menu + ->addChild('Activities', [ + 'route' => 'chill_admin_activity_index' + ]) + ->setExtras([ + 'order' => '60' + ]); + } + } +} \ No newline at end of file diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml index 55e55d370..d0c3ddc6d 100644 --- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml @@ -99,10 +99,13 @@ CHILL_ACTIVITY_LIST: Liste des activités Activities: Activités Activity configuration: Configuration des activités Activity configuration menu: Configuration des activités -Activity Types: Types d'activité +Activity types: Types d'activité +Activity type configuration: Configuration des categories d'activités Activity Reasons: Sujets d'une activité Activity Reasons Category: Catégories de sujet d'activités Activity Types Categories: Catégories des types d'activité +Activity Presences: Presences des activités + # Crud crud: From b0471c485124d2b1e289ef96d407b59eb594fd4a Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Wed, 3 Nov 2021 10:56:28 +0100 Subject: [PATCH 2/4] translation fixes for aside activities --- .../src/Menu/AdminMenuBuilder.php | 2 +- .../Resources/views/asideActivityCategory/index.html.twig | 2 +- .../src/translations/messages.fr.yml | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php index ecc1a1f90..24fc89162 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php +++ b/src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php @@ -32,7 +32,7 @@ final class AdminMenuBuilder implements \Chill\MainBundle\Routing\LocalMenuBuild ]) ->setExtras([ 'order' => 900, - 'explain' => "Configure aside activities categories" + 'explain' => "Aside activity type configuration" ]); } else { $menu diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig index 2c8373daf..00dc1d3ea 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig +++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig @@ -1,7 +1,7 @@ {% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %} {% block admin_content %} -

{{ 'Aside Activity Type list'|trans }}

+

{{ 'Aside Activity Type List'|trans }}

diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml index dac2430bd..6d219626d 100644 --- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml +++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml @@ -3,6 +3,7 @@ Show the aside activity: Voir l'activité annexe Edit the aside activity: Modifier l'activité annexe Remove aside activity: Supprimer l'activité annexe Aside activity: Activité annexe +Aside Activity Type List: Liste des catégories d'activités annexes Duration time: Durée durationTime: durée user_username: nom de l'utilisateur @@ -156,6 +157,11 @@ The activity has been successfully removed.: L'activité a été supprimée. #Menu Create an aside activity: "Créer une activité annexe" +Aside activity categories: Catégories des activités annexes Aside activity configuration menu: "Menu de configuration des activités annexes" -Aside activity configuration: "Configuration des activités annexes" Phonecall: "Appel téléphonique" + +# admin +Aside activities: Activités annexes +Aside activity types: Types d'activités annexes +Aside activity type configuration: Configuration des categories d'activités annexes From b2fe02453432c146bebe40c0529f2c378ee796ca Mon Sep 17 00:00:00 2001 From: LenaertsJ Date: Wed, 3 Nov 2021 13:27:32 +0000 Subject: [PATCH 3/4] Code that causes error commented: UserMenuBuilder.php --- src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php index 14e775234..b952af921 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php @@ -75,9 +75,9 @@ class UserMenuBuilder implements LocalMenuBuilderInterface if ($this->authorizationChecker->isGranted('ROLE_USER')){ $menu->addChild("My calendar list", [ 'route' => 'chill_calendar_calendar_list', - 'routeParameters' => [ - 'user_id' => $user->getId(), - ] +// 'routeParameters' => [ +// 'user_id' => $user->getId(), +// ] ]) ->setExtras([ 'order' => 9, From 6fdbefa4c8efb4064597d18e9ca55061aa4d4cec Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 4 Nov 2021 09:50:25 +0100 Subject: [PATCH 4/4] changelog updated and comments removed --- CHANGELOG.md | 2 +- src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34047e541..efe868f54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to - +* [admin]: links to activity admin section added again. ## Test releases diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php index b952af921..b3c6a9a28 100644 --- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php +++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php @@ -74,10 +74,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface if ($this->authorizationChecker->isGranted('ROLE_USER')){ $menu->addChild("My calendar list", [ - 'route' => 'chill_calendar_calendar_list', -// 'routeParameters' => [ -// 'user_id' => $user->getId(), -// ] + 'route' => 'chill_calendar_calendar_list' ]) ->setExtras([ 'order' => 9,