From a65feb049558fa389822dbd3c2e8f18da0f759a4 Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Thu, 5 Mar 2026 12:34:24 +0700
Subject: [PATCH] Update report filtering, helper, and template

- Updated Filters.php configuration
- Enhanced ReportHelper library functionality
- Modified report template view for improved rendering
---
 app/Config/Filters.php         | 2 +-
 app/Libraries/ReportHelper.php | 2 +-
 app/Views/report/template.php  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 986f0db..7fc4f38 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -61,7 +61,7 @@ class Filters extends BaseFilters
         'after' => [
             'pagecache',   // Web Page Caching
             'performance', // Performance Metrics
-            #'toolbar',     // Debug Toolbar
+            'toolbar',     // Debug Toolbar
         ],
     ];
 
diff --git a/app/Libraries/ReportHelper.php b/app/Libraries/ReportHelper.php
index 1404732..d878798 100644
--- a/app/Libraries/ReportHelper.php
+++ b/app/Libraries/ReportHelper.php
@@ -267,7 +267,7 @@ class ReportHelper
         $i = 0;
         $page = 1;
         $line = 0;
-        $lpp = 38;
+        $lpp = 39;
         $done[1] = "";
         $nline = 0;
         $RERUN = 1;
diff --git a/app/Views/report/template.php b/app/Views/report/template.php
index 35773c6..4f8229b 100644
--- a/app/Views/report/template.php
+++ b/app/Views/report/template.php
@@ -65,7 +65,7 @@ $i = 1;
                 </table>
                 <br/>
                 
-                <?php if ($others != '' && substr_count($others, "\r") + substr_count($result[$npage], "\r") < 38): ?>
+                <?php if ($others != '' && substr_count($others, "\r") + substr_count($result[$npage - 1], "\r") < 39): ?>
                     <table>
                         <tr><td><b><?= esc($othertitle) ?>:</b><br/>
                         <?= $others ?></td></tr>
@@ -129,8 +129,8 @@ endforeach;
                         Status : <?= esc($status) ?>
                         <pre class='small'>Collected on <?= esc($collData) ?>
 Received on <?= esc($recvData) ?>
-Val1 By : <?= esc($val1User) ?> | Val2 By <?= esc($val2User) ?> 
-Page <?= $i ?>/<?= $npage ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></pre>
+Val1 By : <?= esc($val1User) ?> (<?= esc($val1Date) ?>) | Val2 By : <?= esc($val2User) ?> (<?= esc($val2Date) ?>)
+Page <?= $npage + 1 ?>/<?= $npage + 1 ?> Printed By : <?= esc($valBy) ?> <?= esc($date) ?></pre>
                     </td>
                     <td class='right'>
                         <pre><b>&rdquo;This result is valid without signature.&rdquo;</b></pre>