From f85d084e4e0d64343d74e348880a605f7fcebda3 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:03:36 +0200
Subject: [PATCH 1/7] Cleanup AdmiController (user list)

---
 app/Resources/views/admin/user/list.html.twig | 50 +++++++++----------
 src/AppBundle/Controller/AdminController.php  | 12 ++---
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/Resources/views/admin/user/list.html.twig b/app/Resources/views/admin/user/list.html.twig
index 59a5a72f1..f563606d4 100644
--- a/app/Resources/views/admin/user/list.html.twig
+++ b/app/Resources/views/admin/user/list.html.twig
@@ -10,7 +10,7 @@
 
 {% block content %}
     <div class="row center">
-        <h4 class="header">Liste des membres ({{ nb_of_result }})</h4>
+        <h4 class="header">Liste des membres ({{ result_count }})</h4>
     </div>
 
     <ul class="collapsible">
@@ -311,52 +311,52 @@
     </table>
 <div class="container">
     <div class="section">
-    {% if nb_of_pages > 1 %}
+    {% if page_count > 1 %}
     <ul class="pagination">
-        <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(page==1) %}#!{% else %}{{ path("user_index",{'page':page-1}) }}{% endif %}" data-page="{{ page-1 }}">
+        <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==1) %}#!{% else %}{{ path("user_index", {'page':current_page-1}) }}{% endif %}" data-page="{{ current_page-1 }}">
                 <i class="material-icons">chevron_left</i>
             </a>
         </li>
-        {% if nb_of_pages < 10 %}
-            {% for i in range(1,nb_of_pages) %}
-                <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+        {% if page_count < 10 %}
+            {% for i in range(1, page_count) %}
+                <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
             {% endfor %}
         {% else %}
-            {% if page <= 3 %}
-                {% for i in range(1,page+1) %}
-                    <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+            {% if current_page <= 3 %}
+                {% for i in range(1, current_page+1) %}
+                    <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                 {% endfor %}
                 <li>...</li>
-                {% for i in range(nb_of_pages-1,nb_of_pages) %}
-                    <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                {% for i in range(page_count-1, page_count) %}
+                    <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                 {% endfor %}
             {% else %}
-                {% if nb_of_pages - page <= 3 %}
-                    {% for i in range(1,2) %}
-                        <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                {% if page_count - current_page <= 3 %}
+                    {% for i in range(1, 2) %}
+                        <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                     {% endfor %}
                     <li>...</li>
-                    {% for i in range(page-1,nb_of_pages) %}
-                        <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                    {% for i in range(current_page-1, page_count) %}
+                        <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                     {% endfor %}
                 {% else %}
-                    {% for i in range(1,2) %}
-                    <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                    {% for i in range(1, 2) %}
+                    <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                     {% endfor %}
                     <li>...</li>
-                    {% for i in range(page-1,page+1) %}
-                        <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                    {% for i in range(current_page-1, current_page+1) %}
+                        <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                     {% endfor %}
                     <li>...</li>
-                    {% for i in range(nb_of_pages-1,nb_of_pages) %}
-                        <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
+                    {% for i in range(page_count-1, page_count) %}
+                        <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="#" data-page="{{ i }}">{{ i }}</a></li>
                     {% endfor %}
                 {% endif %}
             {% endif %}
         {% endif %}
-        <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(page==nb_of_pages) %}#!{% else %}{{ path("user_index",{'page':page+1}) }}{% endif %}" data-page="{{ page+1}}">
+        <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("user_index", {'page':current_page+1}) }}{% endif %}" data-page="{{ current_page+1 }}">
                 <i class="material-icons">chevron_right</i>
             </a>
         </li>
diff --git a/src/AppBundle/Controller/AdminController.php b/src/AppBundle/Controller/AdminController.php
index f8688c615..ac8442f06 100644
--- a/src/AppBundle/Controller/AdminController.php
+++ b/src/AppBundle/Controller/AdminController.php
@@ -130,9 +130,9 @@ public function usersAction(Request $request, SearchUserFormHelper $formHelper)
         } else {
             $limitPerPage = 25;
             $paginator = new Paginator($qb);
-            $totalItems = count($paginator);
-            $pagesCount = ($totalItems == 0) ? 1 : ceil($totalItems / $limitPerPage);
-            $currentPage = ($currentPage > $pagesCount) ? $pagesCount : $currentPage;
+            $resultCount = count($paginator);
+            $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+            $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
             $paginator
                 ->getQuery()
@@ -143,9 +143,9 @@ public function usersAction(Request $request, SearchUserFormHelper $formHelper)
         return $this->render('admin/user/list.html.twig', array(
             'members' => $paginator,
             'form' => $form->createView(),
-            'nb_of_result' => $totalItems,
-            'page' => $currentPage,
-            'nb_of_pages' => $pagesCount
+            'result_count' => $resultCount,
+            'current_page' => $currentPage,
+            'page_count' => $pageCount
         ));
     }
 

From 8ab4a25009c52107663943310ca31e10d891df2c Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:43:35 +0200
Subject: [PATCH 2/7] Cleanup & fix ShiftFreeLog

---
 .../views/admin/shiftfreelog/index.html.twig  | 26 ++++++++++++++-----
 .../Controller/ShiftFreeLogController.php     | 17 +++++++-----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/Resources/views/admin/shiftfreelog/index.html.twig b/app/Resources/views/admin/shiftfreelog/index.html.twig
index c5ffa1697..5810d8fe2 100644
--- a/app/Resources/views/admin/shiftfreelog/index.html.twig
+++ b/app/Resources/views/admin/shiftfreelog/index.html.twig
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-    <h4>Historique des annulations de créneaux ({{ shiftFreeLogs | length }})</h4>
+    <h4>Historique des annulations de créneaux ({{ result_count }})</h4>
 
     {# Filter form  --------- #}
     <ul class="collapsible">
@@ -58,6 +58,7 @@
                     </div>
                 </div>
                 {{ form_widget(filter_form.submit) }}
+                {{ form_row(filter_form.page) }}
                 {{ form_row(filter_form._token) }}
                 {{ form_end(filter_form, {'render_rest': false}) }}
             </div>
@@ -118,18 +119,31 @@
 
     <ul class="pagination">
         <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(current_page==1) %}#!{% else %}{{ path("admin_shiftfreelog_index",{'page':current_page-1}) }}{% endif %}">
+            <a href="{% if(current_page==1) %}#!{% else %}{{ path("admin_shiftfreelog_index", {'page':current_page-1}) }}{% endif %}" data-page="{{ current_page-1 }}">
                 <i class="material-icons">chevron_left</i>
             </a>
         </li>
-        {% for i in range(1,pages_count) %}
-        <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("admin_shiftfreelog_index",{'page':i}) }}">{{ i }}</a></li>
+        {% for i in range(1, page_count) %}
+            <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}">
+                <a href="#" data-page="{{ i }}">{{ i }}</a>
+            </li>
         {% endfor %}
-        <li class="{% if(current_page==pages_count) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(current_page==pages_count) %}#!{% else %}{{ path("admin_shiftfreelog_index",{'page':current_page+1}) }}{% endif %}">
+        <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("admin_shiftfreelog_index", {'page':current_page+1}) }}{% endif %}" data-page="{{ current_page+1 }}">
                 <i class="material-icons">chevron_right</i>
             </a>
         </li>
     </ul>
+{% endblock %}
 
+{% block javascripts %}
+<script>
+    jQuery(function() {
+        $('.pagination li:not(.disabled) a').click(function(e) {
+            e.preventDefault();
+            $('#form_page').val($(this).data('page'));
+            $('form[name=form]').submit();
+        });
+    });
+</script>
 {% endblock %}
diff --git a/src/AppBundle/Controller/ShiftFreeLogController.php b/src/AppBundle/Controller/ShiftFreeLogController.php
index 9febbdccd..8167a18a4 100644
--- a/src/AppBundle/Controller/ShiftFreeLogController.php
+++ b/src/AppBundle/Controller/ShiftFreeLogController.php
@@ -12,6 +12,7 @@
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Doctrine\ORM\Tools\Pagination\Paginator;
 
@@ -68,6 +69,9 @@ private function filterFormFactory(Request $request): array
                     'volant' => 1,
                 ]
             ))
+            ->add('page', HiddenType::class, [
+                'data' => '1'
+            ])
             ->add('submit', SubmitType::class, array(
                 'label' => 'Filtrer',
                 'attr' => array('class' => 'btn', 'value' => 'filtrer')
@@ -81,6 +85,7 @@ private function filterFormFactory(Request $request): array
             $res["shift_start_date"] = $res["form"]->get("shift_start_date")->getData();
             $res["beneficiary"] = $res["form"]->get("beneficiary")->getData();
             $res["fixe"] = $res["form"]->get("fixe")->getData();
+            $res["page"] = $res["form"]->get("page")->getData();
         }
 
         return $res;
@@ -122,10 +127,10 @@ public function indexAction(Request $request)
 
         $limitPerPage = 25;
         $paginator = new Paginator($qb);
-        $totalItems = count($paginator);
-        $pagesCount = ($totalItems == 0) ? 1 : ceil($totalItems / $limitPerPage);
-        $currentPage = $request->get('page', 1);
-        $currentPage = ($currentPage > $pagesCount) ? $pagesCount : $currentPage;
+        $resultCount = count($paginator);
+        $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+        $currentPage = isset($filter['page']) ? $filter['page'] : 1;
+        $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
         $paginator
             ->getQuery()
@@ -135,9 +140,9 @@ public function indexAction(Request $request)
         return $this->render('admin/shiftfreelog/index.html.twig', array(
             'shiftFreeLogs' => $paginator,
             'filter_form' => $filter['form']->createView(),
+            'result_count' => $resultCount,
             'current_page' => $currentPage,
-            'pages_count' => $pagesCount,
+            'page_count' => $pageCount,
         ));
     }
-
 }

From 7395b5e0940dd7cfb3e21ce623b20804d9c8a239 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:57:25 +0200
Subject: [PATCH 3/7] Cleanup & fix MembershipShiftExemption

---
 .../membershipshiftexemption/index.html.twig  | 26 ++++++++---
 .../MembershipShiftExemptionController.php    | 44 ++++++++++++-------
 .../Controller/ShiftFreeLogController.php     |  5 ++-
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/app/Resources/views/admin/membershipshiftexemption/index.html.twig b/app/Resources/views/admin/membershipshiftexemption/index.html.twig
index 7ba875512..608ae7a7c 100644
--- a/app/Resources/views/admin/membershipshiftexemption/index.html.twig
+++ b/app/Resources/views/admin/membershipshiftexemption/index.html.twig
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-    <h4>Liste des membres exempté.e.s de bénévolat ({{ membershipShiftExemptions | length }})</h4>
+    <h4>Liste des membres exempté.e.s de bénévolat ({{ result_count }})</h4>
 
     {# Filter form  --------- #}
     <ul class="collapsible">
@@ -103,15 +103,17 @@
 
     <ul class="pagination">
         <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(current_page==1) %}#!{% else %}{{ path("admin_membershipshiftexemption_index",{'page':current_page-1}) }}{% endif %}">
+            <a href="{% if(current_page==1) %}#!{% else %}{{ path("admin_membershipshiftexemption_index", {'page':current_page-1}) }}{% endif %}" data-page="{{ current_page-1 }}">
                 <i class="material-icons">chevron_left</i>
             </a>
         </li>
-        {% for i in range(1,max_page) %}
-            <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("admin_membershipshiftexemption_index",{'page':i}) }}">{{ i }}</a></li>
+        {% for i in range(1, page_count) %}
+            <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}">
+                <a href="#" data-page="{{ i }}">{{ i }}</a>
+            </li>
         {% endfor %}
-        <li class="{% if(current_page==max_page) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(current_page==max_page) %}#!{% else %}{{ path("admin_membershipshiftexemption_index",{'page':current_page+1}) }}{% endif %}">
+        <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("admin_membershipshiftexemption_index", {'page':current_page+1}) }}{% endif %}" data-page="{{ current_page+1 }}">
                 <i class="material-icons">chevron_right</i>
             </a>
         </li>
@@ -125,3 +127,15 @@
         </li>
     </ul>
 {% endblock %}
+
+{% block javascripts %}
+<script>
+    jQuery(function() {
+        $('.pagination li:not(.disabled) a').click(function(e) {
+            e.preventDefault();
+            $('#form_page').val($(this).data('page'));
+            $('form[name=form]').submit();
+        });
+    });
+</script>
+{% endblock %}
diff --git a/src/AppBundle/Controller/MembershipShiftExemptionController.php b/src/AppBundle/Controller/MembershipShiftExemptionController.php
index c5773ecbf..95e4ba4ac 100644
--- a/src/AppBundle/Controller/MembershipShiftExemptionController.php
+++ b/src/AppBundle/Controller/MembershipShiftExemptionController.php
@@ -11,8 +11,10 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+use Doctrine\ORM\Tools\Pagination\Paginator;
 use \Datetime;
 
 /**
@@ -31,6 +33,7 @@ private function filterFormFactory(Request $request): array
         $res = [
             "membership" => null,
             "shiftExemption" => null,
+            'page' => 1,
         ];
 
         // filter creation ----------------------
@@ -47,6 +50,9 @@ private function filterFormFactory(Request $request): array
                 'multiple' => false,
                 'required' => false,
             ))
+            ->add('page', HiddenType::class, [
+                'data' => '1'
+            ])
             ->add('submit', SubmitType::class, array(
                 'label' => 'Filtrer',
                 'attr' => array('class' => 'btn', 'value' => 'filtrer')
@@ -58,6 +64,7 @@ private function filterFormFactory(Request $request): array
         if ($res['form']->isSubmitted() && $res['form']->isValid()) {
             $res["membership"] = $res["form"]->get("membership")->getData();
             $res["shiftExemption"] = $res["form"]->get("shiftExemption")->getData();
+            $res["page"] = $res["form"]->get("page")->getData();
         }
 
         return $res;
@@ -77,31 +84,36 @@ public function indexAction(Request $request)
         $sort = 'createdAt';
         $order = 'DESC';
 
+        $qb = $em->getRepository('AppBundle:MembershipShiftExemption')->createQueryBuilder('mse')
+            ->orderBy('mse.' . $sort, $order);
+
         if ($filter['membership']) {
-            $findByFilter['membership'] = $filter['membership'];
+            $qb = $qb->andWhere('mse.membership = :membership')
+                ->setParameter('membership', $filter['membership']);
         }
         if ($filter['shiftExemption']) {
-            $findByFilter['shiftExemption'] = $filter['shiftExemption'];
+            $qb = $qb->andWhere('mse.shiftExemption = :shiftExemption')
+                ->setParameter('shiftExemption', $filter['shiftExemption']);
         }
 
-        $page = $request->get('page', 1);
-        $limit = 50;
-
-        $nb_exemptions = $em->getRepository('AppBundle:MembershipShiftExemption')->count([]);
-        if ($nb_exemptions == 0) {
-            $max_page = 1;
-        } else {
-            $max_page = intval(($nb_exemptions-1) / $limit) + 1;
-        }
+        $limitPerPage = 1;
+        $paginator = new Paginator($qb);
+        $resultCount = count($paginator);
+        $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+        $currentPage = $filter['page'];
+        $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
-        $membershipShiftExemptions = $em->getRepository('AppBundle:MembershipShiftExemption')
-            ->findBy($findByFilter, array($sort => $order), $limit, ($page - 1) * $limit);
+        $paginator
+            ->getQuery()
+            ->setFirstResult($limitPerPage * ($currentPage-1)) // set the offset
+            ->setMaxResults($limitPerPage); // set the limit
 
         return $this->render('admin/membershipshiftexemption/index.html.twig', array(
-            'membershipShiftExemptions' => $membershipShiftExemptions,
+            'membershipShiftExemptions' => $paginator,
             'filter_form' => $filter['form']->createView(),
-            'current_page' => $page,
-            'max_page' => $max_page,
+            'result_count' => $resultCount,
+            'current_page' => $currentPage,
+            'page_count' => $pageCount,
         ));
     }
 
diff --git a/src/AppBundle/Controller/ShiftFreeLogController.php b/src/AppBundle/Controller/ShiftFreeLogController.php
index 8167a18a4..691cb07e8 100644
--- a/src/AppBundle/Controller/ShiftFreeLogController.php
+++ b/src/AppBundle/Controller/ShiftFreeLogController.php
@@ -33,7 +33,8 @@ private function filterFormFactory(Request $request): array
             'created_at' => null,
             'shift_start_date' => null,
             'beneficiary' => null,
-            'fixe' => 0
+            'fixe' => 0,
+            'page' => 1,
         ];
 
         // filter creation ----------------------
@@ -129,7 +130,7 @@ public function indexAction(Request $request)
         $paginator = new Paginator($qb);
         $resultCount = count($paginator);
         $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
-        $currentPage = isset($filter['page']) ? $filter['page'] : 1;
+        $currentPage = $filter['page'];
         $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
         $paginator

From 8f24502a3a311c1dfbf07754bef58e08655473e4 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:10:54 +0200
Subject: [PATCH 4/7] Cleanup AmbassadorController

---
 .../views/ambassador/phone/list.html.twig     | 16 ++++----
 .../Controller/AmbassadorController.php       | 38 +++++++++----------
 .../MembershipShiftExemptionController.php    |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/Resources/views/ambassador/phone/list.html.twig b/app/Resources/views/ambassador/phone/list.html.twig
index 03d2ee681..427a0084a 100644
--- a/app/Resources/views/ambassador/phone/list.html.twig
+++ b/app/Resources/views/ambassador/phone/list.html.twig
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-    <h4>Liste des membres en retard {{ reason }} ({{ nb_of_result }})</h4>
+    <h4>Liste des membres en retard {{ reason }} ({{ result_count }})</h4>
 
     <ul class="collapsible">
         <li>
@@ -193,20 +193,20 @@
         </tbody>
     </table>
 
-    {% if nb_of_pages > 1 %}
+    {% if page_count > 1 %}
         <ul class="pagination">
-            <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-                <a href="#" data-page="{{ page-1 }}">
+            <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+                <a href="#" data-page="{{ current_page-1 }}">
                     <i class="material-icons">chevron_left</i>
                 </a>
             </li>
-            {% for i in range(1,nb_of_pages) %}
-                <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}">
+            {% for i in range(1, page_count) %}
+                <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}">
                     <a href="#" data-page="{{ i }}">{{ i }}</a>
                 </li>
             {% endfor %}
-            <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-                <a href="#" data-page="{{ page+1 }}">
+            <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+                <a href="#" data-page="{{ current_page+1 }}">
                     <i class="material-icons">chevron_right</i>
                 </a>
             </li>
diff --git a/src/AppBundle/Controller/AmbassadorController.php b/src/AppBundle/Controller/AmbassadorController.php
index d35a2b5e9..58af5d6b6 100644
--- a/src/AppBundle/Controller/AmbassadorController.php
+++ b/src/AppBundle/Controller/AmbassadorController.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Validator\Constraints\DateTime;
 
 /**
- * Task controller.
+ * Ambassador controller.
  *
  * @Route("ambassador")
  */
@@ -77,9 +77,9 @@ public function memberNoRegistrationAction(Request $request, SearchUserFormHelpe
         $limitPerPage = 25;
         $qb = $qb->orderBy($sort, $order);
         $paginator = new Paginator($qb);
-        $totalItems = count($paginator);
-        $pagesCount = ($totalItems == 0) ? 1 : ceil($totalItems / $limitPerPage);
-        $currentPage = ($currentPage > $pagesCount) ? $pagesCount : $currentPage;
+        $resultCount = count($paginator);
+        $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+        $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
         $paginator
             ->getQuery()
@@ -90,9 +90,9 @@ public function memberNoRegistrationAction(Request $request, SearchUserFormHelpe
             'reason' => "adhésion",
             'members' => $paginator,
             'form' => $form->createView(),
-            'nb_of_result' => $totalItems,
-            'page' => $currentPage,
-            'nb_of_pages' => $pagesCount
+            'result_count' => $resultCount,
+            'current_page' => $currentPage,
+            'page_count' => $pageCount
         ));
     }
 
@@ -149,9 +149,9 @@ public function memberLateRegistrationAction(Request $request, SearchUserFormHel
         $limitPerPage = 25;
         $qb = $qb->orderBy($sort, $order);
         $paginator = new Paginator($qb);
-        $totalItems = count($paginator);
-        $pagesCount = ($totalItems == 0) ? 1 : ceil($totalItems / $limitPerPage);
-        $currentPage = ($currentPage > $pagesCount) ? $pagesCount : $currentPage;
+        $resultCount = count($paginator);
+        $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+        $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
         $paginator
             ->getQuery()
@@ -162,9 +162,9 @@ public function memberLateRegistrationAction(Request $request, SearchUserFormHel
             'reason' => "de ré-adhésion",
             'members' => $paginator,
             'form' => $form->createView(),
-            'nb_of_result' => $totalItems,
-            'page' => $currentPage,
-            'nb_of_pages' => $pagesCount
+            'result_count' => $resultCount,
+            'current_page' => $currentPage,
+            'page_count' => $pageCount
         ));
     }
 
@@ -216,9 +216,9 @@ public function memberShiftTimeLogAction(Request $request, SearchUserFormHelper
         $limitPerPage = 25;
         $qb = $qb->orderBy($sort, $order);
         $paginator = new Paginator($qb);
-        $totalItems = count($paginator);
-        $pagesCount = ($totalItems == 0) ? 1 : ceil($totalItems / $limitPerPage);
-        $currentPage = ($currentPage > $pagesCount) ? $pagesCount : $currentPage;
+        $resultCount = count($paginator);
+        $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);
+        $currentPage = ($currentPage > $pageCount) ? $pageCount : $currentPage;
 
         $paginator
             ->getQuery()
@@ -229,9 +229,9 @@ public function memberShiftTimeLogAction(Request $request, SearchUserFormHelper
             'reason' => "de créneaux",
             'members' => $paginator,
             'form' => $form->createView(),
-            'nb_of_result' => $totalItems,
-            'page' => $currentPage,
-            'nb_of_pages' => $pagesCount
+            'result_count' => $resultCount,
+            'current_page' => $currentPage,
+            'page_count' => $pageCount
         ));
     }
 
diff --git a/src/AppBundle/Controller/MembershipShiftExemptionController.php b/src/AppBundle/Controller/MembershipShiftExemptionController.php
index 95e4ba4ac..27a0c6f0e 100644
--- a/src/AppBundle/Controller/MembershipShiftExemptionController.php
+++ b/src/AppBundle/Controller/MembershipShiftExemptionController.php
@@ -96,7 +96,7 @@ public function indexAction(Request $request)
                 ->setParameter('shiftExemption', $filter['shiftExemption']);
         }
 
-        $limitPerPage = 1;
+        $limitPerPage = 25;
         $paginator = new Paginator($qb);
         $resultCount = count($paginator);
         $pageCount = ($resultCount == 0) ? 1 : ceil($resultCount / $limitPerPage);

From a1b65bdc939efba42beb076a6ba5ab50e1f798c2 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:27:45 +0200
Subject: [PATCH 5/7] Cleanup HelloAssoController

---
 .../views/admin/helloasso/browser.html.twig   | 27 +++++----
 .../views/admin/helloasso/payments.html.twig  | 15 ++---
 .../Controller/HelloassoController.php        | 60 ++++++++++---------
 3 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/app/Resources/views/admin/helloasso/browser.html.twig b/app/Resources/views/admin/helloasso/browser.html.twig
index 686846afb..f5588cece 100644
--- a/app/Resources/views/admin/helloasso/browser.html.twig
+++ b/app/Resources/views/admin/helloasso/browser.html.twig
@@ -15,9 +15,9 @@
     {% if campaigns is defined and campaigns | length %}
         <div class="row">
             {% for campaign in campaigns %}
-            <div class="col s12 m6 l6 xl4">
-                {% include "admin/helloasso/_partial/campaign.html.twig" with { campaign: campaign } %}
-            </div>
+                <div class="col s12 m6 l6 xl4">
+                    {% include "admin/helloasso/_partial/campaign.html.twig" with { campaign: campaign } %}
+                </div>
             {% endfor %}
         </div>
     {% elseif campaigns is defined and campaigns is not null %}
@@ -67,14 +67,17 @@
                     <td>{{ payment.payer_country }}</td>
                     <td>{{ payment.payer_email }}</td>
                     <td>{{ payment.status }}</td>
-                    <td><ul>{% for key,action in payment.actions %}
+                    <td>
+                        <ul>
+                            {% for key,action in payment.actions %}
                                 <li>#{{ action.id }} {{ action.amount }}€ ({{ action.type }})</li>
-                        {% endfor %}</ul>
+                            {% endfor %}
+                        </ul>
                     </td>
                     <td>
                         <form action="{{ path("helloasso_manual_paiement_add",{paiementId : payment.id }) }}" method="post">
                             <input type="hidden" name="paiementId" value="{{ payment.id }}">
-                            <button class="btn red" type="submit" ><i class="material-icons">save</i></button>
+                            <button class="btn red" type="submit"><i class="material-icons">save</i></button>
                         </form>
                     </td>
                 </tr>
@@ -83,16 +86,16 @@
             </tbody>
         </table>
         <ul class="pagination">
-            <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-                <a href="{% if(page==1) %}#!{% else %}{{ path("helloasso_browser",{campaign:campaign.id,'page':page-1}) }}{% endif %}">
+            <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+                <a href="{% if(current_page==1) %}#!{% else %}{{ path("helloasso_browser",{campaign:campaign.id,'page':current_page-1}) }}{% endif %}">
                     <i class="material-icons">chevron_left</i>
                 </a>
             </li>
-            {% for i in range(1,nb_of_pages) %}
-                <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("helloasso_browser",{campaign:campaign.id,'page':i}) }}">{{ i }}</a></li>
+            {% for i in range(1, page_count) %}
+                <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("helloasso_browser",{campaign:campaign.id,'page':i}) }}">{{ i }}</a></li>
             {% endfor %}
-            <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-                <a href="{% if(page==nb_of_pages) %}#!{% else %}{{ path("helloasso_browser",{campaign:campaign.id,'page':page+1}) }}{% endif %}">
+            <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+                <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("helloasso_browser",{campaign:campaign.id,'page':current_page+1}) }}{% endif %}">
                     <i class="material-icons">chevron_right</i>
                 </a>
             </li>
diff --git a/app/Resources/views/admin/helloasso/payments.html.twig b/app/Resources/views/admin/helloasso/payments.html.twig
index 60d414a4a..489264dc0 100644
--- a/app/Resources/views/admin/helloasso/payments.html.twig
+++ b/app/Resources/views/admin/helloasso/payments.html.twig
@@ -51,23 +51,24 @@
                                 <i class="material-icons">delete</i>
                             </button>
                             {{ form_end(delete_forms[payment.id]) }}
-                        {% endif %}</td>
+                        {% endif %}
+                    </td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
 
     <ul class="pagination">
-        <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(page==1) %}#!{% else %}{{ path("helloasso_payments",{'page':page-1}) }}{% endif %}">
+        <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==1) %}#!{% else %}{{ path("helloasso_payments",{'page':current_page-1}) }}{% endif %}">
                 <i class="material-icons">chevron_left</i>
             </a>
         </li>
-        {% for i in range(1,nb_of_pages) %}
-        <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("helloasso_payments",{'page':i}) }}">{{ i }}</a></li>
+        {% for i in range(1, page_count) %}
+            <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a href="{{ path("helloasso_payments",{'page':i}) }}">{{ i }}</a></li>
         {% endfor %}
-        <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-            <a href="{% if(page==nb_of_pages) %}#!{% else %}{{ path("helloasso_payments",{'page':page+1}) }}{% endif %}">
+        <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+            <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("helloasso_payments",{'page':current_page+1}) }}{% endif %}">
                 <i class="material-icons">chevron_right</i>
             </a>
         </li>
diff --git a/src/AppBundle/Controller/HelloassoController.php b/src/AppBundle/Controller/HelloassoController.php
index 6ff7f4b48..b547bda7c 100644
--- a/src/AppBundle/Controller/HelloassoController.php
+++ b/src/AppBundle/Controller/HelloassoController.php
@@ -30,8 +30,8 @@ class HelloassoController extends Controller
      */
     public function helloassoPaymentsAction(Request $request)
     {
-        if (!($page = $request->get('page'))) {
-            $page = 1;
+        if (!($currentPage = $request->get('page'))) {
+            $currentPage = 1;
         }
         $limit = 50;
         $max = $this->getDoctrine()->getManager()->createQueryBuilder()->from('AppBundle\Entity\HelloassoPayment', 'n')
@@ -39,13 +39,15 @@ public function helloassoPaymentsAction(Request $request)
             ->getQuery()
             ->getSingleScalarResult();
 
-        $nb_of_pages = intval($max / $limit);
+        $page_count = intval($max / $limit);
         if ($max > 0) {
-            $nb_of_pages += (($max % $limit) > 0) ? 1 : 0;
+            $page_count += (($max % $limit) > 0) ? 1 : 0;
         }
+
         $payments = $this->getDoctrine()->getManager()
             ->getRepository('AppBundle:HelloassoPayment')
-            ->findBy(array(), array('createdAt' => 'DESC', 'date' => 'DESC'), $limit, ($page - 1) * $limit);
+            ->findBy(array(), array('createdAt' => 'DESC', 'date' => 'DESC'), $limit, ($currentPage - 1) * $limit);
+
         $delete_forms = array();
         foreach ($payments as $payment) {
             $delete_forms[$payment->getId()] = $this->getPaymentDeleteForm($payment)->createView();
@@ -67,13 +69,13 @@ public function helloassoPaymentsAction(Request $request)
 
         }
 
-        return $this->render(
-            'admin/helloasso/payments.html.twig',
-            array('payments' => $payments,
-                'campaigns' => $campaigns,
-                'delete_forms' => $delete_forms,
-                'page' => $page,
-                'nb_of_pages' => $nb_of_pages));
+        return $this->render('admin/helloasso/payments.html.twig', array(
+            'payments' => $payments,
+            'campaigns' => $campaigns,
+            'delete_forms' => $delete_forms,
+            'current_page' => $currentPage,
+            'page_count' => $page_count
+        ));
     }
 
     /**
@@ -84,8 +86,8 @@ public function helloassoPaymentsAction(Request $request)
      */
     public function helloassoBrowserAction(Request $request)
     {
-        if (!($page = $request->get('page')))
-            $page = 1;
+        if (!($currentPage = $request->get('page')))
+            $currentPage = 1;
 
         if (!($campaignId = $request->get('campaign'))) {
             $campaigns_json = $this->container->get('AppBundle\Helper\Helloasso')->get('campaigns');
@@ -94,9 +96,7 @@ public function helloassoBrowserAction(Request $request)
             } else {
                 $campaigns = null;
             }
-            return $this->render(
-                'admin/helloasso/browser.html.twig',
-                array('campaigns' => $campaigns));
+            return $this->render('admin/helloasso/browser.html.twig', array('campaigns' => $campaigns));
         } else {
             $campaignId = str_pad($campaignId, 12, '0', STR_PAD_LEFT);
             $campaign_json = $this->container->get('AppBundle\Helper\Helloasso')->get('campaigns/' . $campaignId);
@@ -106,15 +106,16 @@ public function helloassoBrowserAction(Request $request)
                 return $this->redirectToRoute('helloasso_browser');
             }
             $payments_json = $this->container->get('AppBundle\Helper\Helloasso')->get('campaigns/' . $campaignId . '/payments', array('page' => $page));
-            $page = $payments_json->pagination->page;
-            $nb_of_pages = $payments_json->pagination->max_page;
+            $currentPage = $payments_json->pagination->page;
+            $page_count = $payments_json->pagination->max_page;
             $results_per_page = $payments_json->pagination->results_per_page;
-            return $this->render(
-                'admin/helloasso/browser.html.twig',
-                array('payments' => $payments_json->resources,
-                    'page' => $page,
-                    'campaign' => $campaign_json,
-                    'nb_of_pages' => $nb_of_pages));
+
+            return $this->render('admin/helloasso/browser.html.twig', array(
+                'payments' => $payments_json->resources,
+                'campaign' => $campaign_json,
+                'current_page' => $currentPage,
+                'page_count' => $page_count
+            ));
         }
 
     }
@@ -181,8 +182,10 @@ public function helloassoManualPaimentAddAction(Request $request)
     public function removePaymentAction(Request $request, HelloassoPayment $payment)
     {
         $session = new Session();
+
         $form = $this->getPaymentDeleteForm($payment);
         $form->handleRequest($request);
+
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             if ($payment->getRegistration()) {
@@ -193,6 +196,7 @@ public function removePaymentAction(Request $request, HelloassoPayment $payment)
             $em->flush();
             $session->getFlashBag()->add('success', 'Le paiement a bien été supprimé !');
         }
+
         return $this->redirectToRoute('helloasso_payments');
     }
 
@@ -255,9 +259,9 @@ protected function getPaymentDeleteForm(HelloassoPayment $payment)
     private function createPaymentEditForm(HelloassoPayment $payment)
     {
         return $this->createFormBuilder()
-                    ->setAction($this->generateUrl('helloasso_payment_edit', array('id' => $payment->getId())))
-                    ->add('subscriber', AutocompleteBeneficiaryType::class, array('label' => 'Numéro d\'adhérent ou nom du membre', 'required' => true))
-                    ->getForm();
+            ->setAction($this->generateUrl('helloasso_payment_edit', array('id' => $payment->getId())))
+            ->add('subscriber', AutocompleteBeneficiaryType::class, array('label' => 'Numéro d\'adhérent ou nom du membre', 'required' => true))
+            ->getForm();
     }
 
     /**

From 42943c14273ccab6208b06939da1e65b85955b34 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:33:22 +0200
Subject: [PATCH 6/7] Cleanup RegistrationController

---
 .../views/registrations/list.html.twig        | 24 +++++++++----------
 .../Controller/RegistrationsController.php    | 14 +++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/Resources/views/registrations/list.html.twig b/app/Resources/views/registrations/list.html.twig
index 0b81114a2..d5cb3ff81 100644
--- a/app/Resources/views/registrations/list.html.twig
+++ b/app/Resources/views/registrations/list.html.twig
@@ -160,32 +160,32 @@
         <br>
         <ul class="pagination">
             {% if to is not null %}
-                <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-                    <a href="{% if(page==1) %}#!{% else %}{{ path("registrations",{'page':page-1,'from':(from | date('Y-m-d')),'to':(to | date('Y-m-d'))}) }}{% endif %}">
+                <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+                    <a href="{% if(current_page==1) %}#!{% else %}{{ path("registrations",{'page':current_page-1,'from':(from | date('Y-m-d')),'to':(to | date('Y-m-d'))}) }}{% endif %}">
                         <i class="material-icons">chevron_left</i>
                     </a>
                 </li>
-                {% for i in range(1,nb_of_pages) %}
-                    <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a
+                {% for i in range(1, page_count) %}
+                    <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a
                                 href="{{ path("registrations",{'page':i,'from':(from | date('Y-m-d')),'to':(to | date('Y-m-d'))}) }}">{{ i }}</a></li>
                 {% endfor %}
-                <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-                    <a href="{% if(page==nb_of_pages) %}#!{% else %}{{ path("registrations",{'page':page+1,'from':(from | date('Y-m-d')),'to':(to | date('Y-m-d'))}) }}{% endif %}">
+                <li class="{% if(page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+                    <a href="{% if(page==page_count) %}#!{% else %}{{ path("registrations",{'page':current_page+1,'from':(from | date('Y-m-d')),'to':(to | date('Y-m-d'))}) }}{% endif %}">
                         <i class="material-icons">chevron_right</i>
                     </a>
                 </li>
             {% else %}
-                <li class="{% if(page==1) %}disabled{% else %}waves-effect{% endif %}">
-                    <a href="{% if(page==1) %}#!{% else %}{{ path("registrations",{'page':page-1,'from':(from | date('Y-m-d'))}) }}{% endif %}">
+                <li class="{% if(current_page==1) %}disabled{% else %}waves-effect{% endif %}">
+                    <a href="{% if(current_page==1) %}#!{% else %}{{ path("registrations",{'page':current_page-1,'from':(from | date('Y-m-d'))}) }}{% endif %}">
                         <i class="material-icons">chevron_left</i>
                     </a>
                 </li>
-                {% for i in range(1,nb_of_pages) %}
-                    <li class="{% if(page==i) %}active{% else %}waves-effect{% endif %}"><a
+                {% for i in range(1, page_count) %}
+                    <li class="{% if(current_page==i) %}active{% else %}waves-effect{% endif %}"><a
                                 href="{{ path("registrations",{'page':i,'from':(from | date('Y-m-d'))}) }}">{{ i }}</a></li>
                 {% endfor %}
-                <li class="{% if(page==nb_of_pages) %}disabled{% else %}waves-effect{% endif %}">
-                    <a href="{% if(page==nb_of_pages) %}#!{% else %}{{ path("registrations",{'page':page+1,'from':(from | date('Y-m-d'))}) }}{% endif %}">
+                <li class="{% if(current_page==page_count) %}disabled{% else %}waves-effect{% endif %}">
+                    <a href="{% if(current_page==page_count) %}#!{% else %}{{ path("registrations",{'page':current_page+1,'from':(from | date('Y-m-d'))}) }}{% endif %}">
                         <i class="material-icons">chevron_right</i>
                     </a>
                 </li>
diff --git a/src/AppBundle/Controller/RegistrationsController.php b/src/AppBundle/Controller/RegistrationsController.php
index f8caa23b1..baa84d807 100644
--- a/src/AppBundle/Controller/RegistrationsController.php
+++ b/src/AppBundle/Controller/RegistrationsController.php
@@ -90,8 +90,8 @@ public function registrationsAction(Request $request)
 
 
         $em = $this->getDoctrine()->getManager();
-        if (!($page = $request->get('page')))
-            $page = 1;
+        if (!($currentPage = $request->get('page')))
+            $currentPage = 1;
         $limit = 25;
         $qb = $em->createQueryBuilder()->from('AppBundle\Entity\AbstractRegistration', 'r')
             ->select('count(r.id)')
@@ -103,8 +103,8 @@ public function registrationsAction(Request $request)
 
         $max = $qb->getQuery()
             ->getSingleScalarResult();
-        $nb_of_pages = intval($max / $limit);
-        $nb_of_pages += (($max % $limit) > 0) ? 1 : 0;
+        $pageCount = intval($max / $limit);
+        $pageCount += (($max % $limit) > 0) ? 1 : 0;
         $repository = $em->getRepository('AppBundle:AbstractRegistration');
         $queryb = $repository->createQueryBuilder('r')
             ->where('r.date >= :from')
@@ -113,7 +113,7 @@ public function registrationsAction(Request $request)
             $queryb = $queryb->andwhere('r.date <= :to')->setParameter('to', $to);
         }
         $queryb = $queryb->orderBy('r.date', 'DESC')
-            ->setFirstResult(($page - 1) * $limit)
+            ->setFirstResult(($currentPage - 1) * $limit)
             ->setMaxResults($limit);
 
         $registrations = $queryb->getQuery()->getResult();
@@ -181,10 +181,10 @@ public function registrationsAction(Request $request)
                 'grand_total' => $grand_total,
                 'totaux' => $totaux,
                 'delete_forms' => $delete_forms,
-                'page' => $page,
                 'from' => $from,
                 'to' => $to,
-                'nb_of_pages' => $nb_of_pages));
+                'current_page' => $currentPage,
+                'page_count' => $pageCount));
     }
 
     /**

From 38df21d913364cc1f0145f1eb6c67696878093c0 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:51:23 +0200
Subject: [PATCH 7/7] Fix

---
 src/AppBundle/Controller/HelloassoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AppBundle/Controller/HelloassoController.php b/src/AppBundle/Controller/HelloassoController.php
index b547bda7c..3ce492979 100644
--- a/src/AppBundle/Controller/HelloassoController.php
+++ b/src/AppBundle/Controller/HelloassoController.php
@@ -105,7 +105,7 @@ public function helloassoBrowserAction(Request $request)
                 $session->getFlashBag()->add('error','campaign not found');
                 return $this->redirectToRoute('helloasso_browser');
             }
-            $payments_json = $this->container->get('AppBundle\Helper\Helloasso')->get('campaigns/' . $campaignId . '/payments', array('page' => $page));
+            $payments_json = $this->container->get('AppBundle\Helper\Helloasso')->get('campaigns/' . $campaignId . '/payments', array('page' => $currentPage));
             $currentPage = $payments_json->pagination->page;
             $page_count = $payments_json->pagination->max_page;
             $results_per_page = $payments_json->pagination->results_per_page;