Merge branch 'issue153_ACCent_activity_admin' into 'master'

Issue153_accent_activity_admin

See merge request Chill-Projet/chill-bundles!193

CHANGELOG.md

@@ -12,14 +12,7 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 
-* [tasks] improve tasks with filter order
-* [tasks] refactor singleControllerTasks: limit the number of conditions from the context
-* [validations] validation of accompanying period added: no duplicate participations or resources (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/60).
-* [renderbox] If gender of person is not defined, no icon is displayed instead of neuter-icon (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/129).
-* [confidential information] module added to blur confidential information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/248).
-* refactor `AuthorizationHelper` and `UserACLAwareRepository` to fix constructor, and separate logic for parent role helper into `ParentRoleHelper`
-* [main]: filter location and locationType in backend: exclude NULL names, only active and availableToUsers
-* [activity]: perform client-side validation & show/hide fields in the "new location" modal
+* [admin]: links to activity admin section added again.
 
 ## Test releases
 

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+
+final class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    private Security $security;
+
+    public function __construct(Security $security)
+    {
+        $this->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'
+                ]);
+        }
+    }
+}

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:

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

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig

@@ -1,7 +1,7 @@
 {% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
 
 {% block admin_content %}
-	<h1>{{ 'Aside Activity Type list'|trans }}</h1>
+	<h1>{{ 'Aside Activity Type List'|trans }}</h1>
 
 	<table class="records_list table table-bordered border-dark">
 		<thead>

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

src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php

@@ -73,14 +73,9 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
     {
         $user = $this->tokenStorage->getToken()->getUser();
 
-        if ($this->authorizationChecker->isGranted('ROLE_USER')
-            && $user instanceof User
-        ) {
+        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,