summaryrefslogtreecommitdiff
path: root/Aktywator/TeamNamesSettings.cs
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2017-12-28 02:13:55 +0100
committeremkael <emkael@tlen.pl>2017-12-28 02:13:55 +0100
commit511333516d2e08daa9d6b148f5e908d63dc89238 (patch)
tree0b97188580d01b2b42e4515dfca96faebf286cd6 /Aktywator/TeamNamesSettings.cs
parent80cd31c1c8e7cef2cfbf6148df3d9ec2d2a23279 (diff)
parent4f5d46d5a077fa47b44f8987552f7e58a7e2f65d (diff)
Merge branch '1.1-beta' into emkaelv1.1.2.9
Diffstat (limited to 'Aktywator/TeamNamesSettings.cs')
-rw-r--r--Aktywator/TeamNamesSettings.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Aktywator/TeamNamesSettings.cs b/Aktywator/TeamNamesSettings.cs
index 034e362..d8f8e6e 100644
--- a/Aktywator/TeamNamesSettings.cs
+++ b/Aktywator/TeamNamesSettings.cs
@@ -79,7 +79,7 @@ namespace Aktywator
ret.Append("SELECT teams.id, ");
if (rbShowTeamNames.Checked)
{
- ret.Append("fullname, ");
+ ret.Append("shortname, ");
switch (cbSecondRow.SelectedIndex) {
case 0:
ret.Append("' ' FROM teams ORDER BY teams.id");
@@ -99,7 +99,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)) + teams.score, ' 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;