aside activities query added to filter by current user

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -1,14 +1,29 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\AsideActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Doctrine\Common\Collections\Criteria;
 
-
+final class AsideActivityController extends CRUDController
-/**
- * Class AsideActivityBundle
- */
-class AsideActivityController extends CRUDController
 {
+    /**
+     * @param QueryBuilder $query
+     */
+    protected function onPostIndexBuildQuery(string $action, Request $request, int $totalItems, PaginatorInterface $paginator, $query) {
+        
+        $usr = $this->getUser();
+        $id = $usr->getId();
+        $criteria = Criteria::create()->andWhere(Criteria::expr()->eq('agent', $id));
+
+        $query
+            ->addCriteria($criteria);
+    }
+
     
 }

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -200,10 +200,4 @@ class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
 
         return $this;
     }
-
-    // public function __toString()
-    // {
-    //     // dump($this->type->getTitle());
-    //     return $this->type->getTitle();
-    // }
 }

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php

@@ -34,6 +34,7 @@ final class AsideActivityFormType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        dump($options);
         $timeChoices = [];
 
         foreach ($this->timeChoices as $e) {
@@ -108,7 +109,6 @@ final class AsideActivityFormType extends AbstractType
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
                     $data->add(new \DateInterval('PT'.$seconds.'S'));
-                    dump($data);
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig

@@ -16,15 +16,6 @@
 			</li>
 		{% endblock %}
 		{% block content_form_actions_before %}{% endblock %}
-            {% block content_form_actions_view %}
-                {% if is_granted(chill_crud_config('role', crud_name, 'view'), entity) %}
-                <li class="">
-                    <a class="btn btn-show" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_view', { 'id': entity.id }) }}">
-                        {{ 'crud.edit.back_to_view'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            {% endblock %}
 		{% block content_form_actions_confirm_delete %}
 			<li>
 				<button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig

@@ -1,6 +1,8 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
-{% block title %}{{ 'Aside activity list' |trans }}{% endblock title %}
+{% block title %}
+	{{ 'Aside activity list' |trans }}
+{% endblock title %}
 
 {% block content %}
 	<div class="col-md-10 col-xxl asideactivity-list">
@@ -13,14 +15,12 @@
 			</p>
 		{% else %}
 
-<div class="flex-table my-4 list-records">
+			<div
+				class="flex-table my-4 list-records">
 				{# Sort activities according to date in descending order #}
 				{% for entity in entities|sort ((a, b) => b.date <=> a.date) %}
 					{% set t = entity.type %}
 
-        {# only load aside activities of current user. #}
-        {% if entity.agent == app.user %}
-
 					<div class="item-bloc">
 						<div class="item-row main">
 							<div class="item-col">
@@ -74,8 +74,7 @@
 									{# TOOD
 																		                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
 																		                        #}
-                        <li>
+										<li><a href="{{ path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update "> </a>
-                            <a href="{{ path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update "></a>
 									</li>
 									{# TOOD
 																		                        {% endif %}
@@ -91,7 +90,7 @@
 							</ul>
 						</div>
 					</div>
-        {% endif %}
+
 				{% endfor %}
 			</div>
 			<ul class="record_actions">

src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml

@@ -1,6 +1,7 @@
 #general
 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
 Duration time: Durée
 durationTime: durée
@@ -25,7 +26,7 @@ Required: Obligatoire
 Persons: Personnes
 Users: Utilisateurs
 Emergency: Urgent
-by: 'Par '
+by: "Par "
 location: Lieu
 
 # Crud
@@ -75,8 +76,10 @@ My aside activities: Mes activités annexes
 Date: Date
 Created by: Creér par
 
-
 #Aside activity delete
 Delete aside activity: Supprimer une activité annexe
 Are you sure you want to remove the aside activity concerning "%name%" ?: Êtes-vous sûr de vouloir supprimer une activité annexe qui concerne "%name%" ?
 The activity has been successfully removed.: L'activité a été supprimée.
+
+#Menu
+Create an aside activity: "Creér une activité annexe"