From 2dddfa473afbb36fcc9591eef388a496fa9147f7 Mon Sep 17 00:00:00 2001 From: Wieland Hagen Date: Sun, 11 May 2025 21:26:22 +0200 Subject: [PATCH] Admin League Games View: display "+0d" for 0 day shifts, fix SQL query --- src/structure/components/com_sportsmanager/admin.php | 2 +- .../com_sportsmanager/views/sportsmanager/view_admin.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php index 7378943..d2d4a07 100644 --- a/src/structure/components/com_sportsmanager/admin.php +++ b/src/structure/components/com_sportsmanager/admin.php @@ -7205,7 +7205,7 @@ function adminMannschaften(): void . "\n WHERE begegnung_historie_id IN (" . "\n SELECT MIN(begegnung_historie_id) AS historie_id FROM #__sportsmanager_begegnung_historie " . "\n WHERE aktion IN (0, 3) AND team_id in " - . "\n (SELECT team_id FROM #__sportsmanager_team WHERE veranstaltung_id = $veranstaltungid)" + . "\n (SELECT team_id FROM #__sportsmanager_team WHERE veranstaltung_id = $veranstaltungId)" . "\n GROUP BY begegnung_id" . "\n )" . "\n AND team_id = #__sportsmanager_team.team_id" diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php index c3ed060..b9c1c7b 100644 --- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php +++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php @@ -16,9 +16,11 @@ function formatTimediff( $timestamp1, $timestamp2, $verbose ) { if (empty($timestamp1) || empty($timestamp2)) { return ""; } else { - $hourdiff = ($timestamp2 - $timestamp1) / 3600.0; - if (abs($hourdiff) > 23) { - return sprintf($verbose ? "%+d d" : "%dd", round($hourdiff / 24.0)); + $daydiff = round(($timestamp2 - $timestamp1) / (3600.0 * 24.0)); + if ($verbose) { + return sprintf("%+d d", $daydiff); + } else if (abs($daydiff) > 0) { + return sprintf("%dd", $daydiff); } else { return "-"; }