Skip to content

Codecrew / Moya Info Tools

Go to a project
Commit 19a24f7e by Liv Haapala
Options

update

1 parent e8fe2cb7
Inline Side-by-side
Showing with 218 additions and 81 deletions
Cloakroom/Cloakroom/Form1.Designer.cs
...@@ -44,13 +44,14 @@ ...@@ -44,13 +44,14 @@
this.luggagesListView = new System.Windows.Forms.ListView(); this.luggagesListView = new System.Windows.Forms.ListView();
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.luggagesListContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.luggagesListContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.releaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.releaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.luggaageDescriptionTextBox = new System.Windows.Forms.TextBox(); this.luggaageDescriptionTextBox = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.eventUserEditor = new MoyaAdminLib.Controls.EventUserEditor(); this.eventUserEditor = new MoyaAdminLib.Controls.EventUserEditor();
this.barcodeFocusTimer = new System.Windows.Forms.Timer(this.components);
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).BeginInit();
this.luggagesListContextMenuStrip.SuspendLayout(); this.luggagesListContextMenuStrip.SuspendLayout();
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
this.barcodeTextBox.Size = new System.Drawing.Size(740, 20); this.barcodeTextBox.Size = new System.Drawing.Size(740, 20);
this.barcodeTextBox.TabIndex = 1; this.barcodeTextBox.TabIndex = 1;
this.barcodeTextBox.TextChanged += new System.EventHandler(this.barcodeTextBox_TextChanged); this.barcodeTextBox.TextChanged += new System.EventHandler(this.barcodeTextBox_TextChanged);
this.barcodeTextBox.Leave += new System.EventHandler(this.barcodeTextBox_Leave);
// //
// label1 // label1
// //
...@@ -167,16 +169,22 @@ ...@@ -167,16 +169,22 @@
this.luggagesListView.TabIndex = 4; this.luggagesListView.TabIndex = 4;
this.luggagesListView.UseCompatibleStateImageBehavior = false; this.luggagesListView.UseCompatibleStateImageBehavior = false;
this.luggagesListView.View = System.Windows.Forms.View.Details; this.luggagesListView.View = System.Windows.Forms.View.Details;
this.luggagesListView.Enter += new System.EventHandler(this.luggagesListView_Enter);
// //
// columnHeader3 // columnHeader3
// //
this.columnHeader3.Text = "Date"; this.columnHeader3.Text = "Date";
this.columnHeader3.Width = 73; this.columnHeader3.Width = 85;
// //
// columnHeader4 // columnHeader4
// //
this.columnHeader4.Text = "Description"; this.columnHeader4.Text = "Description";
this.columnHeader4.Width = 96; this.columnHeader4.Width = 102;
//
// columnHeader5
//
this.columnHeader5.Text = "Code";
this.columnHeader5.Width = 108;
// //
// luggagesListContextMenuStrip // luggagesListContextMenuStrip
// //
...@@ -210,6 +218,7 @@ ...@@ -210,6 +218,7 @@
this.luggaageDescriptionTextBox.Name = "luggaageDescriptionTextBox"; this.luggaageDescriptionTextBox.Name = "luggaageDescriptionTextBox";
this.luggaageDescriptionTextBox.Size = new System.Drawing.Size(165, 20); this.luggaageDescriptionTextBox.Size = new System.Drawing.Size(165, 20);
this.luggaageDescriptionTextBox.TabIndex = 9; this.luggaageDescriptionTextBox.TabIndex = 9;
this.luggaageDescriptionTextBox.TextChanged += new System.EventHandler(this.luggaageDescriptionTextBox_TextChanged);
// //
// groupBox1 // groupBox1
// //
...@@ -225,11 +234,6 @@ ...@@ -225,11 +234,6 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Selected user"; this.groupBox1.Text = "Selected user";
// //
// columnHeader5
//
this.columnHeader5.Text = "Code";
this.columnHeader5.Width = 108;
//
// eventUserEditor // eventUserEditor
// //
this.eventUserEditor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.eventUserEditor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -238,6 +242,12 @@ ...@@ -238,6 +242,12 @@
this.eventUserEditor.Name = "eventUserEditor"; this.eventUserEditor.Name = "eventUserEditor";
this.eventUserEditor.Size = new System.Drawing.Size(297, 133); this.eventUserEditor.Size = new System.Drawing.Size(297, 133);
this.eventUserEditor.TabIndex = 2; this.eventUserEditor.TabIndex = 2;
this.eventUserEditor.Enter += new System.EventHandler(this.eventUserEditor_Enter);
//
// barcodeFocusTimer
//
this.barcodeFocusTimer.Interval = 6000;
this.barcodeFocusTimer.Tick += new System.EventHandler(this.barcodeFocusTimer_Tick);
// //
// Form1 // Form1
// //
...@@ -288,6 +298,7 @@ ...@@ -288,6 +298,7 @@
private System.Windows.Forms.TextBox luggaageDescriptionTextBox; private System.Windows.Forms.TextBox luggaageDescriptionTextBox;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ColumnHeader columnHeader5; private System.Windows.Forms.ColumnHeader columnHeader5;
private System.Windows.Forms.Timer barcodeFocusTimer;
} }
} }
Cloakroom/Cloakroom/Form1.cs
...@@ -85,6 +85,7 @@ namespace Cloakroom ...@@ -85,6 +85,7 @@ namespace Cloakroom
private void submitButton_Click(object sender, EventArgs e) private void submitButton_Click(object sender, EventArgs e)
{ {
barcodeFocusTimer.Start();
string ret = ""; string ret = "";
string code = getUniqueCode(); string code = getUniqueCode();
...@@ -266,13 +267,25 @@ namespace Cloakroom ...@@ -266,13 +267,25 @@ namespace Cloakroom
break; break;
} }
} }
if(remove != null) if (remove != null)
luggagesListView.Items.Remove(remove); luggagesListView.Items.Remove(remove);
addMessageToListView("Luggage released for person " + eventUserEditor.GetName()); addMessageToListView("Luggage released for person " + eventUserEditor.GetName());
} }
else
{
MessageBox.Show("No luggage found for code " + barcodeTextBox.Text + " for person " + selectedCard.wholeName + ". Do not release luggage!");
}
}
else
{
MessageBox.Show("No luggage found for code " + barcodeTextBox.Text + " for person " + selectedCard.wholeName + ". Do not release luggage!");
} }
} }
else if (barcodeTextBox.Text.Length == 8 && selectedCard == null)
addMessageToListView("Enter barcode from card first!");
else
addMessageToListView("Barcode not regognized.");
barcodeTextBox.Text = ""; barcodeTextBox.Text = "";
} }
...@@ -324,6 +337,32 @@ namespace Cloakroom ...@@ -324,6 +337,32 @@ namespace Cloakroom
} }
} }
private void barcodeFocusTimer_Tick(object sender, EventArgs e)
{
barcodeFocusTimer.Stop();
barcodeTextBox.Focus();
}
private void barcodeTextBox_Leave(object sender, EventArgs e)
{
barcodeFocusTimer.Start();
}
private void eventUserEditor_Enter(object sender, EventArgs e)
{
barcodeFocusTimer.Start();
}
private void luggagesListView_Enter(object sender, EventArgs e)
{
barcodeFocusTimer.Start();
}
private void luggaageDescriptionTextBox_TextChanged(object sender, EventArgs e)
{
barcodeFocusTimer.Start();
}
} }
......
Cloakroom/Cloakroom/Form1.resx
...@@ -139,4 +139,7 @@ ...@@ -139,4 +139,7 @@
<metadata name="luggagesListContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="luggagesListContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>366, 17</value> <value>366, 17</value>
</metadata> </metadata>
<metadata name="barcodeFocusTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>585, 17</value>
</metadata>
</root> </root>
\ No newline at end of file
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
this.cardLocationInputToolStripButton = new System.Windows.Forms.ToolStripButton(); this.cardLocationInputToolStripButton = new System.Windows.Forms.ToolStripButton();
this.incomingFormToolStripButton = new System.Windows.Forms.ToolStripButton(); this.incomingFormToolStripButton = new System.Windows.Forms.ToolStripButton();
this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton(); this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.TopPanel = new System.Windows.Forms.Panel(); this.TopPanel = new System.Windows.Forms.Panel();
this.searchTextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.MapsComboBox = new System.Windows.Forms.ComboBox(); this.MapsComboBox = new System.Windows.Forms.ComboBox();
this.searchTextBox = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.searchTimer = new System.Windows.Forms.Timer(this.components); this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components); this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
this.cardLocationInputToolStripButton, this.cardLocationInputToolStripButton,
this.incomingFormToolStripButton, this.incomingFormToolStripButton,
this.cardInfoToolStripButton, this.cardInfoToolStripButton,
this.toolStripButton2, this.orgMealToolStripButton,
this.toolStripButton3}); this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
...@@ -241,14 +241,15 @@ ...@@ -241,14 +241,15 @@
this.cardInfoToolStripButton.Text = "Kortin tiedot"; this.cardInfoToolStripButton.Text = "Kortin tiedot";
this.cardInfoToolStripButton.Click += new System.EventHandler(this.cardInfoToolStripButton_Click); this.cardInfoToolStripButton.Click += new System.EventHandler(this.cardInfoToolStripButton_Click);
// //
// toolStripButton2 // orgMealToolStripButton
// //
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.orgMealToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); this.orgMealToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("orgMealToolStripButton.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.orgMealToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2"; this.orgMealToolStripButton.Name = "orgMealToolStripButton";
this.toolStripButton2.Size = new System.Drawing.Size(23, 22); this.orgMealToolStripButton.Size = new System.Drawing.Size(23, 22);
this.toolStripButton2.Text = "Ruokailutilasto"; this.orgMealToolStripButton.Text = "Ruokailutilasto";
this.orgMealToolStripButton.Click += new System.EventHandler(this.orgMealToolStripButton_Click);
// //
// toolStripButton3 // toolStripButton3
// //
...@@ -269,16 +270,6 @@ ...@@ -269,16 +270,6 @@
this.TopPanel.Size = new System.Drawing.Size(752, 45); this.TopPanel.Size = new System.Drawing.Size(752, 45);
this.TopPanel.TabIndex = 15; this.TopPanel.TabIndex = 15;
// //
// searchTextBox
//
this.searchTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.searchTextBox.Location = new System.Drawing.Point(6, 21);
this.searchTextBox.Name = "searchTextBox";
this.searchTextBox.Size = new System.Drawing.Size(314, 20);
this.searchTextBox.TabIndex = 7;
this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
//
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
...@@ -298,6 +289,16 @@ ...@@ -298,6 +289,16 @@
this.MapsComboBox.TabIndex = 5; this.MapsComboBox.TabIndex = 5;
this.MapsComboBox.SelectedIndexChanged += new System.EventHandler(this.MapsComboBox_SelectedIndexChanged); this.MapsComboBox.SelectedIndexChanged += new System.EventHandler(this.MapsComboBox_SelectedIndexChanged);
// //
// searchTextBox
//
this.searchTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.searchTextBox.Location = new System.Drawing.Point(6, 21);
this.searchTextBox.Name = "searchTextBox";
this.searchTextBox.Size = new System.Drawing.Size(314, 20);
this.searchTextBox.TabIndex = 7;
this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
//
// panel1 // panel1
// //
this.panel1.Controls.Add(this.searchTextBox); this.panel1.Controls.Add(this.searchTextBox);
...@@ -378,7 +379,7 @@ ...@@ -378,7 +379,7 @@
private System.Windows.Forms.ToolStripButton cardLocationInputToolStripButton; private System.Windows.Forms.ToolStripButton cardLocationInputToolStripButton;
private System.Windows.Forms.ToolStripButton incomingFormToolStripButton; private System.Windows.Forms.ToolStripButton incomingFormToolStripButton;
private System.Windows.Forms.ToolStripButton cardInfoToolStripButton; private System.Windows.Forms.ToolStripButton cardInfoToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripButton orgMealToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripButton UnlockToolStripButton; private System.Windows.Forms.ToolStripButton UnlockToolStripButton;
private System.Windows.Forms.TextBox searchTextBox; private System.Windows.Forms.TextBox searchTextBox;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
...@@ -1168,8 +1168,14 @@ namespace MoyaAdminUI ...@@ -1168,8 +1168,14 @@ namespace MoyaAdminUI
private void MainForm_SizeChanged(object sender, EventArgs e) private void MainForm_SizeChanged(object sender, EventArgs e)
{ {
}
private void orgMealToolStripButton_Click(object sender, EventArgs e)
{
OrgMealCounter frm = new OrgMealCounter();
frm.Show();
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
...@@ -171,39 +171,39 @@ ...@@ -171,39 +171,39 @@
<data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
RbvVAAAAAElFTkSuQmCC CD8AAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
</value> </value>
</data> </data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -237,23 +237,23 @@ ...@@ -237,23 +237,23 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
YZiwP1wkqe371DsXAAAAAElFTkSuQmCC CfgDMl6p29Sh7gQAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/OrgMealCounter.Designer.cs
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
this.amountsPerDayListView.Size = new System.Drawing.Size(580, 97); this.amountsPerDayListView.Size = new System.Drawing.Size(580, 97);
this.amountsPerDayListView.TabIndex = 2; this.amountsPerDayListView.TabIndex = 2;
this.amountsPerDayListView.UseCompatibleStateImageBehavior = false; this.amountsPerDayListView.UseCompatibleStateImageBehavior = false;
this.amountsPerDayListView.View = System.Windows.Forms.View.Details;
// //
// amountsPerPersonListView // amountsPerPersonListView
// //
...@@ -67,6 +68,7 @@ ...@@ -67,6 +68,7 @@
this.amountsPerPersonListView.Size = new System.Drawing.Size(580, 248); this.amountsPerPersonListView.Size = new System.Drawing.Size(580, 248);
this.amountsPerPersonListView.TabIndex = 3; this.amountsPerPersonListView.TabIndex = 3;
this.amountsPerPersonListView.UseCompatibleStateImageBehavior = false; this.amountsPerPersonListView.UseCompatibleStateImageBehavior = false;
this.amountsPerPersonListView.View = System.Windows.Forms.View.Details;
// //
// OrgMealCounter // OrgMealCounter
// //
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/OrgMealCounter.cs
...@@ -53,15 +53,18 @@ namespace MoyaAdminUI ...@@ -53,15 +53,18 @@ namespace MoyaAdminUI
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
Dictionary<DateTime, int> amountsPerDay = new Dictionary<DateTime, int>(); Dictionary<DateTime, int> amountsPerDay = new Dictionary<DateTime, int>();
Dictionary<Eventuser, Dictionary<DateTime, int>> amountsPerPersonPerDay = new Dictionary<Eventuser, Dictionary<DateTime, int>>();
Dictionary<Eventuser, int> amountsPerPerson = new Dictionary<Eventuser, int>();
int totalAmount = 0; int totalAmount = 0;
try try
{ {
ret = client.MakeRequest("reader/readerevents/" + reader.readerId + "/0"); ret = client.MakeRequest("reader/readerevents/" + reader.readerId + "/-1");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
ReaderEventList events = ser.Deserialize<ReaderEventList>(ret); ReaderEventList events = ser.Deserialize<ReaderEventList>(ret);
if (events != null && events.readerEvents != null) if (events != null && events.readerEvents != null)
{ {
events.readerEvents = events.readerEvents.OrderBy(r => r.readerEventTime).ToList();
foreach (ReaderEvent re in events.readerEvents) foreach (ReaderEvent re in events.readerEvents)
{ {
DateTime date = re.readerEventTime.Date; DateTime date = re.readerEventTime.Date;
...@@ -70,19 +73,90 @@ namespace MoyaAdminUI ...@@ -70,19 +73,90 @@ namespace MoyaAdminUI
else else
amountsPerDay.Add(date, 1); amountsPerDay.Add(date, 1);
totalAmount++; totalAmount++;
if(re.eventuser != null) {
if (amountsPerPersonPerDay.Keys.Contains(re.eventuser))
{
if (amountsPerPersonPerDay[re.eventuser].Keys.Contains(date))
amountsPerPersonPerDay[re.eventuser][date] += 1;
else
amountsPerPersonPerDay[re.eventuser].Add(date, 1);
}
else
{
amountsPerPersonPerDay.Add(re.eventuser, new Dictionary<DateTime, int>());
amountsPerPersonPerDay[re.eventuser].Add(date, 1);
}
if (amountsPerPerson.Keys.Contains(re.eventuser))
amountsPerPerson[re.eventuser] += 1;
else
amountsPerPerson.Add(re.eventuser, 1);
}
} }
amountsPerDayListView.BeginUpdate();
amountsPerDayListView.Columns.Clear();
amountsPerDayListView.Items.Clear();
ColumnHeader header;
foreach (DateTime date in amountsPerDay.Keys) foreach (DateTime date in amountsPerDay.Keys)
{ {
amountsPerDayListView.Columns.Add(new ColumnHeader(date.ToShortDateString())); header = new ColumnHeader();
header.Text = date.ToShortDateString();
amountsPerDayListView.Columns.Add(header);
} }
amountsPerDayListView.Columns.Add(new ColumnHeader("Yhteensä")); ColumnHeader headerSum = new ColumnHeader();
ListViewItem lvi = new ListViewItem(); headerSum.Text = "Total amount";
amountsPerDayListView.Columns.Add(headerSum);
ListViewItem lvi = null;
foreach (DateTime date in amountsPerDay.Keys)
{
if(lvi == null)
lvi = new ListViewItem(amountsPerDay[date].ToString());
else
lvi.SubItems.Add(amountsPerDay[date].ToString());
}
if (lvi != null)
{
lvi.SubItems.Add(totalAmount.ToString());
amountsPerDayListView.Items.Add(lvi);
}
amountsPerDayListView.EndUpdate();
List<ColumnHeader> headers = new List<ColumnHeader>();
amountsPerPersonListView.BeginUpdate();
amountsPerPersonListView.Columns.Clear();
header = new ColumnHeader();
header.Text = "Name";
headers.Add(header);
foreach (DateTime date in amountsPerDay.Keys) foreach (DateTime date in amountsPerDay.Keys)
{ {
lvi.SubItems.Add(amountsPerDay[date].ToString()); header = new ColumnHeader();
header.Text = date.ToShortDateString();
headers.Add(header);
} }
lvi.SubItems.Add(totalAmount.ToString()); header = new ColumnHeader();
header.Text = "Total amount";
headers.Add(header);
amountsPerPersonListView.Columns.AddRange(headers.ToArray());
foreach (Eventuser user in amountsPerPersonPerDay.Keys)
{
lvi = new ListViewItem(user.firstname + " " + user.lastname);
foreach (DateTime date in amountsPerDay.Keys)
{
if (amountsPerPersonPerDay[user].Keys.Contains(date))
lvi.SubItems.Add(amountsPerPersonPerDay[user][date].ToString());
else
lvi.SubItems.Add("0");
}
lvi.SubItems.Add(amountsPerPerson[user].ToString());
amountsPerPersonListView.Items.Add(lvi);
}
amountsPerPersonListView.EndUpdate();
} }
} }
catch (Exception ex) catch (Exception ex)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!