From ccc1982c6cdb54951cff31fa8fd561ca4c3b0928 Mon Sep 17 00:00:00 2001
From: Dave Morriss <Dave.Morriss@gmail.com>
Date: Sun, 27 Aug 2023 16:00:00 +0100
Subject: [PATCH] Fixed miscalculation triggering 'Call for shows'

templates/shared-call_for_shows.tpl.html:
    - Cosmetic change

templates/queries-call_for_shows-mysql.tpl.html:
templates/queries-call_for_shows-sqlite.tpl.html:
    - In a period of 10 days the minimum number of weekday-only shows
      is 6, not 7. Adjusted the queries appropriately.
---
 templates/queries-call_for_shows-mysql.tpl.html  | 6 +++---
 templates/queries-call_for_shows-sqlite.tpl.html | 6 +++---
 templates/shared-call_for_shows.tpl.html         | 3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/templates/queries-call_for_shows-mysql.tpl.html b/templates/queries-call_for_shows-mysql.tpl.html
index 4f17762..9f67a7a 100644
--- a/templates/queries-call_for_shows-mysql.tpl.html
+++ b/templates/queries-call_for_shows-mysql.tpl.html
@@ -1,6 +1,6 @@
 <!--% query_call_for_shows = '
-	SELECT CASE WHEN COUNT(id) < 7 THEN True ELSE False END AS `request_for_shows`
+	SELECT CASE WHEN COUNT(id) < 6 THEN True ELSE False END AS `request_for_shows`
 	FROM eps
-	WHERE eps.date > NOW() AND eps.date < DATE_ADD(NOW(), INTERVAL 10 DAY)
-		'
+	WHERE eps.date > NOW() AND eps.date <= DATE_ADD(NOW(), INTERVAL 10 DAY)
+	'
 %-->
diff --git a/templates/queries-call_for_shows-sqlite.tpl.html b/templates/queries-call_for_shows-sqlite.tpl.html
index bf6021d..7743ce6 100644
--- a/templates/queries-call_for_shows-sqlite.tpl.html
+++ b/templates/queries-call_for_shows-sqlite.tpl.html
@@ -1,6 +1,6 @@
 <!--% query_call_for_shows = '
-	SELECT CASE WHEN COUNT(id) < 7 THEN True ELSE False END AS `request_for_shows`
+	SELECT CASE WHEN COUNT(id) < 6 THEN True ELSE False END AS `request_for_shows`
 	FROM eps
-	WHERE eps.date > date(\'now\') AND eps.date < date(\'now\', \'+10 days\')
-		'
+	WHERE eps.date > date(\'now\') AND eps.date <= date(\'now\', \'+10 days\')
+	'
 %-->
diff --git a/templates/shared-call_for_shows.tpl.html b/templates/shared-call_for_shows.tpl.html
index d676e09..f0a2572 100644
--- a/templates/shared-call_for_shows.tpl.html
+++ b/templates/shared-call_for_shows.tpl.html
@@ -1,8 +1,7 @@
 <!--% PROCESS 'shared-utils.tpl.html' %-->
 <!--% PROCESS "queries-call_for_shows-${constants.database}.tpl.html" %-->
 <!--% MACRO display_call_for_shows BLOCK %-->
-	<!--% result_call_for_shows = DBI.prepare(query_call_for_shows)
-	%-->
+	<!--% result_call_for_shows = DBI.prepare(query_call_for_shows) %-->
 	<!--% results_call_for_shows = result_call_for_shows.execute().get_all() %-->
 	<!--% IF results_call_for_shows.0.request_for_shows == 1 %-->
 	<!--% USE date %-->