From 5a77a76e6075dfaad21560ee21dc619d1ae3159e Mon Sep 17 00:00:00 2001 From: Marcus Date: Mon, 4 Aug 2025 12:57:50 +0200 Subject: [PATCH] =?UTF-8?q?Bug=20behoben,=20dass=20Parkplatzzuweisungen=20?= =?UTF-8?q?ohne=20Arrival=20nicht=20angezeigt=20wurden=20Bug=20behoben=20d?= =?UTF-8?q?er=20eine=20=C3=84nderung=20der=20Asp=20bei=20CreateFirma=20ver?= =?UTF-8?q?hindert=20hat,=20wenn=20diese=20leerzeichen=20in=20den=20Telnr?= =?UTF-8?q?=20hatten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZKuP/CreateFirma.xaml.cs | 2 +- ZKuP/MainWindow.xaml.cs | 8 +++++--- ZKuP/SQL.cs | 31 +++++++++++++++++++++++-------- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/ZKuP/CreateFirma.xaml.cs b/ZKuP/CreateFirma.xaml.cs index 38b9e91..9d6556a 100644 --- a/ZKuP/CreateFirma.xaml.cs +++ b/ZKuP/CreateFirma.xaml.cs @@ -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) { //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() + 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() { new MySqlParameter("@box", box.Text), new MySqlParameter("@UserName", Environment.UserName), diff --git a/ZKuP/MainWindow.xaml.cs b/ZKuP/MainWindow.xaml.cs index 003cb8a..d4d3007 100644 --- a/ZKuP/MainWindow.xaml.cs +++ b/ZKuP/MainWindow.xaml.cs @@ -43,7 +43,7 @@ namespace ZKuP 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; @@ -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 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 = ""; @@ -1726,8 +1726,10 @@ namespace ZKuP park = list.Split(',').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(); diff --git a/ZKuP/SQL.cs b/ZKuP/SQL.cs index e45deac..3c122a1 100644 --- a/ZKuP/SQL.cs +++ b/ZKuP/SQL.cs @@ -913,16 +913,31 @@ namespace ZKuP { using (cmd) { + var firstVal = ""; + var secondVal = ""; + while (reader.Read()) { - 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(), ""); + if (reader.IsDBNull(FirstColumn)) + firstVal = ""; + else firstVal = reader.GetValue(FirstColumn).ToString(); + + if (reader.IsDBNull(SecondColumn)) + secondVal = ""; + else secondVal = reader.GetValue(SecondColumn).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(), ""); } }