Commit b180fb00 by Tapio Haapala

haku juttuja

1 parent 1b6d2154
......@@ -54,13 +54,8 @@ namespace MoyaAdminUI
}
}
}
/*
[Description("Binded to user")]
public int ReserverId
{
get { return APIreference.eventuserId; }
set { APIreference.eventuserId = value; }
}*/
public bool Dirty = false;
[Category("Place map")]
......@@ -134,42 +129,70 @@ namespace MoyaAdminUI
get { return APIreference.name; }
set { APIreference.name = value; }
}
[Category("Reservation")]
User reserverUserCache = null;
[Category("Reservation"), DisplayName("Player"), Description("Person who will sit to place")]
public string ReserverUserName
{
get
{
if (APIreference.reserverId > 0)
if (reserverUserCache == null)
{
if (getUser() == null)
if (APIreference.eventuserId > 0)
{
foreach (User u in User.Cache)
{
if (u.EventUserId == APIreference.eventuserId)
{
reserverUserCache = u;
break;
}
}
}
// Still no hit, use buyer
if (reserverUserCache == null)
{
return "ERR";
foreach (User u in User.Cache)
{
if (u.EventUserId == APIreference.reserverId)
{
reserverUserCache = u;
break;
}
}
}
else
return User.ToString();
}
return "free";
if (reserverUserCache == null)
return "free";
else return
reserverUserCache.ToString();
}
}
[Category("Reservation")]
User buyerUserCache = null;
[Category("Reservation"), DisplayName("Buyer"), Description("Person who had payed place")]
public User User
{
get
{
return getUser();
if (buyerUserCache == null)
{
foreach (User u in User.Cache)
{
if (u.EventUserId == APIreference.reserverId)
{
buyerUserCache = u;
break;
}
}
}
return buyerUserCache;
}
//set { }
}
private MoyaAdminUI.User getUser()
{
foreach (User u in User.Cache)
{
if (u.EventUserId == APIreference.reserverId)
return u;
}
return null;
}
public Point GetPoint()
{
return new Point(this.MapX, this.MapY);
......@@ -218,6 +241,8 @@ namespace MoyaAdminUI
}
public void Release()
{
reserverUserCache = null;
buyerUserCache = null;
APIreference.Release();
}
......@@ -227,6 +252,8 @@ namespace MoyaAdminUI
* */
internal void Reserve(User user)
{
reserverUserCache = null;
buyerUserCache = null;
APIreference.Reserve(user.EventUserId);
}
}
......
......@@ -45,6 +45,7 @@ namespace MoyaAdminUI
{
MessageBox.Show(ex.Message + "\r\nCannot connect to Moya.\r\nCheck Api url and key");
}
}
private void loadPlacemap()
......@@ -59,7 +60,7 @@ namespace MoyaAdminUI
loadComputerPlaces();
}
loadImage();
}
ComputerPlace selectedPlace;
......@@ -104,6 +105,7 @@ namespace MoyaAdminUI
Size borderSize = this.Size - this.ClientSize;
this.MapPictureBox.Load(RestClient.GetRequestURL(Properties.Settings.Default.ApiURL, "placeadmin/background/" + SelectedMap.Id));
MapPictureBox.Size = this.MapPictureBox.Image.Size;
panel2.Width = this.MapPictureBox.Image.Size.Width;
this.MinimumSize = this.MapPictureBox.Image.Size + new Size(0, this.TopPanel.Size.Height + 20) + new Size(this.panel1.MinimumSize.Width + 270, 0) + borderSize;
}
......@@ -609,7 +611,10 @@ namespace MoyaAdminUI
}
else if (place.Taken)
{
brush = Brushes.Red;
if (place.APIReference.eventuserId > 0)
brush = Brushes.Green;
else
brush = Brushes.Red;
}
else if (place.Buyable)
brush = Brushes.White;
......@@ -661,7 +666,8 @@ namespace MoyaAdminUI
placeEditor.SelectedObject = selectedPlace;
}
this.MapPictureBox.Refresh();
ImageRefreshTimer.Start();
}
private void SaveButton_Click(object sender, EventArgs e)
......@@ -1117,5 +1123,55 @@ namespace MoyaAdminUI
frm.Show();
}
private void searchTextBox_TextChanged(object sender, EventArgs e)
{
searchTimer.Stop();
searchTimer.Start();
}
private void searchTimer_Tick(object sender, EventArgs e)
{
searchTimer.Stop();
ListView.ListViewItemCollection items = PlacesListView.Items;
PlacesListView.BeginUpdate();
if (searchTextBox.Text.Length > 0)
{
foreach (ListViewItem lvi in items)
{
ComputerPlace place = (ComputerPlace)lvi.Tag;
if (
place.Name == searchTextBox.Text
|| place.User != null
&& (
place.ReserverUserName.ToLower().Contains(searchTextBox.Text.ToLower())
|| place.User.ToString().ToLower().Contains(searchTextBox.Text.ToLower())
)
)
{
lvi.Selected = true;
}
else
lvi.Selected = false;
}
}
PlacesListView.EndUpdate();
}
private void ImageRefreshTimer_Tick(object sender, EventArgs e)
{
ImageRefreshTimer.Stop();
this.MapPictureBox.Refresh();
}
private void MainForm_SizeChanged(object sender, EventArgs e)
{
}
}
}
......@@ -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
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALrSURBVDhPjZJ5SBNQHMenhNoilMIiSiRSKpU8CjOdktKk
1GXuyGwzSvLanKaWTt088sor5zR1zW3Nax6Y9615oFQGiVJShIFkVCSlmGZq+zbn/jEQ/MAP3nvf3/cL
7/ceYTtMTU1POjk5ye1P2w+ZmJikqo/0N5UdwrxIomdF34a/hzOIBvrqIvK10s6oSwlm/x2VYb07G2xP
B+zWMyjTSjtDGkm/tdaSgrWGWDTe8/5NJBLttNJWzGxIxtQoQZQ5iXxWvdV1ZccF2tKYASnBdJ/Vumis
VIahlkuWHbGw2Lfp+A/3G4Gugz9U6Pr6B8XD7+a4ijYVS9IAcWXcem+Sx/JAvBckfEsVv6JCRRUqJ89z
4zOPOro5q627NAFmJJJx7fRPVf2nJVTP/IJiegFZVYXokZtjougQGpINsTxEwMKAMeIVItBlnfAr7wU1
VzlnbGFtowkRTczOiqe+o+jNN+RPfEH268/IGJuBoLEdpXIOhsXHMF+lg1G5LTzzKkARKnFZVIuDVnae
mgBB13h7xouPSB75gISh94jpn0KsumL63iK6exKRneMIe6JEYkYQ3Pj5uJBUCIfo9EX1ZzHQBLAKKtMj
O8bBaXkFdvMYgp4+h3/NMK5VDcC3sh++5X24qugBq7wHDiE8kCLv4wTFr15j3sAtLIHhXz2A6+oGuqwD
tLI20CStoD5ugY+4CVRxs2bNkHbAhcvHOQ4fByysmVq7+iV8b5owK3pXNgZEK2vfNJY2aQbGkHfhSnED
vIvqNfd25sTDkhGyamhoaKS1EwgMBkMvs0QWES5WvvQrqF6i5FfBM7cclIIasOuHEFo3CKa0FZceSEEK
5eG4u0+f1roF3YiICKO8PJF9WrFcwBVKRyjZZYvkJBHIKY9Af6gAObkQjsExOHzG6Y7Wsy06AQEBe3Nz
C2xTRZIYTk7JM68k4bzr3XS4hCeq3Ci0U9q+HaHDYrH25OQIrTKKJOECYWkaj8fbvykRCP8ARTd+bLTN
ZQsAAAAASUVORK5CYII=
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
</value>
</data>
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="cardLocationInputToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......@@ -237,20 +237,20 @@
<data name="cardInfoToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPdVNrSFNhGD5io/6YiEX+KKfTXZxOh6Wm5iXU
1LPbmc7LvKWppGmmlSEEGmHbztzmXF6yTbP6k/QriKAfZRcSEhKjjMJAtPKnMAL/CHt73+OFJHrhgcN5
n+f53vN872H2VE7fvkjWlhHFWkajNbbFaJb/HYWgZ3pHPeJss/eWXM+HRLHWbqnevqKucAbS64Yh/ewI
pNR4QF3hhjijLRCr41ckyCHutmyrxDl9ByQaa7+Ss29knxuD4rYJKLzgA83FSShq80EGGh2vGoIEkxNk
WusGcUmzLWcYic5iVhp5f37LXTB0TgkGbPsEPHr+EZ69/gTZ9W5INg9BYtkgTuIAucHmJ40gjii6dVjK
8TNZDWPAdd0Hbcc94fTCVh+MTM/CxONXkFZphaTyQZzABXJuAGQGO0h1/AxpGYnGwqpNrnUdCsmAbZ+E
3KZxyKwfFT7B2DkJCo6HWL0dMAOI0doEyIyOdYmGZxls9KTWDW/S6AWtXmHUWD0P9b3TsPBtDZ7OLIBC
dxPExVbAkHchL3FsylCL6dttdBqFR+NRU1xsgVRM/93CMryZ+wJx2r5/DOJLnci32xgFZ+9JrHBvxuB4
O00iU1gv3n//r0Gcybkp43ACqYFnE0tc6xL8rr8JdMLLuS0Dpf4G4DIhtnqUQWKpa520wi2oy5wzyhIH
RGOTgpIZBiCl2gNv55dhdv4rpJRbBEOaChdNuA0VaoRboFJwDrO6wuVXlVHDJQTZwT+Bz0trsLj0Ay7b
piGt2g0nqjyCcVrtbT9pBDEVbRWO1H+qYXQjC8OkQOlWKq8huqfAeMkLec1jkN/ihdzGOxvE3bOJVOG4
30mmwW7cgVVthy9AO1Fy5QGUXn0IJgTXNRk43Ty+qkIOcbdluxWEEDFhktBjmecL4vW94xm1jg95jZ6f
uU3uX5nV/HyC7ro34mRjERMaGYZcOj2YhDtFvyi5HkGIGZFIFXww6ozokMIsCpfVBIdEatA/GXuxiKMI
MtnPMEzQH5GbqgS3rfXtAAAAAElFTkSuQmCC
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
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......@@ -283,6 +283,12 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="searchTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>307, 17</value>
</metadata>
<metadata name="ImageRefreshTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>424, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!