Merge pull request #10 from AngelsSoftwareOrg/angelsburger90_development

- Fix the application version display - Fix the panel layout to display correctly the text box content - Fix the dashboard display of currency symbol - Make the ordering of Lotto bet on descending order base on target order and its special ID value - Add context menu on Lottery Bet listing a separator - Add new form called Hit Comparison to compare your bet to all draw results to see how it fares - Fix deleting winning bet record using bet_id column rather than id column - Improve Read Me Document - Make the columns click sortable - Update the labels contents on the bottom of the form
AngelsSoftwareOrg · May 16, 2021 · bb9e0a0 · bb9e0a0
2 parents 2091e03 + 7d214a9
commit bb9e0a0
Show file tree

Hide file tree

Showing 31 changed files with 1,492 additions and 112 deletions.
diff --git a/App.config b/App.config
@@ -32,7 +32,7 @@
                 <value>0</value>
             </setting>
             <setting name="version_release" serializeAs="String">
-                <value>1</value>
+                <value>2</value>
             </setting>
             <setting name="repository_name" serializeAs="String">
                 <value>LottoDataManager</value>

diff --git a/DatabaseMain/Lotto_Data_Manager_DB_And_Models_v1.zip b/DatabaseMain/Lotto_Data_Manager_DB_And_Models_v1.zip
diff --git a/DatabaseMain/Lotto_Main_DB.accdb b/DatabaseMain/Lotto_Main_DB.accdb
diff --git a/DatabaseMain/Lotto_Main_DB_Clear.accdb b/DatabaseMain/Lotto_Main_DB_Clear.accdb
diff --git a/Forms/MainFrm.Designer.cs b/Forms/MainFrm.Designer.cs
diff --git a/Forms/MainFrm.cs b/Forms/MainFrm.cs
@@ -22,6 +22,7 @@
 using LottoDataManager.Includes.Model.Structs;
 using LottoDataManager.Includes.Utilities;
 using AngelsRepositoryLib;
+using LottoDataManager.Forms.Ticket;
 
 namespace LottoDataManager
 {
@@ -315,12 +316,10 @@ private void objListVwWinningNum_SelectionChanged(object sender, EventArgs e)
             filter.Columns = GenerateOLVColumnForHighlighting();
 
             List<String> regex = new List<string>();
-            regex.Add("^" + lotteryDrawResult.GetNum1().ToString() + "$");
-            regex.Add("^" + lotteryDrawResult.GetNum2().ToString() + "$");
-            regex.Add("^" + lotteryDrawResult.GetNum3().ToString() + "$");
-            regex.Add("^" + lotteryDrawResult.GetNum4().ToString() + "$");
-            regex.Add("^" + lotteryDrawResult.GetNum5().ToString() + "$");
-            regex.Add("^" + lotteryDrawResult.GetNum6().ToString() + "$");
+            foreach (int n in lotteryDrawResult.GetAllNumberSequenceSorted())
+            {
+                regex.Add("^" + n.ToString() + "$");
+            }
             filter.RegexStrings = regex;
 
             HighlightTextRenderer highlightTextRenderer = new HighlightTextRenderer(filter);
@@ -332,6 +331,7 @@ private void objListVwWinningNum_SelectionChanged(object sender, EventArgs e)
             this.objListVwWinningNum.ModelFilter = filter;
             this.objListVwWinningNum.DefaultRenderer = highlightTextRenderer;
             this.objListVwWinningNum.SelectedForeColor = Color.Black;
+            this.objListVwWinningNum.Refresh();
         }
         private void objectLstVwLatestBet_SelectionChanged(object sender, EventArgs e)
         {
@@ -340,12 +340,10 @@ private void objectLstVwLatestBet_SelectionChanged(object sender, EventArgs e)
             TextMatchFilter filter = new TextMatchFilter(this.objectLstVwLatestBet);
 
             List<String> regex = new List<string>();
-            regex.Add("^" + lotteryBet.GetNum1().ToString() + "$");
-            regex.Add("^" + lotteryBet.GetNum2().ToString() + "$");
-            regex.Add("^" + lotteryBet.GetNum3().ToString() + "$");
-            regex.Add("^" + lotteryBet.GetNum4().ToString() + "$");
-            regex.Add("^" + lotteryBet.GetNum5().ToString() + "$");
-            regex.Add("^" + lotteryBet.GetNum6().ToString() + "$");
+            foreach (int n in lotteryBet.GetAllNumberSequenceSorted())
+            {
+                regex.Add("^" + n.ToString() + "$");
+            }
             filter.RegexStrings = regex;
 
             HighlightTextRenderer highlightTextRenderer = new HighlightTextRenderer(filter);
@@ -357,6 +355,7 @@ private void objectLstVwLatestBet_SelectionChanged(object sender, EventArgs e)
             this.objectLstVwLatestBet.ModelFilter = filter;
             this.objectLstVwLatestBet.DefaultRenderer = highlightTextRenderer;
             this.objectLstVwLatestBet.SelectedForeColor = Color.Black;
+            this.objectLstVwLatestBet.Refresh();
         }
         #endregion
 
@@ -681,14 +680,31 @@ private void updatesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             try
             {
-                UpdatesFrm updateFrm = new UpdatesFrm(AppSettings.GetRepositoryName);
+                UpdatesFrm updateFrm = new UpdatesFrm(AppSettings.GetRepositoryName, AppSettings.GetAppVersion());
                 updateFrm.ShowDialog();
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message);
             }
         }
+        private void hitComparisonToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            ShowHitComparisonForm();
+        }
+        private void toolStripBtnHitCompare_Click(object sender, EventArgs e)
+        {
+            ShowHitComparisonForm();
+        }
+        private void hitComparisonToolStripMenuItem1_Click(object sender, EventArgs e)
+        {
+            ShowHitComparisonForm();
+        }
+        private void ShowHitComparisonForm()
+        {
+            HitComparisonFrm hitFrm = new HitComparisonFrm(this.lotteryDataServices);
+            hitFrm.ShowDialog();
+        }
         #endregion
 
         #region "Main Form"
@@ -712,6 +728,8 @@ private void MainForm_Load(object sender, EventArgs e)
             SplashScreenFrm.GetIntance().DisposeInstance();
             this.Show();
         }
+
+
         #endregion