Marcus/ZKuP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug behoben, dass Parkplatzzuweisungen ohne Arrival nicht angezeigt wurden

Browse Source 
Bug behoben der eine Änderung der Asp bei CreateFirma verhindert hat, wenn diese leerzeichen in den Telnr hatten
This commit is contained in:
Marcus 2025-08-04 12:57:50 +02:00
parent 3e51b35c67
commit 5a77a76e60
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZKuP/CreateFirma.xaml.cs
View File

@ -1433,7 +1433,7 @@ namespace ZKuP
if (MessageBox.Show(this, $"Möchten Sie den Eintrag '{oldValue}' in der Spalte 'Anspr. intern' sicher zu '{box.Text}' ändern?", "Sicher ändern?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question) == MessageBoxResult.Yes) if (MessageBox.Show(this, $"Möchten Sie den Eintrag '{oldValue}' in der Spalte 'Anspr. intern' sicher zu '{box.Text}' ändern?", "Sicher ändern?", MessageBoxButton.YesNoCancel, MessageBoxImage.Question) == MessageBoxResult.Yes)
{ {
//await SQL.WriteSQL($"UPDATE {MainWindow.table}.firmen SET Ansprechpartner_Intern = '{box.Text}',Tel_Nr_Ansprechpartner_Intern = '{SQL.ReadSingleValue($"SELECT Tel_Nr FROM {MainWindow.table}.ansprechpartner WHERE Name = '{(sender as ComboBox).Text}'")}', Bearbeiter = '{Environment.UserName}' WHERE idfirmen = '{id}'"); //await SQL.WriteSQL($"UPDATE {MainWindow.table}.firmen SET Ansprechpartner_Intern = '{box.Text}',Tel_Nr_Ansprechpartner_Intern = '{SQL.ReadSingleValue($"SELECT Tel_Nr FROM {MainWindow.table}.ansprechpartner WHERE Name = '{(sender as ComboBox).Text}'")}', Bearbeiter = '{Environment.UserName}' WHERE idfirmen = '{id}'");
await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.firmen SET Ansprechpartner_Intern = @box,Tel_Nr_Ansprechpartner_Intern = {SQL.ReadSingleValue($"SELECT Tel_Nr FROM {MainWindow.table}.ansprechpartner WHERE Name = '{(sender as ComboBox).Text}'")}, Bearbeiter = @UserName WHERE idfirmen = @id", new List<MySqlParameter>() await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.firmen SET Ansprechpartner_Intern = @box,Tel_Nr_Ansprechpartner_Intern = '{SQL.ReadSingleValue($"SELECT Tel_Nr FROM {MainWindow.table}.ansprechpartner WHERE Name = '{(sender as ComboBox).Text}'")}', Bearbeiter = @UserName WHERE idfirmen = @id", new List<MySqlParameter>()
{ {
new MySqlParameter("@box", box.Text), new MySqlParameter("@box", box.Text),
new MySqlParameter("@UserName", Environment.UserName), new MySqlParameter("@UserName", Environment.UserName),

8
ZKuP/MainWindow.xaml.cs
View File

@ -43,7 +43,7 @@ namespace ZKuP
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
} }
public const string Version = "5.1.0.2"; public const string Version = "5.1.0.3";
public static Roles LoggedInRole { get; private set; } = Roles.None; public static Roles LoggedInRole { get; private set; } = Roles.None;
@ -1717,7 +1717,7 @@ namespace ZKuP
var park = await SQL.ReadListString($"SELECT Parkplatz FROM {MainWindow.table}.`beParkplaetze` LEFT JOIN {MainWindow.table}.`beBelegung` ON beParkplaetze.beNr = beBelegung.beNr WHERE Parkplatz IS NOT null AND CURDATE() BETWEEN beBelegung.von AND beBelegung.bis"); var park = await SQL.ReadListString($"SELECT Parkplatz FROM {MainWindow.table}.`beParkplaetze` LEFT JOIN {MainWindow.table}.`beBelegung` ON beParkplaetze.beNr = beBelegung.beNr WHERE Parkplatz IS NOT null AND CURDATE() BETWEEN beBelegung.von AND beBelegung.bis");
//var singlePark = await SQL.ReadDictionary2($"SELECT parkplatznr, FROM {MainWindow.table}.`parkplaetze`", 0 , 1); //var singlePark = await SQL.ReadDictionary2($"SELECT parkplatznr, FROM {MainWindow.table}.`parkplaetze`", 0 , 1);
var singlePark = await SQL.ReadDictionary2($"SELECT p.parkplatznr, f.Name FROM {MainWindow.table}.parkplaetze p LEFT JOIN {MainWindow.table}.firmen f ON f.idFirmen = p.firma", 0, 1); var singlePark = await SQL.ReadDictionary2($"SELECT LPAD(p.parkplatznr, 2, '0'), f.Name FROM {MainWindow.table}.parkplaetze p LEFT JOIN {MainWindow.table}.firmen f ON f.idFirmen = p.firma", 0, 1);
string list = ""; string list = "";
@ -1727,7 +1727,9 @@ namespace ZKuP
park = list.Split(',').ToList(); park = list.Split(',').ToList();
park = park.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList(); park = park.Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList();
for(var p = 0; p < park.Count; p++) park[p] = park[p].PadLeft(2, '0');
for(var p = 0; p < park.Count; p++)
park[p] = park[p].PadLeft(2, '0');
var justPark = park.ToList(); var justPark = park.ToList();

31
ZKuP/SQL.cs
View File

@ -913,16 +913,31 @@ namespace ZKuP
{ {
using (cmd) using (cmd)
{ {
var firstVal = "";
var secondVal = "";
while (reader.Read()) while (reader.Read())
{ {
if (!reader.IsDBNull(FirstColumn) && !reader.IsDBNull(SecondColumn)) if (reader.IsDBNull(FirstColumn))
if (!queryResult.ContainsKey(reader.GetValue(FirstColumn).ToString())) firstVal = "";
queryResult.Add(reader.GetValue(FirstColumn).ToString(), reader.GetValue(SecondColumn).ToString()); else firstVal = reader.GetValue(FirstColumn).ToString();
else if (reader.IsDBNull(FirstColumn) && !reader.IsDBNull(SecondColumn))
continue;// queryResult.Add("", reader.GetString(SecondColumn)); if (reader.IsDBNull(SecondColumn))
else if (!reader.IsDBNull(FirstColumn) && reader.IsDBNull(SecondColumn)) secondVal = "";
if (!queryResult.ContainsKey(reader.GetValue(FirstColumn).ToString())) else secondVal = reader.GetValue(SecondColumn).ToString();
queryResult.Add(reader.GetValue(FirstColumn).ToString(), "");
if (!queryResult.ContainsKey(firstVal))
queryResult.Add(firstVal, secondVal);
//if (!reader.IsDBNull(FirstColumn) && !reader.IsDBNull(SecondColumn))
// if (!queryResult.ContainsKey(reader.GetValue(FirstColumn).ToString()))
// queryResult.Add(reader.GetValue(FirstColumn).ToString(), reader.GetValue(SecondColumn).ToString());
// else if (reader.IsDBNull(FirstColumn) && !reader.IsDBNull(SecondColumn))
// continue;// queryResult.Add("", reader.GetString(SecondColumn));
// else if (!reader.IsDBNull(FirstColumn) && reader.IsDBNull(SecondColumn))
// if (!queryResult.ContainsKey(reader.GetValue(FirstColumn).ToString()))
// queryResult.Add(reader.GetValue(FirstColumn).ToString(), "");
} }
} }