summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-09-30 12:26:56 +0200
committeremkael <emkael@tlen.pl>2017-09-30 12:26:56 +0200
commitf44c3ffab5d4146744cb45d57ff756c70453be75 (patch)
tree6ccfd6dece4862a1a5c6638d0ced5a684319370c
parentd881985658c2df2f10ed855c71f67c4b993845f0 (diff)
VP scores displayed in Teamy events include VP carry-over
-rw-r--r--Aktywator/Resources/BuildDate.txt2
-rw-r--r--Aktywator/TeamNamesSettings.cs2
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;