Feedback LucP
This commit is contained in:
parent
8de35a5b7a
commit
41f1d36927
5 changed files with 52 additions and 21 deletions
|
|
@ -406,8 +406,14 @@ namespace eDosStation
|
||||||
|
|
||||||
private void Starter()
|
private void Starter()
|
||||||
{
|
{
|
||||||
a = new OkReadBadge.Badging(Msg);
|
try
|
||||||
a.Start();
|
{
|
||||||
|
a = new OkReadBadge.Badging(Msg);
|
||||||
|
a.Start();
|
||||||
|
} catch (System.Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show($"Badgereader error {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Exclamation);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
private void Window_Loaded(object sender, RoutedEventArgs e)
|
private void Window_Loaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
@ -447,7 +453,12 @@ namespace eDosStation
|
||||||
{
|
{
|
||||||
////Debug
|
////Debug
|
||||||
_User = new User(TestCSN, string.Empty);
|
_User = new User(TestCSN, string.Empty);
|
||||||
Dispatcher.InvokeAsync(AskTask);
|
if (_User.Error > 0)
|
||||||
|
{
|
||||||
|
MessageBox.Show(_User.ErrorMessage, "DB Error", MessageBoxButton.OK, MessageBoxImage.Exclamation);
|
||||||
|
} else {
|
||||||
|
Dispatcher.InvokeAsync(AskTask);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -97,9 +97,7 @@ namespace eDosStation
|
||||||
{
|
{
|
||||||
statusEPD.Content = $"Search Timeout";
|
statusEPD.Content = $"Search Timeout";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Window_Unloaded(object sender, RoutedEventArgs e)
|
private void Window_Unloaded(object sender, RoutedEventArgs e)
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,9 @@ namespace eDosStation
|
||||||
|
|
||||||
public bool? VisitIDLocked {get;set; }
|
public bool? VisitIDLocked {get;set; }
|
||||||
|
|
||||||
|
public int Error = 0;
|
||||||
|
public string ErrorMessage;
|
||||||
|
|
||||||
public User(string CSN, string Code)
|
public User(string CSN, string Code)
|
||||||
{
|
{
|
||||||
LastName = FirstName = conCode = Language = string.Empty;
|
LastName = FirstName = conCode = Language = string.Empty;
|
||||||
|
|
@ -32,23 +35,31 @@ namespace eDosStation
|
||||||
cmd.Parameters.AddWithValue("csn", CSN);
|
cmd.Parameters.AddWithValue("csn", CSN);
|
||||||
if (!string.IsNullOrWhiteSpace(Code)) cmd.Parameters.AddWithValue("Badge", Code);
|
if (!string.IsNullOrWhiteSpace(Code)) cmd.Parameters.AddWithValue("Badge", Code);
|
||||||
co.Open();
|
co.Open();
|
||||||
var rs = cmd.ExecuteReader(System.Data.CommandBehavior.SingleRow);
|
try
|
||||||
if (rs.HasRows && rs.Read())
|
|
||||||
{
|
{
|
||||||
object[] Values = new object[rs.FieldCount];
|
var rs = cmd.ExecuteReader(System.Data.CommandBehavior.SingleRow);
|
||||||
int rv = rs.GetValues(Values);
|
if (rs.HasRows && rs.Read())
|
||||||
PersID = (int)Values[rs.GetOrdinal("PersID")];
|
{
|
||||||
LastName = Values[rs.GetOrdinal("LastName")].ToString();
|
object[] Values = new object[rs.FieldCount];
|
||||||
FirstName = Values[rs.GetOrdinal("FirstName")].ToString();
|
int rv = rs.GetValues(Values);
|
||||||
conCode = Values[rs.GetOrdinal("conCode")].ToString();
|
PersID = (int)Values[rs.GetOrdinal("PersID")];
|
||||||
Language = Values[rs.GetOrdinal("Language")].ToString();
|
LastName = Values[rs.GetOrdinal("LastName")].ToString();
|
||||||
AccessAllow = Values[rs.GetOrdinal("AccessAllow")] as bool?;
|
FirstName = Values[rs.GetOrdinal("FirstName")].ToString();
|
||||||
Margin = Values[rs.GetOrdinal("AccessAllow")] as double?;
|
conCode = Values[rs.GetOrdinal("conCode")].ToString();
|
||||||
VisitIDLocked = Values[rs.GetOrdinal("VisitIDLocked")] as bool?;
|
Language = Values[rs.GetOrdinal("Language")].ToString();
|
||||||
|
AccessAllow = Values[rs.GetOrdinal("AccessAllow")] as bool?;
|
||||||
|
Margin = Values[rs.GetOrdinal("AccessAllow")] as double?;
|
||||||
|
VisitIDLocked = Values[rs.GetOrdinal("VisitIDLocked")] as bool?;
|
||||||
|
|
||||||
|
}
|
||||||
|
rs.Close();
|
||||||
|
} catch(System.Exception ex)
|
||||||
|
{
|
||||||
|
Error = 1;
|
||||||
|
ErrorMessage = ex.Message;
|
||||||
}
|
}
|
||||||
rs.Close();
|
co.Close();
|
||||||
co.Close();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
<PublishUrl>\\scksrv1\sckcen\DOKUMENT\idpbw\TOESTELLEN\REMSnew\eDosStation\</PublishUrl>
|
<PublishUrl>\\scksrv1\sckcen\DOKUMENT\idpbw\TOESTELLEN\REMSnew\eDosStation\</PublishUrl>
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
<InstallFrom>Unc</InstallFrom>
|
<InstallFrom>Unc</InstallFrom>
|
||||||
<UpdateEnabled>false</UpdateEnabled>
|
<UpdateEnabled>true</UpdateEnabled>
|
||||||
<UpdateMode>Foreground</UpdateMode>
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
<UpdateInterval>7</UpdateInterval>
|
<UpdateInterval>7</UpdateInterval>
|
||||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
<MapFileExtensions>true</MapFileExtensions>
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||||
<WebPage>publish.htm</WebPage>
|
<WebPage>publish.htm</WebPage>
|
||||||
<ApplicationRevision>1</ApplicationRevision>
|
<ApplicationRevision>4</ApplicationRevision>
|
||||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||||
|
|
@ -202,6 +202,9 @@
|
||||||
<DependentUpon>DataSet1.xsd</DependentUpon>
|
<DependentUpon>DataSet1.xsd</DependentUpon>
|
||||||
</None>
|
</None>
|
||||||
<None Include="eDosStation_TemporaryKey.pfx" />
|
<None Include="eDosStation_TemporaryKey.pfx" />
|
||||||
|
<None Include="LOG.INI">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||||
|
|
@ -236,5 +239,10 @@
|
||||||
<Resource Include="Images\EPD-MK2.png" />
|
<Resource Include="Images\EPD-MK2.png" />
|
||||||
<Resource Include="Images\EPD-N2.png" />
|
<Resource Include="Images\EPD-N2.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="IR_READER_MS_DLL.dll">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -13,4 +13,7 @@
|
||||||
<FallbackCulture>en-US</FallbackCulture>
|
<FallbackCulture>en-US</FallbackCulture>
|
||||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<EnableSecurityDebugging>false</EnableSecurityDebugging>
|
||||||
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
Loading…
Add table
Reference in a new issue