AddCardUser: all methods to Invoke

MainWindow: Release Serial Port before Update
This commit is contained in:
Marcus 2025-09-19 12:57:41 +02:00
parent 12ce5a114d
commit 70cc898d91
2 changed files with 83 additions and 71 deletions

View File

@ -105,6 +105,8 @@ namespace ZKuP
bool up = false;
private void BlinkTimer_Tick(object sender, EventArgs e)
{
Dispatcher.Invoke(() =>
{
if (up)
{
@ -120,6 +122,7 @@ namespace ZKuP
else
up = !up;
}
});
}
private void Helper_DataReceived(object sender, string e)
@ -138,8 +141,6 @@ namespace ZKuP
{
var farbe = SQL.ReadSingleValue($"SELECT Farbe FROM {MainWindow.table}.kartennummern WHERE Kartennummer='{text}'");
Dispatcher.Invoke(() =>
{
switch (farbe)
{
case "1":
@ -149,12 +150,14 @@ namespace ZKuP
cbColor.SelectedValue = "Grün";
break;
}
});
}
});
}
private void tbNummer_TextChanged(object sender, TextChangedEventArgs e)
{
Dispatcher.Invoke(() =>
{
if (tbNummer.Text.Length <= 0)
{
@ -166,13 +169,17 @@ namespace ZKuP
borderKartenleser.Visibility = Visibility.Collapsed;
blinkTimer.Stop();
}
});
}
private async void btnAdd_Click(object sender, RoutedEventArgs e)
{
bool cardExists = (await SQL.RowExists($"{MainWindow.table}.kartennummern", "Kartennummer", tbNummer.Text));
Dispatcher.BeginInvoke(new Action(() =>
{
bool cardExists = (SQL.RowExists($"{MainWindow.table}.kartennummern", "Kartennummer", tbNummer.Text).Result);
if (string.IsNullOrWhiteSpace(tbNummer.Text))
MessageBox.Show(this, "Kartennummer angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@ -200,7 +207,7 @@ namespace ZKuP
if (_signature != null)
{
await SQL.WriteSQL($"REPLACE INTO karten (kartennr,farbe,benutzer,telnr,AusgegebenDurch,AusgegebenTimestamp,Ansprechpartner,Signature) VALUES ('{tbNummer.Text}','{cbColor.SelectedValue.ToString()}','{tbUser.Text}','{tbTelnr.Text}','{Environment.UserName}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{_ap}',@signature)", _signature);
SQL.WriteSQL($"REPLACE INTO karten (kartennr,farbe,benutzer,telnr,AusgegebenDurch,AusgegebenTimestamp,Ansprechpartner,Signature) VALUES ('{tbNummer.Text}','{cbColor.SelectedValue.ToString()}','{tbUser.Text}','{tbTelnr.Text}','{Environment.UserName}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}','{_ap}',@signature)", _signature);
MessageBox.Show(this, "Karte erfolgreich verknüpft", "Erfolg", MessageBoxButton.OK, MessageBoxImage.Information);
@ -217,14 +224,17 @@ namespace ZKuP
MessageBox.Show(this, $"Fehlermeldung:\n\n{ex.Message}", "Fehlermeldung", MessageBoxButton.OK, MessageBoxImage.Information);
}
}
}));
}
private void ResetValues()
{
Dispatcher.Invoke(() =>
{
tbNummer.Text = "";
tbTelnr.Text = "";
});
}

View File

@ -238,6 +238,8 @@ namespace ZKuP
File.Copy(@"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\ZKuPUpdater.exe", Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\ZKuPUpdater.exe", true);
System.Diagnostics.Process.Start(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\ZKuPUpdater.exe", $"\"{file}\"");
Helper.serial.Close();
Helper.serial.Dispose();
Application.Current.Shutdown();
return;
}