From 0c8a526ba5ccd9e4eb61f767f1455695b74b8486 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Fri, 21 Nov 2025 09:41:28 +0100 Subject: [PATCH 1/2] fix: report all columns from annual stats as JSON The previous report was only showing the first column, incorrectly. For now, just report all columns as JSON, and in future we'll add more formatting as we work on analytics. Test-bot: skip --- script/statistics/annual.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/script/statistics/annual.php b/script/statistics/annual.php index 44469f2..fe617bd 100644 --- a/script/statistics/annual.php +++ b/script/statistics/annual.php @@ -29,9 +29,4 @@ $stats = new \Keyman\Site\com\keyman\api\AnnualStatistics(); $data = $stats->execute($mssql, $startDate, $endDate); - $rows = []; - foreach($data as $row) { - $rows[$row[0]] = ["Value" => $row[2], "Comment" => $row[1]]; - } - - json_print($rows); + json_print($data); From d36059a533581fc4063b446f40ae951eb2736418 Mon Sep 17 00:00:00 2001 From: keyman-server Date: Wed, 26 Nov 2025 06:13:33 +0000 Subject: [PATCH 2/2] chore: update BOOTSTRAP_VERSION to v1.08 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b31ef75..606fdde 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ ## START STANDARD SITE BUILD SCRIPT INCLUDE readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh" -readonly BOOTSTRAP_VERSION=v1.0.7 +readonly BOOTSTRAP_VERSION=v1.08 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh) ## END STANDARD SITE BUILD SCRIPT INCLUDE