Skip to content

Joona Romppanen / Moya Info Tools

Go to a project
Commit 0657b381 by Tapio Haapala
Options

lisää ignoreja ja hiontaa print serveriin

1 parent febb15ff
Inline Side-by-side
Showing with 103 additions and 77 deletions
.gitignore
......@@ -2,3 +2,4 @@
/BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin
/PrintServer/moyaPrintServer/moyaPrintServer/obj
bin
/PrintServer/moyaPrintServer/moyaPrintServer/bin
PrintServer/moyaPrintServer/moyaPrintServer/Form1.Designer.cs
......@@ -46,6 +46,9 @@
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.settingsToolStripButton = new System.Windows.Forms.ToolStripButton();
this.sortByNameCheckBox = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.CardFilterTextBox = new System.Windows.Forms.TextBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
......@@ -54,7 +57,7 @@
//
this.autoPrintCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.autoPrintCheckBox.AutoSize = true;
this.autoPrintCheckBox.Location = new System.Drawing.Point(12, 268);
this.autoPrintCheckBox.Location = new System.Drawing.Point(12, 313);
this.autoPrintCheckBox.Name = "autoPrintCheckBox";
this.autoPrintCheckBox.Size = new System.Drawing.Size(69, 17);
this.autoPrintCheckBox.TabIndex = 4;
......@@ -74,7 +77,7 @@
this.listView.FullRowSelect = true;
this.listView.Location = new System.Drawing.Point(11, 84);
this.listView.Name = "listView";
this.listView.Size = new System.Drawing.Size(383, 178);
this.listView.Size = new System.Drawing.Size(406, 223);
this.listView.TabIndex = 5;
this.listView.UseCompatibleStateImageBehavior = false;
this.listView.View = System.Windows.Forms.View.Details;
......@@ -107,7 +110,7 @@
// printButton
//
this.printButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.printButton.Location = new System.Drawing.Point(334, 268);
this.printButton.Location = new System.Drawing.Point(357, 313);
this.printButton.Name = "printButton";
this.printButton.Size = new System.Drawing.Size(60, 23);
this.printButton.TabIndex = 7;
......@@ -119,9 +122,9 @@
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1});
this.statusStrip1.Location = new System.Drawing.Point(0, 300);
this.statusStrip1.Location = new System.Drawing.Point(0, 345);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(406, 22);
this.statusStrip1.Size = new System.Drawing.Size(429, 22);
this.statusStrip1.TabIndex = 8;
this.statusStrip1.Text = "statusStrip1";
//
......@@ -138,7 +141,7 @@
this.PrintersComboBox.FormattingEnabled = true;
this.PrintersComboBox.Location = new System.Drawing.Point(11, 44);
this.PrintersComboBox.Name = "PrintersComboBox";
this.PrintersComboBox.Size = new System.Drawing.Size(383, 21);
this.PrintersComboBox.Size = new System.Drawing.Size(300, 21);
this.PrintersComboBox.TabIndex = 10;
this.PrintersComboBox.SelectedIndexChanged += new System.EventHandler(this.PrintersComboBox_SelectedIndexChanged);
//
......@@ -154,7 +157,7 @@
// refreshButton
//
this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.refreshButton.Location = new System.Drawing.Point(267, 268);
this.refreshButton.Location = new System.Drawing.Point(290, 313);
this.refreshButton.Name = "refreshButton";
this.refreshButton.Size = new System.Drawing.Size(61, 23);
this.refreshButton.TabIndex = 12;
......@@ -173,7 +176,7 @@
this.settingsToolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(406, 25);
this.toolStrip1.Size = new System.Drawing.Size(429, 25);
this.toolStrip1.TabIndex = 13;
this.toolStrip1.Text = "toolStrip1";
//
......@@ -189,19 +192,39 @@
//
// sortByNameCheckBox
//
this.sortByNameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.sortByNameCheckBox.AutoSize = true;
this.sortByNameCheckBox.Location = new System.Drawing.Point(88, 268);
this.sortByNameCheckBox.Location = new System.Drawing.Point(87, 313);
this.sortByNameCheckBox.Name = "sortByNameCheckBox";
this.sortByNameCheckBox.Size = new System.Drawing.Size(88, 17);
this.sortByNameCheckBox.TabIndex = 14;
this.sortByNameCheckBox.Text = "Sort by name";
this.sortByNameCheckBox.UseVisualStyleBackColor = true;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(314, 29);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(54, 13);
this.label1.TabIndex = 15;
this.label1.Text = "Card filter:";
//
// CardFilterTextBox
//
this.CardFilterTextBox.Location = new System.Drawing.Point(317, 45);
this.CardFilterTextBox.Name = "CardFilterTextBox";
this.CardFilterTextBox.Size = new System.Drawing.Size(100, 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");
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(406, 322);
this.ClientSize = new System.Drawing.Size(429, 367);
this.Controls.Add(this.CardFilterTextBox);
this.Controls.Add(this.label1);
this.Controls.Add(this.sortByNameCheckBox);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.refreshButton);
......@@ -244,6 +267,9 @@
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton settingsToolStripButton;
private System.Windows.Forms.CheckBox sortByNameCheckBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox CardFilterTextBox;
private System.Windows.Forms.ToolTip toolTip1;
}
}
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
......@@ -70,7 +70,11 @@ namespace moyaPrintServer
if (sortByNameCheckBox.Checked)
{
List<Card> cards = new List<Card>();
cards = cards.OrderBy(c=>c.wholeName).ToList();
foreach (ListViewItem lvi in items)
{
cards.Add( (Card)lvi.Tag);
}
cards = cards.OrderBy(c=>c.username).ToList();
foreach (Card card in cards)
{
foreach (ListViewItem lvi in items)
......@@ -203,7 +207,8 @@ namespace moyaPrintServer
listView.Items.Clear();
foreach (Card card in queuelist.cards)
{
if (card.state == "VALIDATED")
// 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);
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.resx
......@@ -136,6 +136,9 @@
PKycdQEAAAAASUVORK5CYII=
</value>
</data>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>346, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAgAICAQAAAAAADoAgAAhgAAABAQEAAAAAAAKAEAAG4DAAAwMAAAAQAIAKgOAACWBAAAICAAAAEA
......
PrintServer/moyaPrintServer/moyaPrintServer/Program.cs
......@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;
using System.Diagnostics;
namespace moyaPrintServer
{
......@@ -11,10 +12,33 @@ namespace moyaPrintServer
/// 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());
}
}
......
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.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.8.0")]
[assembly: AssemblyFileVersion("1.0.8.0")]
PrintServer/moyaPrintServer/moyaPrintServer/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18449
// Runtime Version:4.0.30319.18408
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
......@@ -12,7 +12,7 @@ namespace moyaPrintServer.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......@@ -94,5 +94,17 @@ namespace moyaPrintServer.Properties {
this["ApiPass"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApplicationVersion {
get {
return ((string)(this["ApplicationVersion"]));
}
set {
this["ApplicationVersion"] = value;
}
}
}
}
PrintServer/moyaPrintServer/moyaPrintServer/Properties/Settings.settings
......@@ -20,5 +20,8 @@
<Setting Name="ApiPass" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApplicationVersion" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
PrintServer/moyaPrintServer/moyaPrintServer/RestClient.cs
......@@ -3,6 +3,7 @@ using System.IO;
using System.Net;
using System.Security.Cryptography;
using System.Text;
using System.Diagnostics;
public enum HttpVerb
{
......@@ -62,6 +63,7 @@ namespace HttpUtils
int timestamp = ConvertToTimestamp(DateTime.Now);
string hash = CalculateSHA1("/" + parameters + "+" + moyaPrintServer.Properties.Settings.Default.ApiKey + "+" + moyaPrintServer.Properties.Settings.Default.ApiUser + "+" + timestamp + "+" + moyaPrintServer.Properties.Settings.Default.ApiPass);
string url = server + "/rest/" + parameters + "?appkey=" + moyaPrintServer.Properties.Settings.Default.ApiKey + "&appuser=" + moyaPrintServer.Properties.Settings.Default.ApiUser + "&appstamp=" + timestamp + "&appmac=" + hash;
Debug.WriteLine(url);
return url;
}
......
PrintServer/moyaPrintServer/moyaPrintServer/app.config
......@@ -25,6 +25,9 @@
<setting name="ApiPass" serializeAs="String">
<value />
</setting>
<setting name="ApplicationVersion" serializeAs="String">
<value />
</setting>
</moyaPrintServer.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.exe.config deleted 100644 → 0
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="moyaPrintServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
<moyaPrintServer.Properties.Settings>
<setting name="Printer" serializeAs="String">
<value />
</setting>
<setting name="AutoPrint" serializeAs="String">
<value>False</value>
</setting>
<setting name="ApiURL" serializeAs="String">
<value />
</setting>
<setting name="ApiKey" serializeAs="String">
<value />
</setting>
<setting name="ApiUser" serializeAs="String">
<value />
</setting>
<setting name="ApiPass" serializeAs="String">
<value />
</setting>
</moyaPrintServer.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.vshost.exe.config deleted 100644 → 0
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="moyaPrintServer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<userSettings>
<moyaPrintServer.Properties.Settings>
<setting name="Printer" serializeAs="String">
<value />
</setting>
<setting name="AutoPrint" serializeAs="String">
<value>False</value>
</setting>
<setting name="ApiURL" serializeAs="String">
<value />
</setting>
<setting name="ApiKey" serializeAs="String">
<value />
</setting>
<setting name="ApiUser" serializeAs="String">
<value />
</setting>
<setting name="ApiPass" serializeAs="String">
<value />
</setting>
</moyaPrintServer.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
PrintServer/moyaPrintServer/moyaPrintServer/moyaPrintServer.csproj
......@@ -35,6 +35,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoUpdateLib">
<HintPath>..\..\..\MoyaAdmin\MoyaAdminUI\res\AutoUpdateLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Printing" />
......@@ -108,6 +111,9 @@
</Compile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!