From 8e95a3a154813b110ab5c4b708d561700e6df13f Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Thu, 17 Jun 2021 13:44:58 +0200
Subject: [PATCH] =?UTF-8?q?Task=20#0002014:=20Comptabilit=C3=A9=20analytiq?=
 =?UTF-8?q?ue=20ordre=20par=20date=20Database=5FCore=20setter/getter=20for?=
 =?UTF-8?q?=20sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/class/document_export.class.php | 23 ++++++++++++++++++++---
 include/lib/database_core.class.php     | 22 ++++++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/include/class/document_export.class.php b/include/class/document_export.class.php
index 6158a5a66..ab4c5d786 100644
--- a/include/class/document_export.class.php
+++ b/include/class/document_export.class.php
@@ -59,7 +59,7 @@ class Document_Export
         try
         {
             $this->check_file();
-            $stmt=PDFTK." ".$this->store_pdf.'/stamp_*pdf  output '.$this->store_pdf.'/result.pdf';
+            $stmt=PDFTK." ".$this->store_pdf.'/*-stamp_*pdf  output '.$this->store_pdf.'/result.pdf';
             $status=0;
             echo $stmt;
             passthru($stmt, $status);
@@ -171,6 +171,8 @@ class Document_Export
         $cnt_feedback=0;
         global $cn;
         
+        $p_array=$this->reorder_array($p_array);
+        $order=0;
         // follow progress
         $step=round(16/count($p_array), 2);
 
@@ -254,7 +256,8 @@ class Document_Export
             rename($output2, $output);
 
             // Move the PDF into another temp directory 
-            $this->move_file($output, 'stamp_'.$file_pdf);
+            $this->move_file($output, $order.'-stamp_'.$file_pdf);
+            $order++;
         }
 
         $progress->set_value(93);
@@ -430,5 +433,19 @@ class Document_Export
         }
         return array("output"=>$output,"filepdf"=>$file_pdf);
     }
-
+    /**
+     * @brief Order the array with the date
+     * @param array $p_array array of jrn.jr_id
+     */
+    function reorder_array($p_array)
+    {
+        global $cn;
+        if (empty($p_array)) {return array();}
+        
+        $list_jrn_id=join(',', $p_array);
+        
+        $array=$cn->get_array("select jr_id ,jr_date from jrn where jr_id in ($list_jrn_id) order by jr_date");
+        $array=array_column($array, 'jr_id');
+        return $array;
+    }
 }
diff --git a/include/lib/database_core.class.php b/include/lib/database_core.class.php
index 1b47b2469..965c55d17 100644
--- a/include/lib/database_core.class.php
+++ b/include/lib/database_core.class.php
@@ -40,6 +40,7 @@ class DatabaseCore
     private $ret;
     /**< return value  */
     private $is_open;                   /*!< true is connected */
+    protected $sql;     //!< last SQL stmt executed
 
     /*** Connect to a database return an connx to db or false if it fails
      *
@@ -75,7 +76,7 @@ class DatabaseCore
         }
 
         $this->is_open = TRUE;
-        
+        $this->sql="";
 
     }
 
@@ -143,8 +144,25 @@ class DatabaseCore
     {
         $this->is_open = $is_open;
     }
-
+     /**
+     * last SQL stmt executed
+     * @param string $sql
+     */
+    public function get_sql()
+    {
+        return $this->sql;
+    }
     /**
+     * last SQL stmt executed
+     * @param string $sql
+     */
+    public function set_sql($sql)
+    {
+        $this->sql=$sql;
+        return $this;
+    }
+
+        /**
      * \brief send a sql string to the database
      * \param $p_string     sql string
      * \param $p_array array for the SQL string (see pg_query_params)