Merge branch '1.1-beta' into emkaelv1.1.2.9

9 files changed, 91 insertions, 82 deletions

diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs
index 9dedb84..e589418 100644
--- a/Aktywator/Bws.cs
+++ b/Aktywator/Bws.cs
@@ -624,10 +624,7 @@ namespace Aktywator
 
                 while (d.Read())
                 {
-                    if ("*".Equals(section))
-                    {
-                        section = this.getBWSNumber(d, 0).ToString();
-                    }
+                    string pairSection = "*".Equals(section) ? this.getBWSNumber(d, 0).ToString() : section;
                     string table = this.getBWSNumber(d, 1).ToString();
                     int ns = this.getBWSNumber(d, 2);
                     int ew = this.getBWSNumber(d, 3);
@@ -638,14 +635,14 @@ namespace Aktywator
                         {
                             throw new KeyNotFoundException(ns.ToString());
                         }
-                        countNew += updateName(section, table, "N", names[ns][0]);
-                        countNew += updateName(section, table, "S", names[ns][1]);
+                        countNew += updateName(pairSection, table, "N", names[ns][0]);
+                        countNew += updateName(pairSection, table, "S", names[ns][1]);
                         count += 2;
                         if (tournament.type == Tournament.TYPE_TEAMY)
                         {
-                            countNew += updateName(section, (int.Parse(table) + SKOK_STOLOW).ToString(), "E",
+                            countNew += updateName(pairSection, (int.Parse(table) + SKOK_STOLOW).ToString(), "E",
                                 names.ContainsKey(ns + TeamNamesSettings.OpenClosedDiff) ? names[ns + TeamNamesSettings.OpenClosedDiff][0] : names[ns][0]);
-                            countNew += updateName(section, (int.Parse(table) + SKOK_STOLOW).ToString(), "W",
+                            countNew += updateName(pairSection, (int.Parse(table) + SKOK_STOLOW).ToString(), "W",
                                 names.ContainsKey(ns + TeamNamesSettings.OpenClosedDiff) ? names[ns + TeamNamesSettings.OpenClosedDiff][1] : names[ns][1]);
                             count += 2;
                         }
@@ -667,14 +664,14 @@ namespace Aktywator
                         {
                             throw new KeyNotFoundException(ew.ToString());
                         }
-                        countNew += updateName(section, table, "E", names[ew][0]);
-                        countNew += updateName(section, table, "W", names[ew][1]);
+                        countNew += updateName(pairSection, table, "E", names[ew][0]);
+                        countNew += updateName(pairSection, table, "W", names[ew][1]);
                         count += 2;
                         if (tournament.type == Tournament.TYPE_TEAMY)
                         {
-                            countNew += updateName(section, (int.Parse(table) + SKOK_STOLOW).ToString(), "N",
+                            countNew += updateName(pairSection, (int.Parse(table) + SKOK_STOLOW).ToString(), "N",
                                 names.ContainsKey(ns + TeamNamesSettings.OpenClosedDiff) ? names[ew + TeamNamesSettings.OpenClosedDiff][0] : names[ew][0]);
-                            countNew += updateName(section, (int.Parse(table) + SKOK_STOLOW).ToString(), "S",
+                            countNew += updateName(pairSection, (int.Parse(table) + SKOK_STOLOW).ToString(), "S",
                                 names.ContainsKey(ns + TeamNamesSettings.OpenClosedDiff) ? names[ew + TeamNamesSettings.OpenClosedDiff][1] : names[ew][1]);
                             count += 2;
                         }
diff --git a/Aktywator/HandRecordPreview.cs b/Aktywator/HandRecordPreview.cs
index d5e8446..57562a1 100644
--- a/Aktywator/HandRecordPreview.cs
+++ b/Aktywator/HandRecordPreview.cs
@@ -29,9 +29,9 @@ namespace Aktywator
             lSouthHearts.Text = record.south[1];
             lSouthDiamonds.Text = record.south[2];
             lSouthClubs.Text = record.south[3];
-            lWestSpades.Text = record.north[0];
-            lWestHearts.Text = record.north[1];
-            lWestDiamonds.Text = record.north[2];
+            lWestSpades.Text = record.west[0];
+            lWestHearts.Text = record.west[1];
+            lWestDiamonds.Text = record.west[2];
             lWestClubs.Text = record.west[3];
             this.Text = "ROZDANIE " + boardNo;
         }
diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs
index c5ac4ad..f739912 100644
--- a/Aktywator/MainForm.Designer.cs
+++ b/Aktywator/MainForm.Designer.cs
@@ -901,8 +901,6 @@
             // checkBox1
             // 
             this.checkBox1.AutoSize = true;
-            this.checkBox1.Checked = true;
-            this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked;
             this.checkBox1.Location = new System.Drawing.Point(252, 74);
             this.checkBox1.Name = "checkBox1";
             this.checkBox1.Size = new System.Drawing.Size(154, 17);
diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs
index d510f42..bb6a45e 100644
--- a/Aktywator/MainForm.cs
+++ b/Aktywator/MainForm.cs
@@ -438,7 +438,6 @@ namespace Aktywator
                 tournament.clearCellLocks(namesGridView);
                 tournament.displayNameList(namesGridView);
                 tournament.clearCellLocks(namesGridView);
-                namesTimer.Enabled = true;
             }
             else
             {
@@ -630,6 +629,10 @@ namespace Aktywator
         private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
             namesTimer.Enabled = checkBox1.Checked;
+            if (namesTimer.Enabled)
+            {
+                namesTimer_Tick(null, null);
+            }
         }
 
         private void lGroupSectionsWarning_Click(object sender, EventArgs e)
diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx
index 4b7b92d..9d0721f 100644
--- a/Aktywator/MainForm.resx
+++ b/Aktywator/MainForm.resx
@@ -334,56 +334,57 @@
   <data name="bTruncate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
+        gg==
 </value>
   </data>
   <metadata name="toolStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/Aktywator/RRBTournament.cs b/Aktywator/RRBTournament.cs
index 48040ee..3e73d43 100644
--- a/Aktywator/RRBTournament.cs
+++ b/Aktywator/RRBTournament.cs
@@ -54,25 +54,29 @@ namespace Aktywator
 
         override internal Dictionary<int, List<string>> getNameList()
         {
-            this._xml.Load(this._name);
             Dictionary<int, List<string>> names = new Dictionary<int, List<string>>();
-            foreach (XmlNode pair in this._xml.SelectNodes("//lista/para"))
+            try
             {
-                int pairNo = Int32.Parse(pair.SelectSingleNode("numer").InnerText);
-                names.Add(pairNo, new List<string>());
-                foreach (XmlNode player in pair.SelectNodes("gracz/nazwisko"))
+                this._xml.Load(this._name);
+                foreach (XmlNode pair in this._xml.SelectNodes("//lista/para"))
                 {
-                    names[pairNo].Add(player.InnerText);
+                    int pairNo = Int32.Parse(pair.SelectSingleNode("numer").InnerText);
+                    names.Add(pairNo, new List<string>());
+                    foreach (XmlNode player in pair.SelectNodes("gracz/nazwisko"))
+                    {
+                        names[pairNo].Add(player.InnerText);
+                    }
                 }
-            }
 
-            foreach (KeyValuePair<int, List<string>> pair in names)
-            {
-                while (pair.Value.Count < 2)
+                foreach (KeyValuePair<int, List<string>> pair in names)
                 {
-                    pair.Value.Add(" ");
+                    while (pair.Value.Count < 2)
+                    {
+                        pair.Value.Add(" ");
+                    }
                 }
             }
+            catch (Exception) { }
             return names;
         }
     }
diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt
index 6b9b605..0417c53 100644
--- a/Aktywator/Resources/BuildDate.txt
+++ b/Aktywator/Resources/BuildDate.txt
@@ -1 +1 @@
-2017-11-20 
+2017-12-28 
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;
diff --git a/Aktywator/Tournament.cs b/Aktywator/Tournament.cs
index 117b1da..d6da2d4 100644
--- a/Aktywator/Tournament.cs
+++ b/Aktywator/Tournament.cs
@@ -43,6 +43,12 @@ namespace Aktywator
         virtual public void displayNameList(DataGridView grid)
         {
             Dictionary<int, List<string>> names = this.getNameList();
+            if (names.Count == 0)
+            {
+                MessageBox.Show(
+                    "Lista pobranych nazwisk jest pusta - być może coś poszło nie tak przy ich pobieraniu.",
+                    "Pusta lista nazwisk", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            }
             foreach (KeyValuePair<int, List<string>> item in names) {
                 if (!this.updateNameListRow(grid, item.Key, item.Value))
                 {