From d9c1f52894f50d20da556aefcc5807a0d00a03bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 29 Jun 2021 20:51:08 +0200
Subject: [PATCH] improve activity

---
 .../Controller/ActivityController.php         |  8 ++---
 .../ChillActivityBundle/Menu/MenuBuilder.php  | 12 -------
 .../Repository/ActivityRepository.php         | 27 +++++++++++++-
 .../Resources/views/Activity/edit.html.twig   |  2 +-
 .../Resources/views/Activity/list.html.twig   | 36 ++++++++++++++-----
 .../Resources/views/Activity/new.html.twig    |  2 +-
 .../Resources/views/Activity/show.html.twig   |  2 +-
 7 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index 38ca08d1f..fe515918a 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -72,6 +72,7 @@ class ActivityController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
         $view = null;
+        // TODO: add pagination
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
@@ -80,10 +81,9 @@ class ActivityController extends AbstractController
                 ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
                     $person->getCenter());
 
-            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
-                ['person' => $person, 'scope' => $reachableScopes],
-                ['date' => 'DESC'],
-            );
+            $activities = $em->getRepository(Activity::class)
+                ->findByPersonImplied($person, $reachableScopes)
+                ;
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
diff --git a/src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php b/src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php
index f11aa28bc..df7620f30 100644
--- a/src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php
@@ -67,18 +67,6 @@ class MenuBuilder implements LocalMenuBuilderInterface
                     'order' => 201
                 ]);
         }
-        
-        if ($this->authorizationHelper->userHasAccess($user, $person, $roleAdd)) {
-            $menu->addChild($this->translator->trans('Add a new activity'), [
-                    'route' => 'chill_activity_activity_new',
-                    'routeParameters' => [
-                        'person_id' => $person->getId()
-                    ]
-                ])
-                ->setExtras([
-                    'order' => 200
-                ]);
-        }
     }
 
     public static function getMenuIds(): array
diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index b5155d4c9..340481ca9 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -38,5 +38,30 @@ class ActivityRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Activity::class);
     }
-    
+
+    public function findByPersonImplied($person, array $scopes, $orderBy = [ 'date' => 'DESC'], $limit = 100, $offset = 0)
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        $qb
+            // TODO add acl
+            //->where($qb->expr()->in('a.scope', ':scopes'))
+            //->setParameter('scopes', $scopes)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('a.person', ':person'),
+                    ':person MEMBER OF a.persons'
+                )
+            )
+            ->setParameter('person', $person)
+            ;
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        return $qb->getQuery()
+            ->getResult();
+    }    
 }
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
index 56a7c96b4..5e010bc87 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -99,7 +99,7 @@
             </a>
         </li>
         <li>
-            <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+            <button class="sc-button bt-update" type="submit">{{ 'Save'|trans }}</button>
         </li>
     </ul>
 {{ form_end(edit_form) }}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index c84d61009..a4d75917e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -17,7 +17,7 @@
     </p>
 {% else %}
 
-<div class="flex-table list-records {{ context }}">
+<div class="flex-table list-records context-{{ context }}">
     <!--
     <thead>
         <tr>
@@ -54,6 +54,20 @@
                         </p>
                         {% endif %}
                     </div>
+
+                    {% if context == 'person' and activity.accompanyingPeriod is not empty %}
+                      <div class="accompanyingPeriodLink" style="margin-top: 1rem">
+                        <a 
+                           href="{{ chill_path_add_return_path(
+                            "chill_person_accompanying_course_index",
+                            { 'accompanying_period_id': activity.accompanyingPeriod.id }
+                            ) }}"
+                           >
+                          <i class="fa fa-random"></i>
+                          {{ activity.accompanyingPeriod.id }}
+                        </a>
+                      </div>
+                    {% endif %}
                     
                 </div>
                 <div class="item-col">
@@ -147,13 +161,14 @@
             </div>
             
             {%  
-                if activity.comment.comment is not empty 
+                if activity.comment.comment is not empty
                 or activity.persons|length > 0
                 or activity.thirdParties|length > 0
                 or activity.users|length > 0 
             %}
             <div class="item-row details">
                 <div class="item-col">
+
                     {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
                 </div>
                 
@@ -170,10 +185,13 @@
 </div>
 {% endif %}
 
-<ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
-            {{ 'Add a new activity' | trans }}
-        </a>
-    </li>
-</ul>
+{% if context != 'person' %}
+{# TODO set this condition in configuration #}
+  <ul class="record_actions">
+      <li>
+          <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
+              {{ 'Add a new activity' | trans }}
+          </a>
+      </li>
+  </ul>
+{% endif %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
index 35e466915..d7ba17594 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -98,7 +98,7 @@
   </li>
   <li>
     <button class="sc-button bt-create" type="submit">
-      {{ 'Add a new activity'|trans }}
+      {{ 'Create'|trans }}
     </button>
   </li>
 </ul>
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index 584c0d149..92d2069c0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -117,7 +117,7 @@
     </li>
     <li>
     <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
-        {{ 'Edit the activity'|trans }}
+        {{ 'Edit'|trans }}
     </a>
     </li>
     {# TODO