From 709652eecde80f097a289f26fd9f475d7f0d2811 Mon Sep 17 00:00:00 2001
From: MatteoPistorello <pistorellomatteo8@gmail.com>
Date: Thu, 31 Oct 2024 14:49:13 +0100
Subject: [PATCH] feat: gestione pulsanti precedente e successivo

---
 ajax_dataload.php              |  1 +
 editor.php                     | 35 ++++++++++++++++++++++++++++++++++
 modules/interventi/buttons.php | 11 +----------
 src/Util/Query.php             |  2 +-
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/ajax_dataload.php b/ajax_dataload.php
index d5749cc84..18c9a9f44 100755
--- a/ajax_dataload.php
+++ b/ajax_dataload.php
@@ -29,6 +29,7 @@ $draw_numer = intval(filter('draw'));
 if (!empty(filter('order'))) {
     $order['column'] = $order['column'] - 1;
 }
+$_SESSION['module_'.$id_module]['order'] = $order;
 array_shift($columns);
 
 $total = Query::readQuery($structure);
diff --git a/editor.php b/editor.php
index e7dc6f14f..cf1b9d9fa 100755
--- a/editor.php
+++ b/editor.php
@@ -172,6 +172,41 @@ if (empty($record) || !$has_access) {
                         <i class="fa fa-chevron-left"></i> '.tr("Torna all'elenco").'
                     </a>';
 
+    // Pulsante Precedente e Successivo
+    // Aggiungo eventuali filtri applicati alla vista
+    if (count(getSearchValues($id_module)) > 0) {
+        foreach (getSearchValues($id_module) as $key => $value) {
+            $where[$key] = $value;
+        }
+    }
+
+    // Ricavo la posizione per questo id_record
+    $order = $_SESSION['module_'.$id_module]['order'] ?: [];
+    $module_query = Util\Query::getQuery($structure, $where, $order);
+    $posizioni = $dbo->fetchArray($module_query);
+    $key = array_search($id_record, array_column($posizioni, 'id'));
+
+    // Precedente
+    $prev = $posizioni[$key-1]['id'];
+
+    // Successivo
+    $next = $posizioni[$key+1]['id'];
+
+    if (isMobile()) {
+        echo '<div>';
+    } else {
+        echo '<div class="col-md-2 d-none d-sm-inline">';
+    }
+
+    echo '
+                <a class="btn btn-default'.($prev ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$prev.'">
+                    <i class="fa fa-arrow-circle-left"></i>
+                </a>
+                <a class="btn btn-default'.($next ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$next.'">
+                    <i class="fa fa-arrow-circle-right"></i>
+                </a>
+            </div>';
+
     if (isMobile()) {
         echo '<div>';
     } else {
diff --git a/modules/interventi/buttons.php b/modules/interventi/buttons.php
index 9d63b9ad7..352ddea6c 100755
--- a/modules/interventi/buttons.php
+++ b/modules/interventi/buttons.php
@@ -39,17 +39,8 @@ echo '
 
 <button type="button" class="btn btn-primary '.(!empty($info_firma) ? 'tip' : '').'" title="'.$info_firma.'" onclick="anteprimaFirma()" '.($record['flag_completato'] ? 'disabled' : '').'>
     <i class="fa fa-'.(!empty($info_firma) ? 'refresh' : 'desktop').'"></i> '.$frase.'...
-</button>';
+</button>
 
-// TODO: da standardizzare in struttura per tutti i moduli di tipo table
-/*<a class="btn btn-info'.($prev ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module=3&id_record='.$prev.'">
-    <i class="fa fa-arrow-circle-left"></i> '.tr('Precedente').'
-</a>
-<a class="btn btn-info'.($next ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module=3&id_record='.$next.'">
-    '.tr('Successivo').' <i class="fa fa-arrow-circle-right"></i>
-</a>*/
-
-echo '
 <script>
 function duplicaIntervento() {
     openModal("'.tr('Duplica attività').'", "'.$module->fileurl('modals/duplicazione.php').'?id_module='.$id_module.'&id_record='.$id_record.'");
diff --git a/src/Util/Query.php b/src/Util/Query.php
index e6c1febc7..cfdb5971d 100755
--- a/src/Util/Query.php
+++ b/src/Util/Query.php
@@ -478,7 +478,7 @@ class Query
 
         $select = empty($select) ? '*' : implode(', ', $select);
 
-        $query = str_replace('|select|', $select.', @posizione := @posizione + 1 AS `posizione`', $query);
+        $query = str_replace('|select|', $select, $query);
 
         return [
             'query' => self::replacePlaceholder($query),