Skip to content

Commit ac017d6

Browse files
angelsburger90angelsburger90
authored
Merge pull request #20 from AngelsSoftwareOrg/develop
v1.0.0.7 - Cycle Release - LottoDataManagerSetup_v1.0.0.7_Release Clear out Add Bet content Form when exiting from Pick Generator Implement copying of selected bet list thru ctrl+c shortcut Implement selection of all bets on the list view thru ctrl+a shortcut Latest Jackpot, if latest is jackpot, then show the minimum jackpot When deleting a bet, ensure that the cancel button is focus first Refresh the main dashboard if a bet was deleted. Fixed saving the last opened lottery When moving the bet dates, it will now able to save to the current date. Improve Packaging Script Add app and uninstall icon Improve Publishers name When changing database from with and without contents, ensure that the draw result listview has been refresh. Fix null exception if when querying for latest bets and jackpot for each lottery when database has no records. Improve listing of processing logs Resolving Dot Net config issue Fix Critical Severity - System.Text.Encodings.Web vulnerability found in packages.config
2 parents 75bc961 + af47fbf commit ac017d6

21 files changed

+122
-69
lines changed

‎App.config‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
55
<section name="LottoDataManager.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
@@ -32,11 +32,19 @@
3232
<value>0</value>
3333
</setting>
3434
<setting name="version_release" serializeAs="String">
35-
<value>6</value>
35+
<value>7</value>
3636
</setting>
3737
<setting name="repository_name" serializeAs="String">
3838
<value>LottoDataManager</value>
3939
</setting>
4040
</LottoDataManager.Properties.Settings>
4141
</userSettings>
42+
<runtime>
43+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
44+
<dependentAssembly>
45+
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
46+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
47+
</dependentAssembly>
48+
</assemblyBinding>
49+
</runtime>
4250
</configuration>

‎DatabaseMain/Lotto_Main_DB.accdb‎

-7.08 MB
Binary file not shown.

‎Forms/MainFrm.Designer.cs‎

Lines changed: 19 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/MainFrm.cs‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,19 @@ private void InitializesFormContent()
167167
{
168168
if (rowObject == null) return 0;
169169
LotteryDrawResult p = (LotteryDrawResult)rowObject;
170-
if (p.GetWinners() <= 0) return "0";
171-
return p.GetWinners();
170+
if (p.GetWinnersCount() <= 0) return "0";
171+
return p.GetWinnersCount();
172172
};
173173
this.olvColWinStamp.ImageGetter = delegate (object rowObject) {
174174
if (rowObject == null) return 0;
175175
LotteryDrawResult p = (LotteryDrawResult)rowObject;
176-
if (p.GetWinners() <= 0) return 0;
176+
if (p.GetWinnersCount() <= 0) return 0;
177177
return ImageUtils.GetStarJackpotImage(5);
178178
};
179179
this.olvColWinStamp.AspectGetter = delegate (object rowObject) {
180180
if (rowObject == null) return 0;
181181
LotteryDrawResult p = (LotteryDrawResult)rowObject;
182-
return p.GetWinners();
182+
return p.GetWinnersCount();
183183
};
184184
this.olvColWinStamp.AspectToStringConverter = delegate (object rowObject) {
185185
return String.Empty;
@@ -452,7 +452,7 @@ private void objListVwWinningNum_FormatRow(object sender, FormatRowEventArgs e)
452452
{
453453
if (e.Model == null) return;
454454
LotteryDrawResult result = (LotteryDrawResult)e.Model;
455-
if(result.GetWinners() > 0)
455+
if(result.GetWinnersCount() > 0)
456456
{
457457
e.Item.BackColor = Color.GreenYellow;
458458
e.Item.ForeColor = Color.Black;
@@ -554,6 +554,15 @@ private void selectAllToolStripMenuItem_Click(object sender, EventArgs e)
554554
objectLstVwLatestBet.SelectAll();
555555
}
556556
private void copySelectedAsLinearCSVToolStripMenuItem_Click(object sender, EventArgs e)
557+
{
558+
ObjectLstVwLatestBetClipboardCopy();
559+
}
560+
private void objectLstVwLatestBet_KeyUp(object sender, KeyEventArgs e)
561+
{
562+
if (e.Control && e.KeyCode == Keys.C) ObjectLstVwLatestBetClipboardCopy();
563+
if (e.Control && e.KeyCode == Keys.A) objectLstVwLatestBet.SelectAll();
564+
}
565+
private void ObjectLstVwLatestBetClipboardCopy()
557566
{
558567
try
559568
{
@@ -765,7 +774,7 @@ private void lotterySettingToolStripMenuItem_Click(object sender, EventArgs e)
765774
LotterySettingsFrm settings = new LotterySettingsFrm(lotteryDataServices);
766775
settings.ShowDialog(this);
767776
if(settings.IsSourceDatabaseChange) DoApplicationUpdate();
768-
RefreshBets();
777+
SetBetsAndResultDefaultList();
769778
}
770779
private void checkWinningBetsToolStripMenuItem_Click(object sender, EventArgs e)
771780
{
@@ -845,6 +854,7 @@ private void OnApplicationExit(object sender, EventArgs e)
845854
MessageBox.Show(ResourcesUtils.GetMessage("mainf_labels_45"));
846855
}
847856
}
857+
848858
private void exitToolStripMenuItem_Click(object sender, EventArgs e)
849859
{
850860
this.Close();
@@ -876,12 +886,10 @@ private void MainForm_HandleCreated(object sender, EventArgs e)
876886
{
877887
DoApplicationUpdate();
878888
}
879-
880889
private void DoApplicationUpdate()
881890
{
882891
this.applicationUpdateProcessor.StartUpdate(lotteryDataServices);
883892
}
884-
885893
#endregion
886894

887895
}

‎Forms/Others/HitComparisonFrm.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,13 @@ private void InitializesObjectListViewDataBinding()
202202
this.olvColDrawWinner.ImageGetter = delegate (object rowObject) {
203203
if (rowObject == null) return 0;
204204
LotteryDrawResult p = (LotteryDrawResult)rowObject;
205-
if (p.GetWinners() <= 0) return 0;
205+
if (p.GetWinnersCount() <= 0) return 0;
206206
return ImageUtils.GetStarJackpotImage(5);
207207
};
208208
this.olvColDrawWinner.AspectGetter = delegate (object rowObject) {
209209
if (rowObject == null) return 0;
210210
LotteryDrawResult p = (LotteryDrawResult)rowObject;
211-
return p.GetWinners();
211+
return p.GetWinnersCount();
212212
};
213213
this.olvColDrawWinner.AspectToStringConverter = delegate (object rowObject) {
214214
return String.Empty;

‎Forms/ProcessingStatusLogFrm.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,19 @@ private void ProcessingStatusLogFrm_Load(object sender, EventArgs e)
3737
richtbLogs.SelectionStart = 0;
3838
richtbLogs.SelectionLength = 0;
3939
richtbLogs.ScrollToCaret();
40+
richtbLogs.Refresh();
4041
}
4142
#endregion
4243

4344
#region Logging Functions
4445

4546
private void ProcessingStatusLogFrm_HandleCreated(object sender, EventArgs e)
4647
{
48+
int ctrRefresher = 0;
4749
foreach(String[] logsEntry in statusLogsDelayed)
4850
{
4951
AddStatusLogsDisplayOnTextBox(logsEntry[0], logsEntry[1], logsEntry[2]);
52+
if (ctrRefresher % 30 == 0) Application.DoEvents();
5053
}
5154
statusLogsDelayed.Clear();
5255
}
@@ -74,8 +77,6 @@ private void AddRichtextMessage(String message, Color color)
7477
richtbLogs.SelectionColor = color;
7578
richtbLogs.AppendText(message);
7679
richtbLogs.SelectionColor = richtbLogs.ForeColor;
77-
richtbLogs.ScrollToCaret();
78-
richtbLogs.Refresh();
7980
}
8081
public void ClearLogs()
8182
{

‎Forms/Ticket/AddBetFrm.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private void AddBetFrm_Load(object sender, EventArgs e)
8080
dtPickPreferredDate.Visible = false;
8181

8282
//select default if no selection
83-
if(cmbSeqGenType.SelectedItem == null) SelectedSequenceGenerator = GeneratorType.PERSONAL_PICK;
83+
if (cmbSeqGenType.SelectedItem == null) SelectedSequenceGenerator = GeneratorType.PERSONAL_PICK;
8484
}
8585
private void RefreshSelectedDrawDate()
8686
{
@@ -105,6 +105,8 @@ public GeneratorType SelectedSequenceGenerator
105105
private void btnExit_Click(object sender, EventArgs e)
106106
{
107107
this.Close();
108+
textBoxDelimitersInput.Text = String.Empty;
109+
ClearTicketLayoutSelection();
108110
if (!this.hasDataBeenSave) return;
109111
ClassReflectionUtil.RefreshMainFormBets(this);
110112
}
@@ -409,6 +411,10 @@ private void AddSelectedTicketPanelNumber(Button btnNumClicked = null)
409411
lblSelectedNumber.Text = numSelected;
410412
}
411413
private void linkLblClrSelNum_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
414+
{
415+
ClearTicketLayoutSelection();
416+
}
417+
private void ClearTicketLayoutSelection()
412418
{
413419
selTcktPnlNum.Clear();
414420
AddSelectedTicketPanelNumber();

‎Forms/Ticket/ModifyBetDateFrm.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,16 @@ private bool IsValidated()
153153
}
154154
else if (newDateTime.CompareTo(DateTime.Now.Date) == 0) //if the same
155155
{
156-
log(ResourcesUtils.GetMessage("mdd_form_validation_msg6"));
157-
return false;
156+
if (lotteryDataServices.IsPastTicketSellingCutoffTime())
157+
{
158+
DialogResult drPassCutOfftime = MessageBox.Show(ResourcesUtils.GetMessage("mdd_form_validation_msg8"),
159+
ResourcesUtils.GetMessage("mdd_form_others_mgs7"), MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
160+
if(drPassCutOfftime != DialogResult.OK)
161+
{
162+
log(ResourcesUtils.GetMessage("mdd_form_validation_msg6"));
163+
return false;
164+
}
165+
}
158166
}
159167
return true;
160168
}

0 commit comments

Comments
 (0)