diff options
| author | Michał Zimniewicz <michzimny@users.noreply.github.com> | 2019-07-24 23:02:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 23:02:40 +0200 |
| commit | 95e5a94eb697414eb0a8b905c193f682a7cfc0c5 (patch) | |
| tree | 21e8ee68edad0565910d00867caec024e117d9c2 | |
| parent | c87e5eebb4d54a1b63439e7cf150486d9230274e (diff) | |
| parent | a371d2bf8c3e03264eda93d74cdf30d50fb3703f (diff) | |
Merge pull request #57 from emkael/master
Fix for #56
| -rw-r--r-- | Aktywator.txt | 4 | ||||
| -rw-r--r-- | Aktywator/Bws.cs | 11 | ||||
| -rw-r--r-- | Aktywator/Resources/BuildDate.txt | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/Aktywator.txt b/Aktywator.txt index b627842..296a24c 100644 --- a/Aktywator.txt +++ b/Aktywator.txt @@ -2,6 +2,10 @@ - nie działa zbieranie danych pośrednich, gdy wczytane są rozkłady (dane są zbierane w BWS, ale Kolektor Teamów ich nie czyta - potencjalny bug w Kolektorze) - nie działa update ustawienia maksowania każdego sektora w czasie sesji (samo maksowanie ustawione na początku sesji - działa); nie da się również zmienić sposoby liczenia (maksy/butler/cavendish) w trakcie sesji - ograniczenia BCS +Aktywator 1.16 +??.??.???? [mkl] + * wersja z poprawkami błędów + Aktywator 1.1.5 17.11.2018 [mkl] * poprawa bezpieczeństwa PINów diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 36ef372..126a60f 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -733,6 +733,13 @@ namespace Aktywator } pairs[sectionNumber].Add(new PairPosition { pairNo = nsPairNumber, position = "NS", table = tableNumber }); pairs[sectionNumber].Add(new PairPosition { pairNo = ewPairNumber, position = "EW", table = tableNumber }); + if (tournament.type == Tournament.TYPE_TEAMY && MainForm.teamNames.arePlayerNamesDisplayed()) + { + sectionPairs[sectionNumber].Add(nsPairNumber + TeamNamesSettings.OpenClosedDiff); + sectionPairs[sectionNumber].Add(ewPairNumber + TeamNamesSettings.OpenClosedDiff); + pairs[sectionNumber].Add(new PairPosition { pairNo = nsPairNumber + TeamNamesSettings.OpenClosedDiff, position = "EW", table = tableNumber + SKOK_STOLOW }); + pairs[sectionNumber].Add(new PairPosition { pairNo = ewPairNumber + TeamNamesSettings.OpenClosedDiff, position = "NS", table = tableNumber + SKOK_STOLOW }); + } } d.Close(); @@ -833,13 +840,13 @@ namespace Aktywator PairPosition pair = pairs[sections.Key].Find(delegate(PairPosition p) { return p.pairNo == pairNumber; }); for (int i = 0; i < names[pair.pairNo].Count; i++) { countNew += this.updateName(sections.Key.ToString(), pair.table.ToString(), pair.position[i].ToString(), names[pair.pairNo][i]); - if (tournament.type == Tournament.TYPE_TEAMY) + if (tournament.type == Tournament.TYPE_TEAMY && !MainForm.teamNames.arePlayerNamesDisplayed()) { char otherTableSeat = seatMapping[(Array.IndexOf(seatMapping, pair.position[i]) + 2) % 4]; countNew += this.updateName(sections.Key.ToString(), (pair.table + SKOK_STOLOW).ToString(), otherTableSeat.ToString(), names[pair.pairNo][i]); } } - count += names[pair.pairNo].Count * ((tournament.type == Tournament.TYPE_TEAMY) ? 2 : 1); + count += names[pair.pairNo].Count * ((tournament.type == Tournament.TYPE_TEAMY && !MainForm.teamNames.arePlayerNamesDisplayed()) ? 2 : 1); } } } diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt index aeb1927..48f4768 100644 --- a/Aktywator/Resources/BuildDate.txt +++ b/Aktywator/Resources/BuildDate.txt @@ -1 +1 @@ -2018-11-18 +2019-07-24 |