From 6cb3546d9f180de7d3d4787dca3e334d36aea991 Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Mon, 10 May 2021 09:48:04 +0200 Subject: [PATCH] huisstijl --- eDosStation/DataInterface.cs | 12 +++-- eDosStation/EntryBadge.xaml | 83 ++++++++++++++++++-------------- eDosStation/EntryBadge.xaml.cs | 20 ++++---- eDosStation/EpdExit.xaml | 21 ++++---- eDosStation/Images/logo500.png | Bin 0 -> 7269 bytes eDosStation/Images/logoh120.png | Bin 0 -> 3869 bytes eDosStation/Images/logoh60.png | Bin 0 -> 1917 bytes eDosStation/MainWindow.xaml | 18 +++---- eDosStation/MainWindow.xaml.cs | 3 +- eDosStation/Station.cs | 1 + eDosStation/eDosDict.xaml | 31 ++++++++++++ eDosStation/eDosStation.csproj | 3 ++ 12 files changed, 121 insertions(+), 71 deletions(-) create mode 100644 eDosStation/Images/logo500.png create mode 100644 eDosStation/Images/logoh120.png create mode 100644 eDosStation/Images/logoh60.png 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 0000000000000000000000000000000000000000..4b854db8987bf73cd9dafb4c260d2b023720a585 GIT binary patch literal 7269 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 literal 0 HcmV?d00001 diff --git a/eDosStation/Images/logoh120.png b/eDosStation/Images/logoh120.png new file mode 100644 index 0000000000000000000000000000000000000000..e191f7616c928e0cff477cb315cfba4e99c12017 GIT binary patch literal 3869 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

@qs6pm`4UfO?a$tRShITc$FGwk;ZCz; z48`JYWbY>$AC1|;lgqK>EJ*?&_@s}qaqtgLspWkxO|O0j_ZR381zM8UBzk;F8Hr<7 zOmNxrep&u~vW`Y>qi2F=Ms!xf%wREwaM)Onh0))zc=-_z)z#5TG-K+;>LGWEPr;~5ZCvNE100H2oOsgA#1bs1!JS{?=BF z;!;x_Vg@WgEEu&J*Mu)qjv9%Y2||VnX(bvKQO=ArSgc_f8+Dn

iPGRTM};Fvz&T znGerBm-D8D%P*~U&X>ENz0cm~|2${!|FfTSZ8AT&%L5Cuh1tSvVYV<^nD5NxdE1`f z-T>%(*AEHvk>3CmM_ajJVYV<^m@Ui}X7fGe{HOnQbc6*)M%}H|x1X-Qbh*JVBrN=a zKBj@LmK|sGlz}&SOxO8S7cV*N{tpg+$XjD*{_OKcN7w!Sk;D89PEFOHUZ@KU95Eu` zR+t;N6#$gMu+?L2J^F^?>~=+d~6!E!aZ&| zEiOpA2&I2g#3vJms4X`2x%>2Q>v{$&o>HJW_pf%UeP%8T0m{{TcWca900tlQH9|iA z{3-P?bk#($9IbiV)OxS1S*lE}OleiwvS)ah=X2vi6=c@E=@PE5eNF?J(wWEfu#O7I zIR0%w++8|b1DUf4+dBd3QZBuSEVQkG>|ZY%2) z%5Q!pNs=T*e5~BnzFjKpmStJ~NRlK;`j5~$(d`88j5gal2V@?~-S)SQ_v+MDPJpN}6lqKQnrTvQ0N9u8*_1W+>mPmz`8n zCc2~z-Uh2Ez0TfzqG;`HFM3z(guiZ5yfTK2!~Pwsf(@S+FV+B*4tmaj#0P+C*+7mW zSCjnX1h_Xk49X>&0(kjm{A1 z2jJMGayfDt@OT1%-~X>iFP9X^y~ljw@fY^H+{8~mczB{X-IOTBe|25zD@Gz%uvpOk zQ#z{hT?s(p8fB%OCG%4ofT;rkntxrPEbf)8^cVK^7W0iAv(AvQs|}zbUlb&GrVDF& za>bQS+RhbC+r`#w1L!_WM0@I3(xf#^6`A|`V+U$)(9v)>C7ly#U%`M?qKArGTz=vD z^@}IAOvr)d?|(1MJ?FvKMU>#gV9#^g1m7JS1QfWBlGqg*T%OuTdme9YO z>X}Z1``DcO=v=$Y1Wv(ZfarRF55pAgHPMw<`Rdns)+o_otW8aNQ3U_PAb=+ljC`Me z!SFQS&0TG(UaMB>orWH`-xw+IH9_XP z^0oE<*t>==7uhj@JvZJEWAnmZ*5Kg1)6|yfTU@WgD{1#IjZgZ%FtboYU5uCcj#mHE zlG&Q^|gr;nAMJO$Q6lDDu2H4=bDUcjU88%ZXjJUpQK1zo4)ObcZCl?sQ|* zHJ_ltLzT6uIt=j32h}&dBl6r9_apt - - + + + - + @@ -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