From f17c3f208995053a3594e1c5cb23be2ba48c474f Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 21 Mar 2018 17:05:16 +0100 Subject: Complete redesign of names loading mechanism. Fixes #24 --- Aktywator/MainForm.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index bb6a45e..e0ecc29 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -450,7 +450,7 @@ namespace Aktywator { try { - bws.syncNames(tournament, true, eOomRounds.Text, cbNamesSection.SelectedItem.ToString(), namesGridView); + bws.syncNames(tournament, true, cbNamesSection.SelectedItem.ToString(), namesGridView); } catch (Exception ee) { @@ -505,7 +505,7 @@ namespace Aktywator private void timer_Tick(object sender, EventArgs e) { - bws.syncNames(tournament, false, eOomRounds.Text, cbNamesSection.SelectedItem.ToString(), namesGridView); + bws.syncNames(tournament, false, cbNamesSection.SelectedItem.ToString(), namesGridView); } private void bForceSync_Click(object sender, EventArgs e) -- cgit v1.2.3 From 05731124e0b88765c79c894e0d67d80c689cff78 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 21 Mar 2018 17:06:18 +0100 Subject: "OOM rounds" fields is no longer necessary --- Aktywator/MainForm.Designer.cs | 41 ----------------------------------------- Aktywator/MainForm.cs | 6 ------ Aktywator/MainForm.resx | 4 ++-- 3 files changed, 2 insertions(+), 49 deletions(-) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/MainForm.Designer.cs b/Aktywator/MainForm.Designer.cs index 7485e01..f8b03b9 100644 --- a/Aktywator/MainForm.Designer.cs +++ b/Aktywator/MainForm.Designer.cs @@ -90,9 +90,6 @@ this.xResultsOverview = new System.Windows.Forms.ComboBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.sectionToolStrip = new System.Windows.Forms.ToolStrip(); - this.eOomRounds = new System.Windows.Forms.ToolStripTextBox(); - this.lOomLabel = new System.Windows.Forms.ToolStripLabel(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.cbNamesSection = new System.Windows.Forms.ToolStripComboBox(); this.namesPanel = new System.Windows.Forms.Panel(); @@ -802,9 +799,6 @@ this.sectionToolStrip.GripMargin = new System.Windows.Forms.Padding(0); this.sectionToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.sectionToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.eOomRounds, - this.lOomLabel, - this.toolStripButton2, this.toolStripLabel1, this.cbNamesSection}); this.sectionToolStrip.Location = new System.Drawing.Point(3, 458); @@ -813,38 +807,6 @@ this.sectionToolStrip.TabIndex = 30; this.sectionToolStrip.Text = "toolStrip5"; // - // eOomRounds - // - this.eOomRounds.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.eOomRounds.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.eOomRounds.Enabled = false; - this.eOomRounds.Name = "eOomRounds"; - this.eOomRounds.Size = new System.Drawing.Size(80, 25); - this.eOomRounds.ToolTipText = "Jeśli nie wiesz do czego to jest, to nic nie wpisuj!"; - // - // lOomLabel - // - this.lOomLabel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.lOomLabel.Enabled = false; - this.lOomLabel.Name = "lOomLabel"; - this.lOomLabel.Size = new System.Drawing.Size(92, 22); - this.lOomLabel.Text = "Rundy dla OOM"; - this.lOomLabel.ToolTipText = "Jeśli nie wiesz do czego to jest, to nic nie wpisuj!"; - // - // toolStripButton2 - // - this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.toolStripButton2.BackColor = System.Drawing.Color.Transparent; - this.toolStripButton2.CheckOnClick = true; - this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(23, 22); - this.toolStripButton2.Text = "‎✔"; - this.toolStripButton2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - this.toolStripButton2.ToolTipText = "Jeśli nie wiesz do czego to jest, to nic nie wpisuj!"; - this.toolStripButton2.CheckedChanged += new System.EventHandler(this.toolStripButton2_CheckedChanged); - // // toolStripLabel1 // this.toolStripLabel1.Name = "toolStripLabel1"; @@ -1620,9 +1582,6 @@ private System.Windows.Forms.ToolStripButton bTruncate; private System.Windows.Forms.ToolStripButton bAutoSync; private System.Windows.Forms.ToolStripTextBox eInterval; - private System.Windows.Forms.ToolStripTextBox eOomRounds; - private System.Windows.Forms.ToolStripLabel lOomLabel; - private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.DataGridView namesGridView; private System.Windows.Forms.Panel namesPanel; public System.Windows.Forms.NumericUpDown numTeamsTableOffset; diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index e0ecc29..1e418fd 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -580,12 +580,6 @@ namespace Aktywator toolStripSplitButton1.ShowDropDown(); } - private void toolStripButton2_CheckedChanged(object sender, EventArgs e) - { - eOomRounds.Enabled = toolStripButton2.Checked; - lOomLabel.Enabled = toolStripButton2.Checked; - } - private void namesGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex > -1 && e.ColumnIndex > 0) diff --git a/Aktywator/MainForm.resx b/Aktywator/MainForm.resx index a60549f..11af55c 100644 --- a/Aktywator/MainForm.resx +++ b/Aktywator/MainForm.resx @@ -340,7 +340,7 @@ S5vmPfe+JjvtcklE6MUrYYEbmdtDfF9ayn2gKP5L/6d/QueutWjblIOunWvQezgfd/74BmoPvHwuwN7e mZGPOdVz5pg0Lc/JVm/IvXF77xZ0bl6BusRpOOPujCXm7LNiXd1EkhkPir9vUQU/VBS2aV7bhaaceWhe ngT1moVo35yDzh2r0bV7Le6/9hLUeXn/3D5j+ubBTmOEMjqaV580N7/zxRd77r1zEANv5KNx8XycdZUj - 1dj4Y1MWawbJBENqImHqVP8jeXnfd+Q9T8bPQevqDKjXZ6Ej7wV07d0Izf48dB/Yju7929D/yhbg8E7c + 1dj4Y1MWawbJBENqImHqVP/DeXnfd+Q9T8bPQevqDKjXZ6Ej7wV07d0Izf48dB/Yju7929D/yhbg8E7c WLpIESgSeTNDjBoNqQs2t6xf33/33SN4+OGb6MjfiOuTw5FnafmVLUtnIUlsh5Q/4ui2LTvxwZtQ06q3 r8uEekM22retJONfRDftSPeRPeg5mo/eQ7vQSxPppUn8q2AD7mxcgY2hwauZYf4vVFlZz6lXvaDsO7QH D/6wHwPv7MetFYtwQiodiNLTe5kkHtQMB8U/hc1m895cmHK1acsaaDYvg2bHKmho5btf24meY/vQe+wV @@ -383,7 +383,7 @@ imXm5oeYS8Mz0czM8UFGIno2ZKI9Zy5aUmKhSgjBLcpE9REUyMFy7OXzS0k6bMU5Ghx1dy47zuXWMF8f jZppE2sGctPRuTKFiYNwNMb44FaUC65RdggzNP7ff22OIZZ6eh5xpqbaU/nRM95kC4v49vgo9K5JG3yF rp4/Gc0JwSgNdUe+wLqKJE5Dyl+Nx3/9uJTDKWicEoKOhXF0HkSjMsoPb/D5fVa6uvGM5OknwdB42wlb - 287TlJO3WnNvWOrozKXLVKL8htBnsdwoD2tLBq3bjMnJ+zu/fVisfwMVwMtUf+V6egAAAABJRU5ErkJg + 287TlJO3WnNvWOrozKXLVKL8htBnsdwoD2tLBq3bjMnJ+zu/fVisfwP1S8tTgtT67QAAAABJRU5ErkJg gg== -- cgit v1.2.3 From d9a9ced98db04759739eebb6b07361670f097eaa Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 13 Apr 2018 16:51:14 +0200 Subject: Some of the initialization procedures for BWS might need a valid reference to Bws() --- Aktywator/Bws.cs | 4 ++++ Aktywator/MainForm.cs | 1 + 2 files changed, 5 insertions(+) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/Bws.cs b/Aktywator/Bws.cs index 815e643..1af237f 100644 --- a/Aktywator/Bws.cs +++ b/Aktywator/Bws.cs @@ -39,6 +39,10 @@ namespace Aktywator this._filename = filename; sql = new Sql(filename); this.main = main; + } + + public void init() + { string[] sections = this.getSections().Split(','); this.displaySectionBoardsInfo(sections); } diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 1e418fd..511db11 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -65,6 +65,7 @@ namespace Aktywator } bws = new Bws(filename, this); + bws.init(); bws.convert(); labelFilename.Text = filename; -- cgit v1.2.3 From 59a523137b5a8dccee77c23493b34b8862532992 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 13 Apr 2018 16:58:20 +0200 Subject: Two possible warning messages for sections grouping setting warning --- Aktywator/MainForm.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 511db11..d2cb88b 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -321,6 +321,9 @@ namespace Aktywator bws.loadSettings(); } + static public string sectionGroupWarningLabel = "Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!"; + static public string differentRecordsInSections = "BWS zawiera różne rozkłady w różnych sektorach, opcja grupowania sektorów musi być wyłączona."; + private void xShowResults_CheckedChanged(object sender, EventArgs e) { if (xShowResults.Checked) @@ -632,7 +635,8 @@ namespace Aktywator private void lGroupSectionsWarning_Click(object sender, EventArgs e) { - MessageBox.Show("Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!", "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question); + string message = bws.detectDifferentRecordsInSections() ? MainForm.differentRecordsInSections : MainForm.sectionGroupWarningLabel; + MessageBox.Show(message, "Ustawienia grupowania zapisów w sektorach", MessageBoxButtons.OK, MessageBoxIcon.Question); } private void bTeamsNamesSettings_Click(object sender, EventArgs e) -- cgit v1.2.3 From 5ae44afb4d3e63c9a7020689ffe3a2f14a5cc669 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 13 Apr 2018 16:59:21 +0200 Subject: Showing warning in settings panel if there are different hand records in multiple sections --- Aktywator/MainForm.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index d2cb88b..96b66a7 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -324,14 +324,14 @@ namespace Aktywator static public string sectionGroupWarningLabel = "Opcja grupowania zapisów w sektorach (albo osobnego maksowania sektorów) nie może być zaktualizowana w trakcie trwania sesji!"; static public string differentRecordsInSections = "BWS zawiera różne rozkłady w różnych sektorach, opcja grupowania sektorów musi być wyłączona."; - private void xShowResults_CheckedChanged(object sender, EventArgs e) + public void xShowResults_CheckedChanged(object sender, EventArgs e) { if (xShowResults.Checked) { xRepeatResults.Enabled = true; xShowPercentage.Enabled = true; xResultsOverview.Enabled = true; - xGroupSections.Enabled = true; + xGroupSections.Enabled = !bws.detectDifferentRecordsInSections(); } else { @@ -341,7 +341,7 @@ namespace Aktywator xResultsOverview.Enabled = false; xGroupSections.Enabled = false; } - if (cbSettingsSection.Items.Count > 2) + if (cbSettingsSection.Items.Count > 2 || bws.detectDifferentRecordsInSections()) { bws.sectionGroupWarning(); } -- cgit v1.2.3 From 31c37824034320c4f87c91e1bf6d6e0c98e26524 Mon Sep 17 00:00:00 2001 From: emkael Date: Fri, 13 Apr 2018 17:03:57 +0200 Subject: Disabling section group option if there's only one section --- Aktywator/MainForm.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Aktywator/MainForm.cs') diff --git a/Aktywator/MainForm.cs b/Aktywator/MainForm.cs index 96b66a7..6284419 100644 --- a/Aktywator/MainForm.cs +++ b/Aktywator/MainForm.cs @@ -345,6 +345,10 @@ namespace Aktywator { bws.sectionGroupWarning(); } + if (cbSettingsSection.Items.Count <= 2) + { + xGroupSections.Enabled = false; + } } private void xMemberNumbers_CheckedChanged(object sender, EventArgs e) -- cgit v1.2.3