diff --git a/eDosStation/DataInterface.cs b/eDosStation/DataInterface.cs
index 71852ec..c566e2d 100644
--- a/eDosStation/DataInterface.cs
+++ b/eDosStation/DataInterface.cs
@@ -21,6 +21,7 @@ namespace eDosStation
public static SqlCommand LastIDCommand;
public static SqlCommand CheckStatus;
public DataSet1.CommentOnEventDataTable dtCOE;
+ private bool CheckUser;
public static int? NextID()
{
@@ -150,7 +151,12 @@ namespace eDosStation
return ta;
}
- DataSet1TableAdapters.CommentOnEventTableAdapter CommentTA()
+ internal void SetCheckUser(bool pCheckUser)
+ {
+ this.CheckUser = pCheckUser;
+ }
+
+ DataSet1TableAdapters.CommentOnEventTableAdapter CommentTA()
{
var ta = new DataSet1TableAdapters.CommentOnEventTableAdapter();
ta.Connection.ConnectionString = currentConStr;
@@ -333,7 +339,7 @@ namespace eDosStation
u.VisitIDLocked = Values[rs.GetOrdinal("VisitIDLocked")] as int?;
u.ReasonNoAccess = Values[rs.GetOrdinal("ReasonNoAccess")].ToString().Replace("\\n", "\n");
u.UserComment = Values[rs.GetOrdinal("Comment")].ToString();
- u.AllOk = (u.AccessAllow == true && u.VisitIDLocked == 0);
+ u.AllOk = !CheckUser || (u.AccessAllow == true && u.VisitIDLocked == 0) ;
}
else
{
@@ -348,7 +354,7 @@ namespace eDosStation
u.VisitIDLocked = 0;
u.ReasonNoAccess = "Not found";
u.UserComment = "";
- u.AllOk = (u.AccessAllow == true & u.VisitIDLocked == 0);
+ u.AllOk = !CheckUser || (u.AccessAllow == true & u.VisitIDLocked == 0);
}
rs.Close();
}
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index 6530465..b1a05a3 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -18,20 +18,33 @@
-
-
+
+
+
+
+
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+
+
+
+
-
+
- Welcome to eDOS
+ Welcome to eDOS
Entry Process is ready
Please scan your badge on the badge reader
-
+
@@ -42,8 +55,8 @@
-
-
+
+
@@ -60,7 +73,7 @@
-
+
@@ -143,21 +156,36 @@
-
+
+
+
+
+
+
+
-
-
-
+
+
+
@@ -173,7 +201,7 @@
-
+
@@ -181,7 +209,7 @@
-
+
@@ -189,31 +217,16 @@
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
@@ -227,7 +240,7 @@
-
+
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 1b95ae9..f1c9694 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -392,12 +392,15 @@ namespace eDosStation
CSN.Text = csn;
Site.Text = string.Empty;
Code.Text = persID.ToString();
- Dispatcher.Invoke(CheckBadge);
+ Dispatcher.InvokeAsync(CheckBadge,DispatcherPriority.Background);
}
public void endPage()
{
- dfReader.WaitEnd();
- dfReader.Dispose();
+ if (dfReader != null)
+ {
+ dfReader.WaitEnd();
+ dfReader.Dispose();
+ }
this.Close();
}
@@ -413,8 +416,6 @@ namespace eDosStation
Code.Text = string.Empty;
}
-
-
private void TaskOK_Click(object sender, RoutedEventArgs e)
{
bool isOk = false;
@@ -447,8 +448,8 @@ namespace eDosStation
{
tb.SelectedItem = tbEPD;
bEpdDone.Visibility = Visibility.Hidden;//1
- epdWait.Text = "Waiting max 10 seconds";
- Dispatcher.Invoke(new Action(() => { GetEPD(); }),DispatcherPriority.ApplicationIdle);
+ epdWait.Text = "Waiting for EPD (max 10 seconds)";
+ Dispatcher.InvokeAsync(new Action(() => { GetEPD(); }),DispatcherPriority.Background);
}
}
}
@@ -561,6 +562,7 @@ namespace eDosStation
b.Margin = m;
sp.Children.Add(b);
}
+ sp.Visibility = Visibility.Visible;
}
private void Window_Loaded(object sender, RoutedEventArgs e)
{
@@ -628,9 +630,7 @@ namespace eDosStation
endPage();
}
-
-
private void tb_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if (e.AddedItems.Count>0 && e.AddedItems[0] is TabControl)
@@ -641,7 +641,7 @@ namespace eDosStation
private void DfReader_BadgeTO(LSWDesfirePublic.CCard Sender, EventArgs e)
{
- this.Dispatcher.Invoke(new Action(() => endPage()));
+ this.Dispatcher.InvokeAsync(new Action(() => endPage()));
}
private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e)
diff --git a/eDosStation/EpdExit.xaml b/eDosStation/EpdExit.xaml
index 02c054a..597165a 100644
--- a/eDosStation/EpdExit.xaml
+++ b/eDosStation/EpdExit.xaml
@@ -6,7 +6,9 @@
xmlns:local="clr-namespace:eDosStation"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
mc:Ignorable="d"
- Title="Exit" Height="450" Width="800"
+ Title="Exit"
+ Height="980" Width="1820"
+
FontFamily="Segoe UI" FontSize="36"
Loaded="Window_Loaded" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
@@ -14,14 +16,14 @@
-
-
-
+
+
+
-
+
@@ -32,14 +34,9 @@
-
-
-
-
-
@@ -49,7 +46,7 @@
-
+
@@ -67,7 +64,7 @@
-
+
diff --git a/eDosStation/Images/logo500.png b/eDosStation/Images/logo500.png
new file mode 100644
index 0000000..4b854db
Binary files /dev/null and b/eDosStation/Images/logo500.png differ
diff --git a/eDosStation/Images/logoh120.png b/eDosStation/Images/logoh120.png
new file mode 100644
index 0000000..e191f76
Binary files /dev/null and b/eDosStation/Images/logoh120.png differ
diff --git a/eDosStation/Images/logoh60.png b/eDosStation/Images/logoh60.png
new file mode 100644
index 0000000..fc54bcd
Binary files /dev/null and b/eDosStation/Images/logoh60.png differ
diff --git a/eDosStation/MainWindow.xaml b/eDosStation/MainWindow.xaml
index b3e6d34..f73526e 100644
--- a/eDosStation/MainWindow.xaml
+++ b/eDosStation/MainWindow.xaml
@@ -36,12 +36,13 @@
-
-
+
+
+
-
+
@@ -49,13 +50,12 @@
-
-
-
+
+
-
-
-
+
+
+
diff --git a/eDosStation/MainWindow.xaml.cs b/eDosStation/MainWindow.xaml.cs
index fb09eec..11098f9 100644
--- a/eDosStation/MainWindow.xaml.cs
+++ b/eDosStation/MainWindow.xaml.cs
@@ -69,7 +69,6 @@ namespace eDosStation
private void setLocalStatus()
{
-
if (!dataInterface.isOnline())
{
Status.Content = "*** Offline ***";
@@ -152,7 +151,7 @@ namespace eDosStation
ibComment.Visibility = Visibility.Visible;
}
else
- ibComment.Visibility = Visibility.Hidden;
+ ibComment.Visibility = Visibility.Collapsed;
}
else
setErrorStatus(errMsg);
diff --git a/eDosStation/Station.cs b/eDosStation/Station.cs
index 916c146..f1a38ad 100644
--- a/eDosStation/Station.cs
+++ b/eDosStation/Station.cs
@@ -121,6 +121,7 @@ namespace eDosStation
}
dataInterface.SetStation(ID_Station);
+ dataInterface.SetCheckUser(checkUser);
if (Error == 0) using (var cmd2 = new SqlCommand("GetInstallationsComments", co))
{
diff --git a/eDosStation/eDosDict.xaml b/eDosStation/eDosDict.xaml
index 21146b6..bbe6858 100644
--- a/eDosStation/eDosDict.xaml
+++ b/eDosStation/eDosDict.xaml
@@ -195,4 +195,35 @@
+
+ #A1DAF7
+ #9F4191
+ #56256B
+
+
+
+
+
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+ ⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤
+
+
+
\ No newline at end of file
diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj
index 23a58ef..fed2ceb 100644
--- a/eDosStation/eDosStation.csproj
+++ b/eDosStation/eDosStation.csproj
@@ -283,6 +283,9 @@
+
+
+
Always