luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Task Badge

Browse source
This commit is contained in:
Luc Vandenbroucke 2021-04-26 11:00:06 +02:00
parent 5873c927ab
commit 5263f4f32d
3 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
eDosStation/EntryBadge.xaml.cs
View file

@ -14,6 +14,8 @@ namespace eDosStation
/// </summary>
public partial class EntryBadge : Window
{
const int PageTimeout = 10000;
bool initialising = true;
Station thisStation;
EpdBaseClr.Epd2 ep;
@ -21,7 +23,7 @@ namespace eDosStation
DispatcherTimer dispatcherTimer;
int Search, UserSeconds;
Boolean Inst1 = false, Inst2 = false;
private System.Threading.Tasks.Task ReaderTask =null;
private DataInterface dataInterface;
public static LSWDesfirePublic.CCard dfReader;
@ -376,6 +378,12 @@ namespace eDosStation
Code.Text = persID.ToString();
Dispatcher.Invoke(CheckBadge);
}
public void endPage()
{
MessageBox.Show("TO");
this.Close();
}
private void bClose_Click(object sender, RoutedEventArgs e)
{
@ -567,6 +575,9 @@ namespace eDosStation
{
dfReader.SetReader(thisStation.Reader);
dfReader.Badged += DFReader_Badged;
dfReader.BadgeTO += DfReader_BadgeTO;
ReaderTask = dfReader.Wait(PageTimeout);
dfReader.WaitForBadge();
}
else
@ -578,27 +589,16 @@ namespace eDosStation
dfReader.Dispose(); dfReader = null;
}
}
else {
dfReader.WaitForBadge();
}
//else {
// dfReader.WaitForBadge();
//}
//if (string.IsNullOrWhiteSpace(TestCSN) && a==null)
//{
//t = new System.Threading.Thread(() => Starter());
//t.Start();
//}
//else
//{
// ////Debug
// _User = LocalRemote.GetUser(TestCSN, string.Empty);
// if (_User.Error > 0)
// {
// MessageBox.Show(_User.ErrorMessage, "DB Error", MessageBoxButton.OK, MessageBoxImage.Exclamation);
// } else {
// Dispatcher.InvokeAsync(ShowUserInfo); //AskTask
// }
//}
}
private void DfReader_BadgeTO(LSWDesfirePublic.CCard Sender, EventArgs e)
{
this.Dispatcher.Invoke(new Action(() => endPage()));
}
private void DFReader_Badged(LSWDesfirePublic.CCard Sender, LSWDesfirePublic.BadgeEventArgs e)

8
eDosStation/eDosStation.csproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.props')" />
<Import Project="..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props" Condition="Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -318,11 +318,11 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.3.2.26\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.targets'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.props'))" />
<Error Condition="!Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets'))" />
</Target>
<Import Project="..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.2.6\build\LSWDesfirePublic.targets')" />
<PropertyGroup>
<PostBuildEvent>"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool.exe" sign /sha1 857150b64ef7d3e679c8cbde425d2a0b5e58ffaa /fd sha256 /d "Integrity &amp; Authenticity" /tr "http://timestamp.digicert.com" $(TargetPath)</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets" Condition="Exists('..\packages\LSWDesfirePublic.1.3.0\build\LSWDesfirePublic.targets')" />
</Project>

2
eDosStation/packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="LSWDesfirePublic" version="1.2.6" targetFramework="net48" />
<package id="LSWDesfirePublic" version="1.3.0" targetFramework="net48" />
<package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net472" developmentDependency="true" />
<package id="SharpDX" version="2.5.0" targetFramework="net48" />
<package id="SharpDX.D3DCompiler" version="2.5.0" targetFramework="net48" />