From 4997bbffa20c9c4910502e8fdab28d7956514d88 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@koozali.org>
Date: Mon, 1 Jul 2024 08:54:19 +0100
Subject: [PATCH] more format for the table plus supress links when no database
 saved

---
 .../opt/mailstats/templates/mailstats.html.pt | 31 ++++++++++++++-----
 root/usr/bin/mailstats.py                     |  6 +++-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/root/opt/mailstats/templates/mailstats.html.pt b/root/opt/mailstats/templates/mailstats.html.pt
index 9192df7..0e69c6d 100644
--- a/root/opt/mailstats/templates/mailstats.html.pt
+++ b/root/opt/mailstats/templates/mailstats.html.pt
@@ -59,14 +59,29 @@
 				<td tal:condition="repeat.row.index == 24" tal:attributes="class python:'col-total'" tal:content="'TOTALS'">Totals</td>
 				<td tal:condition="repeat.row.index == 25" tal:attributes="class python:'col-percent'" tal:content="'PERCENT'">Percent</td>
 				<td tal:condition="repeat.row.index < 24" tal:content="string:${reporting_date}, ${repeat.row.index}">Hour</td>
-				<td tal:repeat="cell row" tal:attributes="class python: 'col-' + str(repeat.cell.index)">
-					<!-- Exclude the PERCENT column from generating links and apply the logic to rows 0 to 23 -->
-					<tal:condition tal:condition="repeat.row.index >= 0 and repeat.row.index < 24 and repeat.cell.index != 16">
-						<a tal:attributes="href string:./showSummaryLogs.php?hour=${repeat.row.index}" tal:content="cell">Cell</a>
-					</tal:condition>
-					<!-- For PERCENT column or other rows, just display the cell content -->
-					<tal:condition tal:condition="not (repeat.row.index >= 0 and repeat.row.index < 24 and repeat.cell.index != 16)" tal:content="cell">Cell</tal:condition>
-				</td>
+                <td tal:repeat="cell row" tal:attributes="class python: 'col-' + str(repeat.cell.index)">
+                    <!-- Check if 'nolinks' is true. If not, generate links for rows 0 to 23 except 'PERCENT' column -->
+                    <tal:case tal:condition="not: nolinks">
+                        <tal:case tal:condition="repeat.row.index >= 0 and repeat.row.index < 24 and repeat.cell.index != 16">
+                            <a tal:attributes="href string:./showSummaryLogs.php?hour=${repeat.row.index}">
+                                <!-- Check if cell value is zero and print "-" -->
+                                <tal:case tal:condition="cell != 0" tal:content="cell">Cell</tal:case>
+                                <tal:case tal:condition="cell == 0" tal:content="'-'">-</tal:case>
+                            </a>
+                        </tal:case>
+                        <!-- For 'PERCENT' column or other rows, just display the cell content -->
+                        <tal:case tal:condition="not (repeat.row.index >= 0 and repeat.row.index < 24 and repeat.cell.index != 16)">
+                            <!-- Check if cell value is zero and print "-" -->
+                            <tal:case tal:condition="cell != 0" tal:content="cell">Cell</tal:case>
+                            <tal:case tal:condition="cell == 0" tal:content="'-'">-</tal:case>
+                        </tal:case>
+                    </tal:case>
+                    <tal:case tal:condition="nolinks">
+                        <!-- Display cell content without link if 'nolinks' is true -->
+                        <tal:case tal:condition="cell != 0" tal:content="cell">Cell</tal:case>
+                        <tal:case tal:condition="cell == 0" tal:content="'-'">-</tal:case>
+                    </tal:case>
+                </td>
         </tr>
 		</tbody>
 	</table>
diff --git a/root/usr/bin/mailstats.py b/root/usr/bin/mailstats.py
index 4e8f8be..6835cfb 100644
--- a/root/usr/bin/mailstats.py
+++ b/root/usr/bin/mailstats.py
@@ -777,6 +777,7 @@ if __name__ == "__main__":
 			print(f"Unable to connect to {DBName} on {DBHost} port {DBPort} error ({e}) ")
 			saveData = False
 	
+	nolinks = not saveData 
 	# Not sure we need these...
 	# if (ConfigDB,"qpsmtpd","RHSBL").lower() == 'enabled':
 		# RBLList = get_value(ConfigDB,"qpsmtpd","RBLList")
@@ -1120,7 +1121,10 @@ if __name__ == "__main__":
 		template = PageTemplate(template_content)
 		# Render the template with the 2D array data and column headers
 		try:
-			rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders, reporting_date=analysis_date, title=hello_string, version=version_string)
+			rendered_html = template(array_2d=columnCounts_2d, column_headers=columnHeaders, 
+										reporting_date=analysis_date, title=hello_string, 
+										version=version_string,
+										nolinks=nolinks)
 		except Exception as e:
 			print(f"Chameleon template Exception {e}")
 	except Exception as e: