diff --git a/ZKuP/CreateParkausweis.xaml b/ZKuP/CreateParkausweis.xaml
index a9ed116..65f5c2f 100644
--- a/ZKuP/CreateParkausweis.xaml
+++ b/ZKuP/CreateParkausweis.xaml
@@ -46,6 +46,7 @@
+
@@ -65,7 +66,7 @@
-
+
@@ -74,16 +75,16 @@
-
+
-
+
-
+
-
+
diff --git a/ZKuP/CreateParkausweis.xaml.cs b/ZKuP/CreateParkausweis.xaml.cs
index b7af6c8..53a14c1 100644
--- a/ZKuP/CreateParkausweis.xaml.cs
+++ b/ZKuP/CreateParkausweis.xaml.cs
@@ -512,13 +512,21 @@ namespace ZKuP
private void tbDDigitsKennzeichen_PreviewTextInput(object sender, TextCompositionEventArgs e)
{
- if ((sender as TextBox).Text.Length >= 5)
+ if (e.Text != "H" && e.Text != "E" && (sender as TextBox).Text.Length >= 5)
{
e.Handled = true;
return;
}
- if (!System.Text.RegularExpressions.Regex.IsMatch(e.Text, "^[0-9]*$"))
+ var tb = (TextBox)sender;
+
+ // neuer Text unter Berücksichtigung von Selection (Ersetzung möglich)
+ string newText = tb.Text.Substring(0, tb.SelectionStart)
+ + e.Text
+ + tb.Text.Substring(tb.SelectionStart + tb.SelectionLength);
+
+
+ if (!System.Text.RegularExpressions.Regex.IsMatch(newText, @"^[0-9]+(?:E|H)?$"))
{
e.Handled = true;
return;
diff --git a/ZKuP/ImageView.xaml b/ZKuP/ImageView.xaml
index f1ee872..921c080 100644
--- a/ZKuP/ImageView.xaml
+++ b/ZKuP/ImageView.xaml
@@ -9,7 +9,7 @@
Title="Unterschriftenanzeige" Height="370" Width="419" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged">
-
+
diff --git a/ZKuP/ImageView.xaml.cs b/ZKuP/ImageView.xaml.cs
index bdebc64..528a679 100644
--- a/ZKuP/ImageView.xaml.cs
+++ b/ZKuP/ImageView.xaml.cs
@@ -62,7 +62,13 @@ namespace ZKuP
{
Dispatcher.Invoke(new Action(() =>
{
- if (!showComboBox) { dPDate.Visibility = cBSignature.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = Visibility.Collapsed; }
+ if (!showComboBox)
+ {
+ dPDate.Visibility = cBSignature.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = panelRB.Visibility = Visibility.Collapsed;
+
+ imageSignature.Margin = new Thickness(10);
+ this.Height = imageSignature.ActualHeight + 50;
+ }
else { cBSignature.Visibility = dPDate.Visibility = btnToday.Visibility = btnUp.Visibility = btnDown.Visibility = tbFilter.Visibility = lblFilter.Visibility = btnFiltern.Visibility = cbOnlyWithSignature.Visibility = Visibility.Visible; }
}));
diff --git a/ZKuP/MainWindow.xaml b/ZKuP/MainWindow.xaml
index 1db41f3..3159133 100644
--- a/ZKuP/MainWindow.xaml
+++ b/ZKuP/MainWindow.xaml
@@ -120,47 +120,7 @@
-
-
-
+
@@ -203,59 +163,11 @@
-
-
+
@@ -270,22 +182,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -339,24 +240,7 @@
-
+
@@ -1217,7 +1101,6 @@
-
diff --git a/ZKuP/MainWindow.xaml.cs b/ZKuP/MainWindow.xaml.cs
index 64d0cfb..302e506 100644
--- a/ZKuP/MainWindow.xaml.cs
+++ b/ZKuP/MainWindow.xaml.cs
@@ -31,6 +31,7 @@ using System.Windows.Threading;
using Windows.UI.Composition;
using Process = System.Diagnostics.Process;
+
namespace ZKuP
{
///
@@ -45,7 +46,7 @@ namespace ZKuP
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
- public const string Version = "5.2.4.0";
+ public static string Version { get; } = "5.2.5.2";
//public static Roles LoggedInRole { get; private set; } = Roles.None;
internal static MainWindow main;
ThemeManager TM;
@@ -80,6 +81,7 @@ namespace ZKuP
set { fzgAnmeldungEmailUsers = value; OnPropertyChanged(); }
}
+ public static FullName CompleteName = new FullName();
DataTable overv = new DataTable("Overview");
@@ -567,7 +569,7 @@ namespace ZKuP
}
- TM.ChangeTheme(Settings.GetSettingBool("DarkMode"));
+ TM.ChangeTheme(Settings.GetSettingBool("DarkMode"));
TM.ChangeAccent(Settings.GetSettingString("Accent"));
this.Title = "ZKuP - " + Version + "\tRolle: " + RoleManager.LoggedInRole.ToString().Replace("_", " ");
@@ -669,6 +671,10 @@ namespace ZKuP
gridToday.ColumnDefinitions[2].Width = new GridLength(col2Width, GridUnitType.Star);
// Index 1 ist der GridSplitter mit Auto-Breite
+
+ gridRowTop.Height = new GridLength(Settings.GetSettingDouble("SplitterPos"));
+
+
if (gridRowTop.Height.Value > .8 * this.Height)
gridRowTop.Height = new GridLength((this.ActualHeight - 160 - 190) / (Helper.scale == 0 ? 1 : Helper.scale));
@@ -740,13 +746,16 @@ namespace ZKuP
{
try
{
-
using (var domainContext = new PrincipalContext(ContextType.Domain, Environment.UserDomainName))
{
using (var foundUser = UserPrincipal.FindByIdentity(domainContext, IdentityType.SamAccountName, Environment.UserName))
{
if (foundUser.Enabled.HasValue)
{
+ CompleteName.Vorname = foundUser.Surname;
+ CompleteName.Nachname = foundUser.Name;
+ CompleteName.Mittelinitial = foundUser.MiddleName;
+
return (bool)foundUser.Enabled;
}
else
@@ -1696,59 +1705,6 @@ namespace ZKuP
- //private async void BtnNew_Click(object sender, RoutedEventArgs e)
- //{
- // if (LoggedInRole == Roles.Admin || LoggedInRole == Roles.Pförtner)
- // {
- // reloadTimer.Stop();
- // reloadTimerHinweis.Stop();
-
- // if (dgToday.SelectedValue == null)
- // {
- // if (MessageBox.Show(this, "Möchten Sie wirklich eine Ankunft ohne vorherige Auswahl bestätigen?\n\nWenn die Firma/der Besucher in der Liste 'Ankunft heute' steht, bitte per Doppelklick auf die Zeile bestätigen", "Sicher?", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
- // {
- // Arrivals arrivals = new Arrivals(this);
- // arrivals.Owner = this;
- // arrivals.Show();
-
- // arrivals.Closed -= Arrivals_Closed;
- // arrivals.Closed += Arrivals_Closed;
- // }
- // }
- // else
- // {
- // Arrivals arrivals;
- // //if (!(dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().StartsWith("Besucher:"))
- // // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[0]);//(dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().Replace("Besucher: ", ""));
- // //else
- // // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[17], 1);//(dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().Replace("Besucher: ", ""));
-
- // if ((dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().StartsWith("Besucher:"))
- // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[17], 1);
- // //(dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().Replace("Besucher: ", ""));
- // else if ((dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().StartsWith("Führung:"))
- // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[17], 2, (dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString());
- // else
- // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[0]);
-
-
- // arrivals.Owner = this;
- // arrivals.Show();
-
- // arrivals.Closed -= Arrivals_Closed;
- // arrivals.Closed += Arrivals_Closed;
- // }
-
- // //await getZutritte();
- // //overv = await SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.zutritte where Zutritt >= now() + INTERVAL -10 DAY", overv);
-
- // //dgOverview.Items.SortDescriptions.Clear();
- // //dgOverview.Items.SortDescriptions.Add(new SortDescription("Zutritt", ListSortDirection.Descending));
- // //dgOverview.Items.Refresh();
-
- // }
- //}
-
private async void btnDelivery_Click(object sender, RoutedEventArgs e)
{
Cursor = Cursors.Wait;
@@ -1771,11 +1727,7 @@ namespace ZKuP
await getZutritte();
await getFahrzeuge();
}
- //overv = await SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.zutritte where Zutritt >= now() + INTERVAL -10 DAY", overv);
- //dgOverview.Items.SortDescriptions.Clear();
- //dgOverview.Items.SortDescriptions.Add(new SortDescription("Zutritt", ListSortDirection.Descending));
- //dgOverview.Items.Refresh();
Cursor = Cursors.Arrow;
}
@@ -2114,12 +2066,6 @@ namespace ZKuP
else if (dg.Name == "dgToday")
{
Arrivals arrivals;
- //if ((dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().StartsWith("Besucher:"))
- // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[17], 1);
- ////(dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().Replace("Besucher: ", ""));
- //else if ((dgToday.SelectedValue as DataRowView).Row.ItemArray[1].ToString().StartsWith("Führung:"))
- // arrivals = new Arrivals(this, (int)(dgToday.SelectedValue as DataRowView).Row.ItemArray[22], 2, (dgToday.SelectedValue as DataRowView).Row.ItemArray[2].ToString());
- //else
var res = -1;
int.TryParse((dgToday.SelectedValue as DataRowView).Row.ItemArray[0].ToString(), out res);
@@ -2164,15 +2110,6 @@ namespace ZKuP
}
else Log.WriteLog("Trying to open an Arrival with no DataGrid Name");
- //await getZutritte();
- //overv = await SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.zutritte where Zutritt >= now() + INTERVAL -10 DAY", overv);
-
- //dgOverview.Items.SortDescriptions.Clear();
- //dgOverview.Items.SortDescriptions.Add(new SortDescription("Zutritt", ListSortDirection.Descending));
- //dgOverview.Items.Refresh();
- //
-
-
}
Cursor = Cursors.Arrow;
@@ -2816,6 +2753,8 @@ namespace ZKuP
e.Handled = true; // Bewegung stoppen
gridRowTop.Height = new GridLength((this.ActualHeight - 160 - 190) / (Helper.scale == 0 ? 1 : Helper.scale));
}
+
+ Settings.WriteSetting("SplitterPos", gridRowTop.Height.Value);
}
@@ -3151,4 +3090,10 @@ namespace ZKuP
public string Bemerkung;
}
+ public class FullName
+ {
+ public string Vorname;
+ public string Nachname;
+ public string Mittelinitial;
+ }
}
diff --git a/ZKuP/ManageAsp.xaml b/ZKuP/ManageAsp.xaml
index 6076710..6a9db77 100644
--- a/ZKuP/ManageAsp.xaml
+++ b/ZKuP/ManageAsp.xaml
@@ -32,7 +32,13 @@
-
+
+
+
+
+
diff --git a/ZKuP/ManageAsp.xaml.cs b/ZKuP/ManageAsp.xaml.cs
index 791cb91..06790c3 100644
--- a/ZKuP/ManageAsp.xaml.cs
+++ b/ZKuP/ManageAsp.xaml.cs
@@ -33,7 +33,7 @@ namespace ZKuP
//}
DataTable asp = new DataTable("Asp");
- string UserID = "0";
+ string UserID = "-1";
public ManageAsp()
{
@@ -43,6 +43,8 @@ namespace ZKuP
UserID = SQL.ReadSingleValue($"SELECT idusers FROM {MainWindow.table}.users WHERE Username = '{Environment.UserName}'");
+ if (UserID == "1" && Environment.UserName.ToLower() != "marcusbachler") Log.WriteLog("UserID Fail");
+
Query();
}
@@ -71,22 +73,34 @@ namespace ZKuP
MessageBox.Show(this, "Ansprechpartner muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
else if (string.IsNullOrWhiteSpace(tbAspVertreter.Text) || tbAspVertreter.Text.ToList().Distinct().Count() < 5)
MessageBox.Show(this, "Vertreter muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (string.IsNullOrWhiteSpace(tbRaum.Text) || tbRaum.Text.ToList().Distinct().Count() < 5)
+ else if (string.IsNullOrWhiteSpace(tbRaum.Text) || tbRaum.Text.ToList().Distinct().Count() < 2)
MessageBox.Show(this, "Raum/Werkstatt qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
else if (string.IsNullOrWhiteSpace(tbAspVorgesetzter.Text) || tbAspVorgesetzter.Text.ToList().Distinct().Count() < 5)
MessageBox.Show(this, "Vorgesetzter muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (string.IsNullOrWhiteSpace(tbAspTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbAspTel.Text, "^[0-9()+\\-/ ]*$") || tbAspTel.Text.ToList().Distinct().Count() < 5)
+ else if (string.IsNullOrWhiteSpace(tbAspTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbAspTel.Text, "^[0-9()+\\-/ ]*$") || tbAspTel.Text.ToList().Distinct().Count() < 4)
MessageBox.Show(this, "Ansprechpartner-Telefonnummer muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (string.IsNullOrWhiteSpace(tbVertreterTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbAspTel.Text, "^[0-9()+\\-/ ]*$") || tbVertreterTel.Text.ToList().Distinct().Count() < 5)
+ else if (string.IsNullOrWhiteSpace(tbVertreterTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbAspTel.Text, "^[0-9()+\\-/ ]*$") || tbVertreterTel.Text.ToList().Distinct().Count() < 4)
MessageBox.Show(this, "Vertreter-Telefonnummer muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (string.IsNullOrWhiteSpace(tbVorgesetzterTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbVertreterTel.Text, "^[0-9()+\\-/ ]*$") || tbVertreterTel.Text.ToList().Distinct().Count() < 5)
+ else if (string.IsNullOrWhiteSpace(tbVorgesetzterTel.Text) || !System.Text.RegularExpressions.Regex.IsMatch(tbVertreterTel.Text, "^[0-9()+\\-/ ]*$") || tbVertreterTel.Text.ToList().Distinct().Count() < 4)
MessageBox.Show(this, "Vorgesetzter-Telefonnummer muss qualifiziert ausgefüllt sein!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
else
{
- await SQL.WriteSQL($"INSERT INTO {MainWindow.table}.ansprechpartner (Name,Vertreter,Tel_Nr,Vorgesetzter,Tel_Vertreter,Tel_Vorgesetzter,CreatorID) VALUES " +
- $"('{tbAsp.Text}','{tbAspVertreter.Text}','{tbAspTel.Text}','{tbAspVorgesetzter.Text}','{tbVertreterTel.Text}','{tbVorgesetzterTel.Text}','{UserID}')");
+ //if (UserID == "1") UserID = (new Random().Next(2, 10000) * -1).ToString();
+
+ var exists = SQL.ReadSingleValue($"SELECT EXISTS(SELECT 1 FROM ansprechpartner WHERE CreatorID = '{UserID}')");
+
+ if (exists == "1")
+ {
+ await SQL.WriteSQL($"UPDATE {MainWindow.table}.ansprechpartner SET Name = '{tbAsp.Text}', Raum = '{tbRaum.Text}',Vertreter = '{tbAspVertreter.Text}',Tel_Nr = '{tbAspTel.Text}',Vorgesetzter = '{tbAspVorgesetzter.Text}',Tel_Vertreter = '{tbVertreterTel.Text}',Tel_Vorgesetzter = '{tbVorgesetzterTel.Text}' WHERE CreatorID = {UserID}");
+ }
+ else
+ {
+ await SQL.WriteSQL($"INSERT INTO {MainWindow.table}.ansprechpartner (Name,Raum,Vertreter,Tel_Nr,Vorgesetzter,Tel_Vertreter,Tel_Vorgesetzter,CreatorID) VALUES " +
+ $"('{tbAsp.Text}','{tbRaum.Text}','{tbAspVertreter.Text}','{tbAspTel.Text}','{tbAspVorgesetzter.Text}','{tbVertreterTel.Text}','{tbVorgesetzterTel.Text}','{UserID}')");
+ }
tbAsp.Text = "";
+ tbRaum.Text = "";
tbAspTel.Text = "";
tbAspVertreter.Text = "";
tbAspVorgesetzter.Text = "";
@@ -105,7 +119,7 @@ namespace ZKuP
var arr = row.Row.ItemArray;
- if (arr[0].ToString() == Helper.InsertSpaceBeforeUpperCase(Environment.UserName) || arr[6].ToString() == UserID)
+ if (arr[0].ToString() == Helper.InsertSpaceBeforeUpperCase(Environment.UserName) || arr[0].ToString() == $"{MainWindow.CompleteName.Vorname} {MainWindow.CompleteName.Mittelinitial} {MainWindow.CompleteName.Nachname}" || arr[6].ToString() == UserID)
{
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.ansprechpartner WHERE `Name` = '{arr[0]}'");
@@ -125,6 +139,7 @@ namespace ZKuP
var newValue = (e.EditingElement as TextBox).Text;
var name = (e.Row.Item as DataRowView).Row.ItemArray[0];
+ if (UserID == "1") UserID = (new Random().Next(2, 10000) * -1).ToString();
switch (header)
{
@@ -227,34 +242,4 @@ namespace ZKuP
}
}
- //public class Asp
- //{
- // string Name;
- // string Vertreter;
- // string Tel_Nr;
- // string Vorgesetzter;
- // string Tel_Vertreter;
- // string Tel_Vorgesetzter;
-
-
- // public static List DataTableToAsp(System.Data.DataTable dataTable)
- // {
- // List x = new List();
-
- // foreach (DataRow dr in dataTable.Rows)
- // {
- // x.Add(new Asp()
- // {
- // Name = dr[0].ToString(),
- // Vertreter = dr[1].ToString(),
- // Tel_Nr = dr[2].ToString(),
- // Vorgesetzter = dr[3].ToString(),
- // Tel_Vertreter = dr[4].ToString(),
- // Tel_Vorgesetzter = dr[5].ToString()
- // });
- // }
-
- // return x;
- // }
- //}
}
diff --git a/ZKuP/ManageUsers.xaml b/ZKuP/ManageUsers.xaml
index 5cd50cb..7452c7c 100644
--- a/ZKuP/ManageUsers.xaml
+++ b/ZKuP/ManageUsers.xaml
@@ -6,7 +6,7 @@
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:local="clr-namespace:ZKuP"
mc:Ignorable="d"
- Title="Manage Users" Height="657" Width="450" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged">
+ Title="Manage Users" Height="657" Width="550" MinWidth="550" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged">
@@ -19,6 +19,13 @@
+
+
+
+
+
diff --git a/ZKuP/Properties/AssemblyInfo.cs b/ZKuP/Properties/AssemblyInfo.cs
index 404b172..2c3988e 100644
--- a/ZKuP/Properties/AssemblyInfo.cs
+++ b/ZKuP/Properties/AssemblyInfo.cs
@@ -41,15 +41,4 @@ using System.Windows;
)]
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-// Hauptversion
-// Nebenversion
-// Buildnummer
-// Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(ZKuP.MainWindow.Version)]
-[assembly: AssemblyFileVersion(ZKuP.MainWindow.Version)]
+
diff --git a/ZKuP/Resources/Loading2.gif b/ZKuP/Resources/Loading2.gif
new file mode 100644
index 0000000..c2f7b78
Binary files /dev/null and b/ZKuP/Resources/Loading2.gif differ
diff --git a/ZKuP/SQL.cs b/ZKuP/SQL.cs
index 0f68438..4e4b51d 100644
--- a/ZKuP/SQL.cs
+++ b/ZKuP/SQL.cs
@@ -1,4 +1,5 @@
using MySql.Data.MySqlClient;
+using Renci.SshNet;
using System;
using System.Collections.Generic;
using System.Data;
@@ -258,7 +259,7 @@ namespace ZKuP
isOnline = true;
return true;
}
- catch (Exception ex)
+ catch (Exception)
{
conn.Close();
//Log.WriteLog(ex.ToString());
@@ -749,6 +750,19 @@ namespace ZKuP
//byte[] rawData;
System.Drawing.Bitmap image = null;
+ var pattern = @"\b[A-Za-z0-9_]*timestamp[A-Za-z0-9_]*\s*=\s*''";
+
+ if (System.Text.RegularExpressions.Regex.IsMatch(SQLCommand.ToLower(), pattern))
+ {
+ var uri = new Uri(@"/Resources/NoSignature.png", UriKind.Relative);
+ StreamResourceInfo info = System.Windows.Application.GetResourceStream(uri);
+ using (var stream = info.Stream)
+ {
+ image = new Bitmap(stream);
+ }
+ return image;
+ }
+
using (conn)
{
using (cmd)
@@ -863,7 +877,17 @@ namespace ZKuP
{
while (reader.Read())
{
- queryResult.Add(reader.GetDateTime(ColumnID).ToString("yyyy-MM-dd HH:mm:ss") + ";" + reader.GetValue(ColumnID + 1).ToString());
+ var dateValue = reader.IsDBNull(ColumnID)
+ ? ""
+ : reader.GetDateTime(ColumnID).ToString("yyyy-MM-dd HH:mm:ss");
+
+ var otherValue = reader.IsDBNull(ColumnID + 1)
+ ? ""
+ : reader.GetValue(ColumnID + 1).ToString();
+
+ queryResult.Add($"{dateValue};{otherValue}");
+
+ //queryResult.Add(reader.GetDateTime(ColumnID).ToString("yyyy-MM-dd HH:mm:ss") + ";" + reader.GetValue(ColumnID + 1).ToString());
}
}
}
diff --git a/ZKuP/Settings.cs b/ZKuP/Settings.cs
index 5a513f5..d4575b3 100644
--- a/ZKuP/Settings.cs
+++ b/ZKuP/Settings.cs
@@ -56,7 +56,7 @@ namespace ZKuP
if (SettingsDict.ContainsKey(key))
{
var value = SettingsDict[key];
- return (double)value;
+ return Convert.ToDouble(value);
}
return 0;
}
diff --git a/ZKuP/ZKuP.csproj b/ZKuP/ZKuP.csproj
index 0db20fb..cb0c6b5 100644
--- a/ZKuP/ZKuP.csproj
+++ b/ZKuP/ZKuP.csproj
@@ -71,6 +71,7 @@
MinimumRecommendedRules.ruleset
true
4014,1998,0108
+ True
bin\x64\Release\
@@ -894,5 +895,8 @@
+
+
+
\ No newline at end of file