From f44c3ffab5d4146744cb45d57ff756c70453be75 Mon Sep 17 00:00:00 2001 From: emkael Date: Sat, 30 Sep 2017 12:26:56 +0200 Subject: VP scores displayed in Teamy events include VP carry-over --- Aktywator/Resources/BuildDate.txt | 2 +- Aktywator/TeamNamesSettings.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index 6d547b9..5f59e05 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2017-09-27 +2017-09-30 diff --git a/Aktywator/TeamNamesSettings.cs b/Aktywator/TeamNamesSettings.cs index ae7f4e9..40b8613 100644 --- a/Aktywator/TeamNamesSettings.cs +++ b/Aktywator/TeamNamesSettings.cs @@ -92,7 +92,7 @@ namespace Aktywator ret.Append(" GROUP BY teams.id ORDER BY teams.id"); break; case 2: - ret.Append("CONCAT(SUM(IF(matches.homet = teams.id, vph+corrh, vpv+corrv)), ' VP') FROM teams LEFT JOIN matches ON (teams.id = matches.homet OR teams.id = matches.visit) AND matches.rnd <= "); + ret.Append("CONCAT(SUM(IF(matches.homet = teams.id, vph+corrh, vpv+corrv)) + teams.score, ' VP') FROM teams LEFT JOIN matches ON (teams.id = matches.homet OR teams.id = matches.visit) AND matches.rnd <= "); ret.Append(cbRounds.SelectedItem); ret.Append(" GROUP BY teams.id ORDER BY teams.id"); break; -- cgit v1.2.3