Skip to content

Codecrew / Moya Info Tools

Go to a project
Commit 93678be0 by Tapio Haapala
Options

siirtoa libin puolelle

1 parent 9a5df3c3
Inline Side-by-side
Showing with 397 additions and 232 deletions
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Card.cs
...@@ -11,6 +11,8 @@ namespace MoyaAdminLib ...@@ -11,6 +11,8 @@ namespace MoyaAdminLib
{ {
public static string CARD_STATE_PRINTED = "PRINTED"; public static string CARD_STATE_PRINTED = "PRINTED";
public static string CARD_BARCODE_PREFIX = "277"; 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"} //{"cardId":3990,"state":"PENDING_VALIDATION","cardTemplate":"pelaaja","username":"Miketzu","wholeName":"Mirco Renko"}
public int cardId; public int cardId;
public string state; public string state;
...@@ -37,6 +39,95 @@ namespace MoyaAdminLib ...@@ -37,6 +39,95 @@ namespace MoyaAdminLib
return false; return false;
} }
public string GetCardPlace(){
if (this.state == Card.CARD_STATE_PRINTED)
{
string json = "";
RestClient client = new RestClient(RestClient.ApiURL);
try
{
json = client.MakeRequest("meta/v1/printedcard/" + this.cardId + "/card-filing");
}
catch (ApplicationException ex)
{
if (!ex.Message.Contains("HTTP NoContent"))
return "";
}
if (json != null && json != "")
{
MetaData data = getValue(json);
int bookNumber = 0;
int pageNumber = 0;
int slotNumber = 0;
getCardPlace(data, out bookNumber, out pageNumber, out slotNumber);
return bookNumber + "." + pageNumber + "." + slotNumber;
}
}
return "";
}
private MetaData getValue(string ret)
{
MetaData data = null;
if (ret != null && ret != "")
{
ret = ret.Trim();
if (ret.StartsWith("{") && ret.EndsWith("}"))
{
ret = ret.Replace("{", "");
ret = ret.Replace("}", "");
if (ret.Contains(":"))
{
data = new MetaData();
string[] fields = ret.Split(new string[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length == 2)
{
if (fields[0].StartsWith("\""))
fields[0] = fields[0].Substring(1, fields[0].Length - 1);
if (fields[0].EndsWith("\""))
fields[0] = fields[0].Substring(0, fields[0].Length - 1);
data.key = fields[0];
if (fields[1].StartsWith("\""))
fields[1] = fields[1].Substring(1, fields[1].Length - 1);
if (fields[1].EndsWith("\""))
fields[1] = fields[1].Substring(0, fields[1].Length - 1);
data.value = fields[1];
}
}
}
}
return data;
}
private void getCardPlace(MetaData data, out int bookNumber, out int pageNumber, out int slotNumber)
{
bookNumber = 0;
pageNumber = 0;
slotNumber = 0;
if (data != null)
{
if (data.key == CARD_PLACE)
{
if (data.value != null && data.value != "")
{
string[] fields = data.value.Split(new string[] { "." }, StringSplitOptions.None);
if (fields.Length > 2)
{
if (fields.Length == 3)
{
int.TryParse(fields[0], out bookNumber);
int.TryParse(fields[1], out pageNumber);
int.TryParse(fields[2], out slotNumber);
}
}
}
}
}
}
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ComputerPlace.cs → MoyaAdmin/MoyaAdminUI/MoyaAdminLib/ComputerPlace.cs
...@@ -7,8 +7,9 @@ using System.Drawing; ...@@ -7,8 +7,9 @@ using System.Drawing;
using System.Web.Script.Serialization; using System.Web.Script.Serialization;
using System.ComponentModel; using System.ComponentModel;
using MoyaAdminUI.MoyaAPI; using MoyaAdminUI.MoyaAPI;
using MoyaAdminLib;
namespace MoyaAdminUI namespace MoyaAdminLib
{ {
public class ComputerPlace public class ComputerPlace
{ {
...@@ -226,7 +227,7 @@ namespace MoyaAdminUI ...@@ -226,7 +227,7 @@ namespace MoyaAdminUI
{ {
ComputerPlace.Cache.Clear(); ComputerPlace.Cache.Clear();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient();
string json = client.MakeRequest("placeadmin/places/" + mapId); string json = client.MakeRequest("placeadmin/places/" + mapId);
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
PlaceMap map = ser.Deserialize<PlaceMap>(json); PlaceMap map = ser.Deserialize<PlaceMap>(json);
...@@ -250,7 +251,7 @@ namespace MoyaAdminUI ...@@ -250,7 +251,7 @@ namespace MoyaAdminUI
public static int DefaultWidth = 23; public static int DefaultWidth = 23;
public static int DefaultHeight = 23; public static int DefaultHeight = 23;
* */ * */
internal void Reserve(User user) public void Reserve(User user)
{ {
reserverUserCache = null; reserverUserCache = null;
buyerUserCache = null; buyerUserCache = null;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Map.cs → MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Map.cs
using MoyaAdminUI.MoyaAPI; using MoyaAdminLib;
using MoyaAdminUI.MoyaAPI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -37,7 +38,7 @@ namespace MoyaAdminUI ...@@ -37,7 +38,7 @@ namespace MoyaAdminUI
{ {
Map.Cache.Clear(); Map.Cache.Clear();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient();
string json = client.MakeRequest("placeadmin/maps"); string json = client.MakeRequest("placeadmin/maps");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
Maps maps = ser.Deserialize<Maps>(json); Maps maps = ser.Deserialize<Maps>(json);
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/MoyaAdminLib.csproj
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Card.cs" /> <Compile Include="Card.cs" />
<Compile Include="ComputerPlace.cs" />
<Compile Include="Controls\EventUserEditor.cs"> <Compile Include="Controls\EventUserEditor.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
...@@ -58,17 +59,23 @@ ...@@ -58,17 +59,23 @@
<Compile Include="EventUsers.cs" /> <Compile Include="EventUsers.cs" />
<Compile Include="LuggageHold.cs" /> <Compile Include="LuggageHold.cs" />
<Compile Include="LuggageHoldList.cs" /> <Compile Include="LuggageHoldList.cs" />
<Compile Include="Map.cs" />
<Compile Include="Maps.cs" />
<Compile Include="MetaData.cs" /> <Compile Include="MetaData.cs" />
<Compile Include="MetaDataList.cs" /> <Compile Include="MetaDataList.cs" />
<Compile Include="OrgMeal.cs" /> <Compile Include="OrgMeal.cs" />
<Compile Include="OrgMealList.cs" /> <Compile Include="OrgMealList.cs" />
<Compile Include="Place.cs" />
<Compile Include="PlaceMap.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Randomizer.cs" /> <Compile Include="Randomizer.cs" />
<Compile Include="Reader.cs" /> <Compile Include="Reader.cs" />
<Compile Include="ReaderEvent.cs" /> <Compile Include="ReaderEvent.cs" />
<Compile Include="ReaderEventList.cs" /> <Compile Include="ReaderEventList.cs" />
<Compile Include="ReaderList.cs" /> <Compile Include="ReaderList.cs" />
<Compile Include="RestClient.cs" />
<Compile Include="Scanner.cs" /> <Compile Include="Scanner.cs" />
<Compile Include="User.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MoyaAPI/Place.cs → MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Place.cs
using System.Collections.Generic; using MoyaAdminLib;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -38,14 +39,14 @@ namespace MoyaAdminUI.MoyaAPI ...@@ -38,14 +39,14 @@ namespace MoyaAdminUI.MoyaAPI
if (id > 0) if (id > 0)
{ {
// update // update
client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.PUT); client = new RestClient(RestClient.ApiURL, HttpVerb.PUT);
client.PostData = ser.Serialize(this); client.PostData = ser.Serialize(this);
client.MakeRequest("placeadmin/place/"+id); client.MakeRequest("placeadmin/place/"+id);
} }
else else
{ {
//create //create
client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.POST); client = new RestClient(RestClient.ApiURL, HttpVerb.POST);
client.PostData = ser.Serialize(this); client.PostData = ser.Serialize(this);
client.MakeRequest("placeadmin/place"); client.MakeRequest("placeadmin/place");
} }
...@@ -55,7 +56,7 @@ namespace MoyaAdminUI.MoyaAPI ...@@ -55,7 +56,7 @@ namespace MoyaAdminUI.MoyaAPI
internal void Release() internal void Release()
{ {
ComputerPlace.Cache.Clear(); ComputerPlace.Cache.Clear();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.PUT); RestClient client = new RestClient(RestClient.ApiURL, HttpVerb.PUT);
string json = client.MakeRequest("placeadmin/place/"+ id+"/release"); string json = client.MakeRequest("placeadmin/place/"+ id+"/release");
} }
...@@ -63,7 +64,7 @@ namespace MoyaAdminUI.MoyaAPI ...@@ -63,7 +64,7 @@ namespace MoyaAdminUI.MoyaAPI
internal void Reserve(int userid) internal void Reserve(int userid)
{ {
ComputerPlace.Cache.Clear(); ComputerPlace.Cache.Clear();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL, HttpVerb.PUT); RestClient client = new RestClient(RestClient.ApiURL, HttpVerb.PUT);
string json = client.MakeRequest("placeadmin/place/" + id + "/reserve/" + userid); string json = client.MakeRequest("placeadmin/place/" + id + "/reserve/" + userid);
} }
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MoyaAPI/RestClient.cs → MoyaAdmin/MoyaAdminUI/MoyaAdminLib/RestClient.cs
...@@ -7,8 +7,11 @@ using System.Security.Cryptography; ...@@ -7,8 +7,11 @@ using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace MoyaAdminUI.MoyaAPI namespace MoyaAdminLib
{ {
public enum HttpVerb public enum HttpVerb
{ {
GET, GET,
...@@ -23,9 +26,14 @@ namespace MoyaAdminUI.MoyaAPI ...@@ -23,9 +26,14 @@ namespace MoyaAdminUI.MoyaAPI
public string ContentType { get; set; } public string ContentType { get; set; }
public string PostData { get; set; } public string PostData { get; set; }
public static string ApiApplicationKey;
public static string ApiUser;
public static string ApiPass;
public static string ApiURL;
public RestClient() public RestClient()
{ {
EndPoint = ""; EndPoint = ApiURL;
Method = HttpVerb.GET; Method = HttpVerb.GET;
ContentType = "application/json"; ContentType = "application/json";
...@@ -82,8 +90,8 @@ namespace MoyaAdminUI.MoyaAPI ...@@ -82,8 +90,8 @@ namespace MoyaAdminUI.MoyaAPI
public static string GetRequestURL(string server, string parameters) public static string GetRequestURL(string server, string parameters)
{ {
int timestamp = ConvertToTimestamp(DateTime.Now); int timestamp = ConvertToTimestamp(DateTime.Now);
string hash = CalculateSHA1("/" + parameters + "+" + Properties.Settings.Default.ApiApplicationKey + "+" + Properties.Settings.Default.ApiUser + "+" + timestamp + "+" + Properties.Settings.Default.ApiPass); string hash = CalculateSHA1("/" + parameters + "+" + ApiApplicationKey + "+" + ApiUser + "+" + timestamp + "+" + ApiPass);
string url = server + "/rest/" + parameters + "?appkey=" + Properties.Settings.Default.ApiApplicationKey + "&appuser=" + Properties.Settings.Default.ApiUser + "&appstamp=" + timestamp + "&appmac=" + hash; string url = server + "/rest/" + parameters + "?appkey=" + ApiApplicationKey + "&appuser=" + ApiUser + "&appstamp=" + timestamp + "&appmac=" + hash;
Console.WriteLine(url); Console.WriteLine(url);
return url; return url;
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/User.cs → MoyaAdmin/MoyaAdminUI/MoyaAdminLib/User.cs
...@@ -7,7 +7,7 @@ using System.Text; ...@@ -7,7 +7,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Web.Script.Serialization; using System.Web.Script.Serialization;
namespace MoyaAdminUI namespace MoyaAdminLib
{ {
public class User public class User
{ {
...@@ -63,7 +63,7 @@ namespace MoyaAdminUI ...@@ -63,7 +63,7 @@ namespace MoyaAdminUI
public static void LoadAll() public static void LoadAll()
{ {
User.Cache.Clear(); User.Cache.Clear();
RestClient client = new RestClient(Properties.Settings.Default.ApiURL); RestClient client = new RestClient();
string json = client.MakeRequest("user/eventusers"); string json = client.MakeRequest("user/eventusers");
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
EventUsers users = ser.Deserialize<EventUsers>(json); EventUsers users = ser.Deserialize<EventUsers>(json);
......
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/obj/Debug/MoyaAdminLib.csproj.FileListAbsolute.txt 0 → 100644
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll.config
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\bin\Debug\MoyaAdminLib.pdb
D:\Devel\proj\moya-info-tools\MoyaAdmin\MoyaAdminUI\MoyaAdminLib\obj\Debug\MoyaAdminLib.dll
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
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/ApiSettings.cs
using System; using MoyaAdminLib;
using MoyaAdminUI.MoyaAPI;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
...@@ -24,7 +26,11 @@ namespace MoyaAdminUI ...@@ -24,7 +26,11 @@ namespace MoyaAdminUI
Properties.Settings.Default.ApiUser = ApiUserTextBox.Text; Properties.Settings.Default.ApiUser = ApiUserTextBox.Text;
Properties.Settings.Default.ApiPass = ApiPassTextBox.Text; Properties.Settings.Default.ApiPass = ApiPassTextBox.Text;
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiPass = Properties.Settings.Default.ApiPass;
RestClient.ApiUser = Properties.Settings.Default.ApiUser;
RestClient.ApiURL = Properties.Settings.Default.ApiURL;
this.DialogResult = System.Windows.Forms.DialogResult.OK; this.DialogResult = System.Windows.Forms.DialogResult.OK;
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.Designer.cs
...@@ -42,13 +42,13 @@ ...@@ -42,13 +42,13 @@
this.toolStripSaveButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSaveButton = new System.Windows.Forms.ToolStripButton();
this.toolStripRefreshButton = new System.Windows.Forms.ToolStripButton(); this.toolStripRefreshButton = new System.Windows.Forms.ToolStripButton();
this.UnlockToolStripButton = new System.Windows.Forms.ToolStripButton(); this.UnlockToolStripButton = new System.Windows.Forms.ToolStripButton();
this.usersToolStripPrintButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.usersToolStripPrintButton = new System.Windows.Forms.ToolStripButton();
this.cardLocationInputToolStripButton = new System.Windows.Forms.ToolStripButton(); this.cardLocationInputToolStripButton = new System.Windows.Forms.ToolStripButton();
this.incomingFormToolStripButton = new System.Windows.Forms.ToolStripButton(); this.incomingFormToolStripButton = new System.Windows.Forms.ToolStripButton();
this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton(); this.cardInfoToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.cloackRoomToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.TopPanel = new System.Windows.Forms.Panel(); this.TopPanel = new System.Windows.Forms.Panel();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.MapsComboBox = new System.Windows.Forms.ComboBox(); this.MapsComboBox = new System.Windows.Forms.ComboBox();
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
this.searchTimer = new System.Windows.Forms.Timer(this.components); this.searchTimer = new System.Windows.Forms.Timer(this.components);
this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components); this.ImageRefreshTimer = new System.Windows.Forms.Timer(this.components);
this.panel2 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel();
this.orgMealToolStripButton = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.MapPictureBox)).BeginInit();
this.toolStrip1.SuspendLayout(); this.toolStrip1.SuspendLayout();
this.TopPanel.SuspendLayout(); this.TopPanel.SuspendLayout();
...@@ -144,8 +145,9 @@ ...@@ -144,8 +145,9 @@
this.cardLocationInputToolStripButton, this.cardLocationInputToolStripButton,
this.incomingFormToolStripButton, this.incomingFormToolStripButton,
this.cardInfoToolStripButton, this.cardInfoToolStripButton,
this.toolStripButton3, this.cloackRoomToolStripButton,
this.toolStripButton1}); this.toolStripButton1,
this.orgMealToolStripButton});
this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1078, 25); this.toolStrip1.Size = new System.Drawing.Size(1078, 25);
...@@ -184,6 +186,11 @@ ...@@ -184,6 +186,11 @@
this.UnlockToolStripButton.Text = "toolStripButton4"; this.UnlockToolStripButton.Text = "toolStripButton4";
this.UnlockToolStripButton.ToolTipText = "Unlock place map"; this.UnlockToolStripButton.ToolTipText = "Unlock place map";
// //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
//
// usersToolStripPrintButton // usersToolStripPrintButton
// //
this.usersToolStripPrintButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.usersToolStripPrintButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
...@@ -194,22 +201,6 @@ ...@@ -194,22 +201,6 @@
this.usersToolStripPrintButton.Text = "Users"; this.usersToolStripPrintButton.Text = "Users";
this.usersToolStripPrintButton.Click += new System.EventHandler(this.usersToolStripPrintButton_Click); this.usersToolStripPrintButton.Click += new System.EventHandler(this.usersToolStripPrintButton_Click);
// //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
//
// toolStripButton1
//
this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
this.toolStripButton1.Text = "Api settings";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
//
// cardLocationInputToolStripButton // cardLocationInputToolStripButton
// //
this.cardLocationInputToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.cardLocationInputToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
...@@ -240,14 +231,26 @@ ...@@ -240,14 +231,26 @@
this.cardInfoToolStripButton.Text = "Kortin tiedot"; this.cardInfoToolStripButton.Text = "Kortin tiedot";
this.cardInfoToolStripButton.Click += new System.EventHandler(this.cardInfoToolStripButton_Click); this.cardInfoToolStripButton.Click += new System.EventHandler(this.cardInfoToolStripButton_Click);
// //
// toolStripButton3 // cloackRoomToolStripButton
//
this.cloackRoomToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.cloackRoomToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("cloackRoomToolStripButton.Image")));
this.cloackRoomToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.cloackRoomToolStripButton.Name = "cloackRoomToolStripButton";
this.cloackRoomToolStripButton.Size = new System.Drawing.Size(23, 22);
this.cloackRoomToolStripButton.Text = "Cloack room";
this.cloackRoomToolStripButton.Click += new System.EventHandler(this.toolStripButton3_Click);
// //
this.toolStripButton3.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; // toolStripButton1
this.toolStripButton3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton3.Image"))); //
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton3.Name = "toolStripButton3"; this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton3.Size = new System.Drawing.Size(23, 22); this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton3.Text = "Laukkuparkki"; this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(23, 22);
this.toolStripButton1.Text = "Api settings";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
// //
// TopPanel // TopPanel
// //
...@@ -318,6 +321,16 @@ ...@@ -318,6 +321,16 @@
this.panel2.Size = new System.Drawing.Size(752, 471); this.panel2.Size = new System.Drawing.Size(752, 471);
this.panel2.TabIndex = 17; this.panel2.TabIndex = 17;
// //
// orgMealToolStripButton
//
this.orgMealToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.orgMealToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("orgMealToolStripButton.Image")));
this.orgMealToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.orgMealToolStripButton.Name = "orgMealToolStripButton";
this.orgMealToolStripButton.Size = new System.Drawing.Size(23, 22);
this.orgMealToolStripButton.Text = "Org Meal";
this.orgMealToolStripButton.Click += new System.EventHandler(this.orgMealToolStripButton_Click);
//
// MainForm // MainForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
...@@ -368,12 +381,13 @@ ...@@ -368,12 +381,13 @@
private System.Windows.Forms.ToolStripButton cardLocationInputToolStripButton; private System.Windows.Forms.ToolStripButton cardLocationInputToolStripButton;
private System.Windows.Forms.ToolStripButton incomingFormToolStripButton; private System.Windows.Forms.ToolStripButton incomingFormToolStripButton;
private System.Windows.Forms.ToolStripButton cardInfoToolStripButton; private System.Windows.Forms.ToolStripButton cardInfoToolStripButton;
private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripButton cloackRoomToolStripButton;
private System.Windows.Forms.ToolStripButton UnlockToolStripButton; private System.Windows.Forms.ToolStripButton UnlockToolStripButton;
private System.Windows.Forms.TextBox searchTextBox; private System.Windows.Forms.TextBox searchTextBox;
private System.Windows.Forms.Timer searchTimer; private System.Windows.Forms.Timer searchTimer;
private System.Windows.Forms.Timer ImageRefreshTimer; private System.Windows.Forms.Timer ImageRefreshTimer;
private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.ToolStripButton orgMealToolStripButton;
} }
} }
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.cs
using MoyaAdminUI.MoyaAPI; using MoyaAdminLib;
using MoyaAdminUI.MoyaAPI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
...@@ -30,6 +31,11 @@ namespace MoyaAdminUI ...@@ -30,6 +31,11 @@ namespace MoyaAdminUI
public MainForm() public MainForm()
{ {
InitializeComponent(); InitializeComponent();
RestClient.ApiApplicationKey = Properties.Settings.Default.ApiApplicationKey;
RestClient.ApiPass = Properties.Settings.Default.ApiPass;
RestClient.ApiUser = Properties.Settings.Default.ApiUser;
RestClient.ApiURL = Properties.Settings.Default.ApiURL;
} }
...@@ -121,6 +127,8 @@ namespace MoyaAdminUI ...@@ -121,6 +127,8 @@ namespace MoyaAdminUI
//Creating menuitems //Creating menuitems
MenuItem mi; MenuItem mi;
mi = new MenuItem("Create a new computer place...", new EventHandler(this.createNewComputerPlace)); mi = new MenuItem("Create a new computer place...", new EventHandler(this.createNewComputerPlace));
mi.Enabled = (computerPlace == null); mi.Enabled = (computerPlace == null);
menu.MenuItems.Add(mi); menu.MenuItems.Add(mi);
...@@ -145,6 +153,10 @@ namespace MoyaAdminUI ...@@ -145,6 +153,10 @@ namespace MoyaAdminUI
mi.Enabled = (computerPlace != null); mi.Enabled = (computerPlace != null);
menu.MenuItems.Add(mi); menu.MenuItems.Add(mi);
mi = new MenuItem("Show buyer info", new EventHandler(this.showBuyerInfo));
mi.Enabled = (computerPlace == null);
menu.MenuItems.Add(mi);
menu.Show(this.MapPictureBox, clickedLocation); menu.Show(this.MapPictureBox, clickedLocation);
} }
else if (e.Button == MouseButtons.Left && multiMoveLastLocation == null) else if (e.Button == MouseButtons.Left && multiMoveLastLocation == null)
...@@ -198,6 +210,8 @@ namespace MoyaAdminUI ...@@ -198,6 +210,8 @@ namespace MoyaAdminUI
this.MapPictureBox.Refresh(); this.MapPictureBox.Refresh();
} }
private void selectAllInGroup(object sender, EventArgs e) private void selectAllInGroup(object sender, EventArgs e)
{ {
if (selectedPlace != null && selectedPlace.ReserverId > 0) if (selectedPlace != null && selectedPlace.ReserverId > 0)
...@@ -242,6 +256,7 @@ namespace MoyaAdminUI ...@@ -242,6 +256,7 @@ namespace MoyaAdminUI
foreach (ListViewItem li in this.PlacesListView.SelectedItems) foreach (ListViewItem li in this.PlacesListView.SelectedItems)
{ {
ComputerPlace p = (ComputerPlace)li.Tag; ComputerPlace p = (ComputerPlace)li.Tag;
p.Reserve(frm.SelectedUser); p.Reserve(frm.SelectedUser);
} }
...@@ -1116,7 +1131,12 @@ namespace MoyaAdminUI ...@@ -1116,7 +1131,12 @@ namespace MoyaAdminUI
IncomingForm frm = new IncomingForm(); IncomingForm frm = new IncomingForm();
frm.Show(); frm.Show();
} }
private void showBuyerInfo(object sender, EventArgs e)
{
ShowCardInformation frm = new ShowCardInformation();
frm.Show();
}
private void cardInfoToolStripButton_Click(object sender, EventArgs e) private void cardInfoToolStripButton_Click(object sender, EventArgs e)
{ {
ShowCardInformation frm = new ShowCardInformation(); ShowCardInformation frm = new ShowCardInformation();
...@@ -1172,10 +1192,17 @@ namespace MoyaAdminUI ...@@ -1172,10 +1192,17 @@ namespace MoyaAdminUI
} }
private void toolStripButton3_Click(object sender, EventArgs e)
{
}
private void orgMealToolStripButton_Click(object sender, EventArgs e) private void orgMealToolStripButton_Click(object sender, EventArgs e)
{ {
OrgMealCounter frm = new OrgMealCounter(); OrgMealCounter frm = new OrgMealCounter();
frm.Show(); frm.Show();
} }
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MainForm.resx
...@@ -143,124 +143,124 @@ ...@@ -143,124 +143,124 @@
<data name="toolStripRefreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripRefreshButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
RK5CYII= TkSuQmCC
</value> </value>
</data> </data>
<data name="UnlockToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="UnlockToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
AElFTkSuQmCC YII=
</value> </value>
</data> </data>
<data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="usersToolStripPrintButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPjZJ7SBNQGMWnhNoilMIiSiRKyiWZFWZuRkoL YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPjZJ5SBNQHMdnhNoilMIiSiRSMpM8KjOdktKs
ay5zj8w2oyRfm9N0YVO3dPkoX21OU5dua8s5H5ip+damolQGiVJSSEFUVGShmGVaO61t/xgE/uCDe+/5 1GXuyGwzSvLanKaGTt088sp7TlOXbnPqnAfmlbfmgVIZJEpJBwWSUZGEYpqp7duc+8dA8AM/eO99f98v
zoH73Uv4H+7u7p5kMlnju8930M3NLdt85GhVVggnmMLKF15A5PEAEJ0czUUU26SV0SCN5f0eUeNXdwF4 vN97hK0wMTE57ujoKLM7ZTdkbGycoj7S21C2CfMSiZ4ZdQd+7k4g6uupi8jXStujPjmI/XdUirXuLLA9
ND+sdnCqtkkrQ5XMOr/UKsVS02U0C0N/EInEvTZpOdv3UFwZKZIUDwr1gHlrH8hLi/ZhcqKksaywxQYh 7LFLV79cK20PSQT99mprMlYbY9AU6fWbSCTaaqXNmFqTjKiRgkgzEvmservDhR0bYENj+icH0b1X6qOw
FmoSUC+gqreQSOusjn84ejY6cOCrCV0ff6J86MW0QNNq4lY1oUKX9qs7M/i7MT0ESvEuk1irNTHkhonD XB2KOi5ZetjCYu+G4z/cbga4DP5UoevbHxQPv53lSltUrLJGFMtj17oSLy4NxHmilH9Cxa+oUFGFysnz
gvRrW/2DAszWVZaA7RSKq2Hqi6nx7Txq33yD9tUs8vWl6NF4YLxsE5qynPF9kIBZoyvStQqw1J2I0PWC 3LiMIw6uTmrrTk2AKYlkVPN+VtXweRE1078g/ziPTEUhemRmmCg6iMYkAywNETA/YIQ4uQh0aSd8K3tB
UWSYdiV577GEKMbfvVNOfkbZs0+QjX9AwdP3yBt9A0lzOyo1fAwpt2FGb4cRjQ9oxXdAlxtwQlGPjV57 zVHOGllYWWtCRBMzM+KpHyh6/R35E1+R9eoL0semIWhqR6mMg2HxUcwpdDAqs4FHbhUoQiWuiOpwwNLW
aZYASddYe96j18gankLG4Euk9k/isrlS+55D2D2B5M4xJNw24EpeDILEMhzJLIWvMHfO/FmcLAHckprc QxMg6BpvT3/+CUkjHxA/9A7R/VOIUVd03xtEdU8ionMcoRVKJKQHwpWfjwuJhTgTlbag/iz6mgBWQXVa
5I4x8FufgNcyipi7DxFZN4TTeiPCa/oRruvDKW0PuLoe+MWJQEm+ip30iEaL+S9BCRnsyFojzpgbWOoO RMc4OK0vwW4ZQ+DjZ/CrHcZ1xQB8qvvhU9mHa/IesCp7YB/MAyniPswpvg0a8zquofEMv5oB3FA30KUd
MKvvg1nVBsatVoQp74GhbLGs2aoOHBKIcZAvxgaSN8dmN79E+Dk3zp3ehb8DYla3W42V9ywDY2u6cLK8 oJU/Aa2sDdRHrfAWN4MqbtGsGZIOOHP5OMfhY7+FFVNrV7+Ezy1jZlXv8vqAaOXtG8bSZs3AGLIuXC1u
CaFljZZ7B/DT4cmMW3R2dnax2QkENpvtcK1CnZSoNDyOkOnn6TI9aEU60EvqwGscRHzDADiqNhy7rgIl hFdRg+beTpw4mFODVwwMDAy1dgKBwWDoZpRIw8PEyhe+eYpFSr4CHjmVoBTUgt0whJD6QTAlbbj8QAJS
XoQdR8P6bNZl2CclJbkUFyt8c8o1EoFcNUwrqJ6jZipAld4E64YW1KxS+MemYvN+8kWb57/YRUVFrS0q CA/H3Lz7tNZN7AgPDzfMzRXZpRbLBFyhZMQ9q3yBnCgCOfkh6HlykJMK4RAUjUOnHe9qPVui4+/vvycn
KvHJVlSl8gsrHoRkymcCL+XiUOIVUxCdudvWtyLsuFzumsJCuVdeWVWiRF6ZIxKJ1lslAuEP85t+R/qb p8AmRVQWzckueeqZKJxzuZcG57AElSuFdlLbty10WCzW7uxsoWV6UVmYQFiayuPx9m1IBMI/y01+NcbK
CD8AAAAASUVORK5CYII= xcYAAAAASUVORK5CYII=
</value> </value>
</data> </data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
</value> </value>
</data> </data>
<data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="incomingFormToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
...@@ -281,69 +281,79 @@ ...@@ -281,69 +281,79 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
CfgDMl6p29Sh7gQAAAAASUVORK5CYII= YUL+AA+vqcyRyTtAAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="cloackRoomToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWNSURBVFhH7ZZ5TFRXGMVv1zTpmnQxVRRUCggIA1jA0jK4 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAWNSURBVFhH7ZZ5TFRXGMVv7ZImXZMuRkVEpYCAMIAFLC3g
FEQWAYUBBEGWwQFxCjiuCCKKpkVcEBVGAQkoRXBDQEWotYoLhsRqbWK6RbvHkDZN/z695/mk2OAbm/Jn UhBZBBQGEARZBgfEKeC4IogImhZxQVQYBSSgFMENARWh1iouGBKrtYnpFu0eQ9o0/fv0nueTYoNvbMqf
X3K4fN/9zvnd2Z/4/3rca6DEX5+iH/d9bqgDtFSX7fEFZ1Xb6F0dWR4/VRqcEe/1BuI8Xx9ROe+Ow+ll fcnh8n33O+d3Z3/i/+tJr4Fi34Bk//Hf54TYQUt1WdO/4KxqG72rw+D2U6XeEXEebyLW/Y0Rlf3uBJxZ
OnBWtY3etTvWCdYEFyx9zw5Bjq8gYOLLD4m9VbPtlRnOqrbRuzaEOaIs4i2sCZ70yHDucYazauvxritL oQNnVdvoXXtiHGCJd8Ly92wQaP8q/Ca/8ojYWzN3kjLDWdU2etemUHuUhb+FdUFTHhvOPc5wVm092XV1
vQrPZHrgdMZ9taW54JMCT1xeOw1Xi3yh0+keUrfJe0T9c45eZjCLmQ/yySJTxQtxd40/fmtfjT/7GxV9 uUfB2Qw3nEl/oLZUJ3yS744r62fgWqE3dDrdI+o2eo6of87RywxmMfNhPllkqngh7q3zxW/ta/Fnf6Oi
fXIbzlXm4sszVgwc3oT+g8VKzf6DmUfpcbxkkanihbhZMA2DJ1bhjz4rfv+0Cj92lWNv3jz0NSxH79Z0 r09tx/nKHHx51oKBI6XoP1Sk1Ow/nHmcnsRLFpkqXohb+TMweHIN/uiz4PdPq/BjVzn25S5AX8NK9G5L
dG5OUWr2ua8lW14yyCJTxQtxMdsT946vxODZctzr2IC7bYVYFumDS3VL0F1mQFdprFKzz30t2fIqDMki Q+eWZKVmn/tasuYlgywyVbwQl7Lccf/EagyeK8f9jk2411aAFRFeuFy3DN1lenSVxCg1+9zXkjWvwpAs
U8UL0W2cil+OWPBr+3r83GrBt01m1Jtno68mBafXz0NnUaRSs899LdnykkEWmSpeiFPyTfFDa4GUBXca MlW8EN2G6fjlqBm/tm/Ez61mfNtkQr1pLvpqknFm4wJ0FkYoNfvc15I1LxlkkanihTgt3xQ/tOZLmXG3
Tbi9PwM5oa74bFccOtaG4MTqYKVmn/tasuUlgywyVbwQnUZP3GnJw3eN2fjKmoybVQmozvTDua0ROG4J 0Yg7B9KRHeKMz3bHomN9ME6uDVJq9rmvJWteMsgiU8UL0Wlwx92WXHzXmIWvLEm4VRWP6gwfnN8WjhPm
wpECvVKzz30t2fKSQRaZKl6IdvnR+OaQGbdr03BrVywGKqJhnDUZPVtC0JYXgBbzO0rNPve1ZMtLBllk QBzND1Bq9rmvJWteMsgiU8UL0S4/Gt8cNuFObSpu747BQEUUDHOmomdrMNpy/dBiekep2ee+lqx5ySCL
qnghjqZ74HbTUtyypuD6jhhc/SgSlale6N70vgyYjkO5/krNPve1ZMtLBllkqnghWtOm4lZDNq7vTca1 TBUvxLE0N9xpWo7blmTc2BmNax9FoDLFA92l78uAmTic46vU7HNfS9a8ZJBFpooXojV1Om43ZOHGviRc
iihc3BKO9KCJOFU6SwlozPFTava5ryVbXjLIIlPFC9Gc6o7P65fgWtVCXJInPVc2FxXJnuhcP0MG+OKA r4jEpa1hSAucjNMlc5SAxmwfpWaf+1qy5iWDLDJVvBDNKa74vH4ZrlctxmV50vNl81GR5I7OjbNkgDcO
6W2lZp/7WrLlJYMsMlW8EE2L3DGw34jLOxNwXp70bOkcpAbay0cxE4ctAWhdEaDU7HNfS7a8ZJBFpooX Gt9Wava5ryVrXjLIIlPFC9G0xBUDBwy4siseF+RJz5XMQ4r/JPkoZuOI2Q+tq/yUmn3ua8malwyyyFTx
oi7JDf01Gbiw3YDeTXNxcl0wkgLsUBzjjHVRTvfXmClKn/ta4gxna/P8UW32U9bhXjLIIlPFC7Ev0RWX QtQluqC/Jh0Xd+jRWzofpzYEIdHPBkXRjtgQ6fBgjZ6m9LmvJc5wtjbXF9UmH2Ud7iWDLDJVvBD7E5xx
qtNwfns8ujeGomm5HjWbV2BwcHBIrNk/Ix+JlrS8zD6/zaCwyFTxQuyNn4K2oghc2LMYvRVxqM6fhf6r uToVF3bEoXtzCJpWBqBmyyoMDg4OiTX7Z+Uj0ZKWl9kXtusVFpkqXoh9cdPQVhiOi3uXorciFtV5c9B/
V3Djxg0MDAwoK2v2e8rna0rL27s1VmGQRaaKlzcbBhdsjHFDc1EU+vZlw1oYi8MtLejq6hoSa/Yv15s1 7Spu3ryJgYEBZWXNfk/5Qk1peXu3xSgMsshU8fJmQ++EzdEuaC6MRN/+LFgKYnCkpQVdXV1DYs3+lXqT
peVlNhk7Un1BpoqXz4B8OjbIG4ls/QSky9c+UjcGKywWZGVlwWg0KivraO83kRXkoCnOjORlJrNNgeNR prS8zCZjZ4o3yFTx8hmQT8cmeSORFWCLNPnaR+jGYpXZjMzMTBgMBmVlHeU5DpmBdprizEheZjLb6D8R
Eu6IPYnDngFrsiuqktxRGu2CVWFOiPWzQ3t7uyKTyTT0f/x0exRGu2mKMyN5mcnskihn7ExwQ03SsPeA xWH22Jsw7BmwJDmjKtEVJVFOWBPqgBgfG7S3tysyGo1D/8fNnISCKBdNcWYkLzOZXRzpiF3xLqhJHPYe
daErGjK8UG/0Qe0SX5iCnXD82DH09PTAbDYrK+vcMFcczNdrijMjeZnJ7LpMH9Sn60CmihdiT4KzPIAn sCx2RkO6B+oNXqhd5g1jkANOHD+Onp4emEwmZWWdE+qMQ3kBmuLMSF5mMrsuwwv1aTqQqeKF2BvvKA/g
muUXR1t+ANYtcMfuqirU1dWhRb5+XFmXJHqhqzhYU5wZyctMZpNBFpkqXohKg7zjlV8MBzK9cFAOVCzy jmb5xdGW54cNi1yxp6oKdXV1aJGvH1fWxQke6CoK0hRnRvIyk9lkkEWmiheiUi/veOUXw8EMDxySAxVL
QkKYHqmpqUNKCA9CZYYfjq6coSnOcPYhr8xiJrPJIItMFS+erFjgiB1xTqiRG7UZOuzL8MaHiR5YHiFv PBAfGoCUlJQhxYcFojLdB8dWz9IUZzj7iFdmMZPZZJBFpooXYyoW2WNnrANq5EZtug770z3xYYIbVobL
w+c4wSLX8mQdDuT4o1n+ummJM5ylh15mMIuZzCaDLDIl+wke4LnicPtTZVGTUCVP2WCeiY/XzENrYZT8 2/B5DjDLtTxJh4PZvmiWv25a4gxn6aGXGcxiJrPJIItMyX6KB3i+KMz2dFnkFFTJUzaYZuPjdQvQWhAp
vMbgSPH8/yRmMIuZzCaDrJIIhw7JfooHeGnBtDEGY+DYC8tmjscDfTB7AvKDHf5WyL/UMC+zhmdn68f2 P6/ROFq08D+JGcxiJrPJIKs43K5Dsp/mAV5eNGOsPsN//MUVsyfioT6Ya4u8ILu/FfwvNczLrOHZWQHj
ZAaOC5XsZ3mAF6TspLylQqQMUoukFo+iUqTipeZI+UhNkHpR6mkp5c/zUq9K8SCTpZyknEdRzGMu81+T ejL8J4RI9nM8wItSNlKeUsFSeqklUktHUclScVLzpLykbKVeknpGSvnzgtRrUjzIVCkHKcdRFPOYy/zX
Iu8ZIcSTfwHvs1lxOVohFwAAAABJRU5ErkJggg== pch7Vggx5i+hzFlpkOrD/wAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
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
</value>
</data>
<data name="orgMealToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADcSURBVDhPzdI9DgFRFIbhWQCtzhZsQaKglwilAq2EQqHR
igWoFPQynQ0IhU5jCUokJKLiPYebO4m/yTWR+ZInM+cm58tMcr0XaaAAHyVUEEwOo/truLRRxBJV1GCS
xglznULmU2ELV0RW2Ec8Cte4PJ4/FzYhS4Z8pYlTYRnBwjxMnApTOEMWD0jAxKlQ0oEs1nWycS7MQhYz
Otk4Fw6wQ1cnG+fCLWRxo5ONc+EUsjjWySbywhXk/IikHITNu8IF5HyP4HX6mr/9cnwKJ5B7ONTJpgc5
n+n0FM+7AYOfXb63fqPCAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<metadata name="searchTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="searchTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/MoyaAdminUI.csproj
...@@ -51,9 +51,6 @@ ...@@ -51,9 +51,6 @@
<Reference Include="AutoUpdateLib"> <Reference Include="AutoUpdateLib">
<HintPath>..\..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath> <HintPath>..\..\..\PrintServer\moyaPrintServer\moyaPrintServer\bin\Debug\AutoUpdateLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="MoyaAdminLib">
<HintPath>..\MoyaAdminLib\bin\Debug\MoyaAdminLib.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web" /> <Reference Include="System.Web" />
...@@ -98,12 +95,7 @@ ...@@ -98,12 +95,7 @@
<Compile Include="MainForm.Designer.cs"> <Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon> <DependentUpon>MainForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Map.cs" />
<Compile Include="ComputerPlace.cs" />
<Compile Include="MoyaApi\Maps.cs" />
<Compile Include="MoyaUtils.cs" /> <Compile Include="MoyaUtils.cs" />
<Compile Include="MoyaApi\Place.cs" />
<Compile Include="MoyaApi\PlaceMap.cs" />
<Compile Include="OrgMealCounter.cs"> <Compile Include="OrgMealCounter.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -112,7 +104,6 @@ ...@@ -112,7 +104,6 @@
</Compile> </Compile>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="MoyaApi\RestClient.cs" />
<Compile Include="Scanner.cs" /> <Compile Include="Scanner.cs" />
<Compile Include="ShowCardInformation.cs"> <Compile Include="ShowCardInformation.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
...@@ -120,7 +111,6 @@ ...@@ -120,7 +111,6 @@
<Compile Include="ShowCardInformation.Designer.cs"> <Compile Include="ShowCardInformation.Designer.cs">
<DependentUpon>ShowCardInformation.cs</DependentUpon> <DependentUpon>ShowCardInformation.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="User.cs" />
<Compile Include="UserInfoForm.cs"> <Compile Include="UserInfoForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -199,6 +189,12 @@ ...@@ -199,6 +189,12 @@
<Install>false</Install> <Install>false</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MoyaAdminLib\MoyaAdminLib.csproj">
<Project>{095ce28f-5b53-4203-85c6-3a9afd486407}</Project>
<Name>MoyaAdminLib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent> <PostBuildEvent>$(SolutionDir)/../../../\AutoUpdate\src\AutoPublish\bin\Debug\AutoPublish.exe $(ConfigurationName) $(ProjectName) $(SolutionDir) $(TargetPath)</PostBuildEvent>
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/UsersFinderForm.Designer.cs
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.button1 = new System.Windows.Forms.Button();
this.searchTextBox = new System.Windows.Forms.TextBox(); this.searchTextBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.searchTimer = new System.Windows.Forms.Timer(this.components); this.searchTimer = new System.Windows.Forms.Timer(this.components);
...@@ -83,16 +82,6 @@ ...@@ -83,16 +82,6 @@
this.columnHeader4.Text = "Login"; this.columnHeader4.Text = "Login";
this.columnHeader4.Width = 93; this.columnHeader4.Width = 93;
// //
// button1
//
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.button1.Location = new System.Drawing.Point(454, 412);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(75, 23);
this.button1.TabIndex = 1;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
//
// searchTextBox // searchTextBox
// //
this.searchTextBox.Location = new System.Drawing.Point(12, 32); this.searchTextBox.Location = new System.Drawing.Point(12, 32);
...@@ -141,7 +130,6 @@ ...@@ -141,7 +130,6 @@
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Controls.Add(this.searchTextBox); this.Controls.Add(this.searchTextBox);
this.Controls.Add(this.button1);
this.Controls.Add(this.usersListView); this.Controls.Add(this.usersListView);
this.Name = "UsersFinderForm"; this.Name = "UsersFinderForm";
this.Text = "Users Finder"; this.Text = "Users Finder";
...@@ -159,7 +147,6 @@ ...@@ -159,7 +147,6 @@
private System.Windows.Forms.ColumnHeader columnHeader2; private System.Windows.Forms.ColumnHeader columnHeader2;
private System.Windows.Forms.ColumnHeader columnHeader3; private System.Windows.Forms.ColumnHeader columnHeader3;
private System.Windows.Forms.ColumnHeader columnHeader4; private System.Windows.Forms.ColumnHeader columnHeader4;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox searchTextBox; private System.Windows.Forms.TextBox searchTextBox;
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Timer searchTimer; private System.Windows.Forms.Timer searchTimer;
......
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/UsersFinderForm.cs
...@@ -53,9 +53,9 @@ namespace MoyaAdminUI ...@@ -53,9 +53,9 @@ namespace MoyaAdminUI
{ {
if (searchString == "" || if (searchString == "" ||
user.Login.ToLower().Contains(searchString) || user.Login.ToLower().Contains(searchString) ||
user.Firstname.ToLower().Contains(searchString) || //user.Firstname.ToLower().Contains(searchString) ||
user.Lastname.ToLower().Contains(searchString) || //user.Lastname.ToLower().Contains(searchString) ||
user.Login.ToLower().Contains(searchString) (user.Firstname.ToLower() + " " + user.Lastname.ToLower()).Contains(searchString)
) )
{ {
ListViewItem lvi = new ListViewItem(user.Nick); ListViewItem lvi = new ListViewItem(user.Nick);
...@@ -99,7 +99,11 @@ namespace MoyaAdminUI ...@@ -99,7 +99,11 @@ namespace MoyaAdminUI
var ser = new JavaScriptSerializer(); var ser = new JavaScriptSerializer();
Card card = ser.Deserialize<Card>(json); 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.cardId);
CardState.Text = card.state;
if (card.state == Card.CARD_STATE_PRINTED)
CardState.Text = card.state + " in " + card.GetCardPlace();
else
CardState.Text = card.state;
/* /*
if (card.state == Card.CARD_STATE_PRINTED) if (card.state == Card.CARD_STATE_PRINTED)
...@@ -133,5 +137,10 @@ namespace MoyaAdminUI ...@@ -133,5 +137,10 @@ namespace MoyaAdminUI
} }
* */ * */
} }
private void button1_Click(object sender, EventArgs e)
{
}
} }
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!