diff --git a/WindowsFormsCore/Operations/DBRepo.cs b/WindowsFormsCore/Operations/DBRepo.cs
index 0a71802..dc41667 100644
--- a/WindowsFormsCore/Operations/DBRepo.cs
+++ b/WindowsFormsCore/Operations/DBRepo.cs
@@ -20,6 +20,7 @@ namespace WindowsFormsCore.Operations
numberRow.NumbersToKey();
var p = new DynamicParameters();
p.Add("@Id", numberRow.Id);
+ p.Add("@Number0", numberRow.Number0);
p.Add("@Number1", numberRow.Number1);
p.Add("@Number2", numberRow.Number2);
p.Add("@Number3", numberRow.Number3);
@@ -31,6 +32,7 @@ namespace WindowsFormsCore.Operations
string sql = @"insert into dbo.NumbersTable (
Id,
Created,
+ Number0,
Number1,
Number2,
Number3,
@@ -42,6 +44,7 @@ namespace WindowsFormsCore.Operations
values(
@Id,
@Created,
+ @Number0,
@Number1,
@Number2,
@Number3,
diff --git a/WindowsFormsCore/Program.cs b/WindowsFormsCore/Program.cs
index ac60464..7fa68cf 100644
--- a/WindowsFormsCore/Program.cs
+++ b/WindowsFormsCore/Program.cs
@@ -17,7 +17,7 @@ namespace WindowsFormsCore
Application.SetHighDpiMode(HighDpiMode.SystemAware);
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- Application.Run(new Form1());
+ Application.Run(new frmLottoView());
}
}
}
diff --git a/WindowsFormsCore/Form1.Designer.cs b/WindowsFormsCore/frmLottoView.Designer.cs
similarity index 97%
rename from WindowsFormsCore/Form1.Designer.cs
rename to WindowsFormsCore/frmLottoView.Designer.cs
index 97910b8..0ecf48f 100644
--- a/WindowsFormsCore/Form1.Designer.cs
+++ b/WindowsFormsCore/frmLottoView.Designer.cs
@@ -1,7 +1,7 @@
namespace WindowsFormsCore
{
- partial class Form1
+ partial class frmLottoView
{
///
/// Required designer variable.
@@ -29,7 +29,7 @@ namespace WindowsFormsCore
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmLottoView));
this.btnGenMotNr = new System.Windows.Forms.Button();
this.btnGenerate = new System.Windows.Forms.Button();
this.txtNr1 = new System.Windows.Forms.TextBox();
@@ -709,6 +709,8 @@ namespace WindowsFormsCore
//
// lvRows
//
+ this.lvRows.AccessibleRole = System.Windows.Forms.AccessibleRole.MenuBar;
+ this.lvRows.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.lvRows.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.colNum1,
this.colNum2,
@@ -717,13 +719,16 @@ namespace WindowsFormsCore
this.colNum5,
this.colNum6,
this.colNum7});
+ this.lvRows.ForeColor = System.Drawing.SystemColors.HotTrack;
this.lvRows.HideSelection = false;
this.lvRows.Location = new System.Drawing.Point(191, 114);
this.lvRows.Name = "lvRows";
+ this.lvRows.RightToLeftLayout = true;
this.lvRows.Size = new System.Drawing.Size(306, 176);
this.lvRows.TabIndex = 23;
this.lvRows.UseCompatibleStateImageBehavior = false;
this.lvRows.View = System.Windows.Forms.View.Details;
+ this.lvRows.DrawColumnHeader += new System.Windows.Forms.DrawListViewColumnHeaderEventHandler(this.lvRows_DrawColumnHeader);
//
// colNum1
//
@@ -735,36 +740,42 @@ namespace WindowsFormsCore
//
this.colNum2.Name = "colNum2";
this.colNum2.Text = "Nr 2";
+ this.colNum2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum2.Width = 43;
//
// colNum3
//
this.colNum3.Name = "colNum3";
this.colNum3.Text = "Nr 3";
+ this.colNum3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum3.Width = 43;
//
// colNum4
//
this.colNum4.Name = "colNum4";
this.colNum4.Text = "Nr 4";
+ this.colNum4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum4.Width = 43;
//
// colNum5
//
this.colNum5.Name = "colNum5";
this.colNum5.Text = "Nr 5";
+ this.colNum5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum5.Width = 43;
//
// colNum6
//
this.colNum6.Name = "colNum6";
this.colNum6.Text = "Nr 6";
+ this.colNum6.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum6.Width = 43;
//
// colNum7
//
this.colNum7.Name = "colNum7";
this.colNum7.Text = "Nr 7";
+ this.colNum7.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.colNum7.Width = 43;
//
// btnDwn
@@ -797,7 +808,7 @@ namespace WindowsFormsCore
this.btnlose.UseVisualStyleBackColor = true;
this.btnlose.Click += new System.EventHandler(this.btnlose_Click);
//
- // Form1
+ // frmLottoView
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -828,7 +839,7 @@ namespace WindowsFormsCore
this.Controls.Add(this.txtNr1);
this.Controls.Add(this.btnGenerate);
this.Controls.Add(this.btnGenMotNr);
- this.Name = "Form1";
+ this.Name = "frmLottoView";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Form1";
this.gpbInmata.ResumeLayout(false);
diff --git a/WindowsFormsCore/Form1.cs b/WindowsFormsCore/frmLottoView.cs
similarity index 80%
rename from WindowsFormsCore/Form1.cs
rename to WindowsFormsCore/frmLottoView.cs
index 52e10dc..b06b48b 100644
--- a/WindowsFormsCore/Form1.cs
+++ b/WindowsFormsCore/frmLottoView.cs
@@ -9,6 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using WindowsFormsCore.Domain;
using WindowsFormsCore.Operations;
namespace WindowsFormsCore
@@ -51,7 +52,7 @@ namespace WindowsFormsCore
x34 = 34,
x35 = 35
}
- public partial class Form1 : Form
+ public partial class frmLottoView : Form
{
Random rnd = new CryptoRandom(DateTime.Now.DayOfYear);
@@ -61,7 +62,7 @@ namespace WindowsFormsCore
private TextBox[] txtBGrp1 = new TextBox[7];
private TextBox[] txtBGrp2 = new TextBox[7];
- public Form1()
+ public frmLottoView()
{
InitializeComponent();
lotto = new Lotto(rnd);
@@ -209,17 +210,25 @@ namespace WindowsFormsCore
private void AddNumbersToList1()
{
- if(txtBGrp1.Any(tx => tx.Text.Length == 0))
+ var colWidth = lvRows.Width / 7;
+ for (int i = 0; i < lvRows.Columns.Count; i++)
+ {
+ lvRows.Columns[i].Width = colWidth;
+ }
+ lvRows.Refresh();
+ if (txtBGrp1.Any(tx => tx.Text.Length == 0))
{
return;
}
ListViewItem lvRow = new ListViewItem(txtBGrp1[0].Text);
- for(int i = 1; i < txtBGrp1.Length;i++)
+ for (int i = 1; i < txtBGrp1.Length; i++)
{
lvRow.SubItems.Add(txtBGrp1[i].Text);
}
lvRows.Items.Add(lvRow);
+ SaveGeneratedRow(txtBGrp1);
}
+
private void AddNumbersToList2()
{
if (txtBGrp2.Any(tx => tx.Text.Length == 0))
@@ -232,8 +241,20 @@ namespace WindowsFormsCore
lvRow.SubItems.Add(txtBGrp2[i].Text);
}
lvRows.Items.Add(lvRow);
+ SaveGeneratedRow(txtBGrp2);
+ }
+ private void SaveGeneratedRow(TextBox[] rowTab)
+ {
+ var row = new NumberRow();
+ row.Number0 = byte.Parse(rowTab[0].Text);
+ row.Number1 = byte.Parse(rowTab[1].Text);
+ row.Number2 = byte.Parse(rowTab[2].Text);
+ row.Number3 = byte.Parse(rowTab[3].Text);
+ row.Number4 = byte.Parse(rowTab[4].Text);
+ row.Number5 = byte.Parse(rowTab[5].Text);
+ row.Number6 = byte.Parse(rowTab[6].Text);
+ DBRepo.SaveNumberRow(row);
}
-
private void btnDwn_Click(object sender, EventArgs e)
{
AddNumbersToList1();
@@ -248,5 +269,20 @@ namespace WindowsFormsCore
{
this.Close();
}
+
+ private void lvRows_DrawColumnHeader(object sender, DrawListViewColumnHeaderEventArgs e)
+ {
+ using (var sf = new StringFormat())
+ {
+ sf.Alignment = StringAlignment.Center;
+
+ using (var headerFont = new Font("Microsoft Sans Serif", 9, FontStyle.Bold))
+ {
+ e.Graphics.FillRectangle(Brushes.AliceBlue, e.Bounds);
+ e.Graphics.DrawString(e.Header.Text, headerFont,
+ Brushes.Black, e.Bounds, sf);
+ }
+ }
+ }
}
}
diff --git a/WindowsFormsCore/Form1.resx b/WindowsFormsCore/frmLottoView.resx
similarity index 68%
rename from WindowsFormsCore/Form1.resx
rename to WindowsFormsCore/frmLottoView.resx
index 9c1cc11..92a980c 100644
--- a/WindowsFormsCore/Form1.resx
+++ b/WindowsFormsCore/frmLottoView.resx
@@ -225,116 +225,11 @@
True
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wQAADsEBuJFr7QAAALxJREFUOE/dkbENwkAMRTMKIyClzxpp2SALZICsQINSI6VFikTDCBEVPQOkutbc
+ vAAADrwBlbxySQAAALxJREFUOE/dkbENwkAMRTMKIyClzxpp2SALZICsQINSI6VFikTDCBEVPQOkutbc
O8mRLxgEoqN4cuz7/zUpROQn3OM3uEcIIYiyfrO4R6BY7st/EsS5se9KtsRQTyGyZapA90hv85CVp/sk
3aUjOFMwgrk5NcI7uVcCGW9jKrXnNhVVwF4dKhXEuC9IkuE6pGJ9rBeZLZN7J8gksC6DKwANEEbilcF2
sgVMUP8I0y3D0wFMYWe+3ax7/BwpHj+xC45fZcSfAAAAAElFTkSuQmCC
@@ -343,7 +238,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wQAADsEBuJFr7QAAALxJREFUOE/dkbENwkAMRTMKIyClzxpp2SALZICsQINSI6VFikTDCBEVPQOkutbc
+ vAAADrwBlbxySQAAALxJREFUOE/dkbENwkAMRTMKIyClzxpp2SALZICsQINSI6VFikTDCBEVPQOkutbc
O8mRLxgEoqN4cuz7/zUpROQn3OM3uEcIIYiyfrO4R6BY7st/EsS5se9KtsRQTyGyZapA90hv85CVp/sk
3aUjOFMwgrk5NcI7uVcCGW9jKrXnNhVVwF4dKhXEuC9IkuE6pGJ9rBeZLZN7J8gksC6DKwANEEbilcF2
sgVMUP8I0y3D0wFMYWe+3ax7/BwpHj+xC45fZcSfAAAAAElFTkSuQmCC
diff --git a/WpfDemo/WpfDemo.csproj b/WpfDemo/WpfDemo.csproj
index 562e7c3..31cfbf1 100644
--- a/WpfDemo/WpfDemo.csproj
+++ b/WpfDemo/WpfDemo.csproj
@@ -1,4 +1,4 @@
-
+
WinExe