Skip to content

Codecrew / Moya Info Tools

Go to a project
Commit f7f8c306 by Liv Haapala
Options

no message

1 parent 330bb628
Inline Side-by-side
Showing with 427 additions and 233 deletions
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Form1.Designer.cs
......@@ -28,12 +28,15 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
this.label4 = new System.Windows.Forms.Label();
this.PortsComboBox = new System.Windows.Forms.ComboBox();
this.status = new System.Windows.Forms.TextBox();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.settingsToolStripButton = new System.Windows.Forms.ToolStripButton();
this.barcodeTextBox = new System.Windows.Forms.TextBox();
this.barcodeTimer = new System.Windows.Forms.Timer(this.components);
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
......@@ -53,7 +56,7 @@
this.PortsComboBox.FormattingEnabled = true;
this.PortsComboBox.Location = new System.Drawing.Point(12, 47);
this.PortsComboBox.Name = "PortsComboBox";
this.PortsComboBox.Size = new System.Drawing.Size(310, 21);
this.PortsComboBox.Size = new System.Drawing.Size(336, 21);
this.PortsComboBox.TabIndex = 15;
this.PortsComboBox.SelectedIndexChanged += new System.EventHandler(this.PortsComboBox_SelectedIndexChanged);
//
......@@ -62,11 +65,11 @@
this.status.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.status.Location = new System.Drawing.Point(12, 74);
this.status.Location = new System.Drawing.Point(12, 102);
this.status.Multiline = true;
this.status.Name = "status";
this.status.ReadOnly = true;
this.status.Size = new System.Drawing.Size(310, 226);
this.status.Size = new System.Drawing.Size(336, 294);
this.status.TabIndex = 17;
//
// toolStrip1
......@@ -75,7 +78,7 @@
this.settingsToolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(337, 25);
this.toolStrip1.Size = new System.Drawing.Size(363, 25);
this.toolStrip1.TabIndex = 18;
this.toolStrip1.Text = "toolStrip1";
//
......@@ -89,11 +92,27 @@
this.settingsToolStripButton.Text = "Api Settings";
this.settingsToolStripButton.Click += new System.EventHandler(this.settingsToolStripButton_Click);
//
// barcodeTextBox
//
this.barcodeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.barcodeTextBox.Location = new System.Drawing.Point(13, 75);
this.barcodeTextBox.Name = "barcodeTextBox";
this.barcodeTextBox.Size = new System.Drawing.Size(335, 20);
this.barcodeTextBox.TabIndex = 19;
this.barcodeTextBox.TextChanged += new System.EventHandler(this.barcodeTextBox_TextChanged);
//
// barcodeTimer
//
this.barcodeTimer.Interval = 500;
this.barcodeTimer.Tick += new System.EventHandler(this.barcodeTimer_Tick);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(337, 312);
this.ClientSize = new System.Drawing.Size(363, 408);
this.Controls.Add(this.barcodeTextBox);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.status);
this.Controls.Add(this.label4);
......@@ -117,6 +136,8 @@
private System.Windows.Forms.TextBox status;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton settingsToolStripButton;
private System.Windows.Forms.TextBox barcodeTextBox;
private System.Windows.Forms.Timer barcodeTimer;
}
}
......
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Form1.cs
......@@ -90,5 +90,35 @@ namespace BarcodeScannerClient
ApiSettings frm = new ApiSettings();
frm.ShowDialog();
}
private void barcodeTextBox_TextChanged(object sender, EventArgs e)
{
if (barcodeTextBox.Text != "")
barcodeTimer.Enabled = true;
}
private void barcodeTimer_Tick(object sender, EventArgs e)
{
barcodeTimer.Enabled = false;
if (barcodeTextBox.Text != "")
{
string url = Properties.Settings.Default.ApiURL.Replace("%", barcodeTextBox.Text.Trim());
BarcodeRestClient client = new BarcodeRestClient(url);
try
{
ret = client.MakeRequest();
}
catch (Exception ex)
{
ret = ex.Message;
}
setRet();
}
barcodeTextBox.Text = "";
}
}
}
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Form1.resx
......@@ -130,6 +130,9 @@
PKycdQEAAAAASUVORK5CYII=
</value>
</data>
<metadata name="barcodeTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>122, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAkAMDAQAAAAAABoBgAAlgAAACAgEAAAAAAA6AIAAP4GAAAQEBAAAAAAACgBAADmCQAAMDAAAAEA
......
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/app.config
......@@ -22,6 +22,9 @@
<setting name="ApiPass" serializeAs="String">
<value />
</setting>
<setting name="ApplicationVersion" serializeAs="String">
<value />
</setting>
</BarcodeScannerClient.Properties.Settings>
</userSettings>
</configuration>
\ No newline at end of file
BarcodeScannerClient/BarcodeScannerClient/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "BarcodeScannerClient moya v1_00_00"
Name "BarcodeScannerClient moya v1_00_06"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!BarcodeScannerClient moya stable v1_00_00" SecMain
Section "!BarcodeScannerClient moya stable v1_00_06" SecMain
SetShellVarContext current
......@@ -224,8 +224,10 @@ Section "!BarcodeScannerClient moya stable v1_00_00" SecMain
; that is referenced to the main project.
File "I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.pdb"
File "I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.pdb"
......@@ -313,8 +315,10 @@ Section "Uninstall"
; that is referenced to the main project.
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.pdb"
......
CardDisplay/CardDisplay/CardDisplay/CardDisplay.csproj
......@@ -35,8 +35,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoUpdateLib">
<HintPath>..\..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\AutoUpdate\src\AutoUpdateLib\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference>
<Reference Include="MoyaAdminLib">
<HintPath>..\..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath>
......
CardDisplay/CardDisplay/CardDisplay/Forms/Form1.Designer.cs
......@@ -123,17 +123,17 @@
//
// slot1Timer
//
this.slot1Timer.Interval = 1000;
this.slot1Timer.Interval = 500;
this.slot1Timer.Tick += new System.EventHandler(this.slot1Timer_Tick);
//
// slot2Timer
//
this.slot2Timer.Interval = 1000;
this.slot2Timer.Interval = 500;
this.slot2Timer.Tick += new System.EventHandler(this.slot2Timer_Tick);
//
// slot3Timer
//
this.slot3Timer.Interval = 1000;
this.slot3Timer.Interval = 500;
this.slot3Timer.Tick += new System.EventHandler(this.slot3Timer_Tick);
//
// prevSlot1Button
......
CardDisplay/CardDisplay/CardDisplay/Forms/Form1.cs
......@@ -161,9 +161,11 @@ namespace CardDisplay
var ser = new JavaScriptSerializer();
ReaderEventList events = ser.Deserialize<ReaderEventList>(ret);
events.readerEvents = events.readerEvents.OrderBy(r => r.readerEventTime).ToList();
events.readerEvents = events.readerEvents.OrderByDescending(r => r.readerEventTime).ToList();
foreach (ReaderEvent re in events.readerEvents)
{
if (re.eventuser != null && pictureBox1.Tag != null && pictureBox1.Tag is Eventuser && ((Eventuser)pictureBox1.Tag).eventuserId == re.eventuser.eventuserId)
continue;
if (re.eventuser != null)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
......@@ -185,11 +187,15 @@ namespace CardDisplay
MetaData data = getValue(ret);
if(data != null)
cardPlaceLabel1.Text = data.value;
}
}else
cardPlaceLabel1.Text = "0.0.0";
slot1ReaderEventId = re.readerEventId;
slot1Cards.Add(card);
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + re.printedCardId);
slot1SelectedCard = card;
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox1.Tag = re.eventuser;
slot1SelectedCard = card;
break;
}
}
}
......@@ -213,9 +219,11 @@ namespace CardDisplay
var ser = new JavaScriptSerializer();
ReaderEventList events = ser.Deserialize<ReaderEventList>(ret);
events.readerEvents = events.readerEvents.OrderBy(r => r.readerEventTime).ToList();
events.readerEvents = events.readerEvents.OrderByDescending(r => r.readerEventTime).ToList();
foreach (ReaderEvent re in events.readerEvents)
{
if (re.eventuser != null && pictureBox2.Tag != null && pictureBox2.Tag is Eventuser && ((Eventuser)pictureBox2.Tag).eventuserId == re.eventuser.eventuserId)
continue;
if (re.eventuser != null)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
......@@ -236,12 +244,17 @@ namespace CardDisplay
{
MetaData data = getValue(ret);
if (data != null)
cardPlaceLabel1.Text = data.value;
cardPlaceLabel2.Text = data.value;
}
else
cardPlaceLabel1.Text = "0.0.0";
slot2ReaderEventId = re.readerEventId;
slot2Cards.Add(card);
pictureBox2.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox2.Tag = re.eventuser;
slot2SelectedCard = card;
break;
}
}
}
......@@ -264,9 +277,11 @@ namespace CardDisplay
var ser = new JavaScriptSerializer();
ReaderEventList events = ser.Deserialize<ReaderEventList>(ret);
events.readerEvents = events.readerEvents.OrderBy(r => r.readerEventTime).ToList();
events.readerEvents = events.readerEvents.OrderByDescending(r => r.readerEventTime).ToList();
foreach (ReaderEvent re in events.readerEvents)
{
if (re.eventuser != null && pictureBox3.Tag != null && pictureBox3.Tag is Eventuser && ((Eventuser)pictureBox3.Tag).eventuserId == re.eventuser.eventuserId)
continue;
if (re.eventuser != null)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
......@@ -287,12 +302,17 @@ namespace CardDisplay
{
MetaData data = getValue(ret);
if (data != null)
cardPlaceLabel1.Text = data.value;
cardPlaceLabel3.Text = data.value;
}
else
cardPlaceLabel1.Text = "0.0.0";
slot3ReaderEventId = re.readerEventId;
slot3Cards.Add(card);
pictureBox3.ImageLocation = RestClient.GetRequestURL( Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox3.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox3.Tag = re.eventuser;
slot3SelectedCard = card;
break;
}
}
}
......
CardDisplay/CardDisplay/CardDisplay/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
CardDisplay/CardDisplay/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "CardDisplay moya v1_00_00"
Name "CardDisplay moya v1_00_02"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!CardDisplay moya stable v1_00_00" SecMain
Section "!CardDisplay moya stable v1_00_02" SecMain
SetShellVarContext current
......
Cloakroom/Cloakroom/Form1.cs
......@@ -148,7 +148,7 @@ namespace Cloakroom
private bool printLabel(string barcode)
{
if (Properties.Settings.Default.dd == null || !Directory.Exists(Properties.Settings.Default.dd))
if (!File.Exists(cloakroomLabel))
{
MessageBox.Show("Cannot find print template");
return false;
......@@ -167,7 +167,8 @@ namespace Cloakroom
//doc.SetPrinter(Objects.Conf.BoxLabelPrinter, false);
if (doc != null)
{
doc.Open(Path.Combine(Properties.Settings.Default.dd, cloakroomLabel));
//doc.Open(Path.Combine(Properties.Settings.Default.dd, cloakroomLabel));
doc.Open(cloakroomLabel);
if(selectedUser != null)
doc.GetObject("Name").Text = selectedUser.firstname + " " + selectedUser.lastname;
......
Cloakroom/Cloakroom/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
......@@ -49,6 +49,7 @@
this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton();
this.cloackRoomToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton();
this.TopPanel = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label();
this.MapsComboBox = new System.Windows.Forms.ComboBox();
......@@ -57,7 +58,6 @@
this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
this.panel2 = new System.Windows.Forms.Panel();
this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
this.toolStrip1.SuspendLayout();
this.TopPanel.SuspendLayout();
......@@ -219,6 +219,7 @@
this.incomingFormToolStripButton.Name = "incomingFormToolStripButton";
this.incomingFormToolStripButton.Size = new System.Drawing.Size(23, 22);
this.incomingFormToolStripButton.Text = "Sisäänottonäkymä";
this.incomingFormToolStripButton.Visible = false;
this.incomingFormToolStripButton.Click += new System.EventHandler(this.incomingFormToolStripButton_Click);
//
// cardInfoToolStripButton
......@@ -252,6 +253,16 @@
this.toolStripButton1.Text = "Api settings";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
//
// orgMealToolStripButton
//
this.orgMealToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.orgMealToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("orgMealToolStripButton.Image")));
this.orgMealToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.orgMealToolStripButton.Name = "orgMealToolStripButton";
this.orgMealToolStripButton.Size = new System.Drawing.Size(23, 22);
this.orgMealToolStripButton.Text = "Org Meal";
this.orgMealToolStripButton.Click += new System.EventHandler(this.orgMealToolStripButton_Click);
//
// TopPanel
//
this.TopPanel.Controls.Add(this.label3);
......@@ -321,16 +332,6 @@
this.panel2.Size = new System.Drawing.Size(752, 471);
this.panel2.TabIndex = 17;
//
// orgMealToolStripButton
//
this.orgMealToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.orgMealToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("orgMealToolStripButton.Image")));
this.orgMealToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.orgMealToolStripButton.Name = "orgMealToolStripButton";
this.orgMealToolStripButton.Size = new System.Drawing.Size(23, 22);
this.orgMealToolStripButton.Text = "Org Meal";
this.orgMealToolStripButton.Click += new System.EventHandler(this.orgMealToolStripButton_Click);
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
......@@ -143,124 +143,124 @@
<data name="toolStripRefreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
TkSuQmCC
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
RK5CYII=
</value>
</data>
<data name="UnlockToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
YII=
</value>
</data>
<data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPjZJ5SBNQHMdnhNoilMIiSiRSMpM8KjOdktKs
1GXuyGwzSvLanKaGTt088sp7TlOXbnPqnAfmlbfmgVIZJEpJBwWSUZGEYpqp7duc+8dA8AM/eO99f98v
vN97hK0wMTE57ujoKLM7ZTdkbGycoj7S21C2CfMSiZ4ZdQd+7k4g6uupi8jXStujPjmI/XdUirXuLLA9
7LFLV79cK20PSQT99mprMlYbY9AU6fWbSCTaaqXNmFqTjKiRgkgzEvmservDhR0bYENj+icH0b1X6qOw
XB2KOi5ZetjCYu+G4z/cbga4DP5UoevbHxQPv53lSltUrLJGFMtj17oSLy4NxHmilH9Cxa+oUFGFysnz
3LiMIw6uTmrrTk2AKYlkVPN+VtXweRE1078g/ziPTEUhemRmmCg6iMYkAywNETA/YIQ4uQh0aSd8K3tB
zVHOGllYWWtCRBMzM+KpHyh6/R35E1+R9eoL0semIWhqR6mMg2HxUcwpdDAqs4FHbhUoQiWuiOpwwNLW
QxMg6BpvT3/+CUkjHxA/9A7R/VOIUVd03xtEdU8ionMcoRVKJKQHwpWfjwuJhTgTlbag/iz6mgBWQXVa
RMc4OK0vwW4ZQ+DjZ/CrHcZ1xQB8qvvhU9mHa/IesCp7YB/MAyniPswpvg0a8zquofEMv5oB3FA30KUd
oJU/Aa2sDdRHrfAWN4MqbtGsGZIOOHP5OMfhY7+FFVNrV7+Ezy1jZlXv8vqAaOXtG8bSZs3AGLIuXC1u
hFdRg+beTpw4mFODVwwMDAy1dgKBwWDoZpRIw8PEyhe+eYpFSr4CHjmVoBTUgt0whJD6QTAlbbj8QAJS
CA/H3Lz7tNZN7AgPDzfMzRXZpRbLBFyhZMQ9q3yBnCgCOfkh6HlykJMK4RAUjUOnHe9qPVui4+/vvycn
p8AmRVQWzckueeqZKJxzuZcG57AElSuFdlLbty10WCzW7uxsoWV6UVmYQFiayuPx9m1IBMI/y01+NcbK
xcYAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPjZJ5SBNQHMdnhNoilMIiSiRSLJM8KjOdktKk
1GXuyGwzSvLanDYNnbp55JVXznku3eY154F55a15oFQGiVKSRIFkVCihmGZq+zbn/jEQ/MAP3nvf3/cL
7/ceYSdMTExOOzo6yu3O2Q0ZGxsnq4/0tpRdwrxKomdE3oefuxOI+nrqIgq00u6oTwpi/x2VYaM7E2wP
e+zT1S/TSrtDyqPfW29NwnpjNJp4Xr+JRKKtVtqOqTXJiBohjDAjkS+qt3tc2DEBNjSmf1IQ3XutPhKr
1aGo45Jlxy0sDm45/sPtToDL4E8Vur7/QdHwh3mutFnFKm1EYXnMRleC28pArCeKBWdUArlcRRUpJy9z
Y9NPOLg6qa17NQGmJJKRYnpO1fBlGTUzv1DxaREZinz0yM0wUXAUjYkGWBkiYHHACLEVYtBlnfCt7AU1
WzlvZGFlrQkRT8zOSqbmUPDuB3InviHz7Vekjc1A2NSOEjkHw5KTWFDoYFRuA4+cKlBESlwX1+GIpa2H
JkDYNd6e9uozEkc+Im5oGlH9U4hWV1Tfe0R2T4LXOY7QciXi0wLhKsjFlYR8XIhMXVJ/Fn1NACuvOpXX
MQ5O6xuwW8YQ+Owl/GqHcUsxAJ/qfvhU9uFmRQ9YlT2wD+aDxHuEUxTfBo15E9fQOIZfzQBuqxvosg7Q
yp6DVtoG6tNWeEuaQZW0aNYMaQecuQJc4ghw2MKKqbWrX8LnrjGzqnd1c0C0svYtY0mzZmAMeRduFDXC
q6BBc28nTizMvYPXDAwMDLV2AoHBYOimF8vCwyTK1745imVKrgIe2ZWg5NWC3TCEkPpBMKVtuPZYClII
H+Zu3n1a6zb2hIeHG+bkiO1SiuRCrkg64p5ZtkROEIOcVAj6kwqQE/PhEBSFY+cdH2g9O6Lj7+9/IDs7
zyZZXBrFySp+4ZkgWnB5mArnsHiVK4V2Vtu3K3RYLNb+rCyRZVpBaZhQVJLC5/MPbUkEwj+oIn4mWnaf
VgAAAABJRU5ErkJggg==
</value>
</data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......@@ -281,69 +281,69 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPdVNrSFNhGD5io/6YiEX+KKdzm/MyHZqZmpdQ
053d57zMW5pKmmZZGUKgEbrtzG1O85JNzepP0q8ggn7UupCQkBhlFAailT+FEfhnsLf3PU5JohceOJz3
eZ7vPc/3HmZP5ffti2Zt2TGsZTxWZVsWstxvAj3TO+oRJ8jeW/FaLiyGtXZLtPY1RaU9kFU/CllnxyCj
dgQUlW5IMAwExBpuTYQc4gZl2yXM7zsgUln7EzXWrbxzE6Bsn4aSC1OgujgDpe1TkI1G6dXDkGxyglTZ
v0Vc0gTlDCPSWMyJBpuvqPUu6C7P8gZsxzQ8ev4Rnr3+BHkNbkgzD0NK+RBO4oB4nc1HGl4cVTpwWKLn
vLmNE6Dvug/qznv86SVtUzA2Nw/Tj19BZpUVUiuGcAIXxOsHQaqzg0TDeUnLiFQWVmF0bWpQSAZsxwwU
NE9CTsM4/wmGyzMg03Mg1toBM4A4tY2HxODYFKk4lsFGT3r9qJ9GL27z8KOKtRw09M7B0rcNeOpdApnm
FgiVVsCQdyE2OvxS1GL6dhudRuHReNQUKi1wAtN/t7QKbxa+QIK67x+DpDIn8u02Rqa39yRVuv1xON5O
k8gU1ov33/9rIDU5/VI9TiDRcWwKZiDC7/qbQCe8XNg2SNTeBFwmxHaPMiANaflbUJQ7vYlGB8Rik4KS
6gYho2YE3i6uwvziV8iosPCGNBUuGn8bctTwt0Al0zvMctOgT15ODRcfZCf3BD6vbMDyyg+4YpuDzBo3
HK8e4Y0z6277SMOLqWirUspc/acax7dyMUwKlG6l6jqiexYMlzxQ2DIBRa0eKGi6s0XcPZtIFYn7nWoa
6sYdWFd3TgZoJ4xXH0DZtYdgQui7PIHTLZPrcuQQNyjbrRCEgIkQhR/LOV+cpO2dzK5zfChsGvmZ3+z6
lVPDLSZrbniiTjaVMuHREcil00NJuFP0i5LrEYSQEQjkoQdjzggOycyCSGltaFi0Cv3TsCdGHEWQyX6G
YUL+AA+vqcyRyTtAAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL0SURBVDhPdVNrSFNhGD5io/6YiEX+KKdzm3M6HZaZmpdQ
c57dL17mLU0lTTOtDCHQKJs7c5vTvN+y+pP0K4igH7UuJCQkRhmFgWjlT0EC/wz29r7HKUn0wgOH8z7P
873n+d7D7Knsrn2RrD09irUNR6vtS0KW+02gZ3pHPeIE2HsrVseFRLE97RKdY1VZwvnTqgYh7dwQpFQM
gLLEA3HGbr9Yy62KkEPcgGy7hNldB0Tqnm65xraVdX4ECpumoODiJKgvTYOqaRLS0eh4WT8kWFwgVd3e
Ii5pAnKGEWltVrnRvpnXMA761hnegG2egkfPP8Kz158gq9oDydZ+SCzqw0mcEKu3b5KGF0eo7hyWGDhv
Zs0IGNrug6blHn96QeMkDM3OwdTjV5Ba2gNJxX04gRtiDb0g1TtAouW8pGVEahurNLk3tCgkA7Z5GnLq
xiCjepj/BGPrNMgMHIh1DsAMIEZj5yExOjdEao5lsNGRXDXoo9HzGyf4UcU6Dqo7Z2Hx2zo89S6CTHsL
hIU9gCHvIsbk9ElRi+k77HQahUfjUVNYaIOTmP67xRV4M/8F4jRd/xjEm13Id9gZmcHRIS/x+GJwvJ0m
kSmsF++//9dAYnH5pAacQKLn2ETMQITf9TeBTng5v20g190EXCbEdo8yIA1p+VtQFrm8cpMTorFJQUn1
vZBSPgBvF1ZgbuErpBTbeEOaCheNvw0FavhboJIZnFaF2bGpKKKGmw+yhXsCn5fXYWn5B1yxz0JquQdO
lA3wxqmVdzdJw4upaKsSze7u0zXDW5kYJgVKt1J6HdE+A8bLE5BbPwJ5DROQUzu6Rdw9m0gVjvudZOlr
xx1Y07SM+mknTFcfgPnaQ7AgDG3j/jP1Y2sK5BA3INutIISACROFHsu4kB+v6xxLr3R+yK0d+Jld5/6V
Uc4tJGhvTEScqlUxoZFhyKXTg0m4U/SLkusRhJARCBTBB6POCg7JrIJwaUVwSKQa/ZOxJ0YcRZDJfoZh
gv4A7i2pvqM4LmUAAAAASUVORK5CYII=
</value>
</data>
<data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
pch7Vggx5i+hzFlpkOrD/wAAAABJRU5ErkJggg==
fcnh8n33O+d3Z3/i/+tJr4Fi34DkmeO+zwmxg5bqsqZ9wVnVNnpXR4bbT5V6R8R5vIlY9zdGVPZ743Fm
hQ6cVW2jd+2JcYAl3gnLZ9og0P5V+E165RGxt2buRGWGs6pt9K5NofYoC38b64ImPzace5zhrNp6suvq
co+CsxluOJP+QG2pTvgk3x1X1k/HtUJv6HS6R9Rt9BxR/5yjlxnMYubDfLLIVPFC3Fvni9/a1+LP/kZF
X5/ajvOVOfjyrAUDR0rRf6hIqdl/OPM4PYmXLDJVvBC38qdj8OQa/NFnwe+fVuHHrnLsy12AvoaV6N2W
hs4tyUrNPve1ZM1LBllkqnghLmW54/6J1Rg8V477HZtwr60AKyK8cLluGbrL9OgqiVFq9rmvJWtehSFZ
ZKp4IboN0/DLUTN+bd+In1vN+LbJhHrTXPTVJOPMxgXoLIxQava5ryVrXjLIIlPFC3Favil+aM2XMuNu
oxF3DqQjO8QZn+2ORcf6YJxcG6TU7HNfS9a8ZJBFpooXotPgjrstufiuMQtfWZJwqyoe1Rk+OL8tHCfM
gTiaH6DU7HNfS9a8ZJBFpooXol1+NL45bMKd2lTc3h2DgYooGOZMQc/WYLTl+qHF9K5Ss899LVnzkkEW
mSpeiGNpbrjTtBy3Lcm4sTMa1z6KQGWKB7pL35cBM3A4x1ep2ee+lqx5ySCLTBUvRGvqNNxuyMKNfUm4
XhGJS1vDkBY4CadL5igBjdk+Ss0+97VkzUsGWWSqeCGaU1zxef0yXK9ajMvypOfL5qMiyR2dG2fJAG8c
NL6j1OxzX0vWvGSQRaaKF6JpiSsGDhhwZVc8LsiTniuZhxT/ifJRzMYRsx9aV/kpNfvc15I1Lxlkkani
hahLdEF/TTou7tCjt3Q+Tm0IQqKfDYqiHbEh0uHBGj1V6XNfS5zhbG2uL6pNPso63EsGWWSqeCH2Jzjj
cnUqLuyIQ/fmEDStDEDNllUYHBwcEmv2z8pHoiUtL7MvbNcrLDJVvBD74qairTAcF/cuRW9FLKrz5qD/
2lXcvHkTAwMDysqa/Z7yhZrS8vZui1EYZJGp4uXNht4Jm6Nd0FwYib79WbAUxOBISwu6urqGxJr9K/Um
TWl5mU3GzhRvkKni5TMgn45N8kYiK8AWafK1j9CNxSqzGZmZmTAYDMrKOspzHDID7TTFmZG8zGS20X8C
isPssTdh2DNgSXJGVaIrSqKcsCbUATE+Nmhvb1dkNBqH/o+bMREFUS6a4sxIXmYyuzjSEbviXVCTOOw9
YFnsjIZ0D9QbvFC7zBvGIAecOH4cPT09MJlMyso6J9QZh/ICNMWZkbzMZHZdhhfq03QgU8ULsTfeUR7A
Hc3yi6Mtzw8bFrliT1UV6urq0CJfP66sixM80FUUpCnOjORlJrPJIItMFS9EpV7e8covhoMZHjgkByqW
eCA+NAApKSlDig8LRGW6D46tnqUpznD2Ea/MYiazySCLTBUvxlQsssfOWAfUyI3adB32p3viwwQ3rAyX
t+HzHGCWa3mSDgezfdEsf920xBnO0kMvM5jFTGaTQRaZkv0UD/B8UZjt6bLIyaiSp2wwzcbH6xagtSBS
fl6jcbRo4X8SM5jFTGaTQVZxuF2HZD/NA7y8aPpYfYb/WxdXzJ6Ah/pgri3yguz+VvC/1DAvs4ZnZwWM
68nwHx8i2c/xAC9K2Uh5SgVL6aWWSC0dRSVLxUnNk/KSspV6SeoZKeXPC1KvSfEgU6QcpBxHUcxjLvNf
lyLvWSHEmL8AZzNZZWPombkAAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MoyaAdminUI.csproj
......@@ -48,8 +48,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoUpdateLib">
<HintPath>..\..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\AutoUpdate\src\AutoUpdateLib\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.8")]
[assembly: AssemblyFileVersion("1.0.8")]
[assembly: AssemblyVersion("1.0.10")]
[assembly: AssemblyFileVersion("1.0.10")]
MoyaAdmin/MoyaAdminUI/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "MoyaAdminUI moya v1_00_08"
Name "MoyaAdminUI moya v1_00_10"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaAdminUI moya stable v1_00_08" SecMain
Section "!MoyaAdminUI moya stable v1_00_10" SecMain
SetShellVarContext current
......@@ -212,9 +212,9 @@ Section "!MoyaAdminUI moya stable v1_00_08" SecMain
SetOverwrite On
File /oname=autoupdate.xml "D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\autoupdate.moya.xml"
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\autoupdate.moya.xml"
File /oname=MoyaAdminUI.exe "D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.exe"
File /oname=MoyaAdminUI.exe "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.exe"
File autoupdate.crt
......@@ -224,10 +224,12 @@ Section "!MoyaAdminUI moya stable v1_00_08" SecMain
; that is referenced to the main project.
File "D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.dll"
File "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
File "D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
File "D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
File "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
File "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.pdb"
File "I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
......@@ -315,10 +317,12 @@ Section "Uninstall"
; that is referenced to the main project.
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminUI.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\MoyaAdminLib.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminUI\bin\Debug\AutoUpdateLib.pdb"
......
OrgMealCounter/OrgMealCounter/ApiSettings.Designer.cs
......@@ -52,7 +52,6 @@
//
this.ApiPassTextBox.Location = new System.Drawing.Point(12, 164);
this.ApiPassTextBox.Name = "ApiPassTextBox";
this.ApiPassTextBox.PasswordChar = 'ῷ';
this.ApiPassTextBox.Size = new System.Drawing.Size(260, 20);
this.ApiPassTextBox.TabIndex = 16;
//
......
OrgMealCounter/OrgMealCounter/Program.cs
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
......@@ -12,10 +13,33 @@ namespace OrgMealCounter
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
if (!Debugger.IsAttached)
{
if (args.Length == 0 || args[0] != "-noautoupdate")
{
if (AutoUpdateLib.AutoUpdateCore.CheckForUpdates(null))
return; //program is required to close by autoupdate (probably updated)
}
}
System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly();
Version appVersion = a.GetName().Version;
string appVersionString = appVersion.ToString();
if (Properties.Settings.Default.ApplicationVersion != appVersion.ToString())
{
Properties.Settings.Default.Upgrade();
Properties.Settings.Default.ApplicationVersion = appVersionString;
}
Application.Run(new Form1());
}
}
......
OrgMealCounter/OrgMealCounter/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
OrgMealCounter/OrgMealCounter/Properties/Settings.Designer.cs
......@@ -16,6 +16,7 @@ namespace OrgMealCounter.Properties {
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public string ApplicationVersion;
public static Settings Default {
get {
......
OrgMealCounter/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "OrgMealCounter moya v1_00_00"
Name "OrgMealCounter moya v1_00_02"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!OrgMealCounter moya stable v1_00_00" SecMain
Section "!OrgMealCounter moya stable v1_00_02" SecMain
SetShellVarContext current
......@@ -225,9 +225,11 @@ Section "!OrgMealCounter moya stable v1_00_00" SecMain
; that is referenced to the main project.
File "I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.dll"
File "I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\OrgMealCounter.pdb"
File "I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.pdb"
File "I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.pdb"
......@@ -316,9 +318,11 @@ Section "Uninstall"
; that is referenced to the main project.
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\OrgMealCounter.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.pdb"
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.Designer.cs
......@@ -49,8 +49,11 @@
this.label1 = new System.Windows.Forms.Label();
this.CardFilterTextBox = new System.Windows.Forms.TextBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.setPrintedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
// autoPrintCheckBox
......@@ -74,6 +77,7 @@
this.columnHeader1,
this.columnHeader2,
this.columnHeader3});
this.listView.ContextMenuStrip = this.contextMenuStrip1;
this.listView.FullRowSelect = true;
this.listView.Location = new System.Drawing.Point(11, 84);
this.listView.Name = "listView";
......@@ -218,6 +222,20 @@
this.CardFilterTextBox.TabIndex = 16;
this.toolTip1.SetToolTip(this.CardFilterTextBox, "By default print all cards. With this you can limit name of printed card types");
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.setPrintedToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(153, 48);
//
// setPrintedToolStripMenuItem
//
this.setPrintedToolStripMenuItem.Name = "setPrintedToolStripMenuItem";
this.setPrintedToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
this.setPrintedToolStripMenuItem.Text = "Set printed";
this.setPrintedToolStripMenuItem.Click += new System.EventHandler(this.setPrintedToolStripMenuItem_Click);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
......@@ -244,6 +262,7 @@
this.statusStrip1.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
......@@ -270,6 +289,8 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox CardFilterTextBox;
private System.Windows.Forms.ToolTip toolTip1;
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem setPrintedToolStripMenuItem;
}
}
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
......@@ -124,10 +124,26 @@ namespace moyaPrintServer
PrintDocument pd = new PrintDocument();
pd.DocumentName = "Card "+ card.cardId + " " + card.username;
/*
pd.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Card " + this.Name, 216, 339);
//pd.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Card " + this.Name, 216, 350);
pd.PrinterSettings.PrinterName = PrintersComboBox.SelectedItem.ToString();
pd.DefaultPageSettings.Landscape = false;
*/
pd.PrintPage += new PrintPageEventHandler(PrintPage);
pd.PrinterSettings.PrinterName = PrintersComboBox.SelectedItem.ToString();
pd.DefaultPageSettings = pd.PrinterSettings.DefaultPageSettings;
pd.OriginAtMargins = true;
pd.DefaultPageSettings.Margins.Top = 0;
pd.DefaultPageSettings.Margins.Bottom = 0;
pd.DefaultPageSettings.Margins.Right = 0;
pd.DefaultPageSettings.Margins.Left = 0;
pd.Print();
}
......@@ -137,7 +153,12 @@ namespace moyaPrintServer
private void PrintPage(object o, System.Drawing.Printing.PrintPageEventArgs ev)
{
ev.Graphics.DrawImage(currentImage, 0f, 0f, new Rectangle(0, 0, currentImage.Width, currentImage.Height), GraphicsUnit.Pixel);
//ev.Graphics.DrawImage(currentImage, 0f, 0f, new Rectangle(0, 0, currentImage.Width, currentImage.Height), GraphicsUnit.Pixel);
Rectangle margins = ev.MarginBounds;
//margins.Height += 6;
ev.Graphics.DrawImage(currentImage, margins);
// Meillä ei ole kuin yks sivu
try
{
......@@ -170,8 +191,8 @@ namespace moyaPrintServer
Card card = (Card)listView.Items[0].Tag;
try
{
RestClient client = new RestClient(Properties.Settings.Default.ApiURL + "/card/Reserve/" + card.cardId);
client.MakeRequest();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
client.MakeRequest("card/Reserve/" + card.cardId);
}
catch (Exception ex)
{
......@@ -205,11 +226,14 @@ namespace moyaPrintServer
listView.BeginUpdate();
listView.Items.Clear();
if (sortByNameCheckBox.Checked)
queuelist.cards = queuelist.cards.OrderBy(c => c.username).ToList();
foreach (Card card in queuelist.cards)
{
// jos ei ole filtteriä niin tulosta kaikki validoidut kortit. Jos on filtteri niin tulosta vain ne joihin se osuu
if (card.state == "VALIDATED" && (CardFilterTextBox.Text.Length == 0 || CardFilterTextBox.Text == card.cardTemplate))
{
ListViewItem lvi = listView.Items.Add(card.cardId.ToString());
lvi.SubItems.Add(card.username);
lvi.SubItems.Add(card.wholeName);
......@@ -262,6 +286,36 @@ namespace moyaPrintServer
}
private void setPrintedToolStripMenuItem_Click(object sender, EventArgs e)
{
if (listView.SelectedItems.Count > 0)
{
if (MessageBox.Show("Change state to printed for the selected cards?") != DialogResult.OK)
return;
List<ListViewItem> printed = new List<ListViewItem>();
foreach (ListViewItem lvi in listView.SelectedItems)
{
Card card = (Card)lvi.Tag;
try
{
RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
client.MakeRequest("card/Printed/" + currentCardId);
printed.Add(lvi);
}
catch (Exception ex)
{
toolStripStatusLabel1.Text = ex.Message;
}
}
foreach (ListViewItem printedItem in printed)
{
listView.Items.Remove(printedItem);
}
}
}
}
}
PrintServer/moyaPrintServer/moyaPrintServer/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.8.0")]
[assembly: AssemblyFileVersion("1.0.8.0")]
[assembly: AssemblyVersion("1.0.24.0")]
[assembly: AssemblyFileVersion("1.0.24.0")]
PrintServer/moyaPrintServer/moyaPrintServer/moyaPrintServer.csproj
......@@ -35,8 +35,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoUpdateLib">
<HintPath>..\..\..\MoyaAdmin\MoyaAdminUI\res\AutoUpdateLib.dll</HintPath>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\AutoUpdate\src\AutoUpdateLib\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
PrintServer/moyaPrintServer/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "MoyaPrintServer moya v1_00_08"
Name "MoyaPrintServer moya v1_00_24"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaPrintServer moya stable v1_00_08" SecMain
Section "!MoyaPrintServer moya stable v1_00_24" SecMain
SetShellVarContext current
......@@ -212,9 +212,9 @@ Section "!MoyaPrintServer moya stable v1_00_08" SecMain
SetOverwrite On
File /oname=autoupdate.xml "D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\autoupdate.moya.xml"
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\autoupdate.moya.xml"
File /oname=moyaPrintServer.exe "D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.exe"
File /oname=moyaPrintServer.exe "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.exe"
File autoupdate.crt
......@@ -224,10 +224,10 @@ Section "!MoyaPrintServer moya stable v1_00_08" SecMain
; that is referenced to the main project.
File "D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
File "D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
File "D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
......@@ -315,10 +315,10 @@ Section "Uninstall"
; that is referenced to the main project.
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
Delete "$INSTDIR\D:\Devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!