Skip to content

Joona Romppanen / Moya Info Tools

Go to a project
Commit 6ad9cff1 by Tapio Haapala
Options

viilailuja

1 parent b180fb00
Expand all
Inline Side-by-side
Showing with 50 additions and 26 deletions
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Card.cs
......@@ -36,5 +36,7 @@ namespace MoyaAdminLib
return false;
}
}
}
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
......@@ -48,12 +48,11 @@
this.cardLocationInputToolStripButton = new System.Windows.Forms.ToolStripButton();
this.incomingFormToolStripButton = new System.Windows.Forms.ToolStripButton();
this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.TopPanel = new System.Windows.Forms.Panel();
this.searchTextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.MapsComboBox = new System.Windows.Forms.ComboBox();
this.searchTextBox = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
......@@ -140,14 +139,13 @@
this.toolStripSaveButton,
this.toolStripRefreshButton,
this.UnlockToolStripButton,
this.usersToolStripPrintButton,
this.toolStripSeparator1,
this.toolStripButton1,
this.usersToolStripPrintButton,
this.cardLocationInputToolStripButton,
this.incomingFormToolStripButton,
this.cardInfoToolStripButton,
this.toolStripButton2,
this.toolStripButton3});
this.toolStripButton3,
this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1078, 25);
......@@ -203,6 +201,7 @@
//
// toolStripButton1
//
this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
......@@ -241,15 +240,6 @@
this.cardInfoToolStripButton.Text = "Kortin tiedot";
this.cardInfoToolStripButton.Click += new System.EventHandler(this.cardInfoToolStripButton_Click);
//
// toolStripButton2
//
this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(23, 22);
this.toolStripButton2.Text = "Ruokailutilasto";
//
// toolStripButton3
//
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
......@@ -269,16 +259,6 @@
this.TopPanel.Size = new System.Drawing.Size(752, 45);
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
//
this.label3.AutoSize = true;
......@@ -298,6 +278,16 @@
this.MapsComboBox.TabIndex = 5;
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
//
this.panel1.Controls.Add(this.searchTextBox);
......@@ -378,7 +368,6 @@
private System.Windows.Forms.ToolStripButton cardLocationInputToolStripButton;
private System.Windows.Forms.ToolStripButton incomingFormToolStripButton;
private System.Windows.Forms.ToolStripButton cardInfoToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripButton UnlockToolStripButton;
private System.Windows.Forms.TextBox searchTextBox;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
......@@ -1171,6 +1171,7 @@ namespace MoyaAdminUI
}
}
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/UsersFinderForm.cs
......@@ -100,6 +100,38 @@ namespace MoyaAdminUI
Card card = ser.Deserialize<Card>(json);
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
CardState.Text = card.state;
/*
if (card.state == Card.CARD_STATE_PRINTED)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
try
{
json = client.MakeRequest("meta/v1/printedcard/" + card.cardId + "/card-filing");
}
catch (ApplicationException ex)
{
if (!ex.Message.Contains("HTTP NoContent"))
return;
}
if (json != null && json != "")
{
MetaData data = getValue(json);
int bookNumber = 0;
int pageNumber = 0;
int slotNumber = 0;
getCardPlace(data, out bookNumber, out pageNumber, out slotNumber);
if (bookNumber > 0)
bookNumericUpDown.Value = bookNumber;
if (pageNumber > 0)
pageNumericUpDown.Value = pageNumber;
if (slotNumber > 0)
slotNumericUpDown.Value = slotNumber;
}
}
* */
}
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!