Merge pull request #40 from emkael/winter-bugfixes

Winter bugfixes

8 files changed, 86 insertions, 62 deletions

diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs
index f739912..7485e01 100644
--- a/Aktywator/MainForm.Designer.cs
+++ b/Aktywator/MainForm.Designer.cs
@@ -890,9 +890,9 @@
             this.bTeamsNamesSettings.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.bTeamsNamesSettings.Image = ((System.Drawing.Image)(resources.GetObject("bTeamsNamesSettings.Image")));
             this.bTeamsNamesSettings.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.bTeamsNamesSettings.Location = new System.Drawing.Point(188, 40);
+            this.bTeamsNamesSettings.Location = new System.Drawing.Point(169, 40);
             this.bTeamsNamesSettings.Name = "bTeamsNamesSettings";
-            this.bTeamsNamesSettings.Size = new System.Drawing.Size(136, 23);
+            this.bTeamsNamesSettings.Size = new System.Drawing.Size(155, 23);
             this.bTeamsNamesSettings.TabIndex = 36;
             this.bTeamsNamesSettings.UseVisualStyleBackColor = true;
             this.bTeamsNamesSettings.Visible = false;
@@ -956,7 +956,7 @@
             this.label9.Size = new System.Drawing.Size(499, 13);
             this.label9.TabIndex = 31;
             this.label9.Text = "Zmiany wprowadzone powyżej nie zostaną nadpisane danymi z turnieju i nie zostaną " +
-                "zapisane w turnieju.";
+    "zapisane w turnieju.";
             // 
             // label7
             // 
diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx
index 9d0721f..a60549f 100644
--- a/Aktywator/MainForm.resx
+++ b/Aktywator/MainForm.resx
@@ -334,56 +334,56 @@
   <data name="bTruncate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        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
+        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
         gg==
 </value>
   </data>
diff --git a/Aktywator/PBNBoard.cs b/Aktywator/PBNBoard.cs
index fadfd22..994108e 100644
--- a/Aktywator/PBNBoard.cs
+++ b/Aktywator/PBNBoard.cs
@@ -88,7 +88,20 @@ namespace Aktywator
         public String GetLayout()
         {
             string[] dealParts = this.GetField("Deal").Split(':');
-            return dealParts[dealParts.Length - 1];
+            string layout = dealParts[dealParts.Length - 1];
+            if (dealParts.Length > 1)
+            {
+                string[] layoutParts = layout.Split(' ');
+                string[] rotatedLayout = { "", "", "", "" };
+                char dealer = dealParts[0][0];
+                int rotation = Array.IndexOf(DDTable.PLAYERS, dealer);
+                for (int i = 0; i < rotatedLayout.Length; i++)
+                {
+                    rotatedLayout[(i + rotation) % rotatedLayout.Length] = layoutParts[i];
+                }
+                layout = String.Join(" ", rotatedLayout);
+            }
+            return layout;
         }
 
         public String GetNumber()
diff --git a/Aktywator/Resources/BuildDate.txt b/Aktywator/Resources/BuildDate.txt
index 2ee3a9a..fb76437 100644
--- a/Aktywator/Resources/BuildDate.txt
+++ b/Aktywator/Resources/BuildDate.txt
@@ -1 +1 @@
-2018-01-04 
+2018-02-04 
diff --git a/Aktywator/TeamNamesSettings.Designer.cs b/Aktywator/TeamNamesSettings.Designer.cs
index 07b1d97..6de9ec4 100644
--- a/Aktywator/TeamNamesSettings.Designer.cs
+++ b/Aktywator/TeamNamesSettings.Designer.cs
@@ -134,10 +134,10 @@
             this.cbSecondRow.Items.AddRange(new object[] {
             "nic",
             "wynik meczu w IMP",
-            "wynik drużyny w VP"});
+            "wynik turnieju w VP/IMP"});
             this.cbSecondRow.Location = new System.Drawing.Point(103, 112);
             this.cbSecondRow.Name = "cbSecondRow";
-            this.cbSecondRow.Size = new System.Drawing.Size(115, 21);
+            this.cbSecondRow.Size = new System.Drawing.Size(128, 21);
             this.cbSecondRow.TabIndex = 9;
             // 
             // rbShowPlayerNames
@@ -155,7 +155,7 @@
             // 
             this.bClose.Location = new System.Drawing.Point(16, 164);
             this.bClose.Name = "bClose";
-            this.bClose.Size = new System.Drawing.Size(202, 23);
+            this.bClose.Size = new System.Drawing.Size(215, 23);
             this.bClose.TabIndex = 11;
             this.bClose.Text = "Zamknij";
             this.bClose.UseVisualStyleBackColor = true;
@@ -165,7 +165,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(230, 199);
+            this.ClientSize = new System.Drawing.Size(243, 199);
             this.Controls.Add(this.bClose);
             this.Controls.Add(this.rbShowPlayerNames);
             this.Controls.Add(this.cbSecondRow);
diff --git a/Aktywator/TeamNamesSettings.cs b/Aktywator/TeamNamesSettings.cs
index d8f8e6e..23cc865 100644
--- a/Aktywator/TeamNamesSettings.cs
+++ b/Aktywator/TeamNamesSettings.cs
@@ -58,7 +58,7 @@ namespace Aktywator
                 }
                 if (cbSecondRow.SelectedIndex == 2)
                 {
-                    ret.Append(" + VP");
+                    ret.Append(" + VP/IMP");
                 }
             }
             else
@@ -99,7 +99,9 @@ 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, ' ");
+                        ret.Append(this.tournament.getPointsUnit());
+                        ret.Append("') 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/TeamyTournament.cs b/Aktywator/TeamyTournament.cs
index 8da063d..01034b5 100644
--- a/Aktywator/TeamyTournament.cs
+++ b/Aktywator/TeamyTournament.cs
@@ -91,5 +91,14 @@ namespace Aktywator
             finished.Close();
             return segment;
         }
+
+        internal String getPointsUnit()
+        {
+            MySqlDataReader points = this.mysql.select("SELECT imponly FROM admin");
+            points.Read();
+            int unit = points.GetInt32(0);
+            points.Close();
+            return (unit < 0) ? "IMP" : "VP";
+        }
     }
 }
diff --git a/Aktywator/Tournament.cs b/Aktywator/Tournament.cs
index d6da2d4..5fd6772 100644
--- a/Aktywator/Tournament.cs
+++ b/Aktywator/Tournament.cs
@@ -96,7 +96,7 @@ namespace Aktywator
         {
             DataGridViewRow row = new DataGridViewRow();
             row.Cells.Add(new DataGridViewTextBoxCell());
-            row.Cells[0].Value = pairNumber.ToString();
+            row.Cells[0].Value = pairNumber;
             foreach (string name in names)
             {
                 DataGridViewTextBoxCell cell = new DataGridViewTextBoxCell();