Merge pull request #16 from AngelsSoftwareOrg/develop

v1.0.0.5 - Cycle Release - LottoDataManagerSetup_v1.0.0.5_Release
- Rename the Form title of Splash screen
- Fix the bug wherein the "current winnings on this month" will also shows past year winnings

Author: angelsburger90

Forms/MainFrm.cs

@@ -23,6 +23,7 @@
 using LottoDataManager.Includes.Utilities;
 using AngelsRepositoryLib;
 using LottoDataManager.Forms.Ticket;
+using LottoDataManager.Includes.Classes.Extensions;
 
 namespace LottoDataManager
 {
@@ -35,24 +36,25 @@ public partial class MainForm : Form
         private LotteryDataWorker lotteryDataWorker;
         private DashboardReport dashboardReport;
         private ProcessingStatusLogFrm processingStatusLogFrm;
-        private String LOG_STATUS_MODULE_NAME_WEBSCRAP = "Web Scraping";
-        private String LOG_STATUS_MODULE_NAME_GRID_CONTENT = "Grid Content";
-        private String LOG_STATUS_MODULE_NAME_FIELD_DETAILS = "Refreshing Field Details";
-        private String LOG_STATUS_MODULE_NAME_WINNING_BETS = "Processing Winning Bets";
-        private String LOG_STATUS_MODULE_NAME_DRAWN_RESULT = "Download drawn results";
+        private String LOG_STATUS_MODULE_NAME_WEBSCRAP;
+        private String LOG_STATUS_MODULE_NAME_GRID_CONTENT;
+        private String LOG_STATUS_MODULE_NAME_FIELD_DETAILS;
+        private String LOG_STATUS_MODULE_NAME_WINNING_BETS;
+        private String LOG_STATUS_MODULE_NAME_DRAWN_RESULT;
         private int processingLogStatusCtr = 0;
 
         public MainForm()
         {
             InitializeComponent();
             this.lotteryDetails = GameFactory.GetPreviousOpenGameInstance();
             this.processingStatusLogFrm = new ProcessingStatusLogFrm();
+
             this.Text = String.Format("{0} - {1}", ResourcesUtils.GetMessage("mainf_title"), AppSettings.GetAppVersionWithPrefix());
             this.label1.Text = ResourcesUtils.GetMessage("mainf_labels_1");
             this.label3.Text = ResourcesUtils.GetMessage("mainf_labels_2");
             this.label4.Text = ResourcesUtils.GetMessage("mainf_labels_3");
             this.label5.Text = ResourcesUtils.GetMessage("mainf_labels_4");
-            AddProcessingStatusLogs(LOG_STATUS_MODULE_NAME_WEBSCRAP, ResourcesUtils.GetMessage("mainf_labels_5"));
+            
             this.toolStripProcessingLogs.Text = ResourcesUtils.GetMessage("mainf_labels_46");
             this.tabPage1.Text = ResourcesUtils.GetMessage("mainf_labels_6");
             this.groupBox1.Text = ResourcesUtils.GetMessage("mainf_labels_7");
@@ -96,6 +98,13 @@ public MainForm()
             this.tabPageBetFilter.Text = ResourcesUtils.GetMessage("mainf_labels_49");
             this.tabPageDrawFilter.Text = ResourcesUtils.GetMessage("mainf_labels_50");
 
+            this.LOG_STATUS_MODULE_NAME_WEBSCRAP = ResourcesUtils.GetMessage("mainf_labels_51");
+            this.LOG_STATUS_MODULE_NAME_GRID_CONTENT = ResourcesUtils.GetMessage("mainf_labels_52");
+            this.LOG_STATUS_MODULE_NAME_FIELD_DETAILS = ResourcesUtils.GetMessage("mainf_labels_53");
+            this.LOG_STATUS_MODULE_NAME_WINNING_BETS = ResourcesUtils.GetMessage("mainf_labels_54");
+            this.LOG_STATUS_MODULE_NAME_DRAWN_RESULT = ResourcesUtils.GetMessage("mainf_labels_55");
+            AddProcessingStatusLogs(LOG_STATUS_MODULE_NAME_WEBSCRAP, ResourcesUtils.GetMessage("mainf_labels_5"));
+
             ReinitateLotteryServices();
             GenerateLotteriesGameMenu();
             InitializesFormContent();

Forms/SplashScreenFrm.Designer.cs

@@ -1,6 +1,7 @@
 using LottoDataManager.Includes;
 using LottoDataManager.Includes.Classes;
 using LottoDataManager.Includes.Model;
+using LottoDataManager.Includes.Utilities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -35,6 +36,7 @@ public void DisposeInstance()
         private void SplashScreen_Load(object sender, EventArgs e)
         {
             lblVersion.Text = AppSettings.GetAppVersionWithPrefix();
+            this.Text = ResourcesUtils.GetMessage("app_const_app_title");
             TestDatabaseSourceConnection();
         }
         private void TestDatabaseSourceConnection()

Forms/SplashScreenFrm.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LottoDataManager.Includes.Classes.Extensions
+{
+    public static class ControlExtensions
+    {
+        //This is to avoid flickering on Listview
+        public static void DoubleBuffering(this Control control, bool enable)
+        {
+            var method = typeof(Control).GetMethod("SetStyle", BindingFlags.Instance | BindingFlags.NonPublic);
+            method.Invoke(control, new object[] { ControlStyles.OptimizedDoubleBuffer, enable });
+        }
+    }
+}

Forms/SplashScreenFrm.resx

@@ -133,6 +133,7 @@ public double GetTotalWinningsAmountThisMonth(GameMode gameMode)
                                       " WHERE a.active = true " +
                                       "   AND b.game_cd = @game_cd " +
                                       "   AND MONTH(target_draw_date) = MONTH(NOW()) " +
+                                      "   AND YEAR(target_draw_date) = YEAR(NOW()) " + 
                                       "   AND a.claim_status = true";
                 command.Parameters.AddWithValue("@game_cd", (int)gameMode);
                 command.Connection = conn;

Includes/Classes/Extensions/ControlExtensions.cs

@@ -163,6 +163,7 @@
     <Compile Include="Includes\Classes\Comparers\AbstractSorter.cs" />
     <Compile Include="Includes\Classes\Comparers\ListviewIntSorter.cs" />
     <Compile Include="Includes\Classes\Comparers\ListviewTextSorter.cs" />
+    <Compile Include="Includes\Classes\Extensions\ControlExtensions.cs" />
     <Compile Include="Includes\Classes\Generator\AbstractSequenceGenerator.cs" />
     <Compile Include="Includes\Classes\Generator\GeneratorParamType.cs" />
     <Compile Include="Includes\Classes\Generator\GeneratorType.cs" />

Includes/Database/DAO/Impl/LotteryWinningBetDaoImpl.cs

@@ -104,6 +104,11 @@ mainf_labels_47=Date To:
 mainf_labels_48=Date To: 
 mainf_labels_49=Latest Bets Filter
 mainf_labels_50=Latest Draw Results Filter
+mainf_labels_51=Web Scraping
+mainf_labels_52=Grid Content
+mainf_labels_53=Refreshing Field Details
+mainf_labels_54=Processing Winning Bets
+mainf_labels_55=Download drawn results
 
 #~~~~~~~~~~~ PICK GENERATOR FORM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pick_grp_gen_type=Step 1: Choose Generator Type