Skip to content

Joona Romppanen / Moya Info Tools

Go to a project
Commit 21017ed4 by Liv Haapala
Options

update

1 parent 4c461813
Inline Side-by-side
Showing with 2276 additions and 47 deletions
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Program.cs
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Windows.Forms;
......@@ -11,10 +12,33 @@ namespace BarcodeScannerClient
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
static void Main(string[] args)
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
if (!Debugger.IsAttached)
{
if (args.Length == 0 || args[0] != "-noautoupdate")
{
if (AutoUpdateLib.AutoUpdateCore.CheckForUpdates(null))
return; //program is required to close by autoupdate (probably updated)
}
}
System.Reflection.Assembly a = System.Reflection.Assembly.GetExecutingAssembly();
Version appVersion = a.GetName().Version;
string appVersionString = appVersion.ToString();
if (Properties.Settings.Default.ApplicationVersion != appVersion.ToString())
{
Properties.Settings.Default.Upgrade();
Properties.Settings.Default.ApplicationVersion = appVersionString;
}
Application.Run(new Form1());
}
}
......
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.6.0")]
[assembly: AssemblyFileVersion("1.0.6.0")]
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Properties/Settings.Designer.cs
......@@ -82,5 +82,17 @@ namespace BarcodeScannerClient.Properties {
this["ApiPass"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApplicationVersion {
get {
return ((string)(this["ApplicationVersion"]));
}
set {
this["ApplicationVersion"] = value;
}
}
}
}
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/Properties/Settings.settings
......@@ -17,5 +17,8 @@
<Setting Name="ApiPass" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApplicationVersion" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csproj.FileListAbsolute.txt
......@@ -26,3 +26,5 @@ I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeS
I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\Debug\BarcodeScannerClient.exe
I:\devel\proj\moya-info-tools\BarcodeScannerClient\BarcodeScannerClient\BarcodeScannerClient\bin\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.pdb
CardDisplay/CardDisplay/CardDisplay/Forms/Form1.cs
......@@ -187,6 +187,8 @@ namespace CardDisplay
MetaData data = getValue(ret);
if(data != null)
cardPlaceLabel1.Text = data.value;
else
cardPlaceLabel1.Text = "00.00.00";
}else
cardPlaceLabel1.Text = "0.0.0";
......@@ -245,6 +247,8 @@ namespace CardDisplay
MetaData data = getValue(ret);
if (data != null)
cardPlaceLabel2.Text = data.value;
else
cardPlaceLabel1.Text = "00.00.00";
}
else
cardPlaceLabel1.Text = "0.0.0";
......@@ -303,6 +307,8 @@ namespace CardDisplay
MetaData data = getValue(ret);
if (data != null)
cardPlaceLabel3.Text = data.value;
else
cardPlaceLabel1.Text = "00.00.00";
}
else
cardPlaceLabel1.Text = "0.0.0";
......
CardDisplay/CardDisplay/CardDisplay/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
[assembly: AssemblyVersion("1.0.3.0")]
[assembly: AssemblyFileVersion("1.0.3.0")]
CardDisplay/CardDisplay/CardDisplay/obj/x86/Debug/CardDisplay.csproj.FileListAbsolute.txt
......@@ -19,10 +19,13 @@ I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\Card
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.exe
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.pdb
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.AddCardMetaData.resources
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.Form1.resources
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.Properties.Resources.resources
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\CardDisplay.exe
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\CardDisplay.pdb
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\obj\x86\Debug\CardDisplay.Forms.ApiSettings.resources
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\CardDisplay\CardDisplay\CardDisplay\bin\Debug\AutoUpdateLib.pdb
CardDisplay/CardDisplay/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "CardDisplay moya v1_00_02"
Name "CardDisplay moya v1_00_03"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!CardDisplay moya stable v1_00_02" SecMain
Section "!CardDisplay moya stable v1_00_03" SecMain
SetShellVarContext current
......
Cloakroom/Cloakroom/obj/Debug/Cloakroom.csproj.FileListAbsolute.txt 0 → 100644
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe.config
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Form1.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Properties.Resources.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Settings.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.pdb
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Interop.bpac.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.exe
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.pdb
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\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.pdb
Cloakroom/Cloakroom/obj/Debug/Cloakroom.exe 0 → 100644
No preview for this file type
Cloakroom/Cloakroom/obj/Debug/Cloakroom.pdb 0 → 100644
No preview for this file type
Cloakroom/Cloakroom/obj/Debug/Interop.bpac.dll 0 → 100644
No preview for this file type
CloakroomSimple/Cloakroom.sln 0 → 100644

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2012 for Windows Desktop
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloakroom", "Cloakroom\Cloakroom.csproj", "{74D33A35-3220-4D07-B039-D8C4FE62EE07}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74D33A35-3220-4D07-B039-D8C4FE62EE07}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
CloakroomSimple/Cloakroom/App.config 0 → 100644
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="Cloakroom.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
<userSettings>
<Cloakroom.Properties.Settings>
<setting name="ApiUser" serializeAs="String">
<value />
</setting>
<setting name="ApiURL" serializeAs="String">
<value />
</setting>
<setting name="ApiKey" serializeAs="String">
<value />
</setting>
<setting name="ApiPass" serializeAs="String">
<value />
</setting>
<setting name="ReaderId" serializeAs="String">
<value>0</value>
</setting>
<setting name="Port" serializeAs="String">
<value />
</setting>
<setting name="CodeNumber" serializeAs="String">
<value>1</value>
</setting>
</Cloakroom.Properties.Settings>
</userSettings>
</configuration>
CloakroomSimple/Cloakroom/Cloakroom.csproj 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{74D33A35-3220-4D07-B039-D8C4FE62EE07}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cloakroom</RootNamespace>
<AssemblyName>CloakroomSimple</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoUpdateLib">
<HintPath>..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference>
<Reference Include="MoyaAdminLib">
<HintPath>..\..\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Form1.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Form1.Designer.cs">
<DependentUpon>Form1.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Settings.Designer.cs">
<DependentUpon>Settings.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="Settings.resx">
<DependentUpon>Settings.cs</DependentUpon>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="bpac">
<Guid>{90359D74-B7D9-467F-B938-3883F4CAB582}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>2</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
\ No newline at end of file
CloakroomSimple/Cloakroom/Form1.Designer.cs 0 → 100644
namespace Cloakroom
{
partial class Form1
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.settingsToolStripButton = new System.Windows.Forms.ToolStripButton();
this.submitButton = new System.Windows.Forms.Button();
this.messageListView = new System.Windows.Forms.ListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.luggagesListContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.releaseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label2 = new System.Windows.Forms.Label();
this.luggaageDescriptionTextBox = new System.Windows.Forms.TextBox();
this.listView1 = new System.Windows.Forms.ListView();
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.numberNumericUpDown = new System.Windows.Forms.NumericUpDown();
this.toolStrip1.SuspendLayout();
this.luggagesListContextMenuStrip.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numberNumericUpDown)).BeginInit();
this.SuspendLayout();
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.settingsToolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(770, 25);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.Text = "toolStrip1";
//
// settingsToolStripButton
//
this.settingsToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.settingsToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("settingsToolStripButton.Image")));
this.settingsToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.settingsToolStripButton.Name = "settingsToolStripButton";
this.settingsToolStripButton.Size = new System.Drawing.Size(23, 22);
this.settingsToolStripButton.Text = "Asetukset";
this.settingsToolStripButton.Visible = false;
this.settingsToolStripButton.Click += new System.EventHandler(this.settingsToolStripButton_Click);
//
// submitButton
//
this.submitButton.Location = new System.Drawing.Point(12, 48);
this.submitButton.Name = "submitButton";
this.submitButton.Size = new System.Drawing.Size(232, 88);
this.submitButton.TabIndex = 3;
this.submitButton.Text = "Printtaa narikkalippu";
this.submitButton.UseVisualStyleBackColor = true;
this.submitButton.Click += new System.EventHandler(this.submitButton_Click);
//
// messageListView
//
this.messageListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.messageListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
this.columnHeader2});
this.messageListView.Location = new System.Drawing.Point(12, 321);
this.messageListView.Name = "messageListView";
this.messageListView.Size = new System.Drawing.Size(746, 175);
this.messageListView.TabIndex = 5;
this.messageListView.UseCompatibleStateImageBehavior = false;
this.messageListView.View = System.Windows.Forms.View.Details;
//
// columnHeader1
//
this.columnHeader1.Text = "Päivämäärä";
this.columnHeader1.Width = 93;
//
// columnHeader2
//
this.columnHeader2.Text = "Viesti";
this.columnHeader2.Width = 519;
//
// luggagesListContextMenuStrip
//
this.luggagesListContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.releaseToolStripMenuItem});
this.luggagesListContextMenuStrip.Name = "luggagesListContextMenuStrip";
this.luggagesListContextMenuStrip.Size = new System.Drawing.Size(114, 26);
//
// releaseToolStripMenuItem
//
this.releaseToolStripMenuItem.Name = "releaseToolStripMenuItem";
this.releaseToolStripMenuItem.Size = new System.Drawing.Size(113, 22);
this.releaseToolStripMenuItem.Text = "Release";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(9, 25);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(43, 13);
this.label2.TabIndex = 8;
this.label2.Text = "Kuvaus";
//
// luggaageDescriptionTextBox
//
this.luggaageDescriptionTextBox.Location = new System.Drawing.Point(79, 22);
this.luggaageDescriptionTextBox.Name = "luggaageDescriptionTextBox";
this.luggaageDescriptionTextBox.Size = new System.Drawing.Size(165, 20);
this.luggaageDescriptionTextBox.TabIndex = 9;
//
// listView1
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader3,
this.columnHeader4,
this.columnHeader5});
this.listView1.Location = new System.Drawing.Point(12, 142);
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(746, 173);
this.listView1.TabIndex = 10;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
//
// columnHeader3
//
this.columnHeader3.Text = "Päivämäärä";
this.columnHeader3.Width = 93;
//
// columnHeader4
//
this.columnHeader4.Text = "Lippukoodi";
this.columnHeader4.Width = 519;
//
// columnHeader5
//
this.columnHeader5.Text = "Kuvaus";
//
// numberNumericUpDown
//
this.numberNumericUpDown.Location = new System.Drawing.Point(250, 22);
this.numberNumericUpDown.Name = "numberNumericUpDown";
this.numberNumericUpDown.Size = new System.Drawing.Size(120, 20);
this.numberNumericUpDown.TabIndex = 11;
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(770, 508);
this.Controls.Add(this.numberNumericUpDown);
this.Controls.Add(this.listView1);
this.Controls.Add(this.luggaageDescriptionTextBox);
this.Controls.Add(this.label2);
this.Controls.Add(this.messageListView);
this.Controls.Add(this.submitButton);
this.Controls.Add(this.toolStrip1);
this.Name = "Form1";
this.Text = "Narikkaliput";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed);
this.Load += new System.EventHandler(this.Form1_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.luggagesListContextMenuStrip.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.numberNumericUpDown)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton settingsToolStripButton;
private System.Windows.Forms.Button submitButton;
private System.Windows.Forms.ListView messageListView;
private System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.ContextMenuStrip luggagesListContextMenuStrip;
private System.Windows.Forms.ToolStripMenuItem releaseToolStripMenuItem;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox luggaageDescriptionTextBox;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.ColumnHeader columnHeader3;
private System.Windows.Forms.ColumnHeader columnHeader4;
private System.Windows.Forms.ColumnHeader columnHeader5;
private System.Windows.Forms.NumericUpDown numberNumericUpDown;
}
}
CloakroomSimple/Cloakroom/Form1.cs 0 → 100644
using BarcodeScannerClient;
//using HttpUtils;
using MoyaAdminLib;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.Script.Serialization;
using System.Windows.Forms;
namespace Cloakroom
{
public partial class Form1 : Form
{
private string cloakroomLabel = "narikkalappu.lbx";
//private int number = 1;
public Form1()
{
InitializeComponent();
Properties.Settings.Default.Reload();
}
private void settingsToolStripButton_Click(object sender, EventArgs e)
{
Settings frm = new Settings();
frm.ShowDialog();
}
private void Form1_Load(object sender, EventArgs e)
{
numberNumericUpDown.Value = Properties.Settings.Default.CodeNumber;
}
private void submitButton_Click(object sender, EventArgs e)
{
LuggageHold luggage = new LuggageHold();
luggage.luggageCode = numberNumericUpDown.Value.ToString();
luggage.description = luggaageDescriptionTextBox.Text;
luggage.date = DateTime.Now;
ListViewItem lvi = new ListViewItem(luggage.date.ToString("d.M.yyyy HH:mm"));
lvi.SubItems.Add(luggage.description);
lvi.SubItems.Add(luggage.luggageCode);
//luggagesListView.Items.Add(lvi);
if (printLabel((int)numberNumericUpDown.Value, luggage.description))
{
addMessageToListView("Luggage submitted.Code " + numberNumericUpDown.Value.ToString() + ", Description: '" + luggaageDescriptionTextBox.Text + "'");
numberNumericUpDown.Value += 1;
Properties.Settings.Default.CodeNumber = (int)numberNumericUpDown.Value;
Properties.Settings.Default.Save();
}
}
private bool printLabel(int number, string desc)
{
if (!File.Exists(cloakroomLabel))
{
MessageBox.Show("Cannot find print template");
return false;
}
bpac.DocumentClass doc = null;
try
{
doc = new bpac.DocumentClass();
}
catch (Exception ex)
{
MessageBox.Show("Could not print luggage label. LuggageCode: " + number.ToString());
Console.WriteLine(ex.Message + "\r\n" + ex.StackTrace);
return false;
}
//doc.SetPrinter(Objects.Conf.BoxLabelPrinter, false);
if (doc != null)
{
//doc.Open(Path.Combine(Properties.Settings.Default.dd, cloakroomLabel));
doc.Open(cloakroomLabel);
doc.GetObject("Code").Text = number.ToString();
doc.GetObject("Desc").Text = desc;
doc.StartPrint("", bpac.PrintOptionConstants.bpoDefault);
doc.PrintOut(2, bpac.PrintOptionConstants.bpoDefault);
doc.EndPrint();
doc.Close();
return true;
}
return false;
}
private void addMessageToListView(string p)
{
ListViewItem lvi = new ListViewItem(DateTime.Now.ToString("d.M.yyyy HH:mm"));
lvi.SubItems.Add(p);
messageListView.Items.Insert(0, lvi);
}
private void Form1_FormClosed(object sender, FormClosedEventArgs e)
{
}
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
}
}
}
CloakroomSimple/Cloakroom/Form1.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="settingsToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACWSURBVDhPrZCLDcAgCAWd1hVcwRVcwRVcwRWcxeYRSCjV
hn4uIWkFTiT8Tu99jjEo+OgZKaXZWiOByDi1xxZZCR/vQZEtLKXQ2Sp3AbfZQt1ca70XYGTdYAMXcOke
jKwnseFapkgwst2BWyJA8FkCVhIEp33gSdKIJ8quOO1DGvmXJuNPPxDIDrTsETnniYgxvhOcCeEASkcG
PKycdQEAAAAASUVORK5CYII=
</value>
</data>
<metadata name="luggagesListContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>366, 17</value>
</metadata>
</root>
\ No newline at end of file
CloakroomSimple/Cloakroom/Program.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Cloakroom
{
static class Program
{
/// <summary>
/// The main entry point for the application.
/// </summary>
[STAThread]
static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1());
}
}
}
CloakroomSimple/Cloakroom/Properties/AssemblyInfo.cs 0 → 100644
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Cloakroom")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Cloakroom")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("72adbceb-0010-440c-b9f3-1401baff83bf")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2.0")]
[assembly: AssemblyFileVersion("1.0.2.0")]
CloakroomSimple/Cloakroom/Properties/Resources.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18449
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Cloakroom.Properties {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Cloakroom.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}
CloakroomSimple/Cloakroom/Properties/Resources.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
CloakroomSimple/Cloakroom/Properties/Settings.Designer.cs 0 → 100644
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34014
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Cloakroom.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default {
get {
return defaultInstance;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApiUser {
get {
return ((string)(this["ApiUser"]));
}
set {
this["ApiUser"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApiURL {
get {
return ((string)(this["ApiURL"]));
}
set {
this["ApiURL"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApiKey {
get {
return ((string)(this["ApiKey"]));
}
set {
this["ApiKey"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ApiPass {
get {
return ((string)(this["ApiPass"]));
}
set {
this["ApiPass"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public int ReaderId {
get {
return ((int)(this["ReaderId"]));
}
set {
this["ReaderId"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string Port {
get {
return ((string)(this["Port"]));
}
set {
this["Port"] = value;
}
}
[global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1")]
public int CodeNumber {
get {
return ((int)(this["CodeNumber"]));
}
set {
this["CodeNumber"] = value;
}
}
}
}
CloakroomSimple/Cloakroom/Properties/Settings.settings 0 → 100644
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Cloakroom.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings>
<Setting Name="ApiUser" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApiURL" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApiKey" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ApiPass" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="ReaderId" Type="System.Int32" Scope="User">
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="Port" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="CodeNumber" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1</Value>
</Setting>
</Settings>
</SettingsFile>
\ No newline at end of file
CloakroomSimple/Cloakroom/Settings.Designer.cs 0 → 100644
namespace Cloakroom
{
partial class Settings
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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.label1 = new System.Windows.Forms.Label();
this.apiURLTextBox = new System.Windows.Forms.TextBox();
this.portsComboBox = new System.Windows.Forms.ComboBox();
this.label5 = new System.Windows.Forms.Label();
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
//
this.SaveButton.Location = new System.Drawing.Point(197, 226);
this.SaveButton.Name = "SaveButton";
this.SaveButton.Size = new System.Drawing.Size(75, 23);
this.SaveButton.TabIndex = 29;
this.SaveButton.Text = "Save";
this.SaveButton.UseVisualStyleBackColor = true;
this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 8);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(47, 13);
this.label1.TabIndex = 28;
this.label1.Text = "Moya url";
//
// apiURLTextBox
//
this.apiURLTextBox.Location = new System.Drawing.Point(12, 24);
this.apiURLTextBox.Name = "apiURLTextBox";
this.apiURLTextBox.Size = new System.Drawing.Size(260, 20);
this.apiURLTextBox.TabIndex = 27;
//
// portsComboBox
//
this.portsComboBox.FormattingEnabled = true;
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.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(12, 168);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(68, 13);
this.label5.TabIndex = 37;
this.label5.Text = "Scanner port";
//
// Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 261);
this.Controls.Add(this.label5);
this.Controls.Add(this.portsComboBox);
this.Controls.Add(this.label4);
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.label1);
this.Controls.Add(this.apiURLTextBox);
this.Name = "Settings";
this.Text = "Settings";
this.Load += new System.EventHandler(this.Settings_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#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.Label label1;
private System.Windows.Forms.TextBox apiURLTextBox;
private System.Windows.Forms.ComboBox portsComboBox;
private System.Windows.Forms.Label label5;
}
}
\ No newline at end of file
CloakroomSimple/Cloakroom/Settings.cs 0 → 100644

using MoyaAdminLib;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web.Script.Serialization;
using System.Windows.Forms;
namespace Cloakroom
{
public partial class Settings : Form
{
public Settings()
{
InitializeComponent();
}
private void Settings_Load(object sender, EventArgs e)
{
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 != "")
{
loadReaders();
}
if (Properties.Settings.Default.ReaderId != 0)
{
if (portsComboBox.Items.Count > 0)
{
foreach (object obj in portsComboBox.Items)
{
if (obj is Reader && ((Reader)obj).readerId == Properties.Settings.Default.ReaderId)
{
portsComboBox.SelectedItem = obj;
break;
}
}
}
}
}
private void loadReaders()
{
string ret = "";
RestClient client = new RestClient();
try
{
ret = client.MakeRequest("reader/List");
var ser = new JavaScriptSerializer();
ReaderList readers = ser.Deserialize<ReaderList>(ret);
if (readers != null && readers.readers != null)
{
portsComboBox.Items.Clear();
portsComboBox.Items.Add(" ");
foreach (Reader reader in readers.readers)
{
portsComboBox.Items.Add(reader);
}
}
}
catch (Exception ex)
{
ret = ex.Message;
}
}
private void SaveButton_Click(object sender, EventArgs e)
{
Properties.Settings.Default.ApiURL = apiURLTextBox.Text;
Properties.Settings.Default.ApiKey = ApiKeyTextBox.Text;
Properties.Settings.Default.ApiUser = ApiUserTextBox.Text;
Properties.Settings.Default.ApiPass = ApiPassTextBox.Text;
if (portsComboBox.SelectedItem != null && portsComboBox.SelectedItem is Reader)
{
Properties.Settings.Default.ReaderId = ((Reader)portsComboBox.SelectedItem).readerId;
}
Properties.Settings.Default.Save();
this.DialogResult = System.Windows.Forms.DialogResult.OK;
}
}
}
CloakroomSimple/Cloakroom/Settings.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
CloakroomSimple/Cloakroom/obj/Debug/Cloakroom.csproj.FileListAbsolute.txt 0 → 100644
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe.config
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Form1.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Properties.Resources.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.Settings.resources
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.pdb
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Interop.bpac.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.exe
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\obj\Debug\Cloakroom.pdb
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\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\AutoUpdateLib.pdb
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Interop.bpac.dll
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.csproj.ResolveComReference.cache
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\CloakroomSimple.exe.config
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\CloakroomSimple.exe
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\CloakroomSimple.pdb
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\AutoUpdateLib.pdb
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\bin\Debug\Interop.bpac.dll
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.Form1.resources
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.Properties.Resources.resources
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.Settings.resources
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\Cloakroom.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\CloakroomSimple.exe
I:\devel\proj\moya-info-tools\CloakroomSimple\Cloakroom\obj\Debug\CloakroomSimple.pdb
CloakroomSimple/autopublish.xml 0 → 100644
<?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">
<UploadUser>f-solu-06</UploadUser>
<UploadPath>/home/f-solu-06/software.f-solutions.fi</UploadPath>
<UploadHost>software.f-solutions.fi</UploadHost>
<ProjectName>Cloakroom</ProjectName>
<Customers>
<Customer>
<Name>moya</Name>
<Password>moya</Password>
<AllowDevelopmentReleases>false</AllowDevelopmentReleases>
<Obfuscate>false</Obfuscate>
</Customer>
</Customers>
<ForceUpdate>false</ForceUpdate>
<DisableUpdate>false</DisableUpdate>
</AutoPublishSettings>
\ No newline at end of file
CloakroomSimple/autoupdate.crt 0 → 100644
-----BEGIN CERTIFICATE-----
MIIFZTCCBE2gAwIBAgIHJ+f2v0HETTANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
ODcwHhcNMTExMTE1MDAxMjI2WhcNMTQxMTE1MDAxMjI2WjBZMRkwFwYDVQQKFBAq
LmYtc29sdXRpb25zLmZpMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0
ZWQxGTAXBgNVBAMUECouZi1zb2x1dGlvbnMuZmkwggEiMA0GCSqGSIb3DQEBAQUA
A4IBDwAwggEKAoIBAQCd7ksvWMcxBJiXjX3iOUnXvXynUbFA/rImWXGVHp43UI8K
SUrB8JP3zwRHj2j1ovvtr+Yo39cqAt5+ShtvlGyJB65/JqwyrACCDswY5l0gZNJJ
ijEgzAldWfiVEqR18AIdrjH8WbIRHFWxc3goPgJBfy6QYKnHENyZQeRXu9kc+XlS
YCda3wM5UiDgeUCZYpvsDqUxBBl3dcTDjoEBBYn22TUuMsyikvFHjmTLu8RCj1pv
jW1b2nCwbcJRr+w7VhLCRNO6fx3+T/8+dHkgE/HIggsOmR5weqfqo+w9yyF53YPu
QGzGZ4Yx74B4IDX0AP0MhADHHXEL0fv0SKgLAV+rAgMBAAGjggG+MIIBujAPBgNV
HRMBAf8EBTADAQEAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNV
HQ8BAf8EBAMCBaAwMwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5
LmNvbS9nZHMxLTU5LmNybDBTBgNVHSAETDBKMEgGC2CGSAGG/W0BBxcBMDkwNwYI
KwYBBQUHAgEWK2h0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3Np
dG9yeS8wgYAGCCsGAQUFBwEBBHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Au
Z29kYWRkeS5jb20vMEoGCCsGAQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdv
ZGFkZHkuY29tL3JlcG9zaXRvcnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSME
GDAWgBT9rGEyk2xF1uLuhV+auud2mWjM5zArBgNVHREEJDAighAqLmYtc29sdXRp
b25zLmZpgg5mLXNvbHV0aW9ucy5maTAdBgNVHQ4EFgQUT1kTmvnHrGt/k2qyoUif
6uqhS6cwDQYJKoZIhvcNAQEFBQADggEBAFYuQGCEwq0JDTZT51ikHqoBUJRJHfKD
yd2lCkuM5eWR5o5hyEpSeI6QBrlF76VdlwIcE7CRmue/7IjOBv3QoDgvycbiKoeK
Me+Fy+afaBCYn1sA9gzVY+nmyFa8GpjJWjlB39SWh0Hkp004rfK4PS75w/+kxsNA
OJHw/CcuXS4HyDmH++mK4XHh6WpLEG5lpp4UyZfNyWLvdo20L9Yi+fM1rHr4Te77
BiRdisAd/NIsfrrYaryHg4qZNWrC6mLPcvTj9C9Cgn2HrZ5Od5a4Fb02p5emr46c
B1+k2tysG9SD60zXu2sbA+CC4yS48h24KdIAI5z1Y7nKW9TJvwkRvMk=
-----END CERTIFICATE-----
CloakroomSimple/base.nsi 0 → 100644
; NSIS script - ONLY for use with AutoPublish/AutoUpdate system
; //keitsi
;--------------------------------
;Include Modern UI
!include "MUI.nsh"
;--------------------------------
;Configuration
SetCompressor lzma
Name "<$PROJECTNAME$> <$CUSTOMER$> v<$VERSION$>"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
; AutoPublish will move the installer according to autopublish.xml file.
OutFile "installer_temp.exe"
;Folder selection page
; InstallDir "$PROGRAMFILES\<$PROJECTNAME$>_<$CUSTOMER$>"
ShowInstDetails show
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;Pages
; !insertmacro MUI_PAGE_LICENSE "license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
; !define MUI_FINISHPAGE_RUN $INSTDIR\<$BINARYNAMEORIG$>
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Installer Sections
Function GetDotNet
IfFileExists "$WINDIR\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" NextStep
MessageBox MB_OK|MB_ICONEXCLAMATION "You must have the Microsoft .NET Framework 2.0 Installed to use this application. $\n$\nClick 'Open' in the following file dialog to download and run the Microsoft .NET Framework Installer..."
ExecShell Open "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=0856eacb-4362-4b0d-8edd-aab15c5e04f5&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f7%2f567758a3-759e-473e-bf8f-52154438565a%2fdotnetfx.exe" SW_SHOWNORMAL
Quit
NextStep:
FunctionEnd
Function .onInit
; Uber users are so uber that they do not need checks ;)
; Call GetDotNet
Call DetectInstallDir
FunctionEnd
Function DetectInstallDir
;Try to get install folder from obsoleted registry key first, if available
ClearErrors
ReadRegStr $INSTDIR HKCU "Software\<$PROJECTNAME$>" ""
IfErrors 0 instdirfound
ClearErrors
; No obsoleted regkey present, try to read the correct one
ReadRegStr $INSTDIR HKCU "Software\<$PROJECTNAME$>_<$CUSTOMER$>" ""
IfErrors 0 instdirfound
ClearErrors
; No installation dir regkey present at all - use default installation directory.
StrCpy $INSTDIR "$PROGRAMFILES\<$PROJECTNAME$>_<$CUSTOMER$>"
instdirfound:
FunctionEnd
Function .onInstSuccess
Exec '"$INSTDIR\<$BINARYNAMEORIG$>"'
FunctionEnd
Function WaitProgramClose
IfFileExists "$INSTDIR\<$BINARYNAMEORIG$>" loop NotInstalled
loop:
ClearErrors
Delete "$INSTDIR\<$BINARYNAMEORIG$>"
${If} ${Errors}
; Delete failed - means the program is still running. Sleep 2 seconds and retry.
Sleep 3000
ClearErrors
Delete "$INSTDIR\<$BINARYNAMEORIG$>"
${If} ${Errors}
MessageBox MB_OK "Program <$BINARYNAMEORIG$> didn't close in 2 seconds. Automatic update can't continue before it's closed. Please close the program manually and hit OK to retry."
goto loop
${EndIf}
${EndIf}
NotInstalled:
FunctionEnd
Section "!<$PROJECTNAME$> <$CUSTOMER$> <$VERSIONGROUP$> v<$VERSION$>" SecMain
SetShellVarContext current
SetOutPath "$INSTDIR"
Call WaitProgramClose
; SetOverwrite Off
SetOverwrite On
File /oname=autoupdate.xml "<$BINARYDIR$>\autoupdate.<$CUSTOMER$>.xml"
File /oname=<$BINARYNAMEORIG$> "<$BINARYDIR$>\<$BINARYNAMEOBF$>"
File autoupdate.crt
; this line will be replicated for every non-default existing assembly
; that is referenced to the main project.
File "<$REFERENCEDASSEMBLY$>"
File "<$DEBUGDATABASES$>"
File "Cloakroom\Recources\Labels\narikkalappu.lbx"
; Write install path to registry (projectname_customer_versiongroup)
WriteRegStr HKCU "Software\<$PROJECTNAME$>_<$CUSTOMER$>" "" $INSTDIR
; Remove obsoleted registry key on install
DeleteRegKey HKCU "Software\<$PROJECTNAME$>"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
;Create shortcuts
CreateDirectory "$SMPROGRAMS\<$PROJECTNAME$> <$CUSTOMER$>"
CreateShortCut "$SMPROGRAMS\<$PROJECTNAME$> <$CUSTOMER$>\<$PROJECTNAME$>.lnk" "$INSTDIR\<$BINARYNAMEORIG$>"
CreateShortCut "$SMPROGRAMS\<$PROJECTNAME$> <$CUSTOMER$>\Uninstall <$PROJECTNAME$>.lnk" "$INSTDIR\Uninstall.exe"
; Remove shortcuts from old shortcut naming scheme path, if any
SetShellVarContext all
Delete "$SMPROGRAMS\<$PROJECTNAME$>\<$PROJECTNAME$>.lnk"
Delete "$SMPROGRAMS\<$PROJECTNAME$>\Uninstall <$PROJECTNAME$>.lnk"
RMDir "$SMPROGRAMS\<$PROJECTNAME$>"
SetShellVarContext current
Delete "$SMPROGRAMS\<$PROJECTNAME$>\<$PROJECTNAME$>.lnk"
Delete "$SMPROGRAMS\<$PROJECTNAME$>\Uninstall <$PROJECTNAME$>.lnk"
RMDir "$SMPROGRAMS\<$PROJECTNAME$>"
SectionEnd
;--------------------------------
;Descriptions
LangString DESC_SecMain ${LANG_ENGLISH} "Base (required)"
;--------------------------------
;Uninstaller Section
Section "Uninstall"
Delete "$SMPROGRAMS\<$PROJECTNAME$> <$CUSTOMER$>\*"
RMDir "$SMPROGRAMS\<$PROJECTNAME$> <$CUSTOMER$>"
Delete "$INSTDIR\<$BINARYNAMEORIG$>"
Delete "$INSTDIR\autoupdate.xml"
Delete "$INSTDIR\autoupdate.crt"
; this line will be replicated for every non-default existing assembly
; that is referenced to the main project.
Delete "$INSTDIR\<$REFERENCEDASSEMBLY$>"
Delete "$INSTDIR\<$DEBUGDATABASES$>"
Delete "$INSTDIR\Uninstall.exe"
RMDir "$INSTDIR"
SectionEnd
\ No newline at end of file
CloakroomSimple/out_moya.nsi 0 → 100644
; NSIS script - ONLY for use with AutoPublish/AutoUpdate system
; //keitsi
;--------------------------------
;Include Modern UI
!include "MUI.nsh"
;--------------------------------
;Configuration
SetCompressor lzma
Name "Cloakroom moya v1_00_01"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
; AutoPublish will move the installer according to autopublish.xml file.
OutFile "installer_temp.exe"
;Folder selection page
; InstallDir "$PROGRAMFILES\Cloakroom_moya"
ShowInstDetails show
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;Pages
; !insertmacro MUI_PAGE_LICENSE "license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
; !define MUI_FINISHPAGE_RUN $INSTDIR\Cloakroom.exe
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Installer Sections
Function GetDotNet
IfFileExists "$WINDIR\Microsoft.NET\Framework\v2.0.50727\installUtil.exe" NextStep
MessageBox MB_OK|MB_ICONEXCLAMATION "You must have the Microsoft .NET Framework 2.0 Installed to use this application. $\n$\nClick 'Open' in the following file dialog to download and run the Microsoft .NET Framework Installer..."
ExecShell Open "http://www.microsoft.com/downloads/info.aspx?na=90&p=&SrcDisplayLang=en&SrcCategoryId=&SrcFamilyId=0856eacb-4362-4b0d-8edd-aab15c5e04f5&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f7%2f567758a3-759e-473e-bf8f-52154438565a%2fdotnetfx.exe" SW_SHOWNORMAL
Quit
NextStep:
FunctionEnd
Function .onInit
; Uber users are so uber that they do not need checks ;)
; Call GetDotNet
Call DetectInstallDir
FunctionEnd
Function DetectInstallDir
;Try to get install folder from obsoleted registry key first, if available
ClearErrors
ReadRegStr $INSTDIR HKCU "Software\Cloakroom" ""
IfErrors 0 instdirfound
ClearErrors
; No obsoleted regkey present, try to read the correct one
ReadRegStr $INSTDIR HKCU "Software\Cloakroom_moya" ""
IfErrors 0 instdirfound
ClearErrors
; No installation dir regkey present at all - use default installation directory.
StrCpy $INSTDIR "$PROGRAMFILES\Cloakroom_moya"
instdirfound:
FunctionEnd
Function .onInstSuccess
Exec '"$INSTDIR\Cloakroom.exe"'
FunctionEnd
Function WaitProgramClose
IfFileExists "$INSTDIR\Cloakroom.exe" loop NotInstalled
loop:
ClearErrors
Delete "$INSTDIR\Cloakroom.exe"
${If} ${Errors}
; Delete failed - means the program is still running. Sleep 2 seconds and retry.
Sleep 3000
ClearErrors
Delete "$INSTDIR\Cloakroom.exe"
${If} ${Errors}
MessageBox MB_OK "Program Cloakroom.exe didn't close in 2 seconds. Automatic update can't continue before it's closed. Please close the program manually and hit OK to retry."
goto loop
${EndIf}
${EndIf}
NotInstalled:
FunctionEnd
Section "!Cloakroom moya stable v1_00_01" SecMain
SetShellVarContext current
SetOutPath "$INSTDIR"
Call WaitProgramClose
; SetOverwrite Off
SetOverwrite On
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\autoupdate.moya.xml"
File /oname=Cloakroom.exe "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.exe"
File autoupdate.crt
; this line will be replicated for every non-default existing assembly
; that is referenced to the main project.
File "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll"
File "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Interop.bpac.dll"
File "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.pdb"
File "I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.pdb"
File "Cloakroom\Recources\Labels\narikkalappu.lbx"
; Write install path to registry (projectname_customer_versiongroup)
WriteRegStr HKCU "Software\Cloakroom_moya" "" $INSTDIR
; Remove obsoleted registry key on install
DeleteRegKey HKCU "Software\Cloakroom"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
;Create shortcuts
CreateDirectory "$SMPROGRAMS\Cloakroom moya"
CreateShortCut "$SMPROGRAMS\Cloakroom moya\Cloakroom.lnk" "$INSTDIR\Cloakroom.exe"
CreateShortCut "$SMPROGRAMS\Cloakroom moya\Uninstall Cloakroom.lnk" "$INSTDIR\Uninstall.exe"
; Remove shortcuts from old shortcut naming scheme path, if any
SetShellVarContext all
Delete "$SMPROGRAMS\Cloakroom\Cloakroom.lnk"
Delete "$SMPROGRAMS\Cloakroom\Uninstall Cloakroom.lnk"
RMDir "$SMPROGRAMS\Cloakroom"
SetShellVarContext current
Delete "$SMPROGRAMS\Cloakroom\Cloakroom.lnk"
Delete "$SMPROGRAMS\Cloakroom\Uninstall Cloakroom.lnk"
RMDir "$SMPROGRAMS\Cloakroom"
SectionEnd
;--------------------------------
;Descriptions
LangString DESC_SecMain ${LANG_ENGLISH} "Base (required)"
;--------------------------------
;Uninstaller Section
Section "Uninstall"
Delete "$SMPROGRAMS\Cloakroom moya\*"
RMDir "$SMPROGRAMS\Cloakroom moya"
Delete "$INSTDIR\Cloakroom.exe"
Delete "$INSTDIR\autoupdate.xml"
Delete "$INSTDIR\autoupdate.crt"
; this line will be replicated for every non-default existing assembly
; that is referenced to the main project.
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Interop.bpac.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\Cloakroom.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\Cloakroom\Cloakroom\bin\Debug\MoyaAdminLib.pdb"
Delete "$INSTDIR\Uninstall.exe"
RMDir "$INSTDIR"
SectionEnd
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Card.cs
......@@ -13,17 +13,19 @@ namespace MoyaAdminLib
public static string CARD_BARCODE_PREFIX = "277";
public static string CARD_PLACE = "cardplace";
//{"cardId":3990,"state":"PENDING_VALIDATION","cardTemplate":"pelaaja","username":"Miketzu","wholeName":"Mirco Renko"}
public int cardId;
//{"id":3990,"state":"PENDING_VALIDATION","cardTemplate":"pelaaja","username":"Miketzu","wholeName":"Mirco Renko"}
public int id;
public int eventuserId;
public DateTime printTime;
public string state;
public string cardTemplate;
public string template;
public string username;
public string wholeName;
public String Label()
{
return cardId + ", " + username + ", " + wholeName;
return id + ", " + username + ", " + wholeName;
}
public static bool ParseCardId(string data, out int id)
......@@ -47,7 +49,7 @@ namespace MoyaAdminLib
RestClient client = new RestClient(RestClient.ApiURL);
try
{
json = client.MakeRequest("meta/v1/printedcard/" + this.cardId + "/card-filing");
json = client.MakeRequest("meta/v1/printedcard/" + this.id + "/card-filing");
}
catch (ApplicationException ex)
{
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Controls/EventUserEditor.cs
......@@ -45,7 +45,7 @@ namespace MoyaAdminLib.Controls
public void LoadUser(Eventuser user, Card card)
{
LoadUser(user);
cardTemplateTextBox.Text = card.cardTemplate;
cardTemplateTextBox.Text = card.template;
cardStateTextBox.Text = card.state;
}
......@@ -53,7 +53,7 @@ namespace MoyaAdminLib.Controls
{
nameTextBox.Text = card.wholeName;
nickTextBox.Text = card.username;
cardTemplateTextBox.Text = card.cardTemplate;
cardTemplateTextBox.Text = card.template;
cardStateTextBox.Text = card.state;
}
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/obj/Debug/MoyaAdminLib.csproj.FileListAbsolute.txt
......@@ -5,3 +5,11 @@ D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaA
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.pdb
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.Controls.EventUserEditor.resources
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll.config
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.Controls.EventUserEditor.resources
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.pdb
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/CardLocationInput.cs
......@@ -82,7 +82,7 @@ namespace MoyaAdminUI
RestClient client2 = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST, json);
try
{
client2.MakeRequest("meta/v1/printedcard/" + card.cardId + "/card-filing");
client2.MakeRequest("meta/v1/printedcard/" + card.id + "/card-filing");
}
catch (ApplicationException ex)
{
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/IncomingForm.cs
......@@ -50,7 +50,7 @@ namespace MoyaAdminUI
if (card != null)
{
cardPictureBox.ImageLocation = Properties.Settings.Default.ApiURL + "/rest/card/GetImage/" + card.cardId;
cardPictureBox.ImageLocation = Properties.Settings.Default.ApiURL + "/rest/card/GetImage/" + card.id;
}
} catch(Exception ex) {
}
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx.rej 0 → 100644
diff a/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx b/MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx (rejected hunks)
@@ -171,39 +171,39 @@
<data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALsSURBVDhPjZJ7SBNQGMWnRNkilMIiakiUVEvyUajpjJQm
- ma5yj8w2o0a+NqeZolM3H/lKnTnnUqdu0+mcD8xXvjWdKJVBYlQUPUAqKhIxSrOsnebcPwaCP/jg3nu+
- c+B+9xLWws7O7pCnp6fa9airnkQiZRqPNq0o64R9msLMi7uGkDNeIFptMhZRZJbWR1NGOO/vuAp/+vLB
- 83fH5o1WVWZpfShjmVeXOjKw1JKI1vhzP4lEootZWs1+J4ot/Yb4hj2F6mbcWnrzkkKdGWxuRjgz8HdT
- HBbrotAooKr2kMnbVhz/4Xs51Htk1oDez79QOvpyRlDdaeBUtqC8NulPf5rfwnByACpEhw0ijcZAl+qe
- nhQk5+718PEyWjeYAvZTKLYNb2YNze/nUT/9AzVvvyFPW4J+tT2m5LvQkm6NBT0B34ZtkVwjA1PVg2DN
- AOgS3Ywt2dHJFCKb+vBB8eIr5M++oGjqE/KffETOxDTErV0oV/MxqtiHOa0FxtXO8C+sBU2qw1lZI3Y6
- uPibAsS9k105D98hfew1UvSvkDD0AonGShh8jri+p4jtmURUtQ6pOWHwERXhVFoJ3OKyvxs/i5UpgFNc
- lx3bPQl+x2Pw2icQdvcBQhpGcVE7jKC6IQRpBnGhph8cTT/cI4SgxN7EQVpws8m8jE9UCiukfhiXjA1M
- VTcYVffAqOwEvaIDgYo20BXtpjVL2Y0TAhGO80XYQXZkm+3Glwi6QmLXDiwuD4hR1bViLG8zDYyl7sX5
- 0hackzeb7u3FTwaZGfHb2traxmwnEFgs1sbcMlVMtEL3KFiqnacVaeEv0YBW3ABesx6RTSNgKzvhd0sJ
- SqQQB3wDB83WVVjGxMTYFBbKXLNK1WKBVDkWkF/1nZomAzXjDpi3a0BNL4FHeAJ2H/O8bvasiQWXy90q
- kRQ7Z8oqE/gFZfcD0qRz3vHZOBGdavChMY6Y+9aFBYfD2VJQIHXIkVdGi6XlWUKhcPuKRCD8Axv4flla
- RbvVAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPjZJ7SBNQGMWnhNoilMIiSiRKyiWZFWZuRkoL
+ ay5zj8w2oyRfm9N0YVO3dPkoX21OU5dua8s5H5ip+damolQGiVJSSEFUVGShmGVaO61t/xgE/uCDe+/5
+ zoH73Uv4H+7u7p5kMlnju8930M3NLdt85GhVVggnmMLKF15A5PEAEJ0czUUU26SV0SCN5f0eUeNXdwF4
+ ND+sdnCqtkkrQ5XMOr/UKsVS02U0C0N/EInEvTZpOdv3UFwZKZIUDwr1gHlrH8hLi/ZhcqKksaywxQYh
+ FmoSUC+gqreQSOusjn84ejY6cOCrCV0ff6J86MW0QNNq4lY1oUKX9qs7M/i7MT0ESvEuk1irNTHkhonD
+ gvRrW/2DAszWVZaA7RSKq2Hqi6nx7Txq33yD9tUs8vWl6NF4YLxsE5qynPF9kIBZoyvStQqw1J2I0PWC
+ UWSYdiV577GEKMbfvVNOfkbZs0+QjX9AwdP3yBt9A0lzOyo1fAwpt2FGb4cRjQ9oxXdAlxtwQlGPjV57
+ aZYASddYe96j18gankLG4Euk9k/isrlS+55D2D2B5M4xJNw24EpeDILEMhzJLIWvMHfO/FmcLAHckprc
+ 5I4x8FufgNcyipi7DxFZN4TTeiPCa/oRruvDKW0PuLoe+MWJQEm+ip30iEaL+S9BCRnsyFojzpgbWOoO
+ MKvvg1nVBsatVoQp74GhbLGs2aoOHBKIcZAvxgaSN8dmN79E+Dk3zp3ehb8DYla3W42V9ywDY2u6cLK8
+ CaFljZZ7B/DT4cmMW3R2dnax2QkENpvtcK1CnZSoNDyOkOnn6TI9aEU60EvqwGscRHzDADiqNhy7rgIl
+ XoQdR8P6bNZl2CclJbkUFyt8c8o1EoFcNUwrqJ6jZipAld4E64YW1KxS+MemYvN+8kWb57/YRUVFrS0q
+ KvHJVlSl8gsrHoRkymcCL+XiUOIVUxCdudvWtyLsuFzumsJCuVdeWVWiRF6ZIxKJ1lslAuEP85t+R/qb
+ CD8AAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMKSURBVDhPdVJdTJJhGPW+bqp1U8uLmv1QtlWmYf9qaQlq
- llpmQ7BQDIOZ5QSV1NSYfhB8gkqD/ETTnDgkg+oipqP1M502jdVUXOHUqa017cdZnvwQ58o823vx7jzP
- ec9zntdnERrDk00kZRWrKautzGAel1e2jBeoG20SwijOLDJs8pb9HyRlY6prrebyNhPIrodQO3VQDRTg
- mj0GXCUBYb7GzMtSMr3lf4N+mW6WPlag9EMOrJN2dH53Ie1hLuTvb4BrCkVYkQoXhcXmaIF0uRPadk6t
- HryX+6EdyoZt0oE3U71492MCD4bNSK4oxLGKdzhYfAuRnJtib9sS6JmTFPXgP4lFgTMR9z4SMLgLQfYY
- wDc24rLmM+LlQ9ihi8KJeJHN27YEOrA00oXYqhRwXhxD+uswZOivQ3DfihTNWySXDyOQNGJLzUkciUod
- 97YtgU5bpJ9FYr4Mx6lghDyKxXkVgfSKYfAUI0go7oefgQPfymAEsv8jQK9KWPUZgsoxxIuTEKZNwoHm
- RDBrSFwodiEmrxehAhZ2ZR/Fvgju8hEkBCUWEe24op0BlxhAZFYq9lAx2GE8jW3qXITf7ESwIB2H4s4j
- IIK7PET6k9B7vlzmxFXiKXK0DbihNOCSRIHNd4IQlCYAm08gQ1b9SUa2jkiIRndmCUXxJRq2V2LeRXmD
- tNpo/9nzYRjT3+cw9mUGrc/fQijTg5UqQ2WDHf9yoiLdaMSl/DiPQKG21eJ0jeOqVD24YS9rihHBnS2p
- bvttMHdCaXzxq+lZL7R1jqmNAWedu8L4fZLy+g59swPMM9csHgGZ1jT9G8Cq7aeGGCFchq7pddfc/P3L
- N8A1NoOu/q9o75nA2p1s4lxGGUNKtg61d4/C73DKtEcg926TxdHtmp+zqiNOKO/LU7X0rfFjza7eGo7F
- 4x+SPLLI3a153nG7qg2+gQkLDjJLa+MkyrrROssrdHS78dgxiDyVCcHRotFInkyxErfeP2ohAxrxGaXs
- cE4exWSL3dtDOW7foARq3W6WJ+mVOR+fP14n9JodHaZ5AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAMLSURBVDhPdVJdTJJhGPW+bqp1U9OL/jVrq0zDWj9qaSlq
+ FlimQ7RQFIRZ2QSV1NScfhB8gkqD/KTyZ9nQDKqLnI5WNp06leVUXMHUka41zXJmJz/CuTLP9l68O89z
+ 3vOc5/VYhlr/wpOkTGIVZTKX6Y3O0sqnznxVvVlCGMSZhXpPd9n/QVJmhqrWZCxvbQLZ3QCVVQvlSD4y
+ 2qLBVRAQ5KmNSTcUDHf536Bfppulz+UoGcqGaaoNXXM2pDbkoPTDTXCbghFSqMQVQZExii9d7YS2nV2r
+ Q9Lbw9CM3YJ5yoL3M/0Y/P4Zjx1GJFYU4GTFII4W3UY4J0vsblsBPXO8/BF4L2KQb43D/Y8E9PYCkL16
+ 8Az1uKqeBrt0DN7aSJxmi8zuthXQgaWSNsRUJYPz5iTSOkMg1F0H/4EJyeo+JJY74E8asL3mDI5Hpjjd
+ bSug0xbpFhCXJ8MpKhBBz2JwSUkgrcKBJPk4YouGsVPPgVdlIPyZ/xGgVyWomga/chJscTxCNPE48iQO
+ jBoSl4tsiM7tRzA/Ar63TuBQGHf1CBKCEouIdlzTzINLjCD8RgoOUNHwNpzDblUOQrO6EMhPwzHWJfiF
+ cVeHSH8Ses9Xy6xIJ14iW1OHmwo9EiRybLsbgIBUPpg8AkJZ9ScZ2TwuIertmcUUxZOomW6JJRflddJq
+ Q9uP3iEHZud+YfLLPJpf90Eg0yEiRYbKujb8y4kKtRNhCXksl0CBprnFanMiXaoa3XIwfMY7LHGhuLp1
+ UW/sgrz2zc/GV/3QGCwzW/0uWH1DeAOS8kcduicWMM5ntLgEZJqm2UUA6/acHfMJ4vpoGzu7fy3dv3wD
+ bJPz6B7+ivbez9i4l0lcFJb5SMnmsfaeCew4ljzrEsi519hi6bEtzVnVwRKUDuQqnw5s2BGxsH5XKJbP
+ vqDE8WXuXs3rjjtVrfDyj/3jILOkliVRPJx42PIOHT12PLeMIlfZhMAo0UR4kky+Frd5X+SfDGiwhSXM
+ UE4uxWCK7XuCOXavgFhq0/4IV9Jrcx4evwFU//SROPZWZgAAAABJRU5ErkJggg==
</value>
</data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -237,23 +237,23 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL1SURBVDhPdVNbSJNhGP7FRt2YiEVelNPp5pxOxVqm5iHU
- 1H/ng4d5SlNJ00wrQwg0wrb9cydXzmxqVjdJV0EEXZQdSEhIjDIKA9HKS2EEuxn49r6/B5LohQd+eJ/n
- +d7v+d6f2VUFA3tiWVtOHGvxxStti3Es91uI2Py2+KhHnC327krScBFxrLVXrLGvZFQ5NrIbbkP2mRFQ
- 1Hkho8oDyXrrRqKaWxEhh7hbss0SFgzsEymtgzItF8w/OwrlHRNQen4clBcmoaxjHHLQ6GjNMKSanCBR
- WoLEJc2WnGFEaotZprcFitvugrZ7ijdgOyfg0fOP8Oz1J8hv9ECmeRjSKtw4iQOStLYAaXhxTNnNg2Id
- N5PXNAq6nvug6rrHn17aPg4j07Mw8fgVZFVbIb3SjRO4IEk3BBKtHcRqboa0jEhpYTOMrnU1CsmA7ZyE
- wpYxyG308VfQd0+CVMdBosYOmAEkqGw8xHrHukjJsQw2+hQNt0M0ekm7nx81UcNBY/80LHxbg6czCyBV
- 3wBhuRUw5B1IDI6QBLWYvt1Gp1F4NB41heUWOI7pv1tYhjdzXyBZNfCPQYrRiXy7jZHq7H3yKk8oAcfb
- bhKZwnrx/vt/DaQmZ0iiwwnEWo5NM7jWRXivvwl0wsu5TQOZ5jrgMiE2e5QBaUjLv0JGhXNGZnBAPDYp
- KIl2CBS1Xng7vwyz819BUWnhDWkqXDT+NeSo4V+BSqpzmNMrnQF5BTVcfJBd3BP4vLQGi0s/4JJtGrJq
- PXCsxssbZ9XfCpCGF1PRVqUZXYMnm3zBPAyTAqVXqb6K6J0C/UU/FLWOQnGbHwqb7wSJu2sTqaJxv9NN
- 7l7cgVVVl3+DdsJw+QEYrzwEE0LXM7FxqnVsVY4c4m7JdioMIWCiRJFHcs+VpGj6x3LqHR+Kmr0/C1rc
- v3JruflU9TV/zInmMiYyNgq5dHo4CbeLflFyPYQQMgKBPHx/3GnBAalZEC2pC4+IVaJ/JvYSEYcRZLKX
- YZiwP1wkqe371DsXAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL0SURBVDhPdVNrSFNhGD5io/6YiEX+KKdzm/M2h2mm5iXU
+ 1LO7Ou+appKmmVaGEGiEznPmNufykjrN6k/SryCCftS6kJCQGGUUBqKVP4UR7M9gb+97vJBELzxwOO/z
+ PN97nu89zL7K7jsQznLpEax5PFLNrYhZ/jeBnukd9Yizw95f0To+KIId7JbpLOuq8iF/Wt0opJ0fg5Qa
+ J6jKHRBjNPulWn5dghzi7si2S5zdd0iiHuyP1XHerAsTUNQ2AwWXXKC+PAuFbS5IR6OTVSMQX2oDOTvg
+ JS5pduQMI9GaK2ONnCevZQr0nXOCAds+A4+ef4Rnrz9BVr0DkipHQGkaxkmsEK3nPKQRxGGFA0dlBt6d
+ 2TABhq77oOm4J5xe0OqCsfkFmHn8ClIrBiGxbBgnsEO0YQjkegvItLybtIxEbWZVxfYtLQrJgG2fhZym
+ ScioHxc+wdg5CwoDD1KdBTADiNJwAmRG65ZEzbMMNnqS60Z9NHp+67QwqlTHQ33vPCx/24Sn7mVQaG+D
+ uGgQMOQ9yIqtPjlqMX0LR6dReDQeNcVFZjiF6b9bXoM3i18gRtP3j0FciQ35Fo5RGCw98eUOXxSOt9sk
+ MoX14v33/xpEl9p8cgNOINPzrBIzkOB3/U2gE14ubhvE6m4BLhNiu0cZkIa0wi2oTDZ3bLEVIrFJQcn1
+ Q5BS7YS3S2uwsPQVUsrMgiFNhYsm3EYCaoRboFIYrJVKk9WTYKKGXQiyg38Cn1c3YWX1B1zl5iG12gHJ
+ VU7BOLX2joc0gpiKtkpZYu8/0zDuzcQwKVC6lYobiO45MF6ZhtzmCchrmYacxrte4u7bRKpQ3O/E0uFu
+ 3IENTceUn3ai+NoDKLn+EEoRhi6X/2zz5EYCcoi7I9urAISICZEEn8i4mB+n651Mr7V+yG10/sxusv/K
+ qOaX4rU3p8NONxYyweEhyKXTA0m4W/SLkusxhJgRiRICD0ecEx1RVIpC5TWBQeFq9E/CnhRxHEEmBxmG
+ CfgDMl6p29Sh7gQAAAAASUVORK5CYII=
</value>
</data>
- <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.10")]
[assembly: AssemblyFileVersion("1.0.10")]
[assembly: AssemblyVersion("1.0.11")]
[assembly: AssemblyFileVersion("1.0.11")]
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ShowCardInformation.cs
......@@ -40,10 +40,10 @@ namespace MoyaAdminUI
{
nameTextBox.Text = card.wholeName;
nickTextBox.Text = card.username;
cardTemplateTextBox.Text = card.cardTemplate;
cardTemplateTextBox.Text = card.template;
cardStateTextBox.Text = card.state;
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.id);
if (card.state == Card.CARD_STATE_PRINTED)
{
......@@ -51,7 +51,7 @@ namespace MoyaAdminUI
client = new RestClient(Properties.Settings.Default.ApiURL);
try
{
ret = client.MakeRequest("meta/v1/printedcard/" + card.cardId + "/card-filing");
ret = client.MakeRequest("meta/v1/printedcard/" + card.id + "/card-filing");
}
catch (ApplicationException ex)
{
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/UserInfoForm.cs
......@@ -25,7 +25,7 @@ namespace MoyaAdminUI
Card card = MoyaUtils.GetByEventUserId(value.EventUserId);
try
{
cardPictureBox.Load(Properties.Settings.Default.ApiURL + "/dydata/usercard/" + card.cardId + ".png?pfdrid_c=true");
cardPictureBox.Load(Properties.Settings.Default.ApiURL + "/dydata/usercard/" + card.id + ".png?pfdrid_c=true");
}
catch (Exception e)
{
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/UsersFinderForm.cs
......@@ -98,7 +98,7 @@ namespace MoyaAdminUI
string json = client.MakeRequest("user/card/" + user.EventUserId);
var ser = new JavaScriptSerializer();
Card card = ser.Deserialize<Card>(json);
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.cardId);
pictureBox1.ImageLocation = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "card/GetImage/" + card.id);
if (card.state == Card.CARD_STATE_PRINTED)
CardState.Text = card.state + " in " + card.GetCardPlace();
......@@ -112,7 +112,7 @@ namespace MoyaAdminUI
client = new RestClient(Properties.Settings.Default.ApiURL);
try
{
json = client.MakeRequest("meta/v1/printedcard/" + card.cardId + "/card-filing");
json = client.MakeRequest("meta/v1/printedcard/" + card.id + "/card-filing");
}
catch (ApplicationException ex)
{
......
MoyaAdmin/MoyaAdminUI/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "MoyaAdminUI moya v1_00_10"
Name "MoyaAdminUI moya v1_00_11"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaAdminUI moya stable v1_00_10" SecMain
Section "!MoyaAdminUI moya stable v1_00_11" SecMain
SetShellVarContext current
......
OrgMealCounter/OrgMealCounter/obj/Debug/OrgMealCounter.csproj.FileListAbsolute.txt 0 → 100644
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\OrgMealCounter.exe.config
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.Form1.resources
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.Properties.Resources.resources
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.csproj.GenerateResource.Cache
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\OrgMealCounter.exe
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\OrgMealCounter.pdb
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.dll
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\MoyaAdminLib.pdb
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.csprojResolveAssemblyReference.cache
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.ApiSettings.resources
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.exe
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\obj\Debug\OrgMealCounter.pdb
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.dll
I:\devel\proj\moya-info-tools\OrgMealCounter\OrgMealCounter\bin\Debug\AutoUpdateLib.pdb
PrintServer/moyaPrintServer/moyaPrintServer/Card.cs
......@@ -8,7 +8,7 @@ namespace moyaPrintServer
public class Card
{
public int cardId;
public int id;
public string cardTemplate;
public string username;
public string wholeName;
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.cs
......@@ -101,7 +101,7 @@ namespace moyaPrintServer
private void PrintCard(Card card)
{
currentCardId = card.cardId;
currentCardId = card.id;
string api = RestClient.GetRequestURL(Properties.Settings.Default.ApiURL,"card/GetImage/" + currentCardId);
WebRequest request = WebRequest.Create(api);
try
......@@ -123,7 +123,7 @@ namespace moyaPrintServer
PrintDocument pd = new PrintDocument();
pd.DocumentName = "Card "+ card.cardId + " " + card.username;
pd.DocumentName = "Card "+ card.id + " " + card.username;
/*
......@@ -192,7 +192,7 @@ namespace moyaPrintServer
try
{
RestClient client = new RestClient(Properties.Settings.Default.ApiURL);
client.MakeRequest("card/Reserve/" + card.cardId);
client.MakeRequest("card/Reserve/" + card.id);
}
catch (Exception ex)
{
......@@ -234,7 +234,7 @@ namespace moyaPrintServer
if (card.state == "VALIDATED" && (CardFilterTextBox.Text.Length == 0 || CardFilterTextBox.Text == card.cardTemplate))
{
ListViewItem lvi = listView.Items.Add(card.cardId.ToString());
ListViewItem lvi = listView.Items.Add(card.id.ToString());
lvi.SubItems.Add(card.username);
lvi.SubItems.Add(card.wholeName);
lvi.Tag = card;
......@@ -280,7 +280,7 @@ namespace moyaPrintServer
{
Card c = (Card)listView.SelectedItems[0].Tag;
PreviewForm frm = new PreviewForm();
frm.CardId = c.cardId;
frm.CardId = c.id;
frm.ShowDialog();
}
......
PrintServer/moyaPrintServer/moyaPrintServer/Form1.resx
......@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>443, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
......
PrintServer/moyaPrintServer/moyaPrintServer/Properties/AssemblyInfo.cs
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.24.0")]
[assembly: AssemblyFileVersion("1.0.24.0")]
[assembly: AssemblyVersion("1.0.25.0")]
[assembly: AssemblyFileVersion("1.0.25.0")]
PrintServer/moyaPrintServer/out_moya.nsi
......@@ -22,7 +22,7 @@
Name "MoyaPrintServer moya v1_00_24"
Name "MoyaPrintServer moya v1_00_25"
; DO NOT CHANGE OutFile "installer_temp.exe" !!! AutoPublish requires this.
......@@ -198,7 +198,7 @@ FunctionEnd
Section "!MoyaPrintServer moya stable v1_00_24" SecMain
Section "!MoyaPrintServer moya stable v1_00_25" SecMain
SetShellVarContext current
......@@ -212,9 +212,9 @@ Section "!MoyaPrintServer moya stable v1_00_24" SecMain
SetOverwrite On
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\autoupdate.moya.xml"
File /oname=autoupdate.xml "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\autoupdate.moya.xml"
File /oname=moyaPrintServer.exe "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.exe"
File /oname=moyaPrintServer.exe "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.exe"
File autoupdate.crt
......@@ -224,10 +224,10 @@ Section "!MoyaPrintServer moya stable v1_00_24" SecMain
; that is referenced to the main project.
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.dll"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.pdb"
File "I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.pdb"
......@@ -315,10 +315,10 @@ Section "Uninstall"
; that is referenced to the main project.
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.dll"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\moyaPrintServer.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\moyaPrintServer.pdb"
Delete "$INSTDIR\I:\devel\proj\moya-info-tools\PrintServer\moyaPrintServer\moyaPrintServer\bin\Release\AutoUpdateLib.pdb"
......
apikeys.txt 0 → 100644
CardDisplay, Cloakroom, OrgMealCounter
ApiKey: 4ifkLUhy1ByYD6JWOUdA
ApiUser: liv
ApiPass: mIqgbpzGlU5rPrM8JX7l
ApiKey: ryirch1oD0Vig1Taik9ga
ApiUser: tapsa
ApiPass: myPs7I7ov1iM3yeS3am6
\ 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!