Skip to content

Codecrew / Moya Info Tools

Go to a project
Commit 740a1d45 by Liv Haapala
Options

päivityksiä ohjelmiin

1 parent 1410e8eb
Inline Side-by-side
Showing with 1864 additions and 572 deletions
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient.csproj
...@@ -97,7 +97,8 @@ ...@@ -97,7 +97,8 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csproj.FileListAbsolute.txt
...@@ -12,7 +12,6 @@ C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeS ...@@ -12,7 +12,6 @@ C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeS
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.pdb C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.pdb
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.exe C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.exe
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.pdb C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.pdb
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csprojResolveAssemblyReference.cache
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.Form1.resources C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.Form1.resources
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.Properties.Resources.resources C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.Properties.Resources.resources
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csproj.GenerateResource.Cache C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csproj.GenerateResource.Cache
...@@ -28,3 +27,9 @@ I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeS ...@@ -28,3 +27,9 @@ I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeS
I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.pdb I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.pdb
I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.dll I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.pdb I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.pdb
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.dll
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\AutoUpdateLib.pdb
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csproj.AssemblyReference.cache
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.ApiSettings.resources
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csproj.CoreCompileInputs.cache
C:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\obj\x86\Debug\BarcodeScannerClient.csproj.CopyComplete
CardDisplay/CardDisplay/CardDisplay/CardDisplay.csproj
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CardDisplay</RootNamespace> <RootNamespace>CardDisplay</RootNamespace>
<AssemblyName>CardDisplay</AssemblyName> <AssemblyName>CardDisplay</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\AutoUpdate\src\AutoUpdateLib\bin\Debug\AutoUpdateLib.dll</HintPath> <HintPath>Resources\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="MoyaAdminLib"> <Reference Include="MoyaAdminLib">
<HintPath>..\..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath> <HintPath>..\..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath>
...@@ -110,9 +110,12 @@ ...@@ -110,9 +110,12 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Resources\AutoUpdateLib.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\x86\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
CardDisplay/CardDisplay/CardDisplay/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.7.0")] [assembly: AssemblyVersion("1.0.8.0")]
[assembly: AssemblyFileVersion("1.0.7.0")] [assembly: AssemblyFileVersion("1.0.8.0")]
CardDisplay/CardDisplay/CardDisplay/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace CardDisplay.Properties { ...@@ -19,7 +19,7 @@ namespace CardDisplay.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
CardDisplay/CardDisplay/CardDisplay/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace CardDisplay.Properties { ...@@ -12,7 +12,7 @@ namespace CardDisplay.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
CardDisplay/CardDisplay/CardDisplay/app.config
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
<value>Nie4xu9eedu8Shaey1bu</value> <value>Nie4xu9eedu8Shaey1bu</value>
</setting> </setting>
<setting name="ApiURL" serializeAs="String"> <setting name="ApiURL" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiUser" serializeAs="String"> <setting name="ApiUser" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiPass" serializeAs="String"> <setting name="ApiPass" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiTokenSet" serializeAs="String"> <setting name="ApiTokenSet" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
</CardDisplay.Properties.Settings> </CardDisplay.Properties.Settings>
</userSettings> </userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
CardDisplay/CardDisplay/autopublish.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<AutoPublishSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <AutoPublishSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<UploadUser>f-solu-06</UploadUser> <UploadUser>f-solu-06</UploadUser>
<PrivateKeyPath>C:\devel\proj\AutoUpdate.svn\src\AutoPublish\Properties\key.txt</PrivateKeyPath>
<UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath> <UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath>
<UploadHost>www4.f-solutions.fi</UploadHost> <UploadHost>www5.f-solutions.fi</UploadHost>
<ProjectName>CardDisplay</ProjectName> <ProjectName>CardDisplay</ProjectName>
<Customers> <Customers>
<Customer> <Customer>
......
CardDisplay/CardDisplay/out_moya.nsi
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name "CardDisplay moya v1_00_07" Name "CardDisplay moya v1_00_08"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this. ; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
...@@ -198,7 +198,7 @@ FunctionEnd ...@@ -198,7 +198,7 @@ FunctionEnd
Section "!CardDisplay moya stable v1_00_07" SecMain Section "!CardDisplay moya stable v1_00_08" SecMain
SetShellVarContext current SetShellVarContext current
...@@ -228,7 +228,6 @@ Section "!CardDisplay moya stable v1_00_07" SecMain ...@@ -228,7 +228,6 @@ Section "!CardDisplay moya stable v1_00_07" SecMain
File "C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.dll" File "C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.dll"
File "C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\CardDisplay.pdb" File "C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\CardDisplay.pdb"
File "C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.pdb"
...@@ -320,7 +319,6 @@ Section "Uninstall" ...@@ -320,7 +319,6 @@ Section "Uninstall"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\CardDisplay.pdb" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\CardDisplay.pdb"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Release\AutoUpdateLib.pdb"
......
Cloakroom/Cloakroom.sln
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop # Visual Studio Version 16
VisualStudioVersion = 16.0.31911.196
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloakroom", "Cloakroom\Cloakroom.csproj", "{74D33A35-3220-4D07-B039-D8C4FE62EE07}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloakroom", "Cloakroom\Cloakroom.csproj", "{74D33A35-3220-4D07-B039-D8C4FE62EE07}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoyaAdminLib", "..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\MoyaAdminLib.csproj", "{095CE28F-5B53-4203-85C6-3A9AFD486407}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoyaAdminLib", "..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\MoyaAdminLib.csproj", "{095CE28F-5B53-4203-85C6-3A9AFD486407}"
...@@ -8,19 +10,30 @@ EndProject ...@@ -8,19 +10,30 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|Any CPU.Build.0 = Debug|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|x86.ActiveCfg = Debug|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Debug|x86.Build.0 = Debug|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|Any CPU.ActiveCfg = Release|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|Any CPU.Build.0 = Release|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|Any CPU.Build.0 = Release|Any CPU
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|x86.ActiveCfg = Release|Any CPU
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|Any CPU.Build.0 = Debug|Any CPU {74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|x86.Build.0 = Release|Any CPU
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|Any CPU.ActiveCfg = Release|Any CPU {095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|Any CPU.ActiveCfg = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|Any CPU.Build.0 = Release|Any CPU {095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|x86.ActiveCfg = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|x86.Build.0 = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|Any CPU.ActiveCfg = Release|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.ActiveCfg = Release|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9140C60D-5D4A-4F92-9FFC-89A233001292}
EndGlobalSection
EndGlobal EndGlobal
Cloakroom/Cloakroom/App.config
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<value /> <value />
</setting> </setting>
<setting name="ApiURL" serializeAs="String"> <setting name="ApiURL" serializeAs="String">
<value /> <value>http://10.220.105.194:8080/MoyaWeb</value>
</setting> </setting>
<setting name="ApiKey" serializeAs="String"> <setting name="ApiApplicationKey" serializeAs="String">
<value /> <value>4ifkLUhy1ByYD6JWOUdA</value>
</setting> </setting>
<setting name="ApiPass" serializeAs="String"> <setting name="ApiPass" serializeAs="String">
<value /> <value />
...@@ -28,6 +28,12 @@ ...@@ -28,6 +28,12 @@
<setting name="Port" serializeAs="String"> <setting name="Port" serializeAs="String">
<value /> <value />
</setting> </setting>
<setting name="ApplicationVersion" serializeAs="String">
<value />
</setting>
<setting name="ApiTokenSet" serializeAs="String">
<value>False</value>
</setting>
</Cloakroom.Properties.Settings> </Cloakroom.Properties.Settings>
</userSettings> </userSettings>
</configuration> </configuration>
Cloakroom/Cloakroom/Cloakroom.csproj
...@@ -37,9 +37,6 @@ ...@@ -37,9 +37,6 @@
<Reference Include="AutoUpdateLib"> <Reference Include="AutoUpdateLib">
<HintPath>..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath> <HintPath>..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="MoyaAdminLib">
<HintPath>..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
...@@ -111,9 +108,16 @@ ...@@ -111,9 +108,16 @@
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference> </COMReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\MoyaAdminLib.csproj">
<Project>{095ce28f-5b53-4203-85c6-3a9afd486407}</Project>
<Name>MoyaAdminLib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
Cloakroom/Cloakroom/Form1.Designer.cs
...@@ -50,12 +50,31 @@ ...@@ -50,12 +50,31 @@
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.eventUserEditor = new MoyaAdminLib.Controls.EventUserEditor();
this.barcodeFocusTimer = new System.Windows.Forms.Timer(this.components); this.barcodeFocusTimer = new System.Windows.Forms.Timer(this.components);
this.label3 = new System.Windows.Forms.Label();
this.codeTextBox = new System.Windows.Forms.TextBox();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.luggagesSearchListView = new System.Windows.Forms.ListView();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.searchTextBox = new System.Windows.Forms.TextBox();
this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.eventUserEditor = new MoyaAdminLib.Controls.EventUserEditor();
this.toolStrip2 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).BeginInit();
this.luggagesListContextMenuStrip.SuspendLayout(); this.luggagesListContextMenuStrip.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox2.SuspendLayout();
this.toolStrip2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// toolStrip1 // toolStrip1
...@@ -95,11 +114,11 @@ ...@@ -95,11 +114,11 @@
// submitButton // submitButton
// //
this.submitButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.submitButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.submitButton.Location = new System.Drawing.Point(520, 104); this.submitButton.Location = new System.Drawing.Point(509, 133);
this.submitButton.Name = "submitButton"; this.submitButton.Name = "submitButton";
this.submitButton.Size = new System.Drawing.Size(135, 23); this.submitButton.Size = new System.Drawing.Size(243, 236);
this.submitButton.TabIndex = 3; this.submitButton.TabIndex = 3;
this.submitButton.Text = "Submit luggage"; this.submitButton.Text = "Syötä narikkaan";
this.submitButton.UseVisualStyleBackColor = true; this.submitButton.UseVisualStyleBackColor = true;
this.submitButton.Click += new System.EventHandler(this.submitButton_Click); this.submitButton.Click += new System.EventHandler(this.submitButton_Click);
// //
...@@ -119,9 +138,9 @@ ...@@ -119,9 +138,9 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 24); this.label1.Location = new System.Drawing.Point(13, 24);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 13); this.label1.Size = new System.Drawing.Size(56, 13);
this.label1.TabIndex = 6; this.label1.TabIndex = 6;
this.label1.Text = "Barcode"; this.label1.Text = "Viivakoodi";
// //
// barcodeTimer // barcodeTimer
// //
...@@ -136,21 +155,22 @@ ...@@ -136,21 +155,22 @@
this.messageListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.messageListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1, this.columnHeader1,
this.columnHeader2}); this.columnHeader2});
this.messageListView.HideSelection = false;
this.messageListView.Location = new System.Drawing.Point(12, 375); this.messageListView.Location = new System.Drawing.Point(12, 375);
this.messageListView.Name = "messageListView"; this.messageListView.Name = "messageListView";
this.messageListView.Size = new System.Drawing.Size(746, 183); this.messageListView.Size = new System.Drawing.Size(746, 138);
this.messageListView.TabIndex = 5; this.messageListView.TabIndex = 5;
this.messageListView.UseCompatibleStateImageBehavior = false; this.messageListView.UseCompatibleStateImageBehavior = false;
this.messageListView.View = System.Windows.Forms.View.Details; this.messageListView.View = System.Windows.Forms.View.Details;
// //
// columnHeader1 // columnHeader1
// //
this.columnHeader1.Text = "Date"; this.columnHeader1.Text = "Pvm";
this.columnHeader1.Width = 93; this.columnHeader1.Width = 184;
// //
// columnHeader2 // columnHeader2
// //
this.columnHeader2.Text = "Message"; this.columnHeader2.Text = "Viesti";
this.columnHeader2.Width = 519; this.columnHeader2.Width = 519;
// //
// luggagesListView // luggagesListView
...@@ -163,6 +183,7 @@ ...@@ -163,6 +183,7 @@
this.columnHeader5}); this.columnHeader5});
this.luggagesListView.ContextMenuStrip = this.luggagesListContextMenuStrip; this.luggagesListView.ContextMenuStrip = this.luggagesListContextMenuStrip;
this.luggagesListView.FullRowSelect = true; this.luggagesListView.FullRowSelect = true;
this.luggagesListView.HideSelection = false;
this.luggagesListView.Location = new System.Drawing.Point(197, 151); this.luggagesListView.Location = new System.Drawing.Point(197, 151);
this.luggagesListView.Name = "luggagesListView"; this.luggagesListView.Name = "luggagesListView";
this.luggagesListView.Size = new System.Drawing.Size(281, 140); this.luggagesListView.Size = new System.Drawing.Size(281, 140);
...@@ -173,17 +194,17 @@ ...@@ -173,17 +194,17 @@
// //
// columnHeader3 // columnHeader3
// //
this.columnHeader3.Text = "Date"; this.columnHeader3.Text = "Pvm";
this.columnHeader3.Width = 85; this.columnHeader3.Width = 85;
// //
// columnHeader4 // columnHeader4
// //
this.columnHeader4.Text = "Description"; this.columnHeader4.Text = "Kuvaus";
this.columnHeader4.Width = 102; this.columnHeader4.Width = 102;
// //
// columnHeader5 // columnHeader5
// //
this.columnHeader5.Text = "Code"; this.columnHeader5.Text = "Koodi";
this.columnHeader5.Width = 108; this.columnHeader5.Width = 108;
// //
// luggagesListContextMenuStrip // luggagesListContextMenuStrip
...@@ -205,11 +226,11 @@ ...@@ -205,11 +226,11 @@
// //
this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(517, 81); this.label2.Location = new System.Drawing.Point(538, 81);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(60, 13); this.label2.Size = new System.Drawing.Size(43, 13);
this.label2.TabIndex = 8; this.label2.TabIndex = 8;
this.label2.Text = "Description"; this.label2.Text = "Kuvaus";
// //
// luggaageDescriptionTextBox // luggaageDescriptionTextBox
// //
...@@ -224,43 +245,166 @@ ...@@ -224,43 +245,166 @@
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.eventUserEditor);
this.groupBox1.Controls.Add(this.cardsPictureBox); this.groupBox1.Controls.Add(this.cardsPictureBox);
this.groupBox1.Controls.Add(this.luggagesListView); this.groupBox1.Controls.Add(this.luggagesListView);
this.groupBox1.Controls.Add(this.eventUserEditor);
this.groupBox1.Location = new System.Drawing.Point(16, 66); this.groupBox1.Location = new System.Drawing.Point(16, 66);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(487, 303); this.groupBox1.Size = new System.Drawing.Size(487, 303);
this.groupBox1.TabIndex = 10; this.groupBox1.TabIndex = 10;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "Selected user"; this.groupBox1.Text = "Valittu kävijä";
//
// barcodeFocusTimer
//
this.barcodeFocusTimer.Interval = 6000;
this.barcodeFocusTimer.Tick += new System.EventHandler(this.barcodeFocusTimer_Tick);
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(547, 110);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(34, 13);
this.label3.TabIndex = 11;
this.label3.Text = "Koodi";
//
// codeTextBox
//
this.codeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.codeTextBox.Location = new System.Drawing.Point(587, 107);
this.codeTextBox.Name = "codeTextBox";
this.codeTextBox.Size = new System.Drawing.Size(165, 20);
this.codeTextBox.TabIndex = 12;
//
// tabControl1
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 25);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(770, 545);
this.tabControl1.TabIndex = 5;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.label3);
this.tabPage1.Controls.Add(this.barcodeTextBox);
this.tabPage1.Controls.Add(this.codeTextBox);
this.tabPage1.Controls.Add(this.submitButton);
this.tabPage1.Controls.Add(this.luggaageDescriptionTextBox);
this.tabPage1.Controls.Add(this.label1);
this.tabPage1.Controls.Add(this.label2);
this.tabPage1.Controls.Add(this.messageListView);
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(762, 519);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Narikkaan";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.luggagesSearchListView);
this.tabPage2.Controls.Add(this.toolStrip2);
this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(762, 519);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "Listaus narikasta";
this.tabPage2.UseVisualStyleBackColor = true;
//
// luggagesSearchListView
//
this.luggagesSearchListView.CheckBoxes = true;
this.luggagesSearchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader6,
this.columnHeader7,
this.columnHeader8});
this.luggagesSearchListView.Dock = System.Windows.Forms.DockStyle.Fill;
this.luggagesSearchListView.HideSelection = false;
this.luggagesSearchListView.Location = new System.Drawing.Point(3, 74);
this.luggagesSearchListView.Name = "luggagesSearchListView";
this.luggagesSearchListView.Size = new System.Drawing.Size(756, 442);
this.luggagesSearchListView.TabIndex = 0;
this.luggagesSearchListView.UseCompatibleStateImageBehavior = false;
this.luggagesSearchListView.View = System.Windows.Forms.View.Details;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.searchTextBox);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox2.Location = new System.Drawing.Point(3, 3);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(756, 46);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Hakuvalinnat";
//
// searchTextBox
//
this.searchTextBox.Location = new System.Drawing.Point(6, 17);
this.searchTextBox.Name = "searchTextBox";
this.searchTextBox.Size = new System.Drawing.Size(295, 20);
this.searchTextBox.TabIndex = 1;
this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
//
// searchTimer
//
this.searchTimer.Interval = 500;
this.searchTimer.Tick += new System.EventHandler(this.searchTimer_Tick);
//
// columnHeader6
//
this.columnHeader6.Text = "Nimi";
this.columnHeader6.Width = 144;
//
// columnHeader7
//
this.columnHeader7.Text = "Narikkakoodi";
this.columnHeader7.Width = 163;
//
// columnHeader8
//
this.columnHeader8.Text = "Kuvaus";
this.columnHeader8.Width = 250;
// //
// eventUserEditor // eventUserEditor
// //
this.eventUserEditor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.eventUserEditor.Location = new System.Drawing.Point(197, 15);
| System.Windows.Forms.AnchorStyles.Right)));
this.eventUserEditor.Location = new System.Drawing.Point(187, 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(281, 130);
this.eventUserEditor.TabIndex = 2; this.eventUserEditor.TabIndex = 5;
this.eventUserEditor.Enter += new System.EventHandler(this.eventUserEditor_Enter);
// //
// barcodeFocusTimer // toolStrip2
// //
this.barcodeFocusTimer.Interval = 6000; this.toolStrip2.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.barcodeFocusTimer.Tick += new System.EventHandler(this.barcodeFocusTimer_Tick); this.toolStripLabel1});
this.toolStrip2.Location = new System.Drawing.Point(3, 49);
this.toolStrip2.Name = "toolStrip2";
this.toolStrip2.Size = new System.Drawing.Size(756, 25);
this.toolStrip2.TabIndex = 2;
this.toolStrip2.Text = "toolStrip2";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(118, 22);
this.toolStripLabel1.Text = "Vapauta narikkatuote";
this.toolStripLabel1.Click += new System.EventHandler(this.toolStripLabel1_Click);
// //
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(770, 570); this.ClientSize = new System.Drawing.Size(770, 570);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.luggaageDescriptionTextBox);
this.Controls.Add(this.label2);
this.Controls.Add(this.messageListView);
this.Controls.Add(this.label1);
this.Controls.Add(this.barcodeTextBox);
this.Controls.Add(this.submitButton);
this.Controls.Add(this.toolStrip1); this.Controls.Add(this.toolStrip1);
this.Name = "Form1"; this.Name = "Form1";
this.Text = "Form1"; this.Text = "Form1";
...@@ -270,6 +414,15 @@ ...@@ -270,6 +414,15 @@
((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.cardsPictureBox)).EndInit();
this.luggagesListContextMenuStrip.ResumeLayout(false); this.luggagesListContextMenuStrip.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabPage1.PerformLayout();
this.tabPage2.ResumeLayout(false);
this.tabPage2.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.toolStrip2.ResumeLayout(false);
this.toolStrip2.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -281,7 +434,6 @@ ...@@ -281,7 +434,6 @@
private System.Windows.Forms.ToolStripButton settingsToolStripButton; private System.Windows.Forms.ToolStripButton settingsToolStripButton;
private System.Windows.Forms.Timer readerTimer; private System.Windows.Forms.Timer readerTimer;
private System.Windows.Forms.PictureBox cardsPictureBox; private System.Windows.Forms.PictureBox cardsPictureBox;
private MoyaAdminLib.Controls.EventUserEditor eventUserEditor;
private System.Windows.Forms.Button submitButton; private System.Windows.Forms.Button submitButton;
private System.Windows.Forms.TextBox barcodeTextBox; private System.Windows.Forms.TextBox barcodeTextBox;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
...@@ -299,6 +451,21 @@ ...@@ -299,6 +451,21 @@
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; private System.Windows.Forms.Timer barcodeFocusTimer;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox codeTextBox;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.ListView luggagesSearchListView;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.TextBox searchTextBox;
private System.Windows.Forms.Timer searchTimer;
private System.Windows.Forms.ColumnHeader columnHeader6;
private System.Windows.Forms.ColumnHeader columnHeader7;
private System.Windows.Forms.ColumnHeader columnHeader8;
private MoyaAdminLib.Controls.EventUserEditor eventUserEditor;
private System.Windows.Forms.ToolStrip toolStrip2;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
} }
} }
Cloakroom/Cloakroom/Form1.cs
...@@ -27,11 +27,17 @@ namespace Cloakroom ...@@ -27,11 +27,17 @@ namespace Cloakroom
BarCodeScanner scanner = new BarCodeScanner(); BarCodeScanner scanner = new BarCodeScanner();
Dictionary<LuggageHold, Eventuser> usersToLuggage = new Dictionary<LuggageHold, Eventuser>();
Dictionary<string, LuggageHold> luggageCodeToLuggage = new Dictionary<string, LuggageHold>();
Dictionary<Eventuser, LuggageHoldList> luggageLists = new Dictionary<Eventuser, LuggageHoldList>();
List<ListViewItem> searchLuggages = new List<ListViewItem>();
public Form1() public Form1()
{ {
InitializeComponent(); InitializeComponent();
RestClient.ApiURL = Properties.Settings.Default.ApiURL; RestClient.ApiURL = Properties.Settings.Default.ApiURL;
RestClient.ApiApplicationKey = Properties.Settings.Default.ApiKey; RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiUser = Properties.Settings.Default.ApiUser; RestClient.ApiUser = Properties.Settings.Default.ApiUser;
RestClient.ApiPass = Properties.Settings.Default.ApiPass; RestClient.ApiPass = Properties.Settings.Default.ApiPass;
} }
...@@ -44,9 +50,53 @@ namespace Cloakroom ...@@ -44,9 +50,53 @@ namespace Cloakroom
private void Form1_Load(object sender, EventArgs e) private void Form1_Load(object sender, EventArgs e)
{ {
if (Properties.Settings.Default.Port != null) if (Properties.Settings.Default.ReaderId > 0)
{ {
readerTimer.Enabled = true;
readerTimer.Start();
}
loadLuggages();
}
private void loadLuggages()
{
string ret = null;
RestClient client = null;
try
{
client = new RestClient(Properties.Settings.Default.ApiURL);
ret = client.MakeRequest("user/eventusers");
} catch (Exception ex)
{
}
if(ret != null)
{
var ser = new JavaScriptSerializer();
EventUsers users = ser.Deserialize<EventUsers>(ret);
if(users != null)
{
foreach(Eventuser user in users.eventusers)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
ret = client.MakeRequest("meta/v1/eventuser/" + user.eventuserId + "/" + LUGGAGE_MODULE);
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/");
LuggageHoldList luggageList = ser.Deserialize<LuggageHoldList>(ret);
if(!luggageLists.ContainsKey(user))
{
luggageLists.Add(user, luggageList);
}
foreach (LuggageHold luggage in luggageList.luggages)
{
addToSearchListView(user, luggage);
}
}
}
} }
} }
...@@ -63,8 +113,10 @@ namespace Cloakroom ...@@ -63,8 +113,10 @@ namespace Cloakroom
ReaderEventList events = ser.Deserialize<ReaderEventList>(ret); ReaderEventList events = ser.Deserialize<ReaderEventList>(ret);
if (events != null && events.readerEvents != null) if (events != null && events.readerEvents != null)
{ {
//ReaderEvent re = events.readerEvents.Last();
foreach (ReaderEvent re in events.readerEvents) foreach (ReaderEvent re in events.readerEvents)
{ {
if (re.eventuser != null) if (re.eventuser != null)
{ {
ret = client.MakeRequest("user/card/" + re.eventuser.eventuserId); ret = client.MakeRequest("user/card/" + re.eventuser.eventuserId);
...@@ -72,10 +124,11 @@ namespace Cloakroom ...@@ -72,10 +124,11 @@ namespace Cloakroom
if (card != null) if (card != null)
{ {
eventUserEditor.LoadUser(re.eventuser, card); eventUserEditor.LoadUser(re.eventuser, card);
cardsPictureBox.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId); cardsPictureBox.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.id);
selectedUser = re.eventuser; selectedUser = re.eventuser;
selectedCard = card; selectedCard = card;
lastEventId = re.readerEventId; lastEventId = re.readerEventId;
break;
} }
} }
} }
...@@ -96,7 +149,7 @@ namespace Cloakroom ...@@ -96,7 +149,7 @@ namespace Cloakroom
try try
{ {
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
ret = client.MakeRequest("meta/v1/printedcard/" + selectedCard.cardId + "/" + LUGGAGE_MODULE); ret = client.MakeRequest("meta/v1/eventuser/" + selectedCard.eventuserId + "/" + LUGGAGE_MODULE);
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/"); ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
LuggageHoldList luggageList = ser.Deserialize<LuggageHoldList>(ret); LuggageHoldList luggageList = ser.Deserialize<LuggageHoldList>(ret);
...@@ -106,7 +159,7 @@ namespace Cloakroom ...@@ -106,7 +159,7 @@ namespace Cloakroom
luggageList.luggages = new List<LuggageHold>(); luggageList.luggages = new List<LuggageHold>();
} }
LuggageHold luggage = new LuggageHold(); LuggageHold luggage = new LuggageHold();
luggage.luggageCode = code; luggage.luggageCode = codeTextBox.Text;
luggage.description = luggaageDescriptionTextBox.Text; luggage.description = luggaageDescriptionTextBox.Text;
luggageList.luggages.Add(luggage); luggageList.luggages.Add(luggage);
...@@ -114,12 +167,15 @@ namespace Cloakroom ...@@ -114,12 +167,15 @@ namespace Cloakroom
string json = ser.Serialize(luggageList); string json = ser.Serialize(luggageList);
Console.WriteLine("json: " + json); Console.WriteLine("json: " + json);
client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, json); client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.PUT, json);
ret = client.MakeRequest("meta/v1/printedcard/" + selectedCard.cardId + "/" + LUGGAGE_MODULE); ret = client.MakeRequest("meta/v1/eventuser/" + selectedCard.eventuserId + "/" + LUGGAGE_MODULE);
ListViewItem lvi = new ListViewItem(luggage.date.ToString("d.M.yyyy HH:mm")); ListViewItem lvi = new ListViewItem(luggage.date.ToString("d.M.yyyy HH:mm"));
lvi.SubItems.Add(luggage.description); lvi.SubItems.Add(luggage.description);
lvi.SubItems.Add(luggage.luggageCode); lvi.SubItems.Add(luggage.luggageCode);
lvi.Tag = luggage;
luggagesListView.Items.Add(lvi); luggagesListView.Items.Add(lvi);
addToSearchListView(selectedUser, luggage);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -127,8 +183,29 @@ namespace Cloakroom ...@@ -127,8 +183,29 @@ namespace Cloakroom
return; return;
} }
if(printLabel(code)) //if(printLabel(code))
addMessageToListView("Luggage submitted for person " + eventUserEditor.GetName()); addMessageToListView("Narikkaan lisätty tavara henkilölle " + eventUserEditor.GetName());
}
private void addToSearchListView(Eventuser user, LuggageHold luggage)
{
ListViewItem lvi = new ListViewItem(user.firstname + " " + user.lastname);
lvi.SubItems.Add(luggage.luggageCode);
lvi.SubItems.Add(luggage.description);
lvi.Tag = user;
luggagesSearchListView.Items.Add(lvi);
searchLuggages.Add(lvi);
if(!usersToLuggage.ContainsKey(luggage))
{
usersToLuggage.Add(luggage, user);
}
if (!luggageCodeToLuggage.ContainsKey(luggage.luggageCode))
luggageCodeToLuggage.Add(luggage.luggageCode, luggage);
else {
luggageCodeToLuggage[luggage.luggageCode] = luggage;
}
} }
private string getUniqueCode() private string getUniqueCode()
...@@ -209,10 +286,17 @@ namespace Cloakroom ...@@ -209,10 +286,17 @@ namespace Cloakroom
{ {
ret = ""; ret = "";
client = new RestClient(Properties.Settings.Default.ApiURL); client = new RestClient(Properties.Settings.Default.ApiURL);
ret = client.MakeRequest("meta/v1/printedcard/" + card.cardId + "/" + LUGGAGE_MODULE); LuggageHoldList luggageList = null;
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/"); try
Console.WriteLine(ret); {
LuggageHoldList luggageList = ser.Deserialize<LuggageHoldList>(ret); ret = client.MakeRequest("meta/v1/printedcard/" + card.id + "/" + LUGGAGE_MODULE);
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/");
Console.WriteLine(ret);
luggageList = ser.Deserialize<LuggageHoldList>(ret);
}catch (Exception ex)
{
addMessageToListView("Failed to get metadata from users card");
}
if (luggageList != null && luggageList.luggages != null) if (luggageList != null && luggageList.luggages != null)
{ {
foreach (LuggageHold luggage in luggageList.luggages) foreach (LuggageHold luggage in luggageList.luggages)
...@@ -226,7 +310,7 @@ namespace Cloakroom ...@@ -226,7 +310,7 @@ namespace Cloakroom
} }
eventUserEditor.LoadCard(card); eventUserEditor.LoadCard(card);
cardsPictureBox.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId); cardsPictureBox.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.id);
//selectedUser = re.eventuser; //selectedUser = re.eventuser;
selectedCard = card; selectedCard = card;
//lastEventId = re.readerEventId; //lastEventId = re.readerEventId;
...@@ -234,12 +318,22 @@ namespace Cloakroom ...@@ -234,12 +318,22 @@ namespace Cloakroom
} }
else if (barcodeTextBox.Text.Length == 8 && selectedCard != null) else if (barcodeTextBox.Text.Length == 8 && selectedCard != null)
{ {
LuggageHoldList luggageList = null;
LuggageHold released = null;
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
ret = client.MakeRequest("meta/v1/printedcard/" + selectedCard.cardId + "/" + LUGGAGE_MODULE);
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
LuggageHoldList luggageList = ser.Deserialize<LuggageHoldList>(ret); try
LuggageHold released = null; {
ret = client.MakeRequest("meta/v1/printedcard/" + selectedCard.id + "/" + LUGGAGE_MODULE);
ret = ret.Replace("/Date", "\\/Date").Replace(")/", ")\\/");
luggageList = ser.Deserialize<LuggageHoldList>(ret);
} catch(Exception ex)
{
addMessageToListView("Failed to add metadata to users card");
}
if (luggageList != null || luggageList.luggages != null) if (luggageList != null || luggageList.luggages != null)
{ {
foreach (LuggageHold luggage in luggageList.luggages) foreach (LuggageHold luggage in luggageList.luggages)
...@@ -255,7 +349,7 @@ namespace Cloakroom ...@@ -255,7 +349,7 @@ namespace Cloakroom
try try
{ {
client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, ser.Serialize(luggageList)); client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, ser.Serialize(luggageList));
client.MakeRequest("meta/v1/printedcard/" + selectedCard.cardId + "/" + LUGGAGE_MODULE); client.MakeRequest("meta/v1/printedcard/" + selectedCard.id + "/" + LUGGAGE_MODULE);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -309,7 +403,7 @@ namespace Cloakroom ...@@ -309,7 +403,7 @@ namespace Cloakroom
private void releaseToolStripMenuItem_Click(object sender, EventArgs e) private void releaseToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (luggagesListView.SelectedItems != null && luggagesListView.SelectedItems.Count > 0 && selectedCard != null) if (luggagesListView.SelectedItems != null && luggagesListView.SelectedItems.Count > 0 && selectedUser != null)
{ {
List<ListViewItem> removed = new List<ListViewItem>(); List<ListViewItem> removed = new List<ListViewItem>();
LuggageHoldList list = new LuggageHoldList(); LuggageHoldList list = new LuggageHoldList();
...@@ -326,7 +420,7 @@ namespace Cloakroom ...@@ -326,7 +420,7 @@ namespace Cloakroom
try try
{ {
RestClient client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, ser.Serialize(list)); RestClient client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, ser.Serialize(list));
client.MakeRequest("meta/v1/printedcard/" + selectedCard.cardId + "/" + LUGGAGE_MODULE); client.MakeRequest("meta/v1/eventuser/" + selectedUser.eventuserId + "/" + LUGGAGE_MODULE);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -337,6 +431,16 @@ namespace Cloakroom ...@@ -337,6 +431,16 @@ namespace Cloakroom
{ {
LuggageHold luggage = (LuggageHold)lvi.Tag; LuggageHold luggage = (LuggageHold)lvi.Tag;
luggagesListView.Items.Remove(lvi); luggagesListView.Items.Remove(lvi);
ListViewItem searchItemRm = searchLuggages.Find(l => l.SubItems[1].Text == luggage.luggageCode);
if(searchItemRm != null)
{
searchLuggages.Remove(searchItemRm);
usersToLuggage.Remove(luggage);
}
addMessageToListView("Released luggage " + luggage.luggageCode + " for person " + selectedCard.wholeName); addMessageToListView("Released luggage " + luggage.luggageCode + " for person " + selectedCard.wholeName);
} }
...@@ -368,6 +472,129 @@ namespace Cloakroom ...@@ -368,6 +472,129 @@ namespace Cloakroom
{ {
barcodeFocusTimer.Start(); barcodeFocusTimer.Start();
} }
private void searchTimer_Tick(object sender, EventArgs e)
{
searchTimer.Stop();
filterUsers();
}
private void filterUsers()
{
luggagesSearchListView.BeginUpdate();
luggagesSearchListView.Items.Clear();
if (searchTextBox.Text != "")
{
List<ListViewItem> lvis = new List<ListViewItem>();
foreach(ListViewItem lvi in searchLuggages)
{
string luggageCode = lvi.SubItems[1].Text;
if(lvi.Tag is Eventuser)
{
Eventuser user = (Eventuser)lvi.Tag;
if(user.firstname.ToLower().Contains(searchTextBox.Text.ToLower()) ||
user.lastname.ToLower().Contains(searchTextBox.Text.ToLower()) ||
luggageCode.ToLower().Contains(searchTextBox.Text.ToLower())) {
lvis.Add(lvi);
}
}
}
luggagesSearchListView.Items.AddRange(lvis.ToArray());
} else
{
luggagesSearchListView.Items.AddRange(searchLuggages.ToArray());
}
luggagesSearchListView.EndUpdate();
}
private void searchTextBox_TextChanged(object sender, EventArgs e)
{
searchTimer.Start();
}
private void toolStripLabel1_Click(object sender, EventArgs e)
{
if(luggagesSearchListView.CheckedItems.Count > 0)
{
List<string> codes = new List<string>();
foreach(ListViewItem lvi in luggagesSearchListView.CheckedItems)
{
string luggageCode = lvi.SubItems[1].Text;
codes.Add(luggageCode);
}
releaseLuggage(codes);
}
}
private void releaseLuggage(List<string> luggageCodes)
{
Dictionary<Eventuser, LuggageHoldList> updatedLists = new Dictionary<Eventuser, LuggageHoldList>();
List<ListViewItem> searchListViewRemoved = new List<ListViewItem>();
List<ListViewItem> luggageListViewRemoved = new List<ListViewItem>();
if (luggageCodes.Count > 0)
{
foreach (string code in luggageCodes)
{
ListViewItem lvi = searchLuggages.Find(l => l.SubItems[1].Text == code);
foreach(ListViewItem ll in luggagesListView.Items)
{
if(ll.Tag != null && ll.Tag is LuggageHold)
{
LuggageHold luggage = (LuggageHold) ll.Tag;
if (luggage.luggageCode == code)
luggageListViewRemoved.Add(ll);
}
}
if(lvi != null && lvi.Tag != null && lvi.Tag is Eventuser)
{
searchListViewRemoved.Add(lvi);
Eventuser user = (Eventuser)lvi.Tag;
LuggageHold luggage = luggageLists[user].luggages.Find(l => l.luggageCode == code);
luggageLists[user].luggages.Remove(luggage);
if(!updatedLists.ContainsKey(user))
updatedLists.Add(user, luggageLists[user]);
}
}
foreach(Eventuser user in updatedLists.Keys)
{
var ser = new JavaScriptSerializer();
try
{
RestClient client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, ser.Serialize(updatedLists[user]));
client.MakeRequest("meta/v1/eventuser/" + user.eventuserId + "/" + LUGGAGE_MODULE);
}
catch (Exception ex)
{
if (!ex.Message.Contains("HTTP NoContent"))
return;
}
foreach (ListViewItem lvi in searchListViewRemoved)
{
luggagesSearchListView.Items.Remove(lvi);
}
foreach(ListViewItem lvi in luggageListViewRemoved)
{
LuggageHold luggage = (LuggageHold)lvi.Tag;
luggagesListView.Items.Remove(lvi);
addMessageToListView("Narikkatuotteet koodille" + luggage.luggageCode + " annettu takaisin henkilölle " + user.firstname + " " + user.lastname);
}
}
}
}
} }
......
Cloakroom/Cloakroom/Form1.resx
...@@ -142,4 +142,10 @@ ...@@ -142,4 +142,10 @@
<metadata name="barcodeFocusTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="barcodeFocusTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>585, 17</value> <value>585, 17</value>
</metadata> </metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>860, 17</value>
</metadata>
<metadata name="searchTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>743, 17</value>
</metadata>
</root> </root>
\ No newline at end of file
Cloakroom/Cloakroom/Properties/Settings.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.18449 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
...@@ -12,7 +12,7 @@ namespace Cloakroom.Properties { ...@@ -12,7 +12,7 @@ namespace Cloakroom.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [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", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
...@@ -37,7 +37,7 @@ namespace Cloakroom.Properties { ...@@ -37,7 +37,7 @@ namespace Cloakroom.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("http://10.220.105.194:8080/MoyaWeb")]
public string ApiURL { public string ApiURL {
get { get {
return ((string)(this["ApiURL"])); return ((string)(this["ApiURL"]));
...@@ -49,13 +49,13 @@ namespace Cloakroom.Properties { ...@@ -49,13 +49,13 @@ namespace Cloakroom.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("4ifkLUhy1ByYD6JWOUdA")]
public string ApiKey { public string ApiApplicationKey {
get { get {
return ((string)(this["ApiKey"])); return ((string)(this["ApiApplicationKey"]));
} }
set { set {
this["ApiKey"] = value; this["ApiApplicationKey"] = value;
} }
} }
...@@ -94,5 +94,29 @@ namespace Cloakroom.Properties { ...@@ -94,5 +94,29 @@ namespace Cloakroom.Properties {
this["Port"] = value; this["Port"] = 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;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ApiTokenSet {
get {
return ((bool)(this["ApiTokenSet"]));
}
set {
this["ApiTokenSet"] = value;
}
}
} }
} }
Cloakroom/Cloakroom/Properties/Settings.settings
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="ApiURL" Type="System.String" Scope="User"> <Setting Name="ApiURL" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">http://10.220.105.194:8080/MoyaWeb</Value>
</Setting> </Setting>
<Setting Name="ApiKey" Type="System.String" Scope="User"> <Setting Name="ApiApplicationKey" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">4ifkLUhy1ByYD6JWOUdA</Value>
</Setting> </Setting>
<Setting Name="ApiPass" Type="System.String" Scope="User"> <Setting Name="ApiPass" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
...@@ -20,5 +20,11 @@ ...@@ -20,5 +20,11 @@
<Setting Name="Port" Type="System.String" Scope="User"> <Setting Name="Port" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
</Setting> </Setting>
<Setting Name="ApplicationVersion" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApiTokenSet" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>
\ No newline at end of file
Cloakroom/Cloakroom/Settings.Designer.cs
...@@ -28,71 +28,23 @@ ...@@ -28,71 +28,23 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.label4 = new System.Windows.Forms.Label();
this.ApiPassTextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.ApiUserTextBox = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.ApiKeyTextBox = new System.Windows.Forms.TextBox();
this.SaveButton = new System.Windows.Forms.Button(); this.SaveButton = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label();
this.pwTextBox = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.usernameTextBox = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
this.apiURLTextBox = new System.Windows.Forms.TextBox(); this.apiURLTextBox = new System.Windows.Forms.TextBox();
this.portsComboBox = new System.Windows.Forms.ComboBox(); this.resetApiTokenCheckBox = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label();
this.scannersComboBox = new System.Windows.Forms.ComboBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(12, 129);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(48, 13);
this.label4.TabIndex = 35;
this.label4.Text = "Api Pass";
//
// ApiPassTextBox
//
this.ApiPassTextBox.Location = new System.Drawing.Point(12, 145);
this.ApiPassTextBox.Name = "ApiPassTextBox";
this.ApiPassTextBox.PasswordChar = 'ῷ';
this.ApiPassTextBox.Size = new System.Drawing.Size(260, 20);
this.ApiPassTextBox.TabIndex = 34;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(12, 90);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(47, 13);
this.label3.TabIndex = 33;
this.label3.Text = "Api User";
//
// ApiUserTextBox
//
this.ApiUserTextBox.Location = new System.Drawing.Point(12, 106);
this.ApiUserTextBox.Name = "ApiUserTextBox";
this.ApiUserTextBox.Size = new System.Drawing.Size(260, 20);
this.ApiUserTextBox.TabIndex = 32;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 51);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(79, 13);
this.label2.TabIndex = 31;
this.label2.Text = "Application key";
//
// ApiKeyTextBox
//
this.ApiKeyTextBox.Location = new System.Drawing.Point(12, 67);
this.ApiKeyTextBox.Name = "ApiKeyTextBox";
this.ApiKeyTextBox.Size = new System.Drawing.Size(260, 20);
this.ApiKeyTextBox.TabIndex = 30;
//
// SaveButton // SaveButton
// //
this.SaveButton.Location = new System.Drawing.Point(197, 226); this.SaveButton.Location = new System.Drawing.Point(225, 202);
this.SaveButton.Name = "SaveButton"; this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.Size = new System.Drawing.Size(75, 23);
this.SaveButton.TabIndex = 29; this.SaveButton.TabIndex = 29;
...@@ -100,75 +52,131 @@ ...@@ -100,75 +52,131 @@
this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
// //
// label1 // groupBox1
// //
this.label1.AutoSize = true; this.groupBox1.Controls.Add(this.label6);
this.label1.Location = new System.Drawing.Point(12, 8); this.groupBox1.Controls.Add(this.pwTextBox);
this.label1.Name = "label1"; this.groupBox1.Controls.Add(this.label7);
this.label1.Size = new System.Drawing.Size(47, 13); this.groupBox1.Controls.Add(this.usernameTextBox);
this.label1.TabIndex = 28; this.groupBox1.Controls.Add(this.label8);
this.label1.Text = "Moya url"; this.groupBox1.Controls.Add(this.apiURLTextBox);
this.groupBox1.Controls.Add(this.resetApiTokenCheckBox);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(288, 146);
this.groupBox1.TabIndex = 39;
this.groupBox1.TabStop = false;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(6, 58);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(53, 13);
this.label6.TabIndex = 8;
this.label6.Text = "Password";
//
// pwTextBox
//
this.pwTextBox.Location = new System.Drawing.Point(6, 74);
this.pwTextBox.Name = "pwTextBox";
this.pwTextBox.PasswordChar = 'ῷ';
this.pwTextBox.ReadOnly = true;
this.pwTextBox.Size = new System.Drawing.Size(260, 20);
this.pwTextBox.TabIndex = 7;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(6, 19);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(55, 13);
this.label7.TabIndex = 6;
this.label7.Text = "Username";
//
// usernameTextBox
//
this.usernameTextBox.Location = new System.Drawing.Point(6, 35);
this.usernameTextBox.Name = "usernameTextBox";
this.usernameTextBox.ReadOnly = true;
this.usernameTextBox.Size = new System.Drawing.Size(260, 20);
this.usernameTextBox.TabIndex = 5;
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(6, 97);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(47, 13);
this.label8.TabIndex = 1;
this.label8.Text = "Moya url";
// //
// apiURLTextBox // apiURLTextBox
// //
this.apiURLTextBox.Location = new System.Drawing.Point(12, 24); this.apiURLTextBox.Location = new System.Drawing.Point(6, 113);
this.apiURLTextBox.Name = "apiURLTextBox"; this.apiURLTextBox.Name = "apiURLTextBox";
this.apiURLTextBox.ReadOnly = true;
this.apiURLTextBox.Size = new System.Drawing.Size(260, 20); this.apiURLTextBox.Size = new System.Drawing.Size(260, 20);
this.apiURLTextBox.TabIndex = 27; this.apiURLTextBox.TabIndex = 0;
//
// resetApiTokenCheckBox
// //
// portsComboBox this.resetApiTokenCheckBox.AutoSize = true;
this.resetApiTokenCheckBox.Location = new System.Drawing.Point(3, -1);
this.resetApiTokenCheckBox.Name = "resetApiTokenCheckBox";
this.resetApiTokenCheckBox.Size = new System.Drawing.Size(101, 17);
this.resetApiTokenCheckBox.TabIndex = 0;
this.resetApiTokenCheckBox.Text = "Reset api token";
this.resetApiTokenCheckBox.UseVisualStyleBackColor = true;
this.resetApiTokenCheckBox.CheckedChanged += new System.EventHandler(this.resetApiTokenCheckBox_CheckedChanged);
// //
this.portsComboBox.FormattingEnabled = true; // label9
this.portsComboBox.Location = new System.Drawing.Point(12, 182);
this.portsComboBox.Name = "portsComboBox";
this.portsComboBox.Size = new System.Drawing.Size(260, 21);
this.portsComboBox.TabIndex = 36;
// //
// label5 this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(15, 161);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(47, 13);
this.label9.TabIndex = 41;
this.label9.Text = "Scanner";
// //
this.label5.AutoSize = true; // scannersComboBox
this.label5.Location = new System.Drawing.Point(12, 168); //
this.label5.Name = "label5"; this.scannersComboBox.FormattingEnabled = true;
this.label5.Size = new System.Drawing.Size(68, 13); this.scannersComboBox.Location = new System.Drawing.Point(15, 175);
this.label5.TabIndex = 37; this.scannersComboBox.Name = "scannersComboBox";
this.label5.Text = "Scanner port"; this.scannersComboBox.Size = new System.Drawing.Size(285, 21);
this.scannersComboBox.TabIndex = 40;
// //
// Settings // Settings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 261); this.ClientSize = new System.Drawing.Size(309, 230);
this.Controls.Add(this.label5); this.Controls.Add(this.label9);
this.Controls.Add(this.portsComboBox); this.Controls.Add(this.scannersComboBox);
this.Controls.Add(this.label4); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.ApiPassTextBox);
this.Controls.Add(this.label3);
this.Controls.Add(this.ApiUserTextBox);
this.Controls.Add(this.label2);
this.Controls.Add(this.ApiKeyTextBox);
this.Controls.Add(this.SaveButton); this.Controls.Add(this.SaveButton);
this.Controls.Add(this.label1);
this.Controls.Add(this.apiURLTextBox);
this.Name = "Settings"; this.Name = "Settings";
this.Text = "Settings"; this.Text = "Settings";
this.Load += new System.EventHandler(this.Settings_Load); this.Load += new System.EventHandler(this.Settings_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
} }
#endregion #endregion
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox ApiPassTextBox;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox ApiUserTextBox;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox ApiKeyTextBox;
private System.Windows.Forms.Button SaveButton; private System.Windows.Forms.Button SaveButton;
private System.Windows.Forms.Label label1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox pwTextBox;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox usernameTextBox;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox apiURLTextBox; private System.Windows.Forms.TextBox apiURLTextBox;
private System.Windows.Forms.ComboBox portsComboBox; private System.Windows.Forms.CheckBox resetApiTokenCheckBox;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label9;
private System.Windows.Forms.ComboBox scannersComboBox;
} }
} }
\ No newline at end of file
Cloakroom/Cloakroom/Settings.cs
 using MoyaAdminLib;
using MoyaAdminLib;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
...@@ -22,25 +21,23 @@ namespace Cloakroom ...@@ -22,25 +21,23 @@ namespace Cloakroom
private void Settings_Load(object sender, EventArgs e) private void Settings_Load(object sender, EventArgs e)
{ {
resetApiTokenCheckBox.Checked = !Properties.Settings.Default.ApiTokenSet;
apiURLTextBox.Text = Properties.Settings.Default.ApiURL; apiURLTextBox.Text = Properties.Settings.Default.ApiURL;
ApiKeyTextBox.Text = Properties.Settings.Default.ApiKey;
ApiUserTextBox.Text = Properties.Settings.Default.ApiUser;
ApiPassTextBox.Text = Properties.Settings.Default.ApiPass;
if (apiURLTextBox.Text != "" && ApiKeyTextBox.Text != "" && ApiUserTextBox.Text != "" && ApiPassTextBox.Text != "") if (Properties.Settings.Default.ApiTokenSet)
{ {
loadReaders(); loadReaders();
} }
if (Properties.Settings.Default.ReaderId != 0) if (Properties.Settings.Default.ReaderId != 0)
{ {
if (portsComboBox.Items.Count > 0) if (scannersComboBox.Items.Count > 0)
{ {
foreach (object obj in portsComboBox.Items) foreach (object obj in scannersComboBox.Items)
{ {
if (obj is Reader && ((Reader)obj).readerId == Properties.Settings.Default.ReaderId) if (obj is Reader && ((Reader)obj).readerId == Properties.Settings.Default.ReaderId)
{ {
portsComboBox.SelectedItem = obj; scannersComboBox.SelectedItem = obj;
break; break;
} }
} }
...@@ -60,11 +57,11 @@ namespace Cloakroom ...@@ -60,11 +57,11 @@ namespace Cloakroom
ReaderList readers = ser.Deserialize<ReaderList>(ret); ReaderList readers = ser.Deserialize<ReaderList>(ret);
if (readers != null && readers.readers != null) if (readers != null && readers.readers != null)
{ {
portsComboBox.Items.Clear(); scannersComboBox.Items.Clear();
portsComboBox.Items.Add(" "); scannersComboBox.Items.Add(" ");
foreach (Reader reader in readers.readers) foreach (Reader reader in readers.readers)
{ {
portsComboBox.Items.Add(reader); scannersComboBox.Items.Add(reader);
} }
} }
} }
...@@ -76,19 +73,68 @@ namespace Cloakroom ...@@ -76,19 +73,68 @@ namespace Cloakroom
private void SaveButton_Click(object sender, EventArgs e) private void SaveButton_Click(object sender, EventArgs e)
{ {
Properties.Settings.Default.ApiURL = apiURLTextBox.Text; if (scannersComboBox.SelectedItem != null && scannersComboBox.SelectedItem is Reader)
Properties.Settings.Default.ApiKey = ApiKeyTextBox.Text; {
Properties.Settings.Default.ApiUser = ApiUserTextBox.Text; Properties.Settings.Default.ReaderId = ((Reader)scannersComboBox.SelectedItem).readerId;
Properties.Settings.Default.ApiPass = ApiPassTextBox.Text; Properties.Settings.Default.Save();
}
ApiCredential apiCredential = null;
if (portsComboBox.SelectedItem != null && portsComboBox.SelectedItem is Reader) if (resetApiTokenCheckBox.Checked)
{ {
Properties.Settings.Default.ReaderId = ((Reader)portsComboBox.SelectedItem).readerId; try
{
apiCredential = RestClient.GetApiCredential(usernameTextBox.Text, pwTextBox.Text, Properties.Settings.Default.ApiApplicationKey, apiURLTextBox.Text);
}
catch (Exception ex)
{
MessageBox.Show("Failed to get api credentials: " + ex.Message);
}
if (apiCredential != null)
{
Properties.Settings.Default.ApiURL = apiURLTextBox.Text;
Properties.Settings.Default.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
Properties.Settings.Default.ApiUser = apiCredential.authname;
Properties.Settings.Default.ApiPass = apiCredential.secret;
Properties.Settings.Default.ApiTokenSet = true;
Properties.Settings.Default.Save();
}
} }
Properties.Settings.Default.Save();
RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiPass = Properties.Settings.Default.ApiPass;
RestClient.ApiUser = Properties.Settings.Default.ApiUser;
RestClient.ApiURL = Properties.Settings.Default.ApiURL;
this.DialogResult = System.Windows.Forms.DialogResult.OK; this.DialogResult = System.Windows.Forms.DialogResult.OK;
} }
private void ApiSettings_Load(object sender, EventArgs e)
{
resetApiTokenCheckBox.Checked = !Properties.Settings.Default.ApiTokenSet;
apiURLTextBox.Text = Properties.Settings.Default.ApiURL;
//usernameTextBox.Text = Properties.Settings.Default.ApiUser;
//pwTextBox.Text = Properties.Settings.Default.ApiPass;
}
private void resetApiTokenCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (!resetApiTokenCheckBox.Checked)
{
apiURLTextBox.ReadOnly = true;
usernameTextBox.ReadOnly = true;
pwTextBox.ReadOnly = true;
}
else
{
apiURLTextBox.ReadOnly = false;
usernameTextBox.ReadOnly = false;
pwTextBox.ReadOnly = false;
}
}
} }
} }
Cloakroom/Cloakroom/obj/Debug/Cloakroom.csproj.FileListAbsolute.txt
...@@ -15,3 +15,21 @@ I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Interop.bpac.dll ...@@ -15,3 +15,21 @@ I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Interop.bpac.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.ResolveComReference.cache I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.ResolveComReference.cache
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.dll I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.pdb I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.pdb
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe.config
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.pdb
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Interop.bpac.dll
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Interop.bpac.dll
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.ResolveComReference.cache
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Form1.resources
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Properties.Resources.resources
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Settings.resources
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.GenerateResource.cache
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.CoreCompileInputs.cache
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.CopyComplete
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.exe
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.pdb
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.pdb
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll.config
C:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.AssemblyReference.cache
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Controls/EventUserEditor.Designer.cs
...@@ -43,36 +43,36 @@ ...@@ -43,36 +43,36 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(42, 12); this.label1.Location = new System.Drawing.Point(42, 12);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(35, 13); this.label1.Size = new System.Drawing.Size(27, 13);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "Name"; this.label1.Text = "Nimi";
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(48, 40); this.label2.Location = new System.Drawing.Point(11, 40);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(29, 13); this.label2.Size = new System.Drawing.Size(58, 13);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "Nick"; this.label2.Text = "Nimimerkki";
// //
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(5, 68); this.label3.Location = new System.Drawing.Point(6, 68);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(72, 13); this.label3.Size = new System.Drawing.Size(63, 13);
this.label3.TabIndex = 2; this.label3.TabIndex = 2;
this.label3.Text = "Card template"; this.label3.Text = "Kortin pohja";
// //
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(22, 96); this.label4.Location = new System.Drawing.Point(19, 96);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(55, 13); this.label4.Size = new System.Drawing.Size(50, 13);
this.label4.TabIndex = 3; this.label4.TabIndex = 3;
this.label4.Text = "Card state"; this.label4.Text = "Kortin tila";
// //
// nameTextBox // nameTextBox
// //
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/MoyaAdminLib.csproj
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<Compile Include="BacksideTemplateText.cs" /> <Compile Include="BacksideTemplateText.cs" />
<Compile Include="Card.cs" /> <Compile Include="Card.cs" />
<Compile Include="CardList.cs" /> <Compile Include="CardList.cs" />
<Compile Include="CardLocation.cs" />
<Compile Include="ComputerPlace.cs" /> <Compile Include="ComputerPlace.cs" />
<Compile Include="Controls\EventUserEditor.cs"> <Compile Include="Controls\EventUserEditor.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ApiSettings.Designer.cs
...@@ -31,8 +31,6 @@ ...@@ -31,8 +31,6 @@
this.apiURLTextBox = new System.Windows.Forms.TextBox(); this.apiURLTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.SaveButton = new System.Windows.Forms.Button(); this.SaveButton = new System.Windows.Forms.Button();
this.ApiKeyTextBox = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.usernameTextBox = new System.Windows.Forms.TextBox(); this.usernameTextBox = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
...@@ -61,7 +59,8 @@ ...@@ -61,7 +59,8 @@
// //
// SaveButton // SaveButton
// //
this.SaveButton.Location = new System.Drawing.Point(226, 204); this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.SaveButton.Location = new System.Drawing.Point(223, 164);
this.SaveButton.Name = "SaveButton"; this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.Size = new System.Drawing.Size(75, 23);
this.SaveButton.TabIndex = 2; this.SaveButton.TabIndex = 2;
...@@ -69,23 +68,6 @@ ...@@ -69,23 +68,6 @@
this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
// //
// ApiKeyTextBox
//
this.ApiKeyTextBox.Location = new System.Drawing.Point(6, 152);
this.ApiKeyTextBox.Name = "ApiKeyTextBox";
this.ApiKeyTextBox.ReadOnly = true;
this.ApiKeyTextBox.Size = new System.Drawing.Size(260, 20);
this.ApiKeyTextBox.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(6, 136);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(79, 13);
this.label2.TabIndex = 4;
this.label2.Text = "Application key";
//
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
...@@ -127,14 +109,12 @@ ...@@ -127,14 +109,12 @@
this.groupBox1.Controls.Add(this.pwTextBox); this.groupBox1.Controls.Add(this.pwTextBox);
this.groupBox1.Controls.Add(this.label3); this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.usernameTextBox); this.groupBox1.Controls.Add(this.usernameTextBox);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.ApiKeyTextBox);
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Controls.Add(this.apiURLTextBox); this.groupBox1.Controls.Add(this.apiURLTextBox);
this.groupBox1.Controls.Add(this.resetApiTokenCheckBox); this.groupBox1.Controls.Add(this.resetApiTokenCheckBox);
this.groupBox1.Location = new System.Drawing.Point(13, 13); this.groupBox1.Location = new System.Drawing.Point(13, 13);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(288, 185); this.groupBox1.Size = new System.Drawing.Size(288, 146);
this.groupBox1.TabIndex = 9; this.groupBox1.TabIndex = 9;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
// //
...@@ -153,7 +133,7 @@ ...@@ -153,7 +133,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(310, 235); this.ClientSize = new System.Drawing.Size(307, 195);
this.Controls.Add(this.SaveButton); this.Controls.Add(this.SaveButton);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Name = "ApiSettings"; this.Name = "ApiSettings";
...@@ -170,8 +150,6 @@ ...@@ -170,8 +150,6 @@
private System.Windows.Forms.TextBox apiURLTextBox; private System.Windows.Forms.TextBox apiURLTextBox;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button SaveButton; private System.Windows.Forms.Button SaveButton;
private System.Windows.Forms.TextBox ApiKeyTextBox;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox usernameTextBox; private System.Windows.Forms.TextBox usernameTextBox;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ApiSettings.cs
...@@ -27,7 +27,7 @@ namespace MoyaAdminUI ...@@ -27,7 +27,7 @@ namespace MoyaAdminUI
{ {
try try
{ {
apiCredential = RestClient.GetApiCredential(usernameTextBox.Text, pwTextBox.Text, ApiKeyTextBox.Text, apiURLTextBox.Text); apiCredential = RestClient.GetApiCredential(usernameTextBox.Text, pwTextBox.Text, Properties.Settings.Default.ApiApplicationKey, apiURLTextBox.Text);
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -37,7 +37,7 @@ namespace MoyaAdminUI ...@@ -37,7 +37,7 @@ namespace MoyaAdminUI
if (apiCredential != null) if (apiCredential != null)
{ {
Properties.Settings.Default.ApiURL = apiURLTextBox.Text; Properties.Settings.Default.ApiURL = apiURLTextBox.Text;
Properties.Settings.Default.ApiApplicationKey = ApiKeyTextBox.Text; //Properties.Settings.Default.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
Properties.Settings.Default.ApiUser = apiCredential.authname; Properties.Settings.Default.ApiUser = apiCredential.authname;
Properties.Settings.Default.ApiPass = apiCredential.secret; Properties.Settings.Default.ApiPass = apiCredential.secret;
Properties.Settings.Default.ApiTokenSet = true; Properties.Settings.Default.ApiTokenSet = true;
...@@ -60,7 +60,6 @@ namespace MoyaAdminUI ...@@ -60,7 +60,6 @@ namespace MoyaAdminUI
resetApiTokenCheckBox.Checked = !Properties.Settings.Default.ApiTokenSet; resetApiTokenCheckBox.Checked = !Properties.Settings.Default.ApiTokenSet;
apiURLTextBox.Text = Properties.Settings.Default.ApiURL; apiURLTextBox.Text = Properties.Settings.Default.ApiURL;
ApiKeyTextBox.Text = Properties.Settings.Default.ApiApplicationKey;
//usernameTextBox.Text = Properties.Settings.Default.ApiUser; //usernameTextBox.Text = Properties.Settings.Default.ApiUser;
//pwTextBox.Text = Properties.Settings.Default.ApiPass; //pwTextBox.Text = Properties.Settings.Default.ApiPass;
} }
...@@ -72,14 +71,12 @@ namespace MoyaAdminUI ...@@ -72,14 +71,12 @@ namespace MoyaAdminUI
apiURLTextBox.ReadOnly = true; apiURLTextBox.ReadOnly = true;
usernameTextBox.ReadOnly = true; usernameTextBox.ReadOnly = true;
pwTextBox.ReadOnly = true; pwTextBox.ReadOnly = true;
ApiKeyTextBox.ReadOnly = true;
} }
else else
{ {
apiURLTextBox.ReadOnly = false; apiURLTextBox.ReadOnly = false;
usernameTextBox.ReadOnly = false; usernameTextBox.ReadOnly = false;
pwTextBox.ReadOnly = false; pwTextBox.ReadOnly = false;
ApiKeyTextBox.ReadOnly = false;
} }
} }
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/App.config
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
</startup> </startup>
<userSettings> <userSettings>
<MoyaAdminUI.Properties.Settings> <MoyaAdminUI.Properties.Settings>
...@@ -14,19 +14,19 @@ ...@@ -14,19 +14,19 @@
<value>http://10.220.105.194:8080/MoyaWeb</value> <value>http://10.220.105.194:8080/MoyaWeb</value>
</setting> </setting>
<setting name="ApiApplicationKey" serializeAs="String"> <setting name="ApiApplicationKey" serializeAs="String">
<value /> <value>8krAyTEpzP6QnwzkxGek</value>
</setting> </setting>
<setting name="ApiUser" serializeAs="String"> <setting name="ApiUser" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiPass" serializeAs="String"> <setting name="ApiPass" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApplicationVersion" serializeAs="String"> <setting name="ApplicationVersion" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="Port" serializeAs="String"> <setting name="Port" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiTokenSet" serializeAs="String"> <setting name="ApiTokenSet" serializeAs="String">
<value>False</value> <value>False</value>
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/CardLocationInput.Designer.cs
...@@ -308,6 +308,7 @@ ...@@ -308,6 +308,7 @@
this.statusStrip1.Size = new System.Drawing.Size(595, 22); this.statusStrip1.Size = new System.Drawing.Size(595, 22);
this.statusStrip1.TabIndex = 29; this.statusStrip1.TabIndex = 29;
this.statusStrip1.Text = "Status"; this.statusStrip1.Text = "Status";
this.statusStrip1.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.statusStrip1_ItemClicked);
// //
// messageToolStripStatusLabel // messageToolStripStatusLabel
// //
...@@ -321,6 +322,7 @@ ...@@ -321,6 +322,7 @@
this.columnHeader1, this.columnHeader1,
this.columnHeader2}); this.columnHeader2});
this.listView1.FullRowSelect = true; this.listView1.FullRowSelect = true;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(280, 27); this.listView1.Location = new System.Drawing.Point(280, 27);
this.listView1.MultiSelect = false; this.listView1.MultiSelect = false;
this.listView1.Name = "listView1"; this.listView1.Name = "listView1";
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/CardLocationInput.cs
...@@ -197,5 +197,10 @@ namespace MoyaAdminUI ...@@ -197,5 +197,10 @@ namespace MoyaAdminUI
lastAddedSlotsNumericUpDown.Value = lastAddedSlot; lastAddedSlotsNumericUpDown.Value = lastAddedSlot;
messageToolStripStatusLabel.Text = "Viimeisin lisätty value: " + value + " kortille: " + card.Label(); messageToolStripStatusLabel.Text = "Viimeisin lisätty value: " + value + " kortille: " + card.Label();
} }
private void statusStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
this.placesContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.placesContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.printPlaceStickersForSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printPlaceStickersForSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.doAReplaceForComputerPlaceNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.doAReplaceForComputerPlaceNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.moveSelectedPlacesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MapPictureBox = new System.Windows.Forms.PictureBox(); this.MapPictureBox = new System.Windows.Forms.PictureBox();
this.placeEditor = new System.Windows.Forms.PropertyGrid(); this.placeEditor = new System.Windows.Forms.PropertyGrid();
this.PlacesListView = new System.Windows.Forms.ListView(); this.PlacesListView = new System.Windows.Forms.ListView();
...@@ -57,6 +58,7 @@ ...@@ -57,6 +58,7 @@
this.getListOfUnlinkedComputerPlacesToolStripButton = new System.Windows.Forms.ToolStripButton(); this.getListOfUnlinkedComputerPlacesToolStripButton = new System.Windows.Forms.ToolStripButton();
this.generateBacksidesToolStripButton = new System.Windows.Forms.ToolStripButton(); this.generateBacksidesToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton4 = 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.allPlacesCountTextBox = new System.Windows.Forms.TextBox(); this.allPlacesCountTextBox = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
...@@ -72,7 +74,8 @@ ...@@ -72,7 +74,8 @@
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components); this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.placesCountTimer = new System.Windows.Forms.Timer(this.components); this.placesCountTimer = new System.Windows.Forms.Timer(this.components);
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.getCSVForSelectedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog();
this.placesContextMenuStrip.SuspendLayout(); this.placesContextMenuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
...@@ -85,9 +88,11 @@ ...@@ -85,9 +88,11 @@
// //
this.placesContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.placesContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.printPlaceStickersForSelectedPlacesToolStripMenuItem, this.printPlaceStickersForSelectedPlacesToolStripMenuItem,
this.doAReplaceForComputerPlaceNameToolStripMenuItem}); this.doAReplaceForComputerPlaceNameToolStripMenuItem,
this.moveSelectedPlacesToolStripMenuItem,
this.getCSVForSelectedToolStripMenuItem});
this.placesContextMenuStrip.Name = "placesContextMenuStrip"; this.placesContextMenuStrip.Name = "placesContextMenuStrip";
this.placesContextMenuStrip.Size = new System.Drawing.Size(277, 48); this.placesContextMenuStrip.Size = new System.Drawing.Size(277, 92);
this.placesContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.placesContextMenuStrip_Opening); this.placesContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.placesContextMenuStrip_Opening);
// //
// printPlaceStickersForSelectedPlacesToolStripMenuItem // printPlaceStickersForSelectedPlacesToolStripMenuItem
...@@ -104,6 +109,13 @@ ...@@ -104,6 +109,13 @@
this.doAReplaceForComputerPlaceNameToolStripMenuItem.Text = "Do a replace for computer place name"; this.doAReplaceForComputerPlaceNameToolStripMenuItem.Text = "Do a replace for computer place name";
this.doAReplaceForComputerPlaceNameToolStripMenuItem.Click += new System.EventHandler(this.doAReplaceForComputerPlaceNameToolStripMenuItem_Click); this.doAReplaceForComputerPlaceNameToolStripMenuItem.Click += new System.EventHandler(this.doAReplaceForComputerPlaceNameToolStripMenuItem_Click);
// //
// moveSelectedPlacesToolStripMenuItem
//
this.moveSelectedPlacesToolStripMenuItem.Name = "moveSelectedPlacesToolStripMenuItem";
this.moveSelectedPlacesToolStripMenuItem.Size = new System.Drawing.Size(276, 22);
this.moveSelectedPlacesToolStripMenuItem.Text = "Move selected places";
this.moveSelectedPlacesToolStripMenuItem.Click += new System.EventHandler(this.moveSelectedPlacesToolStripMenuItem_Click);
//
// MapPictureBox // MapPictureBox
// //
this.MapPictureBox.Cursor = System.Windows.Forms.Cursors.Default; this.MapPictureBox.Cursor = System.Windows.Forms.Cursors.Default;
...@@ -361,6 +373,16 @@ ...@@ -361,6 +373,16 @@
this.toolStripButton4.Text = "Generate CSV for item collection"; this.toolStripButton4.Text = "Generate CSV for item collection";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click); this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
// //
// toolStripButton3
//
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image")));
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
this.toolStripButton3.Text = "Get Printed Cards CSV";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_2);
//
// TopPanel // TopPanel
// //
this.TopPanel.Controls.Add(this.allPlacesCountTextBox); this.TopPanel.Controls.Add(this.allPlacesCountTextBox);
...@@ -492,15 +514,12 @@ ...@@ -492,15 +514,12 @@
this.placesCountTimer.Interval = 600000000; this.placesCountTimer.Interval = 600000000;
this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick); this.placesCountTimer.Tick += new System.EventHandler(this.placesCountTimer_Tick);
// //
// toolStripButton3 // getCSVForSelectedToolStripMenuItem
// //
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.getCSVForSelectedToolStripMenuItem.Name = "getCSVForSelectedToolStripMenuItem";
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); this.getCSVForSelectedToolStripMenuItem.Size = new System.Drawing.Size(276, 22);
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.getCSVForSelectedToolStripMenuItem.Text = "Get CSV for selected";
this.toolStripButton3.Name = "toolStripButton3"; this.getCSVForSelectedToolStripMenuItem.Click += new System.EventHandler(this.getCSVForSelectedToolStripMenuItem_Click);
this.toolStripButton3.Size = new System.Drawing.Size(23, 22);
this.toolStripButton3.Text = "Get Printed Cards CSV";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click_2);
// //
// MainForm // MainForm
// //
...@@ -577,6 +596,9 @@ ...@@ -577,6 +596,9 @@
private System.Windows.Forms.ToolStripButton generateBacksidesToolStripButton; private System.Windows.Forms.ToolStripButton generateBacksidesToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripMenuItem moveSelectedPlacesToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem getCSVForSelectedToolStripMenuItem;
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
...@@ -1603,5 +1603,66 @@ namespace MoyaAdminUI ...@@ -1603,5 +1603,66 @@ namespace MoyaAdminUI
{ {
} }
private void moveSelectedPlacesToolStripMenuItem_Click(object sender, EventArgs e)
{
MovePlacesForm frm = new MovePlacesForm();
frm.MapHeight = MapPictureBox.Height;
frm.MapWidth = MapPictureBox.Width;
List<ComputerPlace> places = new List<ComputerPlace>();
foreach(ListViewItem lvi in PlacesListView.SelectedItems)
{
ComputerPlace place = (ComputerPlace)lvi.Tag;
places.Add(place);
}
frm.Places = places;
if (frm.ShowDialog() == DialogResult.OK)
{
foreach (ComputerPlace place in frm.Places)
{
foreach (ListViewItem lvi in PlacesListView.Items)
{
if ((ComputerPlace)lvi.Tag == place)
{
if (lvi.SubItems.Count > 3)
{
lvi.SubItems[2].Text = place.MapX.ToString();
lvi.SubItems[3].Text = place.MapY.ToString();
}
}
}
}
}
}
private void getCSVForSelectedToolStripMenuItem_Click(object sender, EventArgs e)
{
if(PlacesListView.SelectedItems.Count > 0)
{
string csv = "\"place\";\"reserver\";\"user_email\"\r\n";
foreach(ListViewItem lvi in PlacesListView.SelectedItems)
{
ComputerPlace place = (ComputerPlace)lvi.Tag;
if (place.User != null)
{
csv += "\""+ place.Name + "\";\"" + place.ReserverUserName + "\";\"" + place.User.Firstname + " " + place.User.Lastname + "\"\r\n";
} else
{
csv += "\"" + place.Name + "\";\"" + place.ReserverUserName + "\";\"\"\r\n";
}
}
if(saveFileDialog1.ShowDialog() == DialogResult.OK)
{
File.WriteAllText(saveFileDialog1.FileName, csv);
}
}
}
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
...@@ -214,53 +214,53 @@ ...@@ -214,53 +214,53 @@
<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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
jPUu2gAAAABJRU5ErkJggg== W5H2AAAAAElFTkSuQmCC
</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">
<value> <value>
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
</value> </value>
</data> </data>
<data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -281,20 +281,20 @@ ...@@ -281,20 +281,20 @@
<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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
AeGpTdIVnM4AAAAASUVORK5CYII= xalITlZengAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -330,20 +330,20 @@ ...@@ -330,20 +330,20 @@
<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="orgMealToolStripButton.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">
...@@ -415,47 +415,47 @@ ...@@ -415,47 +415,47 @@
<data name="generateBacksidesToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="generateBacksidesToolStripButton.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="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
SUVORK5CYII= RU5ErkJggg==
</value> </value>
</data> </data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -482,6 +482,9 @@ ...@@ -482,6 +482,9 @@
<metadata name="placesCountTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="placesCountTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>581, 17</value> <value>581, 17</value>
</metadata> </metadata>
<metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>730, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAMAEBAQAAAAAAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA AAABAAMAEBAQAAAAAAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MoyaAdminUI.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MoyaAdminUI</RootNamespace> <RootNamespace>MoyaAdminUI</RootNamespace>
<AssemblyName>MoyaAdminUI</AssemblyName> <AssemblyName>MoyaAdminUI</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -37,6 +38,7 @@ ...@@ -37,6 +38,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
...@@ -47,11 +49,12 @@ ...@@ -47,11 +49,12 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\AutoUpdate\src\AutoUpdateLib\bin\Debug\AutoUpdateLib.dll</HintPath> <HintPath>..\..\..\PrintServer\moyaPrintServer\res\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Csv, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Csv, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Csv.1.0.31\lib\net40\Csv.dll</HintPath> <HintPath>..\packages\Csv.1.0.31\lib\net40\Csv.dll</HintPath>
...@@ -69,13 +72,11 @@ ...@@ -69,13 +72,11 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL"> <Reference Include="zxing, Version=0.16.4.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.2\lib\net40\zxing.dll</HintPath> <HintPath>..\packages\ZXing.Net.0.16.4\lib\net45\zxing.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL"> <Reference Include="zxing.presentation, Version=0.16.4.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\packages\ZXing.Net.0.16.2\lib\net40\zxing.presentation.dll</HintPath> <HintPath>..\packages\ZXing.Net.0.16.4\lib\net45\zxing.presentation.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
...@@ -133,6 +134,12 @@ ...@@ -133,6 +134,12 @@
<Compile Include="IncomingForm.Designer.cs"> <Compile Include="IncomingForm.Designer.cs">
<DependentUpon>IncomingForm.cs</DependentUpon> <DependentUpon>IncomingForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="ListCardsForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ListCardsForm.Designer.cs">
<DependentUpon>ListCardsForm.cs</DependentUpon>
</Compile>
<Compile Include="ListUsersForm.cs"> <Compile Include="ListUsersForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -145,6 +152,12 @@ ...@@ -145,6 +152,12 @@
<Compile Include="MainForm.Designer.cs"> <Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon> <DependentUpon>MainForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="MovePlacesForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MovePlacesForm.Designer.cs">
<DependentUpon>MovePlacesForm.cs</DependentUpon>
</Compile>
<Compile Include="MoyaUtils.cs" /> <Compile Include="MoyaUtils.cs" />
<Compile Include="OCRForm.cs"> <Compile Include="OCRForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
...@@ -224,12 +237,18 @@ ...@@ -224,12 +237,18 @@
<EmbeddedResource Include="IncomingForm.resx"> <EmbeddedResource Include="IncomingForm.resx">
<DependentUpon>IncomingForm.cs</DependentUpon> <DependentUpon>IncomingForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="ListCardsForm.resx">
<DependentUpon>ListCardsForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ListUsersForm.resx"> <EmbeddedResource Include="ListUsersForm.resx">
<DependentUpon>ListUsersForm.cs</DependentUpon> <DependentUpon>ListUsersForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="MainForm.resx"> <EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon> <DependentUpon>MainForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="MovePlacesForm.resx">
<DependentUpon>MovePlacesForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OCRForm.resx"> <EmbeddedResource Include="OCRForm.resx">
<DependentUpon>OCRForm.cs</DependentUpon> <DependentUpon>OCRForm.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
...@@ -316,9 +335,12 @@ ...@@ -316,9 +335,12 @@
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference> </COMReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="Properties\AutoUpdateLib.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\x86\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Program.cs
...@@ -17,7 +17,7 @@ namespace MoyaAdminUI ...@@ -17,7 +17,7 @@ namespace MoyaAdminUI
{ {
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
if (!Debugger.IsAttached) /*if (!Debugger.IsAttached)
{ {
if (args.Length == 0 || args[0] != "-noautoupdate") if (args.Length == 0 || args[0] != "-noautoupdate")
{ {
...@@ -26,7 +26,7 @@ namespace MoyaAdminUI ...@@ -26,7 +26,7 @@ namespace MoyaAdminUI
return; //program is required to close by autoupdate (probably updated) return; //program is required to close by autoupdate (probably updated)
} }
} }*/
System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly(); System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly();
Version appVersion = a.GetName().Version; Version appVersion = a.GetName().Version;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.29")] [assembly: AssemblyVersion("1.0.37")]
[assembly: AssemblyFileVersion("1.0.29")] [assembly: AssemblyFileVersion("1.0.37")]
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace MoyaAdminUI.Properties { ...@@ -19,7 +19,7 @@ namespace MoyaAdminUI.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace MoyaAdminUI.Properties { ...@@ -12,7 +12,7 @@ namespace MoyaAdminUI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
...@@ -37,7 +37,7 @@ namespace MoyaAdminUI.Properties { ...@@ -37,7 +37,7 @@ namespace MoyaAdminUI.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("8krAyTEpzP6QnwzkxGek")]
public string ApiApplicationKey { public string ApiApplicationKey {
get { get {
return ((string)(this["ApiApplicationKey"])); return ((string)(this["ApiApplicationKey"]));
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/Settings.settings
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Value Profile="(Default)">http://10.220.105.194:8080/MoyaWeb</Value> <Value Profile="(Default)">http://10.220.105.194:8080/MoyaWeb</Value>
</Setting> </Setting>
<Setting Name="ApiApplicationKey" Type="System.String" Scope="User"> <Setting Name="ApiApplicationKey" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">8krAyTEpzP6QnwzkxGek</Value>
</Setting> </Setting>
<Setting Name="ApiUser" Type="System.String" Scope="User"> <Setting Name="ApiUser" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)" />
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ShowCardInformation.Designer.cs
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.barcodeTextBox = new System.Windows.Forms.TextBox(); this.barcodeTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.barcodeTimer = new System.Windows.Forms.Timer(this.components); this.barcodeTimer = new System.Windows.Forms.Timer(this.components);
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
...@@ -47,29 +46,40 @@ ...@@ -47,29 +46,40 @@
this.slotNumericUpDown = new System.Windows.Forms.NumericUpDown(); this.slotNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.cardStateTextBox = new System.Windows.Forms.TextBox(); this.cardStateTextBox = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.cardsListView = new System.Windows.Forms.ListView();
this.pendingValidationCheckBox = new System.Windows.Forms.CheckBox();
this.ValidatedCheckBox = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.rejectedCheckBox = new System.Windows.Forms.CheckBox();
this.inProgressCheckBox = new System.Windows.Forms.CheckBox();
this.printedCheckBox = new System.Windows.Forms.CheckBox();
this.deliveredCheckBox = new System.Windows.Forms.CheckBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.listCardsButton = new System.Windows.Forms.Button();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.showMissingLocationsCheckBox = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bookNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bookNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pageNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pageNumericUpDown)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.slotNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.slotNumericUpDown)).BeginInit();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// barcodeTextBox // barcodeTextBox
// //
this.barcodeTextBox.Location = new System.Drawing.Point(13, 30); this.barcodeTextBox.Location = new System.Drawing.Point(12, 19);
this.barcodeTextBox.Name = "barcodeTextBox"; this.barcodeTextBox.Name = "barcodeTextBox";
this.barcodeTextBox.Size = new System.Drawing.Size(259, 20); this.barcodeTextBox.Size = new System.Drawing.Size(259, 20);
this.barcodeTextBox.TabIndex = 0; this.barcodeTextBox.TabIndex = 0;
this.barcodeTextBox.TextChanged += new System.EventHandler(this.barcodeTextBox_TextChanged); this.barcodeTextBox.TextChanged += new System.EventHandler(this.barcodeTextBox_TextChanged);
// //
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(13, 11);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(56, 13);
this.label1.TabIndex = 1;
this.label1.Text = "Viivakoodi";
//
// barcodeTimer // barcodeTimer
// //
this.barcodeTimer.Interval = 500; this.barcodeTimer.Interval = 500;
...@@ -77,7 +87,8 @@ ...@@ -77,7 +87,8 @@
// //
// pictureBox1 // pictureBox1
// //
this.pictureBox1.Location = new System.Drawing.Point(12, 56); this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.pictureBox1.Location = new System.Drawing.Point(125, 323);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(260, 395); this.pictureBox1.Size = new System.Drawing.Size(260, 395);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
...@@ -87,7 +98,7 @@ ...@@ -87,7 +98,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(330, 56); this.label2.Location = new System.Drawing.Point(54, 31);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(27, 13); this.label2.Size = new System.Drawing.Size(27, 13);
this.label2.TabIndex = 3; this.label2.TabIndex = 3;
...@@ -96,7 +107,7 @@ ...@@ -96,7 +107,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(328, 82); this.label3.Location = new System.Drawing.Point(52, 57);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(29, 13); this.label3.Size = new System.Drawing.Size(29, 13);
this.label3.TabIndex = 4; this.label3.TabIndex = 4;
...@@ -105,7 +116,7 @@ ...@@ -105,7 +116,7 @@
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(326, 107); this.label4.Location = new System.Drawing.Point(50, 82);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(31, 13); this.label4.Size = new System.Drawing.Size(31, 13);
this.label4.TabIndex = 5; this.label4.TabIndex = 5;
...@@ -114,7 +125,7 @@ ...@@ -114,7 +125,7 @@
// label5 // label5
// //
this.label5.AutoSize = true; this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(286, 161); this.label5.Location = new System.Drawing.Point(232, 31);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(71, 13); this.label5.Size = new System.Drawing.Size(71, 13);
this.label5.TabIndex = 6; this.label5.TabIndex = 6;
...@@ -123,7 +134,7 @@ ...@@ -123,7 +134,7 @@
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(285, 187); this.label6.Location = new System.Drawing.Point(231, 57);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(72, 13); this.label6.Size = new System.Drawing.Size(72, 13);
this.label6.TabIndex = 7; this.label6.TabIndex = 7;
...@@ -132,7 +143,7 @@ ...@@ -132,7 +143,7 @@
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(285, 213); this.label7.Location = new System.Drawing.Point(231, 83);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(72, 13); this.label7.Size = new System.Drawing.Size(72, 13);
this.label7.TabIndex = 8; this.label7.TabIndex = 8;
...@@ -140,7 +151,7 @@ ...@@ -140,7 +151,7 @@
// //
// nameTextBox // nameTextBox
// //
this.nameTextBox.Location = new System.Drawing.Point(363, 53); this.nameTextBox.Location = new System.Drawing.Point(87, 28);
this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Name = "nameTextBox";
this.nameTextBox.ReadOnly = true; this.nameTextBox.ReadOnly = true;
this.nameTextBox.Size = new System.Drawing.Size(100, 20); this.nameTextBox.Size = new System.Drawing.Size(100, 20);
...@@ -148,7 +159,7 @@ ...@@ -148,7 +159,7 @@
// //
// nickTextBox // nickTextBox
// //
this.nickTextBox.Location = new System.Drawing.Point(363, 79); this.nickTextBox.Location = new System.Drawing.Point(87, 54);
this.nickTextBox.Name = "nickTextBox"; this.nickTextBox.Name = "nickTextBox";
this.nickTextBox.ReadOnly = true; this.nickTextBox.ReadOnly = true;
this.nickTextBox.Size = new System.Drawing.Size(100, 20); this.nickTextBox.Size = new System.Drawing.Size(100, 20);
...@@ -156,7 +167,7 @@ ...@@ -156,7 +167,7 @@
// //
// cardTemplateTextBox // cardTemplateTextBox
// //
this.cardTemplateTextBox.Location = new System.Drawing.Point(363, 104); this.cardTemplateTextBox.Location = new System.Drawing.Point(87, 79);
this.cardTemplateTextBox.Name = "cardTemplateTextBox"; this.cardTemplateTextBox.Name = "cardTemplateTextBox";
this.cardTemplateTextBox.ReadOnly = true; this.cardTemplateTextBox.ReadOnly = true;
this.cardTemplateTextBox.Size = new System.Drawing.Size(100, 20); this.cardTemplateTextBox.Size = new System.Drawing.Size(100, 20);
...@@ -165,7 +176,7 @@ ...@@ -165,7 +176,7 @@
// bookNumericUpDown // bookNumericUpDown
// //
this.bookNumericUpDown.Enabled = false; this.bookNumericUpDown.Enabled = false;
this.bookNumericUpDown.Location = new System.Drawing.Point(363, 159); this.bookNumericUpDown.Location = new System.Drawing.Point(309, 29);
this.bookNumericUpDown.Name = "bookNumericUpDown"; this.bookNumericUpDown.Name = "bookNumericUpDown";
this.bookNumericUpDown.ReadOnly = true; this.bookNumericUpDown.ReadOnly = true;
this.bookNumericUpDown.Size = new System.Drawing.Size(48, 20); this.bookNumericUpDown.Size = new System.Drawing.Size(48, 20);
...@@ -174,7 +185,7 @@ ...@@ -174,7 +185,7 @@
// pageNumericUpDown // pageNumericUpDown
// //
this.pageNumericUpDown.Enabled = false; this.pageNumericUpDown.Enabled = false;
this.pageNumericUpDown.Location = new System.Drawing.Point(363, 185); this.pageNumericUpDown.Location = new System.Drawing.Point(309, 55);
this.pageNumericUpDown.Name = "pageNumericUpDown"; this.pageNumericUpDown.Name = "pageNumericUpDown";
this.pageNumericUpDown.ReadOnly = true; this.pageNumericUpDown.ReadOnly = true;
this.pageNumericUpDown.Size = new System.Drawing.Size(48, 20); this.pageNumericUpDown.Size = new System.Drawing.Size(48, 20);
...@@ -183,7 +194,7 @@ ...@@ -183,7 +194,7 @@
// slotNumericUpDown // slotNumericUpDown
// //
this.slotNumericUpDown.Enabled = false; this.slotNumericUpDown.Enabled = false;
this.slotNumericUpDown.Location = new System.Drawing.Point(363, 211); this.slotNumericUpDown.Location = new System.Drawing.Point(309, 81);
this.slotNumericUpDown.Name = "slotNumericUpDown"; this.slotNumericUpDown.Name = "slotNumericUpDown";
this.slotNumericUpDown.ReadOnly = true; this.slotNumericUpDown.ReadOnly = true;
this.slotNumericUpDown.Size = new System.Drawing.Size(48, 20); this.slotNumericUpDown.Size = new System.Drawing.Size(48, 20);
...@@ -191,7 +202,7 @@ ...@@ -191,7 +202,7 @@
// //
// cardStateTextBox // cardStateTextBox
// //
this.cardStateTextBox.Location = new System.Drawing.Point(363, 131); this.cardStateTextBox.Location = new System.Drawing.Point(87, 106);
this.cardStateTextBox.Name = "cardStateTextBox"; this.cardStateTextBox.Name = "cardStateTextBox";
this.cardStateTextBox.ReadOnly = true; this.cardStateTextBox.ReadOnly = true;
this.cardStateTextBox.Size = new System.Drawing.Size(100, 20); this.cardStateTextBox.Size = new System.Drawing.Size(100, 20);
...@@ -200,49 +211,212 @@ ...@@ -200,49 +211,212 @@
// label8 // label8
// //
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(333, 134); this.label8.Location = new System.Drawing.Point(57, 109);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(24, 13); this.label8.Size = new System.Drawing.Size(24, 13);
this.label8.TabIndex = 16; this.label8.TabIndex = 16;
this.label8.Text = "Tila"; this.label8.Text = "Tila";
// //
// cardsListView
//
this.cardsListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
this.columnHeader2,
this.columnHeader3});
this.cardsListView.Dock = System.Windows.Forms.DockStyle.Fill;
this.cardsListView.HideSelection = false;
this.cardsListView.Location = new System.Drawing.Point(0, 173);
this.cardsListView.Name = "cardsListView";
this.cardsListView.Size = new System.Drawing.Size(437, 551);
this.cardsListView.TabIndex = 17;
this.cardsListView.UseCompatibleStateImageBehavior = false;
this.cardsListView.View = System.Windows.Forms.View.Details;
//
// pendingValidationCheckBox
//
this.pendingValidationCheckBox.AutoSize = true;
this.pendingValidationCheckBox.Location = new System.Drawing.Point(6, 19);
this.pendingValidationCheckBox.Name = "pendingValidationCheckBox";
this.pendingValidationCheckBox.Size = new System.Drawing.Size(130, 17);
this.pendingValidationCheckBox.TabIndex = 18;
this.pendingValidationCheckBox.Text = "Odottaa hyväksymistä";
this.pendingValidationCheckBox.UseVisualStyleBackColor = true;
//
// ValidatedCheckBox
//
this.ValidatedCheckBox.AutoSize = true;
this.ValidatedCheckBox.Location = new System.Drawing.Point(6, 42);
this.ValidatedCheckBox.Name = "ValidatedCheckBox";
this.ValidatedCheckBox.Size = new System.Drawing.Size(78, 17);
this.ValidatedCheckBox.TabIndex = 19;
this.ValidatedCheckBox.Text = "Hyväksytty";
this.ValidatedCheckBox.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.showMissingLocationsCheckBox);
this.groupBox1.Controls.Add(this.listCardsButton);
this.groupBox1.Controls.Add(this.deliveredCheckBox);
this.groupBox1.Controls.Add(this.printedCheckBox);
this.groupBox1.Controls.Add(this.inProgressCheckBox);
this.groupBox1.Controls.Add(this.rejectedCheckBox);
this.groupBox1.Controls.Add(this.pendingValidationCheckBox);
this.groupBox1.Controls.Add(this.ValidatedCheckBox);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(0, 0);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(437, 173);
this.groupBox1.TabIndex = 20;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Kortin tilat";
//
// rejectedCheckBox
//
this.rejectedCheckBox.AutoSize = true;
this.rejectedCheckBox.Location = new System.Drawing.Point(6, 65);
this.rejectedCheckBox.Name = "rejectedCheckBox";
this.rejectedCheckBox.Size = new System.Drawing.Size(58, 17);
this.rejectedCheckBox.TabIndex = 20;
this.rejectedCheckBox.Text = "Hylätty";
this.rejectedCheckBox.UseVisualStyleBackColor = true;
//
// inProgressCheckBox
//
this.inProgressCheckBox.AutoSize = true;
this.inProgressCheckBox.Location = new System.Drawing.Point(6, 88);
this.inProgressCheckBox.Name = "inProgressCheckBox";
this.inProgressCheckBox.Size = new System.Drawing.Size(101, 17);
this.inProgressCheckBox.TabIndex = 21;
this.inProgressCheckBox.Text = "Printtautumassa";
this.inProgressCheckBox.UseVisualStyleBackColor = true;
//
// printedCheckBox
//
this.printedCheckBox.AutoSize = true;
this.printedCheckBox.Location = new System.Drawing.Point(6, 111);
this.printedCheckBox.Name = "printedCheckBox";
this.printedCheckBox.Size = new System.Drawing.Size(65, 17);
this.printedCheckBox.TabIndex = 22;
this.printedCheckBox.Text = "Printattu";
this.printedCheckBox.UseVisualStyleBackColor = true;
//
// deliveredCheckBox
//
this.deliveredCheckBox.AutoSize = true;
this.deliveredCheckBox.Location = new System.Drawing.Point(6, 134);
this.deliveredCheckBox.Name = "deliveredCheckBox";
this.deliveredCheckBox.Size = new System.Drawing.Size(72, 17);
this.deliveredCheckBox.TabIndex = 23;
this.deliveredCheckBox.Text = "Toimitettu";
this.deliveredCheckBox.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.nameTextBox);
this.groupBox2.Controls.Add(this.label7);
this.groupBox2.Controls.Add(this.nickTextBox);
this.groupBox2.Controls.Add(this.label6);
this.groupBox2.Controls.Add(this.cardTemplateTextBox);
this.groupBox2.Controls.Add(this.label5);
this.groupBox2.Controls.Add(this.bookNumericUpDown);
this.groupBox2.Controls.Add(this.pictureBox1);
this.groupBox2.Controls.Add(this.pageNumericUpDown);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.slotNumericUpDown);
this.groupBox2.Controls.Add(this.cardStateTextBox);
this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox2.Location = new System.Drawing.Point(437, 53);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(397, 724);
this.groupBox2.TabIndex = 21;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Kortin tietoja";
//
// groupBox3
//
this.groupBox3.Controls.Add(this.barcodeTextBox);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox3.Location = new System.Drawing.Point(0, 0);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(834, 53);
this.groupBox3.TabIndex = 22;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Viivakoodi";
//
// panel1
//
this.panel1.Controls.Add(this.cardsListView);
this.panel1.Controls.Add(this.groupBox1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 53);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(437, 724);
this.panel1.TabIndex = 23;
//
// listCardsButton
//
this.listCardsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.listCardsButton.Location = new System.Drawing.Point(356, 144);
this.listCardsButton.Name = "listCardsButton";
this.listCardsButton.Size = new System.Drawing.Size(75, 23);
this.listCardsButton.TabIndex = 24;
this.listCardsButton.Text = "Listaa kortit";
this.listCardsButton.UseVisualStyleBackColor = true;
this.listCardsButton.Click += new System.EventHandler(this.listCardsButton_Click);
//
// columnHeader1
//
this.columnHeader1.Text = "Nimi";
//
// columnHeader2
//
this.columnHeader2.Text = "Tila";
//
// columnHeader3
//
this.columnHeader3.Text = "Kortin sijainti";
//
// showMissingLocationsCheckBox
//
this.showMissingLocationsCheckBox.AutoSize = true;
this.showMissingLocationsCheckBox.Location = new System.Drawing.Point(266, 19);
this.showMissingLocationsCheckBox.Name = "showMissingLocationsCheckBox";
this.showMissingLocationsCheckBox.Size = new System.Drawing.Size(165, 17);
this.showMissingLocationsCheckBox.TabIndex = 25;
this.showMissingLocationsCheckBox.Text = "Näytä puuttuvat kansiopaikat";
this.showMissingLocationsCheckBox.UseVisualStyleBackColor = true;
//
// ShowCardInformation // ShowCardInformation
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(566, 463); this.ClientSize = new System.Drawing.Size(834, 777);
this.Controls.Add(this.label8); this.Controls.Add(this.panel1);
this.Controls.Add(this.cardStateTextBox); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.slotNumericUpDown); this.Controls.Add(this.groupBox3);
this.Controls.Add(this.pageNumericUpDown);
this.Controls.Add(this.bookNumericUpDown);
this.Controls.Add(this.cardTemplateTextBox);
this.Controls.Add(this.nickTextBox);
this.Controls.Add(this.nameTextBox);
this.Controls.Add(this.label7);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1);
this.Controls.Add(this.barcodeTextBox);
this.Name = "ShowCardInformation"; this.Name = "ShowCardInformation";
this.Text = "ShowCardInformation"; this.Text = "ShowCardInformation";
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bookNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bookNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pageNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pageNumericUpDown)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.slotNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.slotNumericUpDown)).EndInit();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.panel1.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }
#endregion #endregion
private System.Windows.Forms.TextBox barcodeTextBox; private System.Windows.Forms.TextBox barcodeTextBox;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Timer barcodeTimer; private System.Windows.Forms.Timer barcodeTimer;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
...@@ -259,5 +433,21 @@ ...@@ -259,5 +433,21 @@
private System.Windows.Forms.NumericUpDown slotNumericUpDown; private System.Windows.Forms.NumericUpDown slotNumericUpDown;
private System.Windows.Forms.TextBox cardStateTextBox; private System.Windows.Forms.TextBox cardStateTextBox;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.ListView cardsListView;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.ColumnHeader columnHeader3;
private System.Windows.Forms.CheckBox pendingValidationCheckBox;
private System.Windows.Forms.CheckBox ValidatedCheckBox;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.CheckBox showMissingLocationsCheckBox;
private System.Windows.Forms.Button listCardsButton;
private System.Windows.Forms.CheckBox deliveredCheckBox;
private System.Windows.Forms.CheckBox printedCheckBox;
private System.Windows.Forms.CheckBox inProgressCheckBox;
private System.Windows.Forms.CheckBox rejectedCheckBox;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Panel panel1;
} }
} }
\ No newline at end of file
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ShowCardInformation.cs
...@@ -171,6 +171,161 @@ namespace MoyaAdminUI ...@@ -171,6 +171,161 @@ namespace MoyaAdminUI
barcodeTimer.Start(); barcodeTimer.Start();
} }
private void listCardsButton_Click(object sender, EventArgs e)
{
List<Card> cards = new List<Card>();
string ret = "";
RestClient client = null;
foreach (User user in User.Cache)
{
client = new RestClient(Properties.Settings.Default.ApiURL);
Card card = null;
try
{
ret = client.MakeRequest("user/card/" + user.EventUserId);
var ser = new JavaScriptSerializer();
card = ser.Deserialize<Card>(ret);
}
catch (Exception ex)
{
}
if (card != null && card.state == "PRINTED" && printedCheckBox.Checked)
{
if ((card.state == "PRINTED" && printedCheckBox.Checked) ||
(card.state == "PENDING_VALIDATION" && pendingValidationCheckBox.Checked) ||
(card.state == "VALIDATED" && ValidatedCheckBox.Checked) ||
(card.state == "DELIVERED" && deliveredCheckBox.Checked) ||
(card.state == "REJECTED" && rejectedCheckBox.Checked))
{
cards.Add(card);
}
}
}
if (cards.Count > 0)
{
Dictionary<int, CardLocation> locationsToCards = new Dictionary<int, CardLocation>();
List<Card> cardsWithoutLocation = new List<Card>();
foreach (Card ca in cards)
{
if (ca.state == Card.CARD_STATE_PRINTED)
{
ret = "";
client = new RestClient(Properties.Settings.Default.ApiURL);
try
{
ret = client.MakeRequest("meta/v1/printedcard/" + ca.id + "/card-filing");
}
catch (ApplicationException ex)
{
if (!ex.Message.Contains("HTTP NoContent"))
return;
}
if (ret != null && ret != "")
{
MetaData data = getValue(ret);
int bookNumber = 0;
int pageNumber = 0;
int slotNumber = 0;
getCardPlace(data, out bookNumber, out pageNumber, out slotNumber);
int idx = int.Parse(bookNumber.ToString() + pageNumber.ToString() + slotNumber.ToString());
CardLocation location = new CardLocation();
location.Card = ca;
location.Book = bookNumber;
location.Page = pageNumber;
location.Slot = slotNumber;
if (idx > 0)
{
if (locationsToCards.ContainsKey(idx))
locationsToCards.Add(idx, location);
else
locationsToCards[idx] = location;
}
else
cardsWithoutLocation.Add(ca);
}
else
cardsWithoutLocation.Add(ca);
}
else
{
cardsWithoutLocation.Add(ca);
}
}
List<int> bookNumbers = new List<int>();
Dictionary<int, int> pageNumbers = new Dictionary<int, int>();
foreach (CardLocation cl in locationsToCards.Values)
{
if (!bookNumbers.Contains(cl.Book))
bookNumbers.Add(cl.Book);
if (pageNumbers.ContainsKey(cl.Book))
{
if (pageNumbers[cl.Book] < cl.Page)
pageNumbers[cl.Book] = cl.Page;
}
else
pageNumbers.Add(cl.Book, cl.Page);
}
foreach (int bookNumber in bookNumbers)
{
if (pageNumbers.ContainsKey(bookNumber))
{
for (int i = 1; i < pageNumbers[bookNumber]; i++)
{
for (int s = 1; s < 4; s++)
{
CardLocation cl = locationsToCards.Values.ToList().Find(cal => cal.Book == bookNumber && cal.Page == i && cal.Slot == s);
if (cl != null)
{
ListViewItem lvi = new ListViewItem(cl.Card.wholeName);
lvi.SubItems.Add(cl.Card.state);
lvi.SubItems.Add(cl.Book.ToString() + "." + cl.Page + "." + cl.Slot);
lvi.Tag = cl;
cardsListView.Items.Add(lvi);
}
else
{
ListViewItem lvi = new ListViewItem("");
lvi.SubItems.Add("");
lvi.SubItems.Add(bookNumber.ToString() + "." + i.ToString() + "." + s.ToString());
lvi.ForeColor = Color.Red;
cardsListView.Items.Add(lvi);
}
}
}
}
}
foreach (Card ca in cardsWithoutLocation)
{
ListViewItem lvi = new ListViewItem(ca.wholeName);
lvi.SubItems.Add(ca.state);
lvi.SubItems.Add("");
cardsListView.Items.Add(lvi);
}
}
//cards = cards.OrderBy(c => c.wholeName).ToList();
/*
foreach (Card card in cards)
{
ListViewItem lvi = new ListViewItem(card.wholeName);
lvi.SubItems.Add(card.username);
lvi.Tag = card;
cardsListView.Items.Add(lvi);
}*/
}
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/packages.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Csv" version="1.0.31" targetFramework="net40" /> <package id="Csv" version="1.0.31" targetFramework="net40" />
<package id="ZXing.Net" version="0.16.2" targetFramework="net40" /> <package id="ZXing.Net" version="0.16.4" targetFramework="net45" />
</packages> </packages>
\ No newline at end of file
MoyaSignup/Form1.cs
...@@ -78,6 +78,7 @@ namespace MoyaSignup ...@@ -78,6 +78,7 @@ namespace MoyaSignup
thermoPrinter.SetBarcodeWidth(ThermoPrinter.BarcodeWidths.Small); thermoPrinter.SetBarcodeWidth(ThermoPrinter.BarcodeWidths.Small);
thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Center); thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Center);
thermoPrinter.SetPositionHRI(ThermoPrinter.HRIPrintingPositions.Below); thermoPrinter.SetPositionHRI(ThermoPrinter.HRIPrintingPositions.Below);
thermoPrinter.SetCharacterTable(ThermoPrinter.CharacterCodeTables.Nordic);
} }
catch catch
{ {
......
MoyaSignup/MoyaSignup.csproj
...@@ -70,7 +70,8 @@ ...@@ -70,7 +70,8 @@
<HintPath>packages\AForge.Video.2.2.5\lib\AForge.Video.dll</HintPath> <HintPath>packages\AForge.Video.2.2.5\lib\AForge.Video.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="AutoUpdateLib"> <Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Resources\AutoUpdateLib.dll</HintPath> <HintPath>Resources\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="ConfLib2, Version=1.0.1.23606, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ConfLib2, Version=1.0.1.23606, Culture=neutral, processorArchitecture=MSIL">
...@@ -341,6 +342,7 @@ ...@@ -341,6 +342,7 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
\ No newline at end of file
MoyaSignup/MoyaSignup.sln
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio Version 17
VisualStudioVersion = 14.0.25420.1 VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoyaSignup", "MoyaSignup.csproj", "{7264F333-9419-4208-AA6D-223D4CE19C05}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoyaSignup", "MoyaSignup.csproj", "{7264F333-9419-4208-AA6D-223D4CE19C05}"
EndProject EndProject
...@@ -30,13 +30,18 @@ Global ...@@ -30,13 +30,18 @@ Global
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.ActiveCfg = Release|x86 {095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.ActiveCfg = Release|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.Build.0 = Release|x86 {095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.Build.0 = Release|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Debug|Any CPU.ActiveCfg = Debug|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Debug|Any CPU.ActiveCfg = Debug|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Debug|Any CPU.Build.0 = Debug|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Debug|x86.ActiveCfg = Debug|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Debug|x86.ActiveCfg = Debug|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Debug|x86.Build.0 = Debug|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Debug|x86.Build.0 = Debug|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Release|Any CPU.ActiveCfg = Release|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Release|Any CPU.ActiveCfg = Release|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Release|Any CPU.Build.0 = Release|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Release|x86.ActiveCfg = Release|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Release|x86.ActiveCfg = Release|x86
{25113A41-1991-4D34-95C0-47C238037A39}.Release|x86.Build.0 = Release|x86 {25113A41-1991-4D34-95C0-47C238037A39}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5106FE86-9179-42CF-AB8C-51F0A1612B31}
EndGlobalSection
EndGlobal EndGlobal
MoyaSignup/Properties/Resources.Designer.cs
...@@ -19,7 +19,7 @@ namespace MoyaSignup.Properties { ...@@ -19,7 +19,7 @@ namespace MoyaSignup.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
MoyaSignup/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace MoyaSignup.Properties { ...@@ -12,7 +12,7 @@ namespace MoyaSignup.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
MoyaSignup/UserDetailsEditor.cs
...@@ -354,12 +354,15 @@ namespace MoyaSignup ...@@ -354,12 +354,15 @@ namespace MoyaSignup
if (thermoPrinter != null) if (thermoPrinter != null)
{ {
thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Left); thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Left);
thermoPrinter.PrintText(name.Replace("ä", "a").Replace("ö", "o").Replace("å", "a").Replace("Ä", "A").Replace("Ö", "O").Replace("Å", "A")); thermoPrinter.PrintText(name);
thermoPrinter.PrintAndFeedPaper(1); thermoPrinter.PrintAndFeedPaper(1);
thermoPrinter.PrintText(info.Replace("ä", "a").Replace("ö", "o").Replace("å", "a").Replace("Ä", "A").Replace("Ö", "O").Replace("Å", "A")); thermoPrinter.PrintText(info);
thermoPrinter.PrintAndFeedPaper(2); thermoPrinter.PrintAndFeedPaper(2);
thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Center); thermoPrinter.SetCharacterAlignment(ThermoPrinter.CharacterAlignments.Center);
thermoPrinter.PrintBarcode(ThermoPrinter.BarCodeTypes.CODE39, barcode); //thermoPrinter.PrintBarcode(ThermoPrinter.BarCodeTypes.CODE39, barcode);
//Changing barcode to from code39 to ean13 because barcode contains only numbers and ean13 results in smaller printed barcode
thermoPrinter.PrintBarcode(ThermoPrinter.BarCodeTypes.JAN13, barcode);
thermoPrinter.PrintAndFeedPaper(5); thermoPrinter.PrintAndFeedPaper(5);
thermoPrinter.FullCut(); thermoPrinter.FullCut();
} else if(receiptPrinterName != null && receiptPrinterName != "") } else if(receiptPrinterName != null && receiptPrinterName != "")
......
MoyaSignup/app.config
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="MoyaSignup.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="MoyaSignup.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Npgsql" publicKeyToken="5D8B90D52F46FDA7" culture="neutral" /> <assemblyIdentity name="Npgsql" publicKeyToken="5D8B90D52F46FDA7" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.0.0.0" newVersion="1.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="ZedGraph" publicKeyToken="02a83cbd123fcd60" culture="neutral" /> <assemblyIdentity name="ZedGraph" publicKeyToken="02a83cbd123fcd60" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.1.7.430" newVersion="5.1.7.430" /> <bindingRedirect oldVersion="0.0.0.0-5.1.7.430" newVersion="5.1.7.430"/>
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
<value>myapikey</value> <value>myapikey</value>
</setting> </setting>
<setting name="ApplicationVersion" serializeAs="String"> <setting name="ApplicationVersion" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="Port" serializeAs="String"> <setting name="Port" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ThermoPrinter" serializeAs="String"> <setting name="ThermoPrinter" serializeAs="String">
<value>0</value> <value>0</value>
...@@ -57,4 +57,4 @@ ...@@ -57,4 +57,4 @@
</setting> </setting>
</MoyaSignup.Properties.Settings> </MoyaSignup.Properties.Settings>
</userSettings> </userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
PrintServer/moyaPrintServer/autopublish.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<AutoPublishSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <AutoPublishSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<UploadUser>f-solu-06</UploadUser> <UploadUser>f-solu-06</UploadUser>
<PrivateKeyPath>C:\devel\proj\AutoUpdate.svn\src\AutoPublish\Properties\key.txt</PrivateKeyPath>
<UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath> <UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath>
<UploadHost>www4.f-solutions.fi</UploadHost> <UploadHost>sftp.f-solutions.fi</UploadHost>
<ProjectName>MoyaPrintServer</ProjectName> <ProjectName>MoyaPrintServer</ProjectName>
<Customers> <Customers>
<Customer> <Customer>
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.Designer.cs
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
this.CardFilterTextBox = new System.Windows.Forms.TextBox(); this.CardFilterTextBox = new System.Windows.Forms.TextBox();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.sortByFirstnameCheckBox = new System.Windows.Forms.CheckBox(); this.sortByFirstnameCheckBox = new System.Windows.Forms.CheckBox();
this.randomizeCheckBox = new System.Windows.Forms.CheckBox();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
// //
this.autoPrintCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.autoPrintCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.autoPrintCheckBox.AutoSize = true; this.autoPrintCheckBox.AutoSize = true;
this.autoPrintCheckBox.Location = new System.Drawing.Point(12, 324); this.autoPrintCheckBox.Location = new System.Drawing.Point(12, 322);
this.autoPrintCheckBox.Name = "autoPrintCheckBox"; this.autoPrintCheckBox.Name = "autoPrintCheckBox";
this.autoPrintCheckBox.Size = new System.Drawing.Size(69, 17); this.autoPrintCheckBox.Size = new System.Drawing.Size(69, 17);
this.autoPrintCheckBox.TabIndex = 4; this.autoPrintCheckBox.TabIndex = 4;
...@@ -80,9 +81,10 @@ ...@@ -80,9 +81,10 @@
this.columnHeader3}); this.columnHeader3});
this.listView.ContextMenuStrip = this.contextMenuStrip1; this.listView.ContextMenuStrip = this.contextMenuStrip1;
this.listView.FullRowSelect = true; this.listView.FullRowSelect = true;
this.listView.HideSelection = false;
this.listView.Location = new System.Drawing.Point(11, 84); this.listView.Location = new System.Drawing.Point(11, 84);
this.listView.Name = "listView"; this.listView.Name = "listView";
this.listView.Size = new System.Drawing.Size(468, 234); this.listView.Size = new System.Drawing.Size(701, 232);
this.listView.TabIndex = 5; this.listView.TabIndex = 5;
this.listView.UseCompatibleStateImageBehavior = false; this.listView.UseCompatibleStateImageBehavior = false;
this.listView.View = System.Windows.Forms.View.Details; this.listView.View = System.Windows.Forms.View.Details;
...@@ -129,7 +131,7 @@ ...@@ -129,7 +131,7 @@
// printButton // printButton
// //
this.printButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.printButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.printButton.Location = new System.Drawing.Point(419, 324); this.printButton.Location = new System.Drawing.Point(652, 322);
this.printButton.Name = "printButton"; this.printButton.Name = "printButton";
this.printButton.Size = new System.Drawing.Size(60, 23); this.printButton.Size = new System.Drawing.Size(60, 23);
this.printButton.TabIndex = 7; this.printButton.TabIndex = 7;
...@@ -141,9 +143,9 @@ ...@@ -141,9 +143,9 @@
// //
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1}); this.toolStripStatusLabel1});
this.statusStrip1.Location = new System.Drawing.Point(0, 356); this.statusStrip1.Location = new System.Drawing.Point(0, 354);
this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(491, 22); this.statusStrip1.Size = new System.Drawing.Size(724, 22);
this.statusStrip1.TabIndex = 8; this.statusStrip1.TabIndex = 8;
this.statusStrip1.Text = "statusStrip1"; this.statusStrip1.Text = "statusStrip1";
// //
...@@ -174,7 +176,7 @@ ...@@ -174,7 +176,7 @@
// refreshButton // refreshButton
// //
this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.refreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.refreshButton.Location = new System.Drawing.Point(352, 324); this.refreshButton.Location = new System.Drawing.Point(585, 322);
this.refreshButton.Name = "refreshButton"; this.refreshButton.Name = "refreshButton";
this.refreshButton.Size = new System.Drawing.Size(61, 23); this.refreshButton.Size = new System.Drawing.Size(61, 23);
this.refreshButton.TabIndex = 12; this.refreshButton.TabIndex = 12;
...@@ -193,7 +195,7 @@ ...@@ -193,7 +195,7 @@
this.settingsToolStripButton}); this.settingsToolStripButton});
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";
this.toolStrip1.Size = new System.Drawing.Size(491, 25); this.toolStrip1.Size = new System.Drawing.Size(724, 25);
this.toolStrip1.TabIndex = 13; this.toolStrip1.TabIndex = 13;
this.toolStrip1.Text = "toolStrip1"; this.toolStrip1.Text = "toolStrip1";
// //
...@@ -211,7 +213,7 @@ ...@@ -211,7 +213,7 @@
// //
this.sortByNameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.sortByNameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.sortByNameCheckBox.AutoSize = true; this.sortByNameCheckBox.AutoSize = true;
this.sortByNameCheckBox.Location = new System.Drawing.Point(87, 324); this.sortByNameCheckBox.Location = new System.Drawing.Point(87, 322);
this.sortByNameCheckBox.Name = "sortByNameCheckBox"; this.sortByNameCheckBox.Name = "sortByNameCheckBox";
this.sortByNameCheckBox.Size = new System.Drawing.Size(108, 17); this.sortByNameCheckBox.Size = new System.Drawing.Size(108, 17);
this.sortByNameCheckBox.TabIndex = 14; this.sortByNameCheckBox.TabIndex = 14;
...@@ -234,7 +236,7 @@ ...@@ -234,7 +236,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.CardFilterTextBox.Location = new System.Drawing.Point(317, 45); this.CardFilterTextBox.Location = new System.Drawing.Point(317, 45);
this.CardFilterTextBox.Name = "CardFilterTextBox"; this.CardFilterTextBox.Name = "CardFilterTextBox";
this.CardFilterTextBox.Size = new System.Drawing.Size(162, 20); this.CardFilterTextBox.Size = new System.Drawing.Size(395, 20);
this.CardFilterTextBox.TabIndex = 16; this.CardFilterTextBox.TabIndex = 16;
this.toolTip1.SetToolTip(this.CardFilterTextBox, "By default print all cards. With this you can limit name of printed card types"); this.toolTip1.SetToolTip(this.CardFilterTextBox, "By default print all cards. With this you can limit name of printed card types");
// //
...@@ -242,7 +244,7 @@ ...@@ -242,7 +244,7 @@
// //
this.sortByFirstnameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.sortByFirstnameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.sortByFirstnameCheckBox.AutoSize = true; this.sortByFirstnameCheckBox.AutoSize = true;
this.sortByFirstnameCheckBox.Location = new System.Drawing.Point(201, 324); this.sortByFirstnameCheckBox.Location = new System.Drawing.Point(201, 322);
this.sortByFirstnameCheckBox.Name = "sortByFirstnameCheckBox"; this.sortByFirstnameCheckBox.Name = "sortByFirstnameCheckBox";
this.sortByFirstnameCheckBox.Size = new System.Drawing.Size(107, 17); this.sortByFirstnameCheckBox.Size = new System.Drawing.Size(107, 17);
this.sortByFirstnameCheckBox.TabIndex = 17; this.sortByFirstnameCheckBox.TabIndex = 17;
...@@ -250,11 +252,22 @@ ...@@ -250,11 +252,22 @@
this.sortByFirstnameCheckBox.UseVisualStyleBackColor = true; this.sortByFirstnameCheckBox.UseVisualStyleBackColor = true;
this.sortByFirstnameCheckBox.CheckedChanged += new System.EventHandler(this.sortByFirstnameCheckBox_CheckedChanged); this.sortByFirstnameCheckBox.CheckedChanged += new System.EventHandler(this.sortByFirstnameCheckBox_CheckedChanged);
// //
// randomizeCheckBox
//
this.randomizeCheckBox.AutoSize = true;
this.randomizeCheckBox.Location = new System.Drawing.Point(315, 322);
this.randomizeCheckBox.Name = "randomizeCheckBox";
this.randomizeCheckBox.Size = new System.Drawing.Size(79, 17);
this.randomizeCheckBox.TabIndex = 18;
this.randomizeCheckBox.Text = "Randomize";
this.randomizeCheckBox.UseVisualStyleBackColor = true;
//
// Form1 // Form1
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(491, 378); this.ClientSize = new System.Drawing.Size(724, 376);
this.Controls.Add(this.randomizeCheckBox);
this.Controls.Add(this.sortByFirstnameCheckBox); this.Controls.Add(this.sortByFirstnameCheckBox);
this.Controls.Add(this.CardFilterTextBox); this.Controls.Add(this.CardFilterTextBox);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
...@@ -307,6 +320,7 @@ ...@@ -307,6 +320,7 @@
private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
private System.Windows.Forms.ToolStripMenuItem setPrintedToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem setPrintedToolStripMenuItem;
private System.Windows.Forms.CheckBox sortByFirstnameCheckBox; private System.Windows.Forms.CheckBox sortByFirstnameCheckBox;
private System.Windows.Forms.CheckBox randomizeCheckBox;
} }
} }
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
...@@ -239,13 +239,13 @@ namespace moyaPrintServer ...@@ -239,13 +239,13 @@ namespace moyaPrintServer
try try
{ {
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
string json = client.MakeRequest("card/ListUnprinted"); string json = client.MakeRequest("card/ListUnprinted");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
PrintQueueList queuelist = ser.Deserialize<PrintQueueList>(json); PrintQueueList queuelist = ser.Deserialize<PrintQueueList>(json);
if (queuelist == null || queuelist.cards.Count == 0) if (queuelist == null || queuelist.cards.Count == 0)
{ {
toolStripStatusLabel1.Text = "No new cards"; toolStripStatusLabel1.Text = "No new cards";
...@@ -254,10 +254,18 @@ namespace moyaPrintServer ...@@ -254,10 +254,18 @@ namespace moyaPrintServer
listView.BeginUpdate(); listView.BeginUpdate();
listView.Items.Clear(); listView.Items.Clear();
if (sortByNameCheckBox.Checked) if (sortByNameCheckBox.Checked)
queuelist.cards = queuelist.cards.OrderBy(c => c.username).ToList(); queuelist.cards = queuelist.cards.OrderBy(c => c.username).ToList();
if (sortByFirstnameCheckBox.Checked) if (sortByFirstnameCheckBox.Checked)
queuelist.cards = queuelist.cards.OrderBy(c => c.wholeName).ToList(); queuelist.cards = queuelist.cards.OrderBy(c => c.wholeName).ToList();
if (randomizeCheckBox.Checked)
{
Random nrg = new Random();
queuelist.cards = queuelist.cards.OrderBy(c => nrg.Next()).ToList();
}
foreach (Card card in queuelist.cards) 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 // jos ei ole filtteriä niin tulosta kaikki validoidut kortit. Jos on filtteri niin tulosta vain ne joihin se osuu
...@@ -271,13 +279,24 @@ namespace moyaPrintServer ...@@ -271,13 +279,24 @@ namespace moyaPrintServer
} }
} }
listView.EndUpdate(); listView.EndUpdate();
} }
catch (Exception ex) catch (Exception ex)
{ {
toolStripStatusLabel1.Text = ex.Message; toolStripStatusLabel1.Text = ex.Message;
} }
} }
/*
private List<PrintQueueList> shuffleList(List<PrintQueueList> cards)
{
List<PrintQueueList> shuffled = new List<PrintQueueList>();
for(int i = 0; i < cards.Count; i++)
{
}
}*/
private int GetNumberOfPrintJobs() private int GetNumberOfPrintJobs()
{ {
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.resx
...@@ -142,9 +142,6 @@ ...@@ -142,9 +142,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>346, 17</value> <value>346, 17</value>
</metadata> </metadata>
<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"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
AAABAAgAICAQAAAAAADoAgAAhgAAABAQEAAAAAAAKAEAAG4DAAAwMAAAAQAIAKgOAACWBAAAICAAAAEA AAABAAgAICAQAAAAAADoAgAAhgAAABAQEAAAAAAAKAEAAG4DAAAwMAAAAQAIAKgOAACWBAAAICAAAAEA
......
PrintServer/moyaPrintServer/moyaPrintServer/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.36.0")] [assembly: AssemblyVersion("1.0.37.0")]
[assembly: AssemblyFileVersion("1.0.36.0")] [assembly: AssemblyFileVersion("1.0.37.0")]
PrintServer/moyaPrintServer/moyaPrintServer/Properties/Resources.Designer.cs
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.17929 // Runtime Version:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
...@@ -19,7 +19,7 @@ namespace moyaPrintServer.Properties { ...@@ -19,7 +19,7 @@ namespace moyaPrintServer.Properties {
// class via a tool like ResGen or Visual Studio. // class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen // To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project. // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
PrintServer/moyaPrintServer/moyaPrintServer/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace moyaPrintServer.Properties { ...@@ -12,7 +12,7 @@ namespace moyaPrintServer.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
PrintServer/moyaPrintServer/moyaPrintServer/app.config
...@@ -8,29 +8,29 @@ ...@@ -8,29 +8,29 @@
<userSettings> <userSettings>
<moyaPrintServer.Properties.Settings> <moyaPrintServer.Properties.Settings>
<setting name="Printer" serializeAs="String"> <setting name="Printer" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="AutoPrint" serializeAs="String"> <setting name="AutoPrint" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
<setting name="ApiURL" serializeAs="String"> <setting name="ApiURL" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiApplicationKey" serializeAs="String"> <setting name="ApiApplicationKey" serializeAs="String">
<value>8krAyTEpzP6QnwzkxGek</value> <value>8krAyTEpzP6QnwzkxGek</value>
</setting> </setting>
<setting name="ApiUser" serializeAs="String"> <setting name="ApiUser" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiPass" serializeAs="String"> <setting name="ApiPass" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApplicationVersion" serializeAs="String"> <setting name="ApplicationVersion" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="ApiTokenSet" serializeAs="String"> <setting name="ApiTokenSet" serializeAs="String">
<value>False</value> <value>False</value>
</setting> </setting>
</moyaPrintServer.Properties.Settings> </moyaPrintServer.Properties.Settings>
</userSettings> </userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
PrintServer/moyaPrintServer/moyaPrintServer/moyaPrintServer.csproj
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>moyaPrintServer</RootNamespace> <RootNamespace>moyaPrintServer</RootNamespace>
<AssemblyName>moyaPrintServer</AssemblyName> <AssemblyName>moyaPrintServer</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile> </TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
...@@ -33,10 +34,10 @@ ...@@ -33,10 +34,10 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AutoUpdateLib">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\res\AutoUpdateLib.dll</HintPath> <HintPath>..\res\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\x86\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
QrCodeScannerFrm/QrCodeScannerFrm.sln
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio Version 16
VisualStudioVersion = 14.0.25420.1 VisualStudioVersion = 16.0.31911.196
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QrCodeScannerFrm", "QrCodeScannerFrm\QrCodeScannerFrm.csproj", "{9FB4AF3A-D611-481C-9501-6B48B7AB3519}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QrCodeScannerFrm", "QrCodeScannerFrm\QrCodeScannerFrm.csproj", "{9FB4AF3A-D611-481C-9501-6B48B7AB3519}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoyaAdminLib", "..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\MoyaAdminLib.csproj", "{095CE28F-5B53-4203-85C6-3A9AFD486407}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|Any CPU.Build.0 = Debug|Any CPU {9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|x86.ActiveCfg = Debug|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Debug|x86.Build.0 = Debug|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|Any CPU.ActiveCfg = Release|Any CPU {9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|Any CPU.Build.0 = Release|Any CPU {9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|Any CPU.Build.0 = Release|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|x86.ActiveCfg = Release|Any CPU
{9FB4AF3A-D611-481C-9501-6B48B7AB3519}.Release|x86.Build.0 = Release|Any CPU
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|Any CPU.ActiveCfg = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|Any CPU.Build.0 = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|x86.ActiveCfg = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Debug|x86.Build.0 = Debug|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|Any CPU.ActiveCfg = Release|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.ActiveCfg = Release|x86
{095CE28F-5B53-4203-85C6-3A9AFD486407}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2B8C3160-4214-4A27-A9EF-5ECD20C5FF01}
EndGlobalSection
EndGlobal EndGlobal
QrCodeScannerFrm/QrCodeScannerFrm/ApiSettings.Designer.cs
...@@ -35,12 +35,19 @@ ...@@ -35,12 +35,19 @@
this.readerTextBox = new System.Windows.Forms.TextBox(); this.readerTextBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.webCamsComboBox = new System.Windows.Forms.ComboBox(); this.webCamsComboBox = new System.Windows.Forms.ComboBox();
this.resetApiTokenCheckBox = new System.Windows.Forms.CheckBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label4 = new System.Windows.Forms.Label();
this.pwTextBox = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.usernameTextBox = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// SaveButton // SaveButton
// //
this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.SaveButton.Location = new System.Drawing.Point(197, 158); this.SaveButton.Location = new System.Drawing.Point(226, 254);
this.SaveButton.Name = "SaveButton"; this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23); this.SaveButton.Size = new System.Drawing.Size(75, 23);
this.SaveButton.TabIndex = 4; this.SaveButton.TabIndex = 4;
...@@ -51,7 +58,7 @@ ...@@ -51,7 +58,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 27); this.label1.Location = new System.Drawing.Point(12, 124);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(43, 13); this.label1.Size = new System.Drawing.Size(43, 13);
this.label1.TabIndex = 19; this.label1.TabIndex = 19;
...@@ -60,7 +67,7 @@ ...@@ -60,7 +67,7 @@
// //
// domainTextBox // domainTextBox
// //
this.domainTextBox.Location = new System.Drawing.Point(12, 43); this.domainTextBox.Location = new System.Drawing.Point(12, 140);
this.domainTextBox.Name = "domainTextBox"; this.domainTextBox.Name = "domainTextBox";
this.domainTextBox.Size = new System.Drawing.Size(260, 20); this.domainTextBox.Size = new System.Drawing.Size(260, 20);
this.domainTextBox.TabIndex = 0; this.domainTextBox.TabIndex = 0;
...@@ -68,7 +75,7 @@ ...@@ -68,7 +75,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 66); this.label2.Location = new System.Drawing.Point(12, 163);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(78, 13); this.label2.Size = new System.Drawing.Size(78, 13);
this.label2.TabIndex = 22; this.label2.TabIndex = 22;
...@@ -76,7 +83,7 @@ ...@@ -76,7 +83,7 @@
// //
// readerTextBox // readerTextBox
// //
this.readerTextBox.Location = new System.Drawing.Point(12, 82); this.readerTextBox.Location = new System.Drawing.Point(12, 179);
this.readerTextBox.Name = "readerTextBox"; this.readerTextBox.Name = "readerTextBox";
this.readerTextBox.Size = new System.Drawing.Size(260, 20); this.readerTextBox.Size = new System.Drawing.Size(260, 20);
this.readerTextBox.TabIndex = 1; this.readerTextBox.TabIndex = 1;
...@@ -84,7 +91,7 @@ ...@@ -84,7 +91,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(12, 109); this.label3.Location = new System.Drawing.Point(12, 202);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(53, 13); this.label3.Size = new System.Drawing.Size(53, 13);
this.label3.TabIndex = 23; this.label3.TabIndex = 23;
...@@ -93,16 +100,76 @@ ...@@ -93,16 +100,76 @@
// webCamsComboBox // webCamsComboBox
// //
this.webCamsComboBox.FormattingEnabled = true; this.webCamsComboBox.FormattingEnabled = true;
this.webCamsComboBox.Location = new System.Drawing.Point(12, 126); this.webCamsComboBox.Location = new System.Drawing.Point(12, 218);
this.webCamsComboBox.Name = "webCamsComboBox"; this.webCamsComboBox.Name = "webCamsComboBox";
this.webCamsComboBox.Size = new System.Drawing.Size(260, 21); this.webCamsComboBox.Size = new System.Drawing.Size(260, 21);
this.webCamsComboBox.TabIndex = 3; this.webCamsComboBox.TabIndex = 3;
// //
// resetApiTokenCheckBox
//
this.resetApiTokenCheckBox.AutoSize = true;
this.resetApiTokenCheckBox.Location = new System.Drawing.Point(6, -1);
this.resetApiTokenCheckBox.Name = "resetApiTokenCheckBox";
this.resetApiTokenCheckBox.Size = new System.Drawing.Size(101, 17);
this.resetApiTokenCheckBox.TabIndex = 0;
this.resetApiTokenCheckBox.Text = "Reset api token";
this.resetApiTokenCheckBox.UseVisualStyleBackColor = true;
this.resetApiTokenCheckBox.CheckedChanged += new System.EventHandler(this.resetApiTokenCheckBox_CheckedChanged);
//
// groupBox1
//
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.pwTextBox);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.usernameTextBox);
this.groupBox1.Controls.Add(this.resetApiTokenCheckBox);
this.groupBox1.Location = new System.Drawing.Point(15, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(288, 109);
this.groupBox1.TabIndex = 24;
this.groupBox1.TabStop = false;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(6, 58);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 13);
this.label4.TabIndex = 8;
this.label4.Text = "Password";
//
// pwTextBox
//
this.pwTextBox.Location = new System.Drawing.Point(6, 74);
this.pwTextBox.Name = "pwTextBox";
this.pwTextBox.PasswordChar = 'ῷ';
this.pwTextBox.ReadOnly = true;
this.pwTextBox.Size = new System.Drawing.Size(260, 20);
this.pwTextBox.TabIndex = 7;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(6, 19);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(55, 13);
this.label5.TabIndex = 6;
this.label5.Text = "Username";
//
// usernameTextBox
//
this.usernameTextBox.Location = new System.Drawing.Point(6, 35);
this.usernameTextBox.Name = "usernameTextBox";
this.usernameTextBox.ReadOnly = true;
this.usernameTextBox.Size = new System.Drawing.Size(260, 20);
this.usernameTextBox.TabIndex = 5;
//
// ApiSettings // ApiSettings
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 196); this.ClientSize = new System.Drawing.Size(313, 292);
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.webCamsComboBox); this.Controls.Add(this.webCamsComboBox);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
...@@ -113,6 +180,8 @@ ...@@ -113,6 +180,8 @@
this.Name = "ApiSettings"; this.Name = "ApiSettings";
this.Text = "ApiSettings"; this.Text = "ApiSettings";
this.Load += new System.EventHandler(this.ApiSettings_Load); this.Load += new System.EventHandler(this.ApiSettings_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
...@@ -126,5 +195,11 @@ ...@@ -126,5 +195,11 @@
private System.Windows.Forms.TextBox readerTextBox; private System.Windows.Forms.TextBox readerTextBox;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.ComboBox webCamsComboBox; private System.Windows.Forms.ComboBox webCamsComboBox;
private System.Windows.Forms.CheckBox resetApiTokenCheckBox;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox pwTextBox;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox usernameTextBox;
} }
} }
\ No newline at end of file
QrCodeScannerFrm/QrCodeScannerFrm/ApiSettings.cs
using DirectShowLib; using DirectShowLib;
using MoyaAdminLib;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
...@@ -19,6 +20,37 @@ namespace QrCodeScannerFrm ...@@ -19,6 +20,37 @@ namespace QrCodeScannerFrm
private void SaveButton_Click(object sender, EventArgs e) private void SaveButton_Click(object sender, EventArgs e)
{ {
ApiCredential apiCredential = null;
if (resetApiTokenCheckBox.Checked)
{
try
{
apiCredential = RestClient.GetApiCredential(usernameTextBox.Text, pwTextBox.Text, Properties.Settings.Default.ApiApplicationKey, "https://" + domainTextBox.Text + "/MoyaWeb");
}
catch (Exception ex)
{
MessageBox.Show("Failed to get api credentials: " + ex.Message);
}
if (apiCredential != null)
{
//Properties.Settings.Default.ApiURL = apiURLTextBox.Text;
//Properties.Settings.Default.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
Properties.Settings.Default.ApiUser = apiCredential.authname;
Properties.Settings.Default.ApiPass = apiCredential.secret;
Properties.Settings.Default.ApiTokenSet = true;
Properties.Settings.Default.Save();
}
}
/*RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiPass = Properties.Settings.Default.ApiPass;
RestClient.ApiUser = Properties.Settings.Default.ApiUser;*/
if (domainTextBox.Text != "" && readerTextBox.Text != "" && webCamsComboBox.SelectedItem != null) if (domainTextBox.Text != "" && readerTextBox.Text != "" && webCamsComboBox.SelectedItem != null)
{ {
Properties.Settings.Default.Host = domainTextBox.Text; Properties.Settings.Default.Host = domainTextBox.Text;
...@@ -31,11 +63,18 @@ namespace QrCodeScannerFrm ...@@ -31,11 +63,18 @@ namespace QrCodeScannerFrm
return; return;
} }
RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiPass = Properties.Settings.Default.ApiPass;
RestClient.ApiUser = Properties.Settings.Default.ApiUser;
RestClient.ApiURL = "https://" + Properties.Settings.Default.Host + "/MoyaWeb";
this.DialogResult = System.Windows.Forms.DialogResult.OK; this.DialogResult = System.Windows.Forms.DialogResult.OK;
} }
private void ApiSettings_Load(object sender, EventArgs e) private void ApiSettings_Load(object sender, EventArgs e)
{ {
resetApiTokenCheckBox.Checked = !Properties.Settings.Default.ApiTokenSet;
domainTextBox.Text = Properties.Settings.Default.Host; domainTextBox.Text = Properties.Settings.Default.Host;
readerTextBox.Text = Properties.Settings.Default.Reader; readerTextBox.Text = Properties.Settings.Default.Reader;
...@@ -53,5 +92,21 @@ namespace QrCodeScannerFrm ...@@ -53,5 +92,21 @@ namespace QrCodeScannerFrm
{ {
} }
private void resetApiTokenCheckBox_CheckedChanged(object sender, EventArgs e)
{
if (!resetApiTokenCheckBox.Checked)
{
//apiURLTextBox.ReadOnly = true;
usernameTextBox.ReadOnly = true;
pwTextBox.ReadOnly = true;
}
else
{
//apiURLTextBox.ReadOnly = false;
usernameTextBox.ReadOnly = false;
pwTextBox.ReadOnly = false;
}
}
} }
} }
QrCodeScannerFrm/QrCodeScannerFrm/App.config
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
</runtime> </runtime>
<userSettings> <userSettings>
<QrCodeScannerFrm.Properties.Settings> <QrCodeScannerFrm.Properties.Settings>
<setting name="ApiKey" serializeAs="String"> <setting name="ApiApplicationKey" serializeAs="String">
<value /> <value>8krAyTEpzP6QnwzkxGek</value>
</setting> </setting>
<setting name="ApiURL" serializeAs="String"> <setting name="ApiURL" serializeAs="String">
<value>http://my.event.ltd/MoyaWeb/shop/rfidListener.jsf?reader=demo_reader&amp;tag=%</value> <value>http://my.event.ltd/MoyaWeb/shop/rfidListener.jsf?reader=demo_reader&amp;tag=%</value>
...@@ -42,6 +42,9 @@ ...@@ -42,6 +42,9 @@
<setting name="WebCam" serializeAs="String"> <setting name="WebCam" serializeAs="String">
<value>-1</value> <value>-1</value>
</setting> </setting>
<setting name="ApiTokenSet" serializeAs="String">
<value>False</value>
</setting>
</QrCodeScannerFrm.Properties.Settings> </QrCodeScannerFrm.Properties.Settings>
</userSettings> </userSettings>
</configuration> </configuration>
\ No newline at end of file
QrCodeScannerFrm/QrCodeScannerFrm/Form1.cs
...@@ -32,6 +32,8 @@ namespace QrCodeScannerFrm ...@@ -32,6 +32,8 @@ namespace QrCodeScannerFrm
string ret = ""; string ret = "";
public static event EventHandler<CodeEventArgs> CodeRead;
private void Form1_Load(object sender, EventArgs e) private void Form1_Load(object sender, EventArgs e)
{ {
if (TrayForm.CaptureDevice != null) if (TrayForm.CaptureDevice != null)
...@@ -146,8 +148,17 @@ namespace QrCodeScannerFrm ...@@ -146,8 +148,17 @@ namespace QrCodeScannerFrm
{ {
if (code != "" && hostTextBox.Text != "" && readerTextBox.Text != "") if (code != "" && hostTextBox.Text != "" && readerTextBox.Text != "")
{ {
if (CodeRead != null)
{
CodeEventArgs e = new CodeEventArgs();
e.Code = code;
CodeRead(this, e);
}
string url = Properties.Settings.Default.ApiURL.Replace("my.event.ltd", hostTextBox.Text.Trim()).Replace("demo_reader", readerTextBox.Text.Trim()).Replace("%", codeTextBox.Text.Trim()); string url = Properties.Settings.Default.ApiURL.Replace("my.event.ltd", hostTextBox.Text.Trim()).Replace("demo_reader", readerTextBox.Text.Trim()).Replace("%", codeTextBox.Text.Trim());
Debug.WriteLine("Url: " + url);
BarcodeRestClient client = new BarcodeRestClient(url); BarcodeRestClient client = new BarcodeRestClient(url);
try try
......
QrCodeScannerFrm/QrCodeScannerFrm/Properties/AssemblyInfo.cs
...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices; ...@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.16.0")] [assembly: AssemblyVersion("1.0.18.0")]
[assembly: AssemblyFileVersion("1.0.16.0")] [assembly: AssemblyFileVersion("1.0.18.0")]
QrCodeScannerFrm/QrCodeScannerFrm/Properties/Settings.Designer.cs
...@@ -12,7 +12,7 @@ namespace QrCodeScannerFrm.Properties { ...@@ -12,7 +12,7 @@ namespace QrCodeScannerFrm.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
...@@ -25,13 +25,13 @@ namespace QrCodeScannerFrm.Properties { ...@@ -25,13 +25,13 @@ namespace QrCodeScannerFrm.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("8krAyTEpzP6QnwzkxGek")]
public string ApiKey { public string ApiApplicationKey {
get { get {
return ((string)(this["ApiKey"])); return ((string)(this["ApiApplicationKey"]));
} }
set { set {
this["ApiKey"] = value; this["ApiApplicationKey"] = value;
} }
} }
...@@ -118,5 +118,17 @@ namespace QrCodeScannerFrm.Properties { ...@@ -118,5 +118,17 @@ namespace QrCodeScannerFrm.Properties {
this["WebCam"] = value; this["WebCam"] = value;
} }
} }
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ApiTokenSet {
get {
return ((bool)(this["ApiTokenSet"]));
}
set {
this["ApiTokenSet"] = value;
}
}
} }
} }
QrCodeScannerFrm/QrCodeScannerFrm/Properties/Settings.settings
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="QrCodeScannerFrm.Properties" GeneratedClassName="Settings"> <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="QrCodeScannerFrm.Properties" GeneratedClassName="Settings">
<Profiles /> <Profiles />
<Settings> <Settings>
<Setting Name="ApiKey" Type="System.String" Scope="User"> <Setting Name="ApiApplicationKey" Type="System.String" Scope="User">
<Value Profile="(Default)" /> <Value Profile="(Default)">8krAyTEpzP6QnwzkxGek</Value>
</Setting> </Setting>
<Setting Name="ApiURL" Type="System.String" Scope="User"> <Setting Name="ApiURL" Type="System.String" Scope="User">
<Value Profile="(Default)">http://my.event.ltd/MoyaWeb/shop/rfidListener.jsf?reader=demo_reader&amp;tag=%</Value> <Value Profile="(Default)">http://my.event.ltd/MoyaWeb/shop/rfidListener.jsf?reader=demo_reader&amp;tag=%</Value>
...@@ -26,5 +26,8 @@ ...@@ -26,5 +26,8 @@
<Setting Name="WebCam" Type="System.Int32" Scope="User"> <Setting Name="WebCam" Type="System.Int32" Scope="User">
<Value Profile="(Default)">-1</Value> <Value Profile="(Default)">-1</Value>
</Setting> </Setting>
<Setting Name="ApiTokenSet" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>
\ No newline at end of file
QrCodeScannerFrm/QrCodeScannerFrm/QrCodeScannerFrm.csproj
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AutoUpdateLib"> <Reference Include="AutoUpdateLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Resources\AutoUpdateLib.dll</HintPath> <HintPath>Resources\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="DirectShowLib-2005, Version=2.0.0.0, Culture=neutral, PublicKeyToken=67e7b740cdfc2d3f, processorArchitecture=MSIL"> <Reference Include="DirectShowLib-2005, Version=2.0.0.0, Culture=neutral, PublicKeyToken=67e7b740cdfc2d3f, processorArchitecture=MSIL">
...@@ -69,6 +70,7 @@ ...@@ -69,6 +70,7 @@
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
...@@ -99,6 +101,13 @@ ...@@ -99,6 +101,13 @@
<DependentUpon>ApiSettings.cs</DependentUpon> <DependentUpon>ApiSettings.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="BarcodeRestClient.cs" /> <Compile Include="BarcodeRestClient.cs" />
<Compile Include="CodeEventArgs.cs" />
<Compile Include="CodeLinkingForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="CodeLinkingForm.Designer.cs">
<DependentUpon>CodeLinkingForm.cs</DependentUpon>
</Compile>
<Compile Include="Form1.cs"> <Compile Include="Form1.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -116,6 +125,9 @@ ...@@ -116,6 +125,9 @@
<EmbeddedResource Include="ApiSettings.resx"> <EmbeddedResource Include="ApiSettings.resx">
<DependentUpon>ApiSettings.cs</DependentUpon> <DependentUpon>ApiSettings.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="CodeLinkingForm.resx">
<DependentUpon>CodeLinkingForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form1.resx"> <EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
...@@ -174,9 +186,15 @@ ...@@ -174,9 +186,15 @@
</None> </None>
<Content Include="Utilities\Audio\Formats.txt" /> <Content Include="Utilities\Audio\Formats.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\MoyaAdminLib.csproj">
<Project>{095CE28F-5B53-4203-85C6-3A9AFD486407}</Project>
<Name>MoyaAdminLib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>$(SolutionDir)/../../\AutoUpdate\src\AutoPublish\bin\x86\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.
......
QrCodeScannerFrm/QrCodeScannerFrm/TrayForm.Designer.cs
...@@ -32,10 +32,11 @@ ...@@ -32,10 +32,11 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TrayForm)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TrayForm));
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.videoFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.apiSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.apiSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.scanCodeTimer = new System.Windows.Forms.Timer(this.components); this.scanCodeTimer = new System.Windows.Forms.Timer(this.components);
this.videoFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openCardCodeLinkingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -50,23 +51,31 @@ ...@@ -50,23 +51,31 @@
// //
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.videoFormToolStripMenuItem, this.videoFormToolStripMenuItem,
this.openCardCodeLinkingToolStripMenuItem,
this.apiSettingsToolStripMenuItem, this.apiSettingsToolStripMenuItem,
this.exitToolStripMenuItem}); this.exitToolStripMenuItem});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(154, 92); this.contextMenuStrip1.Size = new System.Drawing.Size(198, 114);
this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
// //
// videoFormToolStripMenuItem
//
this.videoFormToolStripMenuItem.Name = "videoFormToolStripMenuItem";
this.videoFormToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.videoFormToolStripMenuItem.Text = "Live video feed";
this.videoFormToolStripMenuItem.Click += new System.EventHandler(this.videoFormToolStripMenuItem_Click);
//
// apiSettingsToolStripMenuItem // apiSettingsToolStripMenuItem
// //
this.apiSettingsToolStripMenuItem.Name = "apiSettingsToolStripMenuItem"; this.apiSettingsToolStripMenuItem.Name = "apiSettingsToolStripMenuItem";
this.apiSettingsToolStripMenuItem.Size = new System.Drawing.Size(153, 22); this.apiSettingsToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.apiSettingsToolStripMenuItem.Text = "Settings"; this.apiSettingsToolStripMenuItem.Text = "Settings";
this.apiSettingsToolStripMenuItem.Click += new System.EventHandler(this.apiSettingsToolStripMenuItem_Click); this.apiSettingsToolStripMenuItem.Click += new System.EventHandler(this.apiSettingsToolStripMenuItem_Click);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(153, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
...@@ -74,12 +83,12 @@ ...@@ -74,12 +83,12 @@
// //
this.scanCodeTimer.Tick += new System.EventHandler(this.scanCodeTimer_Tick); this.scanCodeTimer.Tick += new System.EventHandler(this.scanCodeTimer_Tick);
// //
// videoFormToolStripMenuItem // openCardCodeLinkingToolStripMenuItem
// //
this.videoFormToolStripMenuItem.Name = "videoFormToolStripMenuItem"; this.openCardCodeLinkingToolStripMenuItem.Name = "openCardCodeLinkingToolStripMenuItem";
this.videoFormToolStripMenuItem.Size = new System.Drawing.Size(153, 22); this.openCardCodeLinkingToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
this.videoFormToolStripMenuItem.Text = "Live video feed"; this.openCardCodeLinkingToolStripMenuItem.Text = "Open card code linking";
this.videoFormToolStripMenuItem.Click += new System.EventHandler(this.videoFormToolStripMenuItem_Click); this.openCardCodeLinkingToolStripMenuItem.Click += new System.EventHandler(this.openCardCodeLinkingToolStripMenuItem_Click);
// //
// TrayForm // TrayForm
// //
...@@ -103,5 +112,6 @@ ...@@ -103,5 +112,6 @@
private System.Windows.Forms.ToolStripMenuItem apiSettingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem apiSettingsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem videoFormToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem videoFormToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem openCardCodeLinkingToolStripMenuItem;
} }
} }
\ No newline at end of file
QrCodeScannerFrm/QrCodeScannerFrm/TrayForm.cs
...@@ -106,8 +106,8 @@ namespace QrCodeScannerFrm ...@@ -106,8 +106,8 @@ namespace QrCodeScannerFrm
if (result != null) if (result != null)
{ {
Debug.WriteLine(result.BarcodeFormat.ToString()); //Debug.WriteLine(result.BarcodeFormat.ToString());
Debug.WriteLine(result.Text); //Debug.WriteLine(result.Text);
if (lastCode != result.Text || timeCodeSent.AddSeconds(30) < DateTime.Now) if (lastCode != result.Text || timeCodeSent.AddSeconds(30) < DateTime.Now)
{ {
lastCode = result.Text; lastCode = result.Text;
...@@ -119,13 +119,13 @@ namespace QrCodeScannerFrm ...@@ -119,13 +119,13 @@ namespace QrCodeScannerFrm
} }
else else
{ {
Debug.WriteLine("Couldn't dedect qr code, trying to dedect barcode."); //Debug.WriteLine("Couldn't dedect qr code, trying to dedect barcode.");
Debug.WriteLine("Couldn't dedect qr code, trying to dedect barcode."); //Debug.WriteLine("Couldn't dedect qr code, trying to dedect barcode.");
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
if (i > 0) if (i > 0)
{ {
Debug.WriteLine("Couldn't dedect barcode, trying to rotate picture 90 degrees."); //Debug.WriteLine("Couldn't dedect barcode, trying to rotate picture 90 degrees.");
image.RotateFlip(RotateFlipType.Rotate90FlipNone); image.RotateFlip(RotateFlipType.Rotate90FlipNone);
} }
source = new BitmapLuminanceSource(image); source = new BitmapLuminanceSource(image);
...@@ -134,8 +134,8 @@ namespace QrCodeScannerFrm ...@@ -134,8 +134,8 @@ namespace QrCodeScannerFrm
result = barcodereader.Decode(image); result = barcodereader.Decode(image);
if (result != null && !result.BarcodeFormat.ToString().Contains("UPC")) if (result != null && !result.BarcodeFormat.ToString().Contains("UPC"))
{ {
Debug.WriteLine(result.BarcodeFormat.ToString()); //Debug.WriteLine(result.BarcodeFormat.ToString());
Debug.WriteLine(result.Text); //Debug.WriteLine(result.Text);
if (lastCode != result.Text || timeCodeSent.AddSeconds(30) < DateTime.Now) if (lastCode != result.Text || timeCodeSent.AddSeconds(30) < DateTime.Now)
{ {
lastCode = result.Text; lastCode = result.Text;
...@@ -165,6 +165,8 @@ namespace QrCodeScannerFrm ...@@ -165,6 +165,8 @@ namespace QrCodeScannerFrm
{ {
string url = Properties.Settings.Default.ApiURL.Replace("my.event.ltd", Properties.Settings.Default.Host.Trim()).Replace("demo_reader", Properties.Settings.Default.Reader.Trim()).Replace("%", code.Trim()); string url = Properties.Settings.Default.ApiURL.Replace("my.event.ltd", Properties.Settings.Default.Host.Trim()).Replace("demo_reader", Properties.Settings.Default.Reader.Trim()).Replace("%", code.Trim());
Debug.WriteLine("Url: " + url);
BarcodeRestClient client = new BarcodeRestClient(url); BarcodeRestClient client = new BarcodeRestClient(url);
try try
...@@ -233,5 +235,13 @@ namespace QrCodeScannerFrm ...@@ -233,5 +235,13 @@ namespace QrCodeScannerFrm
Form1 frm = new Form1(); Form1 frm = new Form1();
frm.Show(); frm.Show();
} }
private void openCardCodeLinkingToolStripMenuItem_Click(object sender, EventArgs e)
{
//Debug.WriteLine("ApiUrl: " + Properties.Settings.Default.ApiURL);
//Debug.WriteLine("ApiUrl: " + Properties.Settings.Default.ApiURL);
CodeLinkingForm frm = new CodeLinkingForm();
frm.Show();
}
} }
} }
QrCodeScannerFrm/autopublish.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<AutoPublishSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <AutoPublishSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<UploadUser>f-solu-06</UploadUser> <UploadUser>f-solu-06</UploadUser>
<PrivateKeyPath />
<UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath> <UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath>
<UploadHost>www4.f-solutions.fi</UploadHost> <UploadHost>www4.f-solutions.fi</UploadHost>
<ProjectName>QrCodeScannerFrm</ProjectName> <ProjectName>QrCodeScannerFrm</ProjectName>
......
QrCodeScannerFrm/out_moya.nsi
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name "QrCodeScannerFrm moya v1_00_16" Name "QrCodeScannerFrm moya v1_00_18"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this. ; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
...@@ -198,7 +198,7 @@ FunctionEnd ...@@ -198,7 +198,7 @@ FunctionEnd
Section "!QrCodeScannerFrm moya stable v1_00_16" SecMain Section "!QrCodeScannerFrm moya stable v1_00_18" SecMain
SetShellVarContext current SetShellVarContext current
...@@ -214,17 +214,17 @@ Section "!QrCodeScannerFrm moya stable v1_00_16" SecMain ...@@ -214,17 +214,17 @@ Section "!QrCodeScannerFrm moya stable v1_00_16" SecMain
File /oname=cvextern.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\Resources\cvextern.dll" File /oname=cvextern.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\Resources\cvextern.dll"
File /oname=opencv_highgui220.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\opencv_highgui220.dll" File /oname=opencv_highgui220.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\opencv_highgui220.dll"
File /oname=opencv_core220.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\opencv_core220.dll" File /oname=opencv_core220.dll "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\opencv_core220.dll"
File /oname=autoupdate.xml "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\autoupdate.moya.xml" File /oname=autoupdate.xml "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\autoupdate.moya.xml"
File /oname=QrCodeScannerFrm.exe "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\QrCodeScannerFrm.exe" File /oname=QrCodeScannerFrm.exe "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\QrCodeScannerFrm.exe"
File autoupdate.crt File autoupdate.crt
...@@ -234,14 +234,16 @@ Section "!QrCodeScannerFrm moya stable v1_00_16" SecMain ...@@ -234,14 +234,16 @@ Section "!QrCodeScannerFrm moya stable v1_00_16" SecMain
; that is referenced to the main project. ; that is referenced to the main project.
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\DirectShowLib-2005.dll" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\MoyaAdminLib.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\Emgu.CV.dll" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\DirectShowLib-2005.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\Emgu.Util.dll" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\Emgu.CV.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\zxing.dll" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\Emgu.Util.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\AutoUpdateLib.dll" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\zxing.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\AutoUpdateLib.dll"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\QrCodeScannerFrm.pdb" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\QrCodeScannerFrm.pdb"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\zxing.pdb" File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\MoyaAdminLib.pdb"
File "C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\zxing.pdb"
...@@ -329,14 +331,16 @@ Section "Uninstall" ...@@ -329,14 +331,16 @@ Section "Uninstall"
; that is referenced to the main project. ; that is referenced to the main project.
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\DirectShowLib-2005.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\MoyaAdminLib.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\Emgu.CV.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\DirectShowLib-2005.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\Emgu.Util.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\Emgu.CV.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\zxing.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\Emgu.Util.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\AutoUpdateLib.dll" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\zxing.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\QrCodeScannerFrm.pdb" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\QrCodeScannerFrm.pdb"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Release\zxing.pdb" Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\MoyaAdminLib.pdb"
Delete "$INSTDIR\C:\devel\proj\moya-info-tools\QrCodeScannerFrm\QrCodeScannerFrm\bin\Debug\zxing.pdb"
......
ThermoPrinterLibrary/ThermoPrinterLibrary/ThermoPrinter.cs
...@@ -66,6 +66,7 @@ namespace ThermoPrinterLibrary ...@@ -66,6 +66,7 @@ namespace ThermoPrinterLibrary
JAN13 = 0x2, JAN13 = 0x2,
JAN8 = 0x3, JAN8 = 0x3,
CODE39 = 0x4, CODE39 = 0x4,
//CODE39 = 0x69,
ITF = 0x5, ITF = 0x5,
CODABAR = 0x6 CODABAR = 0x6
} }
...@@ -84,6 +85,19 @@ namespace ThermoPrinterLibrary ...@@ -84,6 +85,19 @@ namespace ThermoPrinterLibrary
Right = 0x2 Right = 0x2
} }
public enum CharacterCodeTables: byte
{
USA = 0x0,
Katakana = 0x1,
Multilingual = 0x2,
Portuguese = 0x3,
CanadianFrench = 0x4,
Nordic = 0x5,
WPC1252 = 0x10,
Latin2 = 0x11,
Euro = 0x13
}
public enum HRIPrintingPositions: byte public enum HRIPrintingPositions: byte
{ {
NoPrinting = 0x0, NoPrinting = 0x0,
...@@ -227,11 +241,47 @@ namespace ThermoPrinterLibrary ...@@ -227,11 +241,47 @@ namespace ThermoPrinterLibrary
} }
} }
public void SetCharacterTable(CharacterCodeTables table)
{
if (initialized)
{
commands = new byte[3];
commands[0] = (byte)Commands.ESC;
commands[1] = (byte)'t';
commands[2] = (byte)table;
this.port.Write(commands, 0, 3);
}
}
public void PrintText(string text) public void PrintText(string text)
{ {
if (initialized) if (initialized)
{ {
byte[] bytes = Encoding.ASCII.GetBytes(text); Encoding encode = Encoding.GetEncoding("iso-8859-1");
byte[] bytes = encode.GetBytes(text);
//Failed to find correct encoding that would replace äöå as the correct ascii value so fixing this by replacing correct value to byte data
int i = 0;
foreach (char c in text.ToCharArray())
{
if (c == 'ä')
bytes[i] = 132;
else if (c == 'ö')
bytes[i] = 148;
else if (c == 'å')
bytes[i] = 134;
else if (c == 'Ä')
bytes[i] = 142;
else if (c == 'Ö')
bytes[i] = 153;
else if (c == 'Å')
bytes[i] = 143;
i++;
}
//byte[] bytes = Encoding.ASCII.GetBytes(text);
this.port.Write(bytes, 0, bytes.Length); this.port.Write(bytes, 0, bytes.Length);
//this.port.Write(text); //this.port.Write(text);
} }
...@@ -279,6 +329,7 @@ namespace ThermoPrinterLibrary ...@@ -279,6 +329,7 @@ namespace ThermoPrinterLibrary
this.port.Write(c.GetBytes(), 0, c.Length); this.port.Write(c.GetBytes(), 0, c.Length);
} }
public void SetPositionHRI(HRIPrintingPositions position) public void SetPositionHRI(HRIPrintingPositions position)
{ {
if (!initialized) return; if (!initialized) return;
...@@ -299,9 +350,5 @@ namespace ThermoPrinterLibrary ...@@ -299,9 +350,5 @@ namespace ThermoPrinterLibrary
this.port.Write(c.GetBytes(), 0, c.Length); this.port.Write(c.GetBytes(), 0, c.Length);
} }
public void SelectingInternationalCharacters()
{
}
} }
} }
apikeys.txt
...@@ -5,4 +5,7 @@ ApiPass: mIqgbpzGlU5rPrM8JX7l ...@@ -5,4 +5,7 @@ ApiPass: mIqgbpzGlU5rPrM8JX7l
ApiKey: ryirch1oD0Vig1Taik9ga ApiKey: ryirch1oD0Vig1Taik9ga
ApiUser: tapsa ApiUser: tapsa
ApiPass: myPs7I7ov1iM3yeS3am6 ApiPass: myPs7I7ov1iM3yeS3am6
\ No newline at end of file
$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!