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

Compare commits

base: Marcus:a67950371c726b06b82769a3ec68f618fbc3d462
Branches Tags
Marcus:master
...
compare: Marcus:3e51b35c67da7831f4009f5423faf2f6eaf81627
Branches Tags
Marcus:master

2 Commits
a67950371c ... 3e51b35c67

Author SHA1 Message Date
Marcus
3e51b35c67 new Branch 2025-07-29 13:47:49 +02:00
Marcus
b8f7c7bf6e Umstellung auf SSL 
Neue Icons für Konnektivität
Warnings beseitigt
PreUpgrade von BouncyCastle
 2025-07-29 11:57:02 +02:00
26 changed files with 632 additions and 363 deletions
Show Stats Expand all files Collapse all files

2
ZKuP/AddCardUser.xaml.cs
View File

@ -22,7 +22,7 @@ namespace ZKuP
public partial class AddCardUser : MetroWindow
{
string _user = "";
string _ansprechpartnerFirma = "";
//string _ansprechpartnerFirma = "";
bool _isBesucher = false;
List<string> comboList = new List<string>() { "Grün", "Rot", "Gerätewagen" };
List<string> comboListNurRot = new List<string>() { "Rot" };

6
ZKuP/AddFirmenList.xaml.cs
View File

@ -53,7 +53,7 @@ namespace ZKuP
{
if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
{
if (boxes[i].Tag == "Name")
if (boxes[i].Tag.ToString() == "Name")
boxes[i].Text = list[i];
}
}
@ -66,7 +66,7 @@ namespace ZKuP
{
if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
{
if (boxes[i].Tag == "Tel")
if (boxes[i].Tag.ToString() == "Tel")
boxes[i].Text = list[i];
}
}
@ -84,7 +84,7 @@ namespace ZKuP
private void BuildWindow(int besucherAnzahl)
{
int maxProSpalte = 10; // Maximale Anzahl an Textfeldern pro Spalte
//int maxProSpalte = 10; // Maximale Anzahl an Textfeldern pro Spalte
// PanelsContainer soll die WrapPanels halten
spGroupPers.Children.Clear(); // Vorherige Panels entfernen (falls schon welche existieren)

2
ZKuP/App.xaml
View File

@ -20,6 +20,8 @@
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MahApps.Styles.Button.Flat}">
<Setter Property="mah:ControlsHelper.CornerRadius" Value="4"/>
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>

6
ZKuP/Arrivals.xaml.cs
View File

@ -32,7 +32,7 @@ namespace ZKuP
int firmenCount = 0;
int besucherCount = 0;
bool arrivalClicked = false;
bool kl_EinweisungClicked = false;
//bool kl_EinweisungClicked = false;
//string query = "";
MySqlCommand query = new MySqlCommand();
byte[] _signature = null;
@ -1073,8 +1073,8 @@ namespace ZKuP
private async void btnSignature_Click(object sender, RoutedEventArgs e)
{
string kat = "1";
string firmaBesucher = "";
//string kat = "1";
//string firmaBesucher = "";
string name = "";
var kennzeichenTextboxes = spKennzeichen.Children.OfType<TextBox>().ToList();

2
ZKuP/Belegung.xaml.cs
View File

@ -616,7 +616,7 @@ namespace ZKuP
private void btnCurrentlyBooked_Click(object sender, RoutedEventArgs e)
{
if (btnCurrentlyBooked.Content == "Alle gebuchten Flächen anzeigen")
if (btnCurrentlyBooked.Content.ToString() == "Alle gebuchten Flächen anzeigen")
{
be = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.beBelegung WHERE bis >= curdate() ORDER BY beNr ASC, bis ASC").Result;
dgBelegung.DataContext = be;

4
ZKuP/COMSelector.xaml.cs
View File

@ -33,9 +33,13 @@ namespace ZKuP
}
private void btnSave_Click(object sender, RoutedEventArgs e)
{
if (cbCOMList.SelectedValue != null)
{
var match = Regex.Match(cbCOMList.SelectedValue.ToString(), @"COM\d+(?=\))");
Settings.WriteSetting("COMPort", match.Value);
}
else Settings.WriteSetting("COMPort", "");
this.Close();
}

73
ZKuP/CreateFirma.xaml.cs
View File

@ -1619,6 +1619,7 @@ namespace ZKuP
new MySqlParameter("@id", id)
});
}
else (sender as TextBox).Text = oldValue;
}
foreach (var textBox in textBoxes)
@ -2197,46 +2198,46 @@ namespace ZKuP
}
}
public class Firma
{
public string Name;
string Verantwortlicher_MA_Firma;
string Tel_Nr_Verantwortlicher_Firma;
string Anzahl_Begleiter;
string Anzahl_Fzg;
string Beauftragte_Leistung;
string Arbeitsbeginn;
string Arbeitsende;
string Örtliche_Einweisung_bis;
string Ansprechpartner_Intern;
string Tel_Nr_Ansprechpartner_Intern;
//public class Firma
//{
// public string Name;
// string Verantwortlicher_MA_Firma;
// string Tel_Nr_Verantwortlicher_Firma;
// string Anzahl_Begleiter;
// string Anzahl_Fzg;
// string Beauftragte_Leistung;
// string Arbeitsbeginn;
// string Arbeitsende;
// string Örtliche_Einweisung_bis;
// string Ansprechpartner_Intern;
// string Tel_Nr_Ansprechpartner_Intern;
public static List<Firma> DataTableToFirma(System.Data.DataTable dataTable)
{
List<Firma> x = new List<Firma>();
// public static List<Firma> DataTableToFirma(System.Data.DataTable dataTable)
// {
// List<Firma> x = new List<Firma>();
foreach (DataRow dr in dataTable.Rows)
{
x.Add(new Firma()
{
Name = dr[1].ToString(),
Verantwortlicher_MA_Firma = dr[2].ToString(),
Tel_Nr_Verantwortlicher_Firma = dr[3].ToString(),
Anzahl_Begleiter = dr[4].ToString(),
Anzahl_Fzg = dr[5].ToString(),
Beauftragte_Leistung = dr[6].ToString(),
Arbeitsbeginn = dr[7].ToString(),
Arbeitsende = dr[8].ToString(),
Örtliche_Einweisung_bis = dr[9].ToString(),
Ansprechpartner_Intern = dr[10].ToString(),
Tel_Nr_Ansprechpartner_Intern = dr[11].ToString()
});
}
// foreach (DataRow dr in dataTable.Rows)
// {
// x.Add(new Firma()
// {
// Name = dr[1].ToString(),
// Verantwortlicher_MA_Firma = dr[2].ToString(),
// Tel_Nr_Verantwortlicher_Firma = dr[3].ToString(),
// Anzahl_Begleiter = dr[4].ToString(),
// Anzahl_Fzg = dr[5].ToString(),
// Beauftragte_Leistung = dr[6].ToString(),
// Arbeitsbeginn = dr[7].ToString(),
// Arbeitsende = dr[8].ToString(),
// Örtliche_Einweisung_bis = dr[9].ToString(),
// Ansprechpartner_Intern = dr[10].ToString(),
// Tel_Nr_Ansprechpartner_Intern = dr[11].ToString()
// });
// }
return x;
}
}
// return x;
// }
//}
}

18
ZKuP/CreateVisitor_List.xaml.cs
View File

@ -23,12 +23,12 @@ namespace ZKuP
/// </summary>
public partial class CreateVisitor_List : MetroWindow
{
private List<Visitor> myVar;
public List<Visitor> VisitorView
{
get { return myVar; }
set { myVar = value; }
}
//private List<Visitor> myVar;
//public List<Visitor> VisitorView
//{
// get { return myVar; }
// set { myVar = value; }
//}
DataTable visitors = new DataTable("Visitors");
@ -44,7 +44,7 @@ namespace ZKuP
this.Title = "Besucherliste von: " + Helper.InsertSpaceBeforeUpperCase(Environment.UserName);
visitors = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
VisitorView = Visitor.DataTableToVisitor(visitors);
//VisitorView = Visitor.DataTableToVisitor(visitors);
dgVisitors.DataContext = visitors;
dgVisitors.Items.SortDescriptions.Clear();
@ -115,7 +115,7 @@ namespace ZKuP
dgVisitors.PreviewKeyDown += DgVisitors_PreviewKeyDown;
visitors = SQL.ReadSQL($"Select * from {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
VisitorView = Visitor.DataTableToVisitor(visitors);
//VisitorView = Visitor.DataTableToVisitor(visitors);
dgVisitors.RowValidationErrorTemplate = new ControlTemplate();
@ -192,7 +192,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.besucher WHERE `idbesucher` = '{arr[0]}'");
visitors = SQL.ReadSQL($"Select * from {MainWindow.table}.besucher WHERE Ersteller = '{Environment.UserName}'", visitors).Result;
VisitorView = Visitor.DataTableToVisitor(visitors);
//VisitorView = Visitor.DataTableToVisitor(visitors);
}

2
ZKuP/Delivery.xaml.cs
View File

@ -51,7 +51,7 @@ namespace ZKuP
};
string query = "";
//string query = "";
byte[] _signature = null;
bool _emergency = false;

2
ZKuP/Family.xaml.cs
View File

@ -23,7 +23,7 @@ namespace ZKuP
public partial class Family : MetroWindow
{
DataTable dtOwn;
DataTable dtAll;
//DataTable dtAll;
public Family()
{

43
ZKuP/FodyWeavers.xsd
View File

@ -29,12 +29,27 @@
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX86Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinX64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="UnmanagedWinArm64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
@ -73,6 +88,11 @@
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableEventSubscription" type="xs:boolean">
<xs:annotation>
<xs:documentation>The attach method no longer subscribes to the `AppDomain.AssemblyResolve` (.NET 4.x) and `AssemblyLoadContext.Resolving` (.NET 6.0+) events.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
@ -105,12 +125,27 @@
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX86Assemblies instead</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinX86Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X86 (32 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
<xs:documentation>Obsolete, use UnmanagedWinX64Assemblies instead</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinX64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged X64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UnmanagedWinArm64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged Arm64 (64 bit) assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="PreloadOrder" type="xs:string">

80
ZKuP/GrantParkausweis.xaml.cs
View File

@ -104,48 +104,48 @@ namespace ZKuP
}
}
public class Grant
{
int idparkausweise;
string MA_Vorname;
string MA_Name;
string Kennzeichen;
string Email;
string Telefon;
string Abteilung;
string Firma;
string Adresse;
string PLZ;
string Vorgesetzter;
int Schicht;
int isKrad;
//public class Grant
//{
// int idparkausweise;
// string MA_Vorname;
// string MA_Name;
// string Kennzeichen;
// string Email;
// string Telefon;
// string Abteilung;
// string Firma;
// string Adresse;
// string PLZ;
// string Vorgesetzter;
// int Schicht;
// int isKrad;
public static List<Grant> DataTableToGrant(System.Data.DataTable dataTable)
{
List<Grant> x = new List<Grant>();
// public static List<Grant> DataTableToGrant(System.Data.DataTable dataTable)
// {
// List<Grant> x = new List<Grant>();
foreach (System.Data.DataRow dr in dataTable.Rows)
{
x.Add(new Grant()
{
idparkausweise = (int)dr[0],
MA_Vorname = dr[1].ToString(),
MA_Name = dr[2].ToString(),
Kennzeichen = dr[3].ToString(),
Email = dr[4].ToString(),
Telefon = dr[5].ToString(),
Abteilung = dr[6].ToString(),
Firma = dr[7].ToString(),
Adresse = dr[8].ToString(),
PLZ = dr[9].ToString(),
Vorgesetzter = dr[10].ToString(),
Schicht = (int)dr[11],
isKrad = (int)dr[12]
});
}
// foreach (System.Data.DataRow dr in dataTable.Rows)
// {
// x.Add(new Grant()
// {
// idparkausweise = (int)dr[0],
// MA_Vorname = dr[1].ToString(),
// MA_Name = dr[2].ToString(),
// Kennzeichen = dr[3].ToString(),
// Email = dr[4].ToString(),
// Telefon = dr[5].ToString(),
// Abteilung = dr[6].ToString(),
// Firma = dr[7].ToString(),
// Adresse = dr[8].ToString(),
// PLZ = dr[9].ToString(),
// Vorgesetzter = dr[10].ToString(),
// Schicht = (int)dr[11],
// isKrad = (int)dr[12]
// });
// }
return x;
}
}
// return x;
// }
//}
}

5
ZKuP/Helper.cs
View File

@ -285,10 +285,10 @@ namespace ZKuP
{
case 1:
return (from System.Data.DataRow dr in dataTable.Rows select dr[startColumn + 0].ToString()).ToList();
break;
//break;
case 2:
return (from System.Data.DataRow dr in dataTable.Rows select dr[startColumn + 0].ToString() + " " + dr[startColumn + 1].ToString()).ToList();
break;
//break;
default:
@ -992,7 +992,6 @@ namespace ZKuP
{
case MessageBoxResult.Yes:
return;
break;
case MessageBoxResult.No:
App.BringOtherInstanceToFront();
Application.Current.Shutdown();

1
ZKuP/KartenTausch.xaml.cs
View File

@ -44,7 +44,6 @@ namespace ZKuP
private void Helper_DataReceived(object sender, string e)
{
var text = "";
Dispatcher.Invoke(() =>
{
if (cbRot.ItemsSource.Cast<string>().ToList().Contains(e.Split('=')[0].ToString()))

190
ZKuP/MainWindow.xaml
View File

@ -48,6 +48,186 @@
<EasingDoubleKeyFrame KeyTime="00:00:01" Value="1"/>
</DoubleAnimationUsingKeyFrames>
</Storyboard>
<!-- Connected Icon -->
<DrawingImage x:Key="ConnectedIcon">
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V100 H300 V0 H0 Z">
<DrawingGroup.Transform>
<TranslateTransform X="25" Y="8" />
</DrawingGroup.Transform>
<DrawingGroup Opacity="1" Transform="1,0,0,1,50,50">
<GeometryDrawing Brush="#FF22C55E">
<GeometryDrawing.Pen>
<Pen Brush="#FF16A34A" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="8" RadiusY="8" Rect="-25,-8,20,16" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF22C55E">
<GeometryDrawing.Pen>
<Pen Brush="#FF16A34A" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="8" RadiusY="8" Rect="5,-8,20,16" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFFFFFFF">
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="1" RadiusY="1" Rect="-8,-3,6,6" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFFFFFFF">
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="1" RadiusY="1" Rect="2,-3,6,6" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FF000000">
<GeometryDrawing.Pen>
<Pen Brush="#FF16A34A" Thickness="3" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="-5,0" EndPoint="5,0" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
<!--<DrawingImage x:Key="ConnectedIcon">
<DrawingImage.Drawing>
<DrawingGroup>
--><!-- Left connector part --><!--
<GeometryDrawing Brush="#22c55e"
Geometry="M0,8 L20,8 A8,8 0 0,1 20,24 L0,24 A8,8 0 0,1 0,8 Z">
<GeometryDrawing.Pen>
<Pen Brush="#16a34a" Thickness="2"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
--><!-- Right connector part --><!--
<GeometryDrawing Brush="#22c55e"
Geometry="M30,8 L50,8 A8,8 0 0,1 50,24 L30,24 A8,8 0 0,1 30,8 Z">
<GeometryDrawing.Pen>
<Pen Brush="#16a34a" Thickness="2"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
--><!-- Left pin --><!--
<GeometryDrawing Brush="White"
Geometry="M17,13 L23,13 A1,1 0 0,1 23,19 L17,19 A1,1 0 0,1 17,13 Z"/>
--><!-- Right pin --><!--
<GeometryDrawing Brush="White"
Geometry="M27,13 L33,13 A1,1 0 0,1 33,19 L27,19 A1,1 0 0,1 27,13 Z"/>
--><!-- Connection line --><!--
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#16a34a" Thickness="3"/>
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<LineGeometry StartPoint="20,16" EndPoint="30,16"/>
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>-->
<!-- Not Connected Icon -->
<DrawingImage x:Key="NotConnectedIcon">
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V100 H300 V0 H0 Z">
<DrawingGroup.Transform>
<TranslateTransform X="30" Y="8" />
</DrawingGroup.Transform>
<DrawingGroup Opacity="1" Transform="1,0,0,1,150,50">
<GeometryDrawing Brush="#FFEF4444">
<GeometryDrawing.Pen>
<Pen Brush="#FFDC2626" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="8" RadiusY="8" Rect="-30,-8,20,16" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFEF4444">
<GeometryDrawing.Pen>
<Pen Brush="#FFDC2626" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="8" RadiusY="8" Rect="15,-8,20,16" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFFFFFFF">
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="1" RadiusY="1" Rect="-13,-3,6,6" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Brush="#FFFFFFFF">
<GeometryDrawing.Geometry>
<RectangleGeometry RadiusX="1" RadiusY="1" Rect="18,-3,6,6" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
<GeometryDrawing Geometry="F1 M300,100z M0,0z M-5,-2L0,0 -5,2 M5,-2L10,0 5,2">
<GeometryDrawing.Pen>
<Pen Brush="#FFEF4444" Thickness="2" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Miter" />
</GeometryDrawing.Pen>
</GeometryDrawing>
</DrawingGroup>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
<!--<DrawingImage x:Key="NotConnectedIcon">
<DrawingImage.Drawing>
<DrawingGroup>
--><!-- Left connector part --><!--
<GeometryDrawing Brush="#ef4444"
Geometry="M0,8 L20,8 A8,8 0 0,1 20,24 L0,24 A8,8 0 0,1 0,8 Z">
<GeometryDrawing.Pen>
<Pen Brush="#dc2626" Thickness="2"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
--><!-- Right connector part (separated) --><!--
<GeometryDrawing Brush="#ef4444"
Geometry="M35,8 L55,8 A8,8 0 0,1 55,24 L35,24 A8,8 0 0,1 35,8 Z">
<GeometryDrawing.Pen>
<Pen Brush="#dc2626" Thickness="2"/>
</GeometryDrawing.Pen>
</GeometryDrawing>
--><!-- Left pin --><!--
<GeometryDrawing Brush="White"
Geometry="M17,13 L23,13 A1,1 0 0,1 23,19 L17,19 A1,1 0 0,1 17,13 Z"/>
--><!-- Right pin --><!--
<GeometryDrawing Brush="White"
Geometry="M38,13 L44,13 A1,1 0 0,1 44,19 L38,19 A1,1 0 0,1 38,13 Z"/>
--><!-- Spark/gap indication --><!--
<GeometryDrawing>
<GeometryDrawing.Pen>
<Pen Brush="#ef4444" Thickness="2"/>
</GeometryDrawing.Pen>
<GeometryDrawing.Geometry>
<PathGeometry>
<PathFigure StartPoint="25,14">
<LineSegment Point="30,16"/>
<LineSegment Point="25,18"/>
</PathFigure>
<PathFigure StartPoint="30,14">
<LineSegment Point="35,16"/>
<LineSegment Point="30,18"/>
</PathFigure>
</PathGeometry>
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>-->
</mah:MetroWindow.Resources>
@ -1072,8 +1252,14 @@
<Grid Margin="0,-25,200,0" HorizontalAlignment="Right" VerticalAlignment="Top">
<Image Source="/Resources/ConnBackground.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
<Image x:Name="imgConnection" Source="/Resources/Disconnected.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
<Border>
<Grid Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top">
<Image Source="/Resources/ConnBackground.png" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>
<!--<Image x:Name="imgConnection" Source="/Resources/Disconnected.png" Width="50" Height="30" HorizontalAlignment="Left" VerticalAlignment="Top" Stretch="Uniform"/>-->
<Image x:Name="imgConnection" Source="{StaticResource NotConnectedIcon}" Width="38" Height="30" Margin="2,0,2,4" HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Uniform"/>
<Image x:Name="imgSecureConn" Source="/Resources/Lock.png" ToolTip="Verbindung OK und gesichert" Visibility="Collapsed" Width="16" Margin="26,2,0,0"/>
</Grid>
</Border>
<Button x:Name="btnDarkMode" Click="btnDarkMode_Click" Padding="2,3,2,0" FontWeight="Regular" Visibility="Visible" Panel.ZIndex="100" Margin="50,0,0,0" HorizontalAlignment="Left" Width="35" Height="25" VerticalAlignment="Top">
<Image x:Name="imgDarkModeButton" Source="/Resources/Moon.png"/>

61
ZKuP/MainWindow.xaml.cs
View File

@ -43,7 +43,7 @@ namespace ZKuP
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
public const string Version = "5.1.0.0";
public const string Version = "5.1.0.2";
public static Roles LoggedInRole { get; private set; } = Roles.None;
@ -91,10 +91,11 @@ namespace ZKuP
DispatcherTimer ausfahrtTimer = new DispatcherTimer();
RoutedCommand resetWindow;
RoutedCommand skullWindow;
//RoutedCommand skullWindow;
int maxBikes = 24;
bool ReadyToSavePosition = false;
bool isSecureConn = false;
public MainWindow()
{
@ -280,7 +281,7 @@ namespace ZKuP
await Task.Run(() => AuthenticateUser());
SQL.GetCipher();
isSecureConn = SQL.IsSecureConnection();
//#if !DEBUG
Helper.CheckIfMultipleInstances();
//#endif
@ -380,7 +381,7 @@ namespace ZKuP
await Dispatcher.BeginInvoke(new Action(() => pgLoad.Value = 15));
auth = await SQL.ReadSingleValueAsync($"SELECT EXISTS(SELECT * FROM {MainWindow.table}.users WHERE `Username` = '{Environment.UserName}')");
await Dispatcher.BeginInvoke(new Action(() => SQL.WriteSQL($"REPLACE INTO {MainWindow.table}.apptracker (Username, Version, LastLogin) VALUES ('{Environment.UserName}', '{Version}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}')")));
await Dispatcher.BeginInvoke(new Action(() => SQL.WriteSQL($"REPLACE INTO {MainWindow.table}.apptracker (Username, Version, LastLogin, Online) VALUES ('{Environment.UserName}', '{Version}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', 1)")));
await Dispatcher.BeginInvoke(new Action(() => pgLoad.Value = 20));
@ -528,8 +529,9 @@ namespace ZKuP
this.Top = Settings.GetSettingDouble("Top");
var ws = Settings.GetSetting("WindowState");
#pragma warning disable CS0252
this.WindowState = ws == "" ? WindowState.Normal : (WindowState)ws;
#pragma warning restore CS0252
//double ratio = Settings.GetSettingDouble("ColumnRatio");
// Gespeicherte Werte laden
@ -1394,6 +1396,7 @@ namespace ZKuP
}
bool lastConn = false;
bool lastConnSecure = false;
bool connMsg = true;
private async Task CheckConnection(bool first = false)
{
@ -1406,18 +1409,33 @@ namespace ZKuP
if (conn.IsConnected)
{
if (conn.IsConnected != lastConn)
if (conn.IsConnected != lastConn || isSecureConn != lastConnSecure)
{
imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
+ System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
+ ";component/"
+ $"Resources/Connected.png", UriKind.Absolute));
//imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
// + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
// + ";component/"
// + $"Resources/ConnectedSecure.png", UriKind.Absolute));
imgConnection.Source = (ImageSource)this.FindResource("ConnectedIcon");
imgConnection.ToolTip = $"Verbindung OK";
(this.Resources["sbConnection"] as System.Windows.Media.Animation.Storyboard).Begin();
(this.Resources["sbConnection"] as System.Windows.Media.Animation.Storyboard).Stop();
lastConn = conn.IsConnected;
if (isSecureConn)
{
lastConnSecure = isSecureConn;
imgConnection.ToolTip += $" und gesichert";
imgSecureConn.Visibility = Visibility.Visible;
}
else
{
lastConnSecure = isSecureConn;
imgConnection.ToolTip = $"Verbindung OK";
imgSecureConn.Visibility = Visibility.Collapsed;
}
}
}
else
@ -1432,21 +1450,22 @@ namespace ZKuP
MessageBox.Show("Sie haben keine Verbindung zur Datenbank und das DB VPN 'Ivanti Secure Access (ehem. Pulse Secure)' ist nicht verbunden\n\n" +
"Befinden Sie sich außerhalb des BKU Netzes, bitte die Verbindung zum VPN sicherstellen\n\n" +
"Nach Herstellen der Verbindung erneut starten\n" +
"Die Anwendung wird jetzt geschlossen", "VPN verbunden?", MessageBoxButton.OK, MessageBoxImage.Information);
"Nach Herstellen der Verbindung erneut starten\n", "VPN verbunden?", MessageBoxButton.OK, MessageBoxImage.Information);/*"Die Anwendung wird jetzt geschlossen"*/
}
Application.Current.Shutdown();
Environment.Exit(0);
//Application.Current.Shutdown();
//Environment.Exit(0);
}
}
if (!conn.IsConnected && conn.IsConnected != lastConn)
{
imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
+ System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
+ ";component/"
+ $"Resources/Disconnected.png", UriKind.Absolute));
//imgConnection.Source = new BitmapImage(new Uri(@"pack://application:,,,/"
// + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
// + ";component/"
// + $"Resources/Disconnected.png", UriKind.Absolute));
imgConnection.Source = (ImageSource)this.FindResource("NotConnectedIcon");
imgSecureConn.Visibility = Visibility.Collapsed;
imgConnection.ToolTip = $"Verbindung zum Server unterbrochen\n\nEs sind keine Änderungen oder Abfragen möglich";
@ -2493,7 +2512,7 @@ namespace ZKuP
idFirma_Besucher = (int)(dc).Row.ItemArray[14];
kat = "2";
}
#pragma warning disable CS0472
if (idFirma_Besucher != null && idFirma_Besucher != -1)
{
AspInfo aI = new AspInfo(idFirma_Besucher, kat, 2, (dc).Row.ItemArray[0].ToString());
@ -2503,6 +2522,7 @@ namespace ZKuP
else
MessageBox.Show("Keine gültigen Informationen vorhanden", "Fehler", MessageBoxButton.OK, MessageBoxImage.Information);
}
#pragma warning restore CS0472
@ -2511,7 +2531,7 @@ namespace ZKuP
private void Window_Closing(object sender, CancelEventArgs e)
private async void Window_Closing(object sender, CancelEventArgs e)
{
if (Main.Visibility == Visibility.Visible)
{
@ -2525,6 +2545,7 @@ namespace ZKuP
Settings.WriteSetting("WindowState", this.WindowState);
Settings.Save();
await SQL.WriteSQL($"UPDATE {MainWindow.table}.apptracker SET Online = 0 WHERE Username = '{Environment.UserName}'");
//Properties.Settings.Default.Save();
}
}

66
ZKuP/ManageAsp.xaml.cs
View File

@ -25,12 +25,12 @@ namespace ZKuP
{
public event PropertyChangedEventHandler PropertyChanged;
private List<Asp> myVar;
public List<Asp> aspView
{
get { return myVar; }
set { myVar = value; }
}
//private List<Asp> myVar;
//public List<Asp> aspView
//{
// get { return myVar; }
// set { myVar = value; }
//}
DataTable asp = new DataTable("Asp");
string UserID = "0";
@ -57,7 +57,7 @@ namespace ZKuP
asp = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.ansprechpartner WHERE Name LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR Vertreter LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR Vorgesetzter LIKE '%{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}%' OR CreatorID = '{UserID}' ORDER BY Name ASC", asp).Result;
}
aspView = Asp.DataTableToAsp(asp);
//aspView = Asp.DataTableToAsp(asp);
dgAsp.DataContext = asp;
}
@ -217,34 +217,34 @@ namespace ZKuP
}
}
public class Asp
{
string Name;
string Vertreter;
string Tel_Nr;
string Vorgesetzter;
string Tel_Vertreter;
string Tel_Vorgesetzter;
//public class Asp
//{
// string Name;
// string Vertreter;
// string Tel_Nr;
// string Vorgesetzter;
// string Tel_Vertreter;
// string Tel_Vorgesetzter;
public static List<Asp> DataTableToAsp(System.Data.DataTable dataTable)
{
List<Asp> x = new List<Asp>();
// public static List<Asp> DataTableToAsp(System.Data.DataTable dataTable)
// {
// List<Asp> x = new List<Asp>();
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()
});
}
// 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;
}
}
// return x;
// }
//}
}

66
ZKuP/ManageDeliveries.xaml.cs
View File

@ -28,12 +28,12 @@ namespace ZKuP
{
public event PropertyChangedEventHandler PropertyChanged;
private List<Deliver> myVar;
public List<Deliver> DeliveriesView
{
get { return myVar; }
set { myVar = value; OnPropertyChanged(); }
}
//private List<Deliver> myVar;
//public List<Deliver> DeliveriesView
//{
// get { return myVar; }
// set { myVar = value; OnPropertyChanged(); }
//}
System.Data.DataTable lieferanten = new System.Data.DataTable("lieferanten");
public ManageDeliveries()
@ -41,7 +41,7 @@ namespace ZKuP
InitializeComponent();
lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
//DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
dgLieferanten.DataContext = lieferanten;
dgLieferanten.Items.SortDescriptions.Clear();
@ -70,7 +70,7 @@ namespace ZKuP
lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
//DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
dgLieferanten.ScrollIntoView(dgLieferanten.Items[dgLieferanten.Items.Count - 1]); //scroll to last
dgLieferanten.UpdateLayout();
ResetInput();
@ -124,7 +124,7 @@ namespace ZKuP
dgLieferanten.PreviewKeyDown += DgLieferanten_PreviewKeyDown;
lieferanten = await SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten);
DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
//DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
}
@ -139,7 +139,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.lieferanten WHERE `ID` = '{arr[4]}'");
lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
//DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
}
}
@ -160,7 +160,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.lieferanten WHERE `ID` = '{arr[4]}'");
lieferanten = SQL.ReadSQL($"Select * from {MainWindow.table}.lieferanten", lieferanten).Result;
DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
//DeliveriesView = Deliver.DataTableToDeliver(lieferanten);
}
}
@ -231,32 +231,32 @@ namespace ZKuP
public class Deliver
{
public string Firma;
string Fahrer;
string Handynr;
string Kennzeichen;
//public class Deliver
//{
// public string Firma;
// string Fahrer;
// string Handynr;
// string Kennzeichen;
public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
{
List<Deliver> x = new List<Deliver>();
// public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
// {
// List<Deliver> x = new List<Deliver>();
foreach (System.Data.DataRow dr in dataTable.Rows)
{
x.Add(new Deliver()
{
Firma = dr[0].ToString(),
Fahrer = dr[1].ToString(),
Handynr = dr[2].ToString(),
Kennzeichen = dr[3].ToString()
});
}
// foreach (System.Data.DataRow dr in dataTable.Rows)
// {
// x.Add(new Deliver()
// {
// Firma = dr[0].ToString(),
// Fahrer = dr[1].ToString(),
// Handynr = dr[2].ToString(),
// Kennzeichen = dr[3].ToString()
// });
// }
return x;
}
}
// return x;
// }
//}
}

68
ZKuP/ManageEntstoerdienste.xaml.cs
View File

@ -25,12 +25,12 @@ namespace ZKuP
{
public event PropertyChangedEventHandler PropertyChanged;
private List<Deliver> myVar;
public List<Deliver> DeliveriesView
{
get { return myVar; }
set { myVar = value; OnPropertyChanged(); }
}
//private List<Deliver> myVar;
//public List<Deliver> DeliveriesView
//{
// get { return myVar; }
// set { myVar = value; OnPropertyChanged(); }
//}
System.Data.DataTable entstoerdienste = new System.Data.DataTable("entstoerdienste");
@ -51,7 +51,7 @@ namespace ZKuP
cbFirma.ItemsSource = list;
entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
dgEntstoerdienste.DataContext = entstoerdienste;
dgEntstoerdienste.Items.SortDescriptions.Clear();
@ -91,7 +91,7 @@ namespace ZKuP
dgEntstoerdienste.PreviewKeyDown += DgEntstoerdienste_PreviewKeyDown;
entstoerdienste = await SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste);
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
}
private async void DgEntstoerdienste_PreviewKeyDown(object sender, KeyEventArgs e)
@ -105,7 +105,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
}
}
@ -131,7 +131,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
}
}
@ -146,7 +146,7 @@ namespace ZKuP
await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.entstoerdienste WHERE `identstoerdienste` = '{arr[0]}'");
entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
}
}
@ -185,7 +185,7 @@ namespace ZKuP
entstoerdienste = SQL.ReadSQL($"Select * from {MainWindow.table}.entstoerdienste", entstoerdienste).Result;
DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
//DeliveriesView = Deliver.DataTableToDeliver(entstoerdienste);
dgEntstoerdienste.ScrollIntoView(dgEntstoerdienste.Items[dgEntstoerdienste.Items.Count - 1]); //scroll to last
dgEntstoerdienste.UpdateLayout();
ResetInput();
@ -222,31 +222,31 @@ namespace ZKuP
public class Deliver
{
public string Firma;
string Fahrer;
string Handynr;
string Kennzeichen;
//public class Deliver
//{
// public string Firma;
// string Fahrer;
// string Handynr;
// string Kennzeichen;
public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
{
List<Deliver> x = new List<Deliver>();
// public static List<Deliver> DataTableToDeliver(System.Data.DataTable dataTable)
// {
// List<Deliver> x = new List<Deliver>();
foreach (System.Data.DataRow dr in dataTable.Rows)
{
x.Add(new Deliver()
{
Firma = dr[0].ToString(),
Fahrer = dr[1].ToString(),
Handynr = dr[2].ToString(),
Kennzeichen = dr[3].ToString()
});
}
// foreach (System.Data.DataRow dr in dataTable.Rows)
// {
// x.Add(new Deliver()
// {
// Firma = dr[0].ToString(),
// Fahrer = dr[1].ToString(),
// Handynr = dr[2].ToString(),
// Kennzeichen = dr[3].ToString()
// });
// }
return x;
}
}
// return x;
// }
//}

58
ZKuP/ManageUsers.xaml.cs
View File

@ -37,12 +37,12 @@ namespace ZKuP
"M2 AM"
};
private List<Users> myVar;
public List<Users> UserView
{
get { return myVar; }
set { myVar = value; OnPropertyChanged(); }
}
//private List<Users> myVar;
//public List<Users> UserView
//{
// get { return myVar; }
// set { myVar = value; OnPropertyChanged(); }
//}
DataTable userList = new DataTable("userList");
@ -55,7 +55,7 @@ namespace ZKuP
userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
userList.DefaultView.Sort = "Username";
userList = userList.DefaultView.ToTable();
UserView = Users.DataTableToUserList(userList);
//UserView = Users.DataTableToUserList(userList);
dgUsers.DataContext = userList;
}
@ -87,10 +87,10 @@ namespace ZKuP
userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
userList.DefaultView.Sort = "Username";
userList = userList.DefaultView.ToTable();
UserView = Users.DataTableToUserList(userList);
//UserView = Users.DataTableToUserList(userList);
dgUsers.DataContext = userList;
dgUsers.ScrollIntoView(UserView.Last());
//dgUsers.ScrollIntoView(UserView.Last());
}
else
MessageBox.Show("Der angegebene User existiert bereits!", "User bereits vorhanden", MessageBoxButton.OK, MessageBoxImage.Error);
@ -136,7 +136,7 @@ namespace ZKuP
userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
userList.DefaultView.Sort = "Username asc";
userList = userList.DefaultView.ToTable();
UserView = Users.DataTableToUserList(userList);
//UserView = Users.DataTableToUserList(userList);
}
}
@ -160,7 +160,7 @@ namespace ZKuP
userList = SQL.ReadSQL($"Select * from {MainWindow.table}.users", userList).Result;
userList.DefaultView.Sort = "Username";
userList = userList.DefaultView.ToTable();
UserView = Users.DataTableToUserList(userList);
//UserView = Users.DataTableToUserList(userList);
dgUsers.DataContext = userList;
}
}
@ -188,26 +188,26 @@ namespace ZKuP
}
public class Users
{
string Username;
string Role;
//public class Users
//{
// string Username;
// string Role;
public static List<Users> DataTableToUserList(System.Data.DataTable dataTable)
{
List<Users> x = new List<Users>();
// public static List<Users> DataTableToUserList(System.Data.DataTable dataTable)
// {
// List<Users> x = new List<Users>();
foreach (DataRow dr in dataTable.Rows)
{
x.Add(new Users()
{
Username = dr[1].ToString(),
Role = dr[2].ToString()
});
}
// foreach (DataRow dr in dataTable.Rows)
// {
// x.Add(new Users()
// {
// Username = dr[1].ToString(),
// Role = dr[2].ToString()
// });
// }
return x;
}
}
// return x;
// }
//}
}

84
ZKuP/ManageVisitor.xaml.cs
View File

@ -28,12 +28,12 @@ namespace ZKuP
{
public event PropertyChangedEventHandler PropertyChanged;
private List<Visitor> myVar;
public List<Visitor> VisitorView
{
get { return myVar; }
set { myVar = value; OnPropertyChanged(); }
}
//private List<Visitor> myVar;
//public List<Visitor> VisitorView
//{
// get { return myVar; }
// set { myVar = value; OnPropertyChanged(); }
//}
DataTable visitors = new DataTable("Visitors");
private Dictionary<string, List<string>> visitorSearchList = new Dictionary<string, List<string>>();
@ -96,7 +96,7 @@ namespace ZKuP
$"OR Ansprechpartner_Intern = '{Helper.InsertSpaceBeforeUpperCase(Environment.UserName)}' ORDER BY Name ASC"
, visitors).Result;
VisitorView = Visitor.DataTableToVisitor(visitors);
//VisitorView = Visitor.DataTableToVisitor(visitors);
dgVisitors.DataContext = visitors;
@ -118,7 +118,7 @@ namespace ZKuP
private void requestListAdmin()
{
visitors = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.besucher ORDER BY Name ASC", visitors).Result;
VisitorView = Visitor.DataTableToVisitor(visitors);
//VisitorView = Visitor.DataTableToVisitor(visitors);
dgVisitors.DataContext = visitors;
visitorSearchList.Clear();
@ -693,7 +693,7 @@ namespace ZKuP
{
visitors.DefaultView.RowFilter = $"";
Task.Run(() => VisitorView = Visitor.DataTableToVisitor(visitors));
//Task.Run(() => VisitorView = Visitor.DataTableToVisitor(visitors));
dgVisitors.DataContext = visitors;
}
else
@ -875,42 +875,42 @@ namespace ZKuP
}
public class Visitor
{
public string Name;
string Verantwortlicher_MA;
string Tel_Nr_Besucher;
string Anzahl_Begleitpersonen;
string Besuchstag;
string Grund_des_Besuchs;
string Oertlichkeit;
string Ansprechpartner_Intern;
string Tel_Nr_Ansprechpartner_Intern;
//public class Visitor
//{
// public string Name;
// string Verantwortlicher_MA;
// string Tel_Nr_Besucher;
// string Anzahl_Begleitpersonen;
// string Besuchstag;
// string Grund_des_Besuchs;
// string Oertlichkeit;
// string Ansprechpartner_Intern;
// string Tel_Nr_Ansprechpartner_Intern;
public static List<Visitor> DataTableToVisitor(System.Data.DataTable dataTable)
{
List<Visitor> x = new List<Visitor>();
// public static List<Visitor> DataTableToVisitor(System.Data.DataTable dataTable)
// {
// List<Visitor> x = new List<Visitor>();
foreach (DataRow dr in dataTable.Rows)
{
x.Add(new Visitor()
{
Name = dr[1].ToString(),
Verantwortlicher_MA = dr[2].ToString(),
Tel_Nr_Besucher = dr[3].ToString(),
Anzahl_Begleitpersonen = dr[4].ToString(),
Besuchstag = dr[5].ToString(),
Grund_des_Besuchs = dr[6].ToString(),
Ansprechpartner_Intern = dr[7].ToString(),
Tel_Nr_Ansprechpartner_Intern = dr[8].ToString(),
Oertlichkeit = dr[9].ToString()
});
}
// foreach (DataRow dr in dataTable.Rows)
// {
// x.Add(new Visitor()
// {
// Name = dr[1].ToString(),
// Verantwortlicher_MA = dr[2].ToString(),
// Tel_Nr_Besucher = dr[3].ToString(),
// Anzahl_Begleitpersonen = dr[4].ToString(),
// Besuchstag = dr[5].ToString(),
// Grund_des_Besuchs = dr[6].ToString(),
// Ansprechpartner_Intern = dr[7].ToString(),
// Tel_Nr_Ansprechpartner_Intern = dr[8].ToString(),
// Oertlichkeit = dr[9].ToString()
// });
// }
return x;
}
}
}
// return x;
// }
//}
}

BIN
ZKuP/Resources/ConnectedSecure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
ZKuP/Resources/Lock.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

80
ZKuP/SQL.cs
View File

@ -19,10 +19,12 @@ namespace ZKuP
{
private static string p = "fNZG8bO+b8lbajxNUCPCIRNBap4/T5N5Qoa0Rec3P9b2EiwC5eNIwfEMjR5Fvc/W";
private static string s = "KYgjkRVn0edFDca2GbZq/A==";
private static string u = "F/u2njMf6aE4krZGTjzgZw==";
private static string uSSL = "miSRZrFLxAAWlzRLx9B6Ww==";
private static string d = "xWb4X9gPEzwe76zqpysF3w==";
#if DEBUG
private static string u = "F/u2njMf6aE4krZGTjzgZw==";
private static string dTest = "e+tv3ZaP+cewOJgE7jNNlA==";
#endif
//static MySqlConnection conn = new MySqlConnection(GetConnstr());
//private static MySqlConnection _conn;
//public static MySqlConnection conn
@ -61,8 +63,6 @@ namespace ZKuP
isOnline = false;
return false;
}
isOnline = false;
return false;
}
}
@ -91,7 +91,6 @@ namespace ZKuP
System.Windows.Application.Current.Shutdown();
return false;
}
return false;
}
}
@ -113,7 +112,7 @@ namespace ZKuP
return $"Server={GetIP()};" +
$"Uid={Crypto.Decrypt(Crypto.GetHashKey("8734FCD0D69756D3AE7154E69F8042CA"), uSSL)};" +
$"Pwd={Crypto.Decrypt(Crypto.GetHashKey("71A209CC81FDB2F458C4EC8DF7090154"), p)};" +
$"database={Crypto.Decrypt(Crypto.GetHashKey("B79DE37BC846D9B1054EE837AAA45D83"), dTest)}" +
$"database={Crypto.Decrypt(Crypto.GetHashKey("8EB0CC56E502BFC5C19F6A0A0A53D543"), d)}" +
$";SslMode=Required;{(withTimeout ? "Connection Timeout = 10" : "")}";
//Ohne SSL
@ -124,12 +123,12 @@ namespace ZKuP
// $";{(withTimeout ? "Connection Timeout = 10" : "")}";
#elif DEBUG
//Ohne SSL
////Ohne SSL
//return $"Server={GetIP()};" +
// $"Uid={Crypto.Decrypt(Crypto.GetHashKey("990C535389C3A18FFD44951DAA291161"), u)};" +
// $"Pwd={Crypto.Decrypt(Crypto.GetHashKey("71A209CC81FDB2F458C4EC8DF7090154"), p)};" +
// $"database={Crypto.Decrypt(Crypto.GetHashKey("B79DE37BC846D9B1054EE837AAA45D83"), dTest)}" +
// $";{(withTimeout ? "Connection Timeout = 10" : "")}";
// $";SslMode=none;{(withTimeout ? "Connection Timeout = 10" : "")}";
//Mit SSL
@ -152,9 +151,9 @@ namespace ZKuP
return new MySqlConnection(GetConnstr());
}
internal static void GetCipher()
internal static bool IsSecureConnection()
{
#if DEBUG
//#if DEBUG
using (var conn = GetConnection())
{
conn.Open();
@ -162,17 +161,30 @@ namespace ZKuP
var cmd = new MySqlCommand("SHOW STATUS LIKE 'Ssl_cipher'", conn);
using (var reader = cmd.ExecuteReader())
{
string varName = "";
string varValue = "";
while (reader.Read())
{
string varName = reader.GetString(0); // Variable_name
string varValue = reader.GetString(1); // Value
varName = reader.GetString(0); // Variable_name
varValue = reader.GetString(1); // Value
Console.WriteLine($"{varName}: {varValue}");
}
}
conn.Close();
if (varValue == "ECDHE-RSA-AES256-GCM-SHA384")
{
return true;
}
#endif
else
{
return false;
}
}
}
//#endif
}
public static bool TestConnection()
@ -247,6 +259,7 @@ namespace ZKuP
if (signature != null && signature.Length > 0)
cmd.Parameters.Add("@signature", MySqlDbType.LongBlob).Value = signature;
else cmd.Parameters.Add("@signature", MySqlDbType.LongBlob).Value = new byte[1];
await SQL.WriteSQL(cmd);
}
@ -627,8 +640,8 @@ namespace ZKuP
var conn = GetConnection();
MySqlCommand cmd = new MySql.Data.MySqlClient.MySqlCommand(SQLCommand, conn);
UInt32 FileSize;
byte[] rawData;
//UInt32 FileSize;
//byte[] rawData;
System.Drawing.Bitmap image = null;
using (conn)
@ -687,7 +700,7 @@ namespace ZKuP
while (reader.Read())
{
if (!reader.IsDBNull(ColumnID))
queryResult.Add(reader.GetString(ColumnID));
queryResult.Add(reader.GetValue(ColumnID).ToString());
else
queryResult.Add("");
}
@ -725,7 +738,7 @@ namespace ZKuP
{
while (reader.Read())
{
queryResult.Add(reader.GetDateTime(ColumnID).ToString("yyyy-MM-dd HH:mm:ss") + ";" + reader.GetString(ColumnID + 1));
queryResult.Add(reader.GetDateTime(ColumnID).ToString("yyyy-MM-dd HH:mm:ss") + ";" + reader.GetValue(ColumnID + 1).ToString());
}
}
}
@ -763,7 +776,7 @@ namespace ZKuP
while (reader.Read())
{
if (!reader.IsDBNull(ColumnID) && !reader.IsDBNull(ColumnID + 1))
queryResult.Add(reader.GetString(ColumnID) + $"{Seperator}" + reader.GetString(ColumnID + 1));
queryResult.Add(reader.GetValue(ColumnID).ToString() + $"{Seperator}" + reader.GetValue(ColumnID + 1).ToString());
else
queryResult.Add("");
}
@ -806,25 +819,25 @@ namespace ZKuP
switch(ColumnCount)
{
case 1:
queryResult.Add(reader.GetString(ColumnOne));
queryResult.Add(reader.GetValue(ColumnOne).ToString());
break;
case 2:
queryResult.Add(reader.GetString(ColumnOne) + $"{SeperatorOne}" + reader.GetString(ColumnTwo));
queryResult.Add(reader.GetValue(ColumnOne).ToString() + $"{SeperatorOne}" + reader.GetValue(ColumnTwo).ToString());
break;
case 3:
queryResult.Add(reader.GetString(ColumnOne) + $"{SeperatorOne}" + reader.GetString(ColumnTwo) + $"{SeperatorTwo}" + reader.GetString(ColumnThree));
queryResult.Add(reader.GetValue(ColumnOne).ToString() + $"{SeperatorOne}" + reader.GetValue(ColumnTwo).ToString() + $"{SeperatorTwo}" + reader.GetValue(ColumnThree).ToString());
break;
case 4:
queryResult.Add(reader.GetString(ColumnOne) + $"{SeperatorOne}" + reader.GetString(ColumnTwo) + $"{SeperatorTwo}" + reader.GetString(ColumnThree) + $"{SeperatorThree}" + reader.GetString(ColumnFour));
queryResult.Add(reader.GetValue(ColumnOne).ToString() + $"{SeperatorOne}" + reader.GetValue(ColumnTwo).ToString() + $"{SeperatorTwo}" + reader.GetValue(ColumnThree).ToString() + $"{SeperatorThree}" + reader.GetValue(ColumnFour).ToString());
break;
case 5:
queryResult.Add(reader.GetString(ColumnOne) + $"{SeperatorOne}" + reader.GetString(ColumnTwo) + $"{SeperatorTwo}" + reader.GetString(ColumnThree) + $"{SeperatorThree}" + reader.GetString(ColumnFour) + $"{SeperatorFour}" + reader.GetString(ColumnFive));
queryResult.Add(reader.GetValue(ColumnOne).ToString() + $"{SeperatorOne}" + reader.GetValue(ColumnTwo).ToString() + $"{SeperatorTwo}" + reader.GetValue(ColumnThree).ToString() + $"{SeperatorThree}" + reader.GetValue(ColumnFour).ToString() + $"{SeperatorFour}" + reader.GetValue(ColumnFive).ToString());
break;
case 6:
queryResult.Add(reader.GetString(ColumnOne) + $"{SeperatorOne}" + reader.GetString(ColumnTwo) + $"{SeperatorTwo}" + reader.GetString(ColumnThree) + $"{SeperatorThree}" + reader.GetString(ColumnFour) + $"{SeperatorFour}" + reader.GetString(ColumnFive) + $"{SeperatorFive}" + reader.GetString(ColumnSix));
queryResult.Add(reader.GetValue(ColumnOne).ToString() + $"{SeperatorOne}" + reader.GetValue(ColumnTwo).ToString() + $"{SeperatorTwo}" + reader.GetValue(ColumnThree).ToString() + $"{SeperatorThree}" + reader.GetValue(ColumnFour).ToString() + $"{SeperatorFour}" + reader.GetValue(ColumnFive).ToString() + $"{SeperatorFive}" + reader.GetValue(ColumnSix).ToString());
break;
default:
queryResult.Add(reader.GetString(ColumnOne));
queryResult.Add(reader.GetValue(ColumnOne).ToString());
break;
}
}
@ -861,14 +874,14 @@ namespace ZKuP
if (FirstColumn == 0 && SecondColumn == 0)
{
if (!queryResult.ContainsKey(0))
queryResult.Add(0, reader.GetString(SecondColumn));
queryResult.Add(0, reader.GetValue(SecondColumn).ToString());
}
else
{
var x = reader.GetInt32(FirstColumn);
if (!queryResult.ContainsKey(x))
queryResult.Add(x, reader.GetString(SecondColumn));
queryResult.Add(x, reader.GetValue(SecondColumn).ToString());
}
}
@ -903,13 +916,13 @@ namespace ZKuP
while (reader.Read())
{
if (!reader.IsDBNull(FirstColumn) && !reader.IsDBNull(SecondColumn))
if (!queryResult.ContainsKey(reader.GetString(FirstColumn)))
queryResult.Add(reader.GetString(FirstColumn), reader.GetString(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.GetString(FirstColumn)))
queryResult.Add(reader.GetString(FirstColumn), "");
if (!queryResult.ContainsKey(reader.GetValue(FirstColumn).ToString()))
queryResult.Add(reader.GetValue(FirstColumn).ToString(), "");
}
}
@ -946,8 +959,9 @@ namespace ZKuP
await conn.OpenAsync();
var result = await cmd.ExecuteScalarAsync();
conn.Open();
var result = cmd.ExecuteScalar();
conn.Close();
return result != null;

16
ZKuP/Signature.xaml.cs
View File

@ -40,7 +40,7 @@ namespace ZKuP
try
{
var dev = 1;
//var dev = 1;
if (signoPad._stPad.DeviceGetCount() <= 0)
{
MessageBox.Show("Kein Unterschriftenpad gefunden\nMeldung 0x04", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@ -109,15 +109,15 @@ namespace ZKuP
private void btnConfirm_Click(object sender, RoutedEventArgs e)
{
System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Tiff;
SignatureImageFlag options = signotec.STPadLibNet.SignatureImageFlag.Timestamp | signotec.STPadLibNet.SignatureImageFlag.TimestampRelToImage | signotec.STPadLibNet.SignatureImageFlag.DontSmooth; ;
//System.Drawing.Imaging.ImageFormat format = System.Drawing.Imaging.ImageFormat.Tiff;
//SignatureImageFlag options = signotec.STPadLibNet.SignatureImageFlag.Timestamp | signotec.STPadLibNet.SignatureImageFlag.TimestampRelToImage | signotec.STPadLibNet.SignatureImageFlag.DontSmooth; ;
int resolution = 300;
int width = 0;
int height = 0;
int penWidth = 0;
System.Drawing.Color penColor = System.Drawing.Color.FromArgb(255, 0, 0, 0);
//int resolution = 300;
//int width = 0;
//int height = 0;
//int penWidth = 0;
//System.Drawing.Color penColor = System.Drawing.Color.FromArgb(255, 0, 0, 0);
try

38
ZKuP/ZKuP.csproj
View File

@ -70,6 +70,7 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
<NoWarn>4014,1998,0108</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
@ -88,6 +89,7 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<WarningsAsErrors>1030</WarningsAsErrors>
<NoWarn>4014,1998,0108</NoWarn>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>3C16B2C32C7121098E02D5B8C9B97FB987E781D1</ManifestCertificateThumbprint>
@ -608,14 +610,14 @@
<Resource Include="Resources\Sun.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle">
<Version>1.8.9</Version>
<PackageReference Include="BouncyCastle.Cryptography">
<Version>2.6.1</Version>
</PackageReference>
<PackageReference Include="ColorHelper">
<Version>1.8.1</Version>
</PackageReference>
<PackageReference Include="Costura.Fody">
<Version>5.2.0</Version>
<Version>6.0.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
@ -623,25 +625,25 @@
<Version>2.0.2</Version>
</PackageReference>
<PackageReference Include="Google.Protobuf">
<Version>3.17.3</Version>
<Version>3.31.1</Version>
</PackageReference>
<PackageReference Include="K4os.Compression.LZ4.Streams">
<Version>1.2.6</Version>
<Version>1.3.8</Version>
</PackageReference>
<PackageReference Include="MahApps.Metro">
<Version>2.4.7</Version>
<Version>2.4.10</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>5.0.2</Version>
<Version>7.0.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.Office.Interop.Word">
<Version>15.0.4797.1003</Version>
<Version>15.0.4797.1004</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
<Version>7.1.2</Version>
<Version>7.1.3</Version>
</PackageReference>
<PackageReference Include="MySql.Data">
<Version>8.0.25</Version>
<Version>9.4.0</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>2.0.3</Version>
@ -650,7 +652,7 @@
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="SSH.NET">
<Version>2020.0.1</Version>
<Version>2025.0.0</Version>
</PackageReference>
<PackageReference Include="System.Collections">
<Version>4.3.0</Version>
@ -662,7 +664,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Diagnostics.DiagnosticSource">
<Version>5.0.1</Version>
<Version>9.0.7</Version>
</PackageReference>
<PackageReference Include="System.Diagnostics.Tools">
<Version>4.3.0</Version>
@ -737,7 +739,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version>
<Version>4.6.1</Version>
</PackageReference>
<PackageReference Include="System.Xml.ReaderWriter">
<Version>4.3.1</Version>
@ -746,10 +748,10 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="WpfScreenHelper">
<Version>1.1.0</Version>
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="XamlAnimatedGif">
<Version>2.3.0</Version>
<Version>2.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@ -861,5 +863,11 @@
<ItemGroup>
<Resource Include="Resources\ConnBackground.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\ConnectedSecure.png" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Lock.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>