diff --git a/ZKuP/AddCardUser.xaml b/ZKuP/AddCardUser.xaml
index 1c65db6..5f9490c 100644
--- a/ZKuP/AddCardUser.xaml
+++ b/ZKuP/AddCardUser.xaml
@@ -1,27 +1,35 @@
-
+ Title="Kartenbenutzer" MinHeight="450" Height="450" Width="594" Loaded="Window_Loaded" LocationChanged="Window_LocationChanged">
-
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/ZKuP/AddCardUser.xaml.cs b/ZKuP/AddCardUser.xaml.cs
index 4eaf782..56ad7dd 100644
--- a/ZKuP/AddCardUser.xaml.cs
+++ b/ZKuP/AddCardUser.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using MahApps.Metro.Controls;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -18,37 +19,69 @@ namespace ZKuP
///
/// Interaktionslogik für AddCardUser.xaml
///
- public partial class AddCardUser : Window
+ public partial class AddCardUser : MetroWindow
{
string _user = "";
string _ansprechpartnerFirma = "";
+ bool _isBesucher = false;
List comboList = new List() { "Grün", "Rot", "Gerätewagen" };
List comboListNurRot = new List() { "Rot" };
+ List mitarbeiterList = new List();
+ List telList = new List();
+
byte[] _signature = null;
string _ap = "";
bool _needTel = true;
- public AddCardUser(string user = "", bool isBesucher = false, string nr = "", string ap = "", bool needTel = true)
+ public AddCardUser(string user = "", bool isBesucher = false, string count = "", string ap = "", bool needTel = true, bool hasEinweisung = false, string firma = "", string telnr = "", string idFirma = "")
{
_user = user;
_ap = ap;
_needTel = needTel;
+ _isBesucher = isBesucher;
InitializeComponent();
- this.Title = "Karten ausgeben - " + nr;
+ Helper.InitSerial();
+ Helper.DataReceived += Helper_DataReceived;
- //cbColor.ItemsSource = isBesucher ? comboListNurRot : comboList;
- cbColor.ItemsSource = comboListNurRot;
+ this.Title = "Karten ausgeben - " + count;
+
+ lblFirma.Text = isBesucher ? "Firma" : "Firma*";
+ lblTelnr.Text = needTel ? "Telefonnummer*" : "Telefonnummer";
+
+ cbColor.ItemsSource = isBesucher ? comboListNurRot : comboList;
+ cbColor.ItemsSource = hasEinweisung ? comboList : comboListNurRot;
+ //cbColor.ItemsSource = comboListNurRot;
+
+ if (!isBesucher)
+ {
+ tbFirma.Text = firma;
+ mitarbeiterList = SQL.ReadSingleValue($"SELECT Personen FROM {MainWindow.table}.firmenPeople WHERE idFirmen = '{idFirma}'").Split(';').ToList();
+ telList = SQL.ReadSingleValue($"SELECT TelNr FROM {MainWindow.table}.firmenPeople WHERE idFirmen = '{idFirma}'").Split(';').ToList();
+ if (!mitarbeiterList.Contains(user)) mitarbeiterList.Add(user);
+ if (!telList.Contains(telnr)) telList.Add(telnr);
+
+ tbUser.ItemsSource = mitarbeiterList;
+ tbTelnr.ItemsSource = telList;
+
+ if (!string.IsNullOrWhiteSpace(count))
+ {
+ var selection = Convert.ToInt16(count.Split('/')[0]) - 2;
+ tbUser.SelectedIndex = selection;
+ tbTelnr.SelectedIndex = selection;
+ }
+ }
if (!user.Contains("["))
{
- tbUser.Text = user;
+ if(tbUser.SelectedIndex == -1) tbUser.Text = user;
try
{
if (user != "")
- tbTelnr.Text = SQL.ReadSingleValue($"SELECT Tel_Nr_Verantwortlicher_Firma FROM {MainWindow.table}.firmen WHERE Name='{user}'");
+ tbTelnr.Text = telnr;
+ //tbTelnr.Text = SQL.ReadSingleValue($"SELECT Tel_Nr_Verantwortlicher_Firma FROM {MainWindow.table}.firmen WHERE Name='{user}'");
}
catch (Exception)
{
@@ -63,15 +96,41 @@ namespace ZKuP
}
}
+ private void Helper_DataReceived(object sender, string e)
+ {
+ var text = "";
+ Dispatcher.Invoke(() => text = tbNummer.Text = e.Split('=')[0]);
+
+ if (!string.IsNullOrWhiteSpace(text))
+ {
+ var farbe = SQL.ReadSingleValue($"SELECT Farbe FROM {MainWindow.table}.kartennummern WHERE Kartennummer='{text}'");
+
+ Dispatcher.Invoke(() =>
+ {
+ switch (farbe)
+ {
+ case "1":
+ cbColor.SelectedValue = "Rot";
+ break;
+ case "2":
+ cbColor.SelectedValue = "Grün";
+ break;
+ }
+ });
+ }
+ }
+
private async void btnAdd_Click(object sender, RoutedEventArgs e)
{
- if (tbNummer.Text == "")
+ if (string.IsNullOrWhiteSpace(tbNummer.Text))
MessageBox.Show(this, "Kartennummer angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
else if (cbColor.SelectedIndex == -1)
MessageBox.Show(this, "Kartenfarbe auswählen!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (tbUser.Text == "")
- MessageBox.Show(this, "Benutzer angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
- else if (_needTel && tbTelnr.Text == "")
+ else if (string.IsNullOrWhiteSpace(tbUser.Text))
+ MessageBox.Show(this, "Person angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+ else if (!_isBesucher && string.IsNullOrWhiteSpace(tbFirma.Text))
+ MessageBox.Show(this, "Firma angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+ else if (_needTel && string.IsNullOrWhiteSpace(tbTelnr.Text))
MessageBox.Show(this, "Telefonnummer angeben!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
else
{
@@ -85,7 +144,7 @@ namespace ZKuP
if (_signature != null)
{
- await SQL.WriteSQL($"REPLACE INTO karten (kartennr,farbe,benutzer,telnr,AusgegebenDurch,AusgegebenTimestamp,Signature,Ansprechpartner) VALUES ('{tbNummer.Text}','{cbColor.SelectedValue.ToString()}','{tbUser.Text}','{tbTelnr.Text}','{Environment.UserName}','{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}', @signature, '{_ap}')", _signature);
+ 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);
MessageBox.Show(this, "Karte erfolgreich verknüpft", "Erfolg", MessageBoxButton.OK, MessageBoxImage.Information);
@@ -112,9 +171,16 @@ namespace ZKuP
}
- private void tbUser_PreviewTextInput(object sender, TextCompositionEventArgs e)
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
{
- if (tbUser.Text.Length >= 254) e.Handled = true;
+ Helper.CheckWindowIsInScreenSpace(this);
}
+
+ private void Window_LocationChanged(object sender, EventArgs e)
+ {
+ Helper.CheckWindowIsInScreenSpace(this);
+ }
+
}
}
diff --git a/ZKuP/AddFirmenList.xaml b/ZKuP/AddFirmenList.xaml
new file mode 100644
index 0000000..0f51fc1
--- /dev/null
+++ b/ZKuP/AddFirmenList.xaml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ZKuP/AddFirmenList.xaml.cs b/ZKuP/AddFirmenList.xaml.cs
new file mode 100644
index 0000000..80a9646
--- /dev/null
+++ b/ZKuP/AddFirmenList.xaml.cs
@@ -0,0 +1,287 @@
+using MahApps.Metro.Controls;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.RightsManagement;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ZKuP
+{
+ ///
+ /// Interaktionslogik für AddVisitorsList.xaml
+ ///
+ public partial class AddFirmenList : MetroWindow
+ {
+ public int GroupID { get; private set; }
+ int width = 0;
+ bool _isEdit = false;
+ int _idFirmen = 0;
+
+ public string Personen { get; set; }
+ public string TelNr { get; set; }
+
+ public AddFirmenList(bool isEdit = false, int idFirmen = 0, int PeopleCount = 0)
+ {
+ InitializeComponent();
+
+
+ if (isEdit)
+ {
+ _isEdit = isEdit;
+ _idFirmen = idFirmen;
+ btnAdd.Visibility = Visibility.Visible;
+
+ BuildWindow(PeopleCount);
+
+ var list = SQL.ReadSingleValue($"SELECT Personen FROM {MainWindow.table}.firmenPeople WHERE idFirmen = '{_idFirmen}'").Split(';');
+
+ if (list.Length > 0)
+ {
+ var boxes = Helper.FindVisualChildren(spGroupPers).Where(p => p.Tag.ToString() == "Name").ToList();
+
+ for (var i = 0; i < boxes.Count(); i++)
+ {
+ if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
+ {
+ if (boxes[i].Tag == "Name")
+ boxes[i].Text = list[i];
+ }
+ }
+
+ boxes = Helper.FindVisualChildren(spGroupPers).Where(p => p.Tag.ToString() == "Tel").ToList();
+
+ list = SQL.ReadSingleValue($"SELECT TelNr FROM {MainWindow.table}.firmenPeople WHERE idFirmen = '{_idFirmen}'").Split(';');
+
+ for (var i = 0; i < boxes.Count(); i++)
+ {
+ if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
+ {
+ if (boxes[i].Tag == "Tel")
+ boxes[i].Text = list[i];
+ }
+ }
+ }
+ }
+ else
+ {
+ if(PeopleCount > 0)
+ {
+ for (var i = 0; i < PeopleCount; i++)
+ Add();
+ }
+ }
+ }
+
+ private void BuildWindow(int besucherAnzahl)
+ {
+ int maxProSpalte = 10; // Maximale Anzahl an Textfeldern pro Spalte
+
+ // PanelsContainer soll die WrapPanels halten
+ spGroupPers.Children.Clear(); // Vorherige Panels entfernen (falls schon welche existieren)
+
+ // Erstelle die WrapPanels und füge sie dem StackPanel hinzu
+ int columnCount = 2;// (int)Math.Ceiling((double)besucherAnzahl / maxProSpalte);
+
+ //for (int i = 0; i < columnCount; i++)
+ //{
+ WrapPanel wrapPanel = new WrapPanel()
+ {
+ //Orientation = Orientation.Vertical, // Jedes WrapPanel wird vertikal sein
+ Margin = new Thickness(10),
+ Width = 600
+ };
+
+ // Für jedes WrapPanel Textfelder hinzufügen
+ for (int j = 0; j < besucherAnzahl; j++)
+ {
+ var mainPanel = new StackPanel();
+ mainPanel.Orientation = Orientation.Horizontal;
+
+ var sp = new StackPanel();
+ var lbl = new TextBlock() { Text = $"Begleitperson Nr. {j + 1}:", Margin = new Thickness(5), Height = 20 };
+ lbl.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ sp.Children.Add(lbl);
+ var tb = new TextBox() { Tag = "Name", Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280, ToolTip = "Um eine Person zu entfernen, Feld leer lassen" };
+ ToolTipService.SetInitialShowDelay(tb, 200);
+ MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb, "Vorname Nachname");
+ sp.Children.Add(tb);
+
+ var sp2 = new StackPanel();
+ var lbl2 = new TextBlock() { Text = $"", Margin = new Thickness(5), Height = 20 };
+ lbl2.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ sp2.Children.Add(lbl2);
+ var tb2 = new TextBox() { Tag = "Tel", Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280, ToolTip = "Um eine Person zu entfernen, Feld leer lassen" };
+ ToolTipService.SetInitialShowDelay(tb2, 200);
+ MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb2, "Telefonnummer");
+ sp2.Children.Add(tb2);
+
+ mainPanel.Children.Add(sp);
+ mainPanel.Children.Add(sp2);
+
+ wrapPanel.Children.Add(mainPanel);
+ }
+
+ // Das WrapPanel zum StackPanel hinzufügen
+ spGroupPers.Children.Add(wrapPanel);
+ //}
+
+ width = (columnCount * 320) + 10;
+ //this.Height = this.MinHeight + (besucherAnzahl * 80);
+ }
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
+ {
+ this.Height = spGroupPers.DesiredSize.Height + 80;
+ this.Width = width;
+
+ Helper.CheckWindowIsInScreenSpace(this);
+ }
+
+ private async void btnSend_Click(object sender, RoutedEventArgs e)
+ {
+ //await SendIt();
+ this.Close();
+ }
+
+ private async Task SendIt()
+ {
+ var textBoxes = Helper.FindVisualChildren(spGroupPers);
+ var person = "";
+
+ foreach (var textBox in textBoxes)
+ {
+ if (textBox.Tag != null && (!string.IsNullOrWhiteSpace(textBox.Text) && textBox.Tag.ToString() == "Name")) person = textBox.Text;
+ else if (textBox.Tag == null) return;
+ //else if (string.IsNullOrWhiteSpace(textBox.Text))
+ //{
+ // MessageBox.Show("Namensfeld muss ausgefüllt werden", "Fehlende Daten", MessageBoxButton.OK, MessageBoxImage.Error);
+ // return;
+ //}
+
+ if (textBox.Tag != null && textBox.Tag.ToString() == "Tel")
+ {
+ //if(!string.IsNullOrWhiteSpace(textBox.Text))
+ //{
+ // MessageBox.Show("Telefonnummer muss ausgefüllt werden", "Fehlende Daten", MessageBoxButton.OK, MessageBoxImage.Error);
+ // return;
+ //}
+
+ Personen += person + ";";
+ TelNr += textBox.Text + ";";
+ }
+ }
+
+ if (Personen != null) Personen = Personen.TrimEnd(';');
+ if (TelNr != null) TelNr = TelNr.TrimEnd(';');
+
+
+ if (Personen != null)
+ {
+ await SQL.CreateAndWriteSQL($"DELETE FROM {MainWindow.table}.firmenPeople WHERE idFirmen = @id", new List()
+ {
+ new MySqlParameter("@id", _idFirmen)
+ });
+
+ await SQL.CreateAndWriteSQL($"INSERT INTO {MainWindow.table}.firmenPeople (idFirmen, Personen, TelNr) VALUES (@id, @personen, @tel)", new List()
+ {
+ new MySqlParameter("@id", _idFirmen),
+ new MySqlParameter("@personen", Personen),
+ new MySqlParameter("@tel", TelNr)
+ });
+
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.firmen SET Anzahl_Begleiter = @anzahl WHERE idFirmen = @id", new List()
+ {
+ new MySqlParameter("@id", _idFirmen),
+ new MySqlParameter("@anzahl", Personen.Split(';').Length)
+ });
+ }
+ }
+
+ private void btnAdd_Click(object sender, RoutedEventArgs e)
+ {
+ Add();
+ }
+
+ private void Add()
+ {
+ bool zeroPanels = false;
+ WrapPanel wrapPanel = new WrapPanel
+ {
+ Orientation = Orientation.Vertical, // Jedes WrapPanel wird vertikal sein
+ Margin = new Thickness(10),
+ Width = 600
+ };
+
+ if (Helper.FindVisualChildren(spGroupPers).Count() > 0)
+ {
+ wrapPanel = Helper.FindVisualChildren(spGroupPers).Last();
+ }
+ else
+ zeroPanels = true;
+
+ var nr = Helper.FindVisualChildren(spGroupPers).Where(p => p.Text.StartsWith("Begleitperson")).Count();
+
+ var mainSp = new StackPanel() { Tag = "Count" };
+ mainSp.Orientation = Orientation.Horizontal;
+
+ var sp = new StackPanel();
+ var lbl = new TextBlock() { Text = $"Begleitperson Nr. {nr + 1}:", Margin = new Thickness(5), Height = 20 };
+ lbl.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ sp.Children.Add(lbl);
+ var tb = new TextBox() { Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280, ToolTip = "Um eine Person zu entfernen, Feld leer lassen", Tag = "Name" };
+ ToolTipService.SetInitialShowDelay(tb, 200);
+ MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb, "Vorname Nachname");
+ sp.Children.Add(tb);
+ mainSp.Children.Add(sp);
+
+ var tbTel = new TextBox() { Margin = new Thickness(10, 30, 10, 0), Height = 30, Width = 280, HorizontalAlignment = HorizontalAlignment.Left, VerticalAlignment = VerticalAlignment.Top, ToolTip = "Um eine Person zu entfernen, Feld leer lassen", Tag = "Tel" };
+ ToolTipService.SetInitialShowDelay(tbTel, 200);
+ MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tbTel, "Telefonnummer");
+ mainSp.Children.Add(tbTel);
+
+
+ wrapPanel.Children.Add(mainSp);
+ this.Height = this.Height + 60;
+ // Das WrapPanel zum StackPanel hinzufügen
+
+ if (zeroPanels)
+ {
+ spGroupPers.Children.Add(wrapPanel);
+ this.Height = this.Height + 20;
+ zeroPanels = false;
+ }
+
+ //width = (columnCount * 320) + 10;
+ }
+
+ private void btnRemove_Click(object sender, RoutedEventArgs e)
+ {
+ var wrapPanel = Helper.FindVisualChildren(spGroupPers).Last();
+ wrapPanel.Children.RemoveAt(wrapPanel.Children.Count - 1);
+ this.Height = this.Height - 60;
+ }
+
+
+ private void Window_LocationChanged(object sender, EventArgs e)
+ {
+ Helper.CheckWindowIsInScreenSpace(this);
+ }
+
+ private async void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+ {
+ await SendIt();
+ this.DialogResult = true;
+ }
+
+ }
+}
diff --git a/ZKuP/AddVisitorsList.xaml b/ZKuP/AddVisitorsList.xaml
index e3f4677..f11c6ee 100644
--- a/ZKuP/AddVisitorsList.xaml
+++ b/ZKuP/AddVisitorsList.xaml
@@ -1,15 +1,17 @@
-
+ Title="Besuchergruppe hinzufügen" MinHeight="70" MinWidth="330" Width="330" Loaded="Window_Loaded" Closing="Window_Closing" LocationChanged="Window_LocationChanged">
-
+
-
+
+
-
+
diff --git a/ZKuP/AddVisitorsList.xaml.cs b/ZKuP/AddVisitorsList.xaml.cs
index d5d4dba..fbc5241 100644
--- a/ZKuP/AddVisitorsList.xaml.cs
+++ b/ZKuP/AddVisitorsList.xaml.cs
@@ -1,7 +1,9 @@
using MahApps.Metro.Controls;
+using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Security.RightsManagement;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -18,34 +20,38 @@ namespace ZKuP
///
/// Interaktionslogik für AddVisitorsList.xaml
///
- public partial class AddVisitorsList : Window
+ public partial class AddVisitorsList : MetroWindow
{
public int GroupID { get; private set; }
int width = 0;
+ bool _isEdit = false;
+ int _idBesucher = 0;
- public AddVisitorsList(int VisitorCount)
+ public AddVisitorsList(int VisitorCount, bool isEdit = false, int idBesucher = 0)
{
InitializeComponent();
BuildWindow(VisitorCount);
- //var col = (VisitorCount / 10) + 1;
- //for (int j = 0; j < col; j++)
- //{
- // var spGroup = new StackPanel() { Orientation = Orientation.Vertical, Margin = new Thickness(0, 0, 0, 50) };
+ if (isEdit)
+ {
+ _isEdit = isEdit;
+ _idBesucher = idBesucher;
+ btnAdd.Visibility = Visibility.Visible;
- // for (int i = 0; i < VisitorCount; i++)
- // {
- // var sp = new StackPanel();
- // var tb = new TextBlock() { Text = $"Besucher Nr. {i + 1}:", Margin = new Thickness(5), Height = 20 };
- // tb.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
- // MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb, "Vorname Nachname");
- // sp.Children.Add(tb);
- // sp.Children.Add(new TextBox() { Margin = new Thickness(10, 0, 10, 0), Height = 30 });
+ var list = SQL.ReadSingleValue($"SELECT besucherList FROM {MainWindow.table}.besucherGroups WHERE idbesucher = '{idBesucher}'").Split(';');
- // spGroup.Children.Add(sp);
- // }
- //}
+ if (list.Length > 0)
+ {
+ var boxes = Helper.FindVisualChildren(spGroup).ToList();
+
+ for (var i = 0; i < Helper.FindVisualChildren(spGroup).Count(); i++)
+ {
+ if (list.Length > i && !string.IsNullOrWhiteSpace(list[i]))
+ boxes[i].Text = list[i];
+ }
+ }
+ }
}
private void BuildWindow(int besucherAnzahl)
@@ -71,11 +77,13 @@ namespace ZKuP
for (int j = 0; j < maxProSpalte && (i * maxProSpalte + j) < besucherAnzahl; j++)
{
var sp = new StackPanel();
- var tb = new TextBlock() { Text = $"Besucher Nr. {i * maxProSpalte + j + 1}:", Margin = new Thickness(5), Height = 20 };
- tb.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ var lbl = new TextBlock() { Text = $"Begleitperson Nr. {i * maxProSpalte + j + 1}:", Margin = new Thickness(5), Height = 20 };
+ lbl.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ sp.Children.Add(lbl);
+ var tb = new TextBox() { Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280, ToolTip = "Um eine Person zu entfernen, Feld leer lassen" };
+ ToolTipService.SetInitialShowDelay(tb, 200);
MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb, "Vorname Nachname");
sp.Children.Add(tb);
- sp.Children.Add(new TextBox() { Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280 });
wrapPanel.Children.Add(sp);
@@ -92,29 +100,144 @@ namespace ZKuP
{
this.Height = spGroup.DesiredSize.Height + 40;
this.Width = width;
+
+ Helper.CheckWindowIsInScreenSpace(this);
}
- private async void btnAdd_Click(object sender, RoutedEventArgs e)
+ private async void btnSend_Click(object sender, RoutedEventArgs e)
+ {
+ await SendIt();
+ this.Close();
+ }
+
+ private async Task SendIt()
{
var visitors = "";
- foreach (var t in this.FindChildren())
+ foreach (var t in this.FindChildren())
{
- if(string.IsNullOrWhiteSpace(t.Text))
+ if (!string.IsNullOrWhiteSpace(t.Text))
{
- MessageBox.Show("Alle Besucher müssen eingetragen werden!", "Unzureichende Eingabe", MessageBoxButton.OK, MessageBoxImage.Error);
- return;
+ if (t.Text.ToList().Distinct().Count() < 4)
+ {
+ MessageBox.Show("Personen müssen qualifiziert angegeben werden!", "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+ return;
+ }
+ else
+ visitors += t.Text + ";";
+
+ //MessageBox.Show("Alle Besucher müssen eingetragen werden!", "Unzureichende Eingabe", MessageBoxButton.OK, MessageBoxImage.Error);
+ //return;
}
- visitors += t.Text + ";";
}
try
{
- await SQL.WriteSQL($"Insert INTO {MainWindow.table}.besucherGroups (besucherList) VALUES ('{visitors}')");
- GroupID = Convert.ToInt32(SQL.ReadSingleValue($"SELECT LAST_INSERT_ID()"));
+ var count = visitors.Split(';').Count() - 1;
+
+ if (count > 0)
+ {
+ if (_isEdit)
+ {
+ if (Helper.FindVisualChildren(spGroup).Count() > count)
+ if (MessageBoxResult.OK == MessageBox.Show("Es müssen alle Besucher namentlich angegeben werden\n\nEs wird nur die Anzahl der ausgefüllten Felder als 'Anzahl Begleitpersonen' hinterlegt", "Unzureichende Angaben", MessageBoxButton.OKCancel, MessageBoxImage.Warning))
+ {
+ if (SQL.RowExists(MainWindow.table.ToString() + ".besucherGroups", "idbesucher", _idBesucher.ToString()).Result)
+ {
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucherGroups SET besucherList = '{visitors}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucherGroups SET besucherList = @visitors WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@visitors", visitors),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = '{count}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = @count WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@count", count),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ }
+ else
+ {
+ //await SQL.WriteSQL($"INSERT INTO {MainWindow.table}.besucherGroups (besucherList, idbesucher) VALUES ('{visitors}','{_idBesucher}')");
+ GroupID = await SQL.CreateAndWriteSQL($"INSERT INTO {MainWindow.table}.besucherGroups (besucherList, idbesucher) VALUES (@visitors,@idbesucher)", new List()
+ {
+ new MySqlParameter("@visitors", visitors),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = '{count}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = @count WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@count", count),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ }
+ }
+ else return;
+ else
+ {
+ if (SQL.RowExists(MainWindow.table.ToString() + ".besucherGroups", "idbesucher", _idBesucher.ToString()).Result)
+ {
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucherGroups SET besucherList = '{visitors}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucherGroups SET besucherList = @visitors WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@visitors", visitors),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = '{count}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = @count WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@count", count),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ }
+ else
+ {
+ //await SQL.WriteSQL($"INSERT INTO {MainWindow.table}.besucherGroups (besucherList, idbesucher) VALUES ('{visitors}','{_idBesucher}')");
+ GroupID = await SQL.CreateAndWriteSQL($"INSERT INTO {MainWindow.table}.besucherGroups (besucherList, idbesucher) VALUES (@visitors,@idbesucher)", new List()
+ {
+ new MySqlParameter("@visitors", visitors),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = '{count}' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = @count WHERE idbesucher = @idbesucher", new List()
+ {
+ new MySqlParameter("@count", count),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ }
+ }
+ }
+ else
+ //await SQL.WriteSQL($"Insert INTO {MainWindow.table}.besucherGroups (besucherList) VALUES ('{visitors}')");
+ GroupID = await SQL.CreateAndWriteSQL($"INSERT INTO {MainWindow.table}.besucherGroups (besucherList, idbesucher) VALUES (@visitors,@idbesucher)", new List()
+ {
+ new MySqlParameter("@visitors", visitors),
+ new MySqlParameter("@idbesucher", _idBesucher)
+ });
+ }
+ else
+ {
+ if (MessageBoxResult.OK == MessageBox.Show("Es wurden keine Personen angegeben!\nDie Anzahl der Personen wird somit auf 0 gesetzt", "Keine Angaben", MessageBoxButton.OKCancel, MessageBoxImage.Error))
+ {
+ if (SQL.RowExists(MainWindow.table.ToString() + ".besucherGroups", "idbesucher", _idBesucher.ToString()).Result)
+ {
+ await SQL.WriteSQL($"DELETE FROM {MainWindow.table}.besucherGroups WHERE idbesucher = '{_idBesucher}'");
+ //await SQL.WriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = '0' WHERE idbesucher = '{_idBesucher}'");
+ await SQL.CreateAndWriteSQL($"UPDATE {MainWindow.table}.besucher SET Anzahl_Begleitpersonen = 0 WHERE idbesucher = @_idBesucher", new List()
+ {
+ new MySqlParameter("@_idBesucher", _idBesucher)
+ });
+ }
+ }
+ }
+
+ //GroupID = Convert.ToInt32(SQL.ReadSingleValue($"SELECT LAST_INSERT_ID()"));
this.DialogResult = true;
- this.Close();
}
catch (Exception ex)
{
@@ -122,5 +245,59 @@ namespace ZKuP
MessageBox.Show("Es ist ein Fehler beim hinzufügen der Besucher aufgetreten, bitte erneut versuchen", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
+
+ private void btnAdd_Click(object sender, RoutedEventArgs e)
+ {
+ bool zeroPanels = false;
+ WrapPanel wrapPanel = new WrapPanel
+ {
+ Orientation = Orientation.Vertical, // Jedes WrapPanel wird vertikal sein
+ Margin = new Thickness(10),
+ Width = 300
+ };
+
+ if (Helper.FindVisualChildren(spGroup).Count() > 0)
+ {
+ wrapPanel = Helper.FindVisualChildren(spGroup).Last();
+ }
+ else
+ zeroPanels = true;
+
+ var nr = Helper.FindVisualChildren(spGroup).Count();
+
+ var sp = new StackPanel();
+ var lbl = new TextBlock() { Text = $"Begleitperson Nr. {nr + 1}:", Margin = new Thickness(5), Height = 20 };
+ lbl.SetResourceReference(Control.ForegroundProperty, SystemColors.ControlTextBrushKey);
+ sp.Children.Add(lbl);
+ var tb = new TextBox() { Margin = new Thickness(10, 0, 10, 0), Height = 30, Width = 280, ToolTip = "Um eine Person zu entfernen, Feld leer lassen" };
+ ToolTipService.SetInitialShowDelay(tb, 200);
+ MahApps.Metro.Controls.TextBoxHelper.SetWatermark(tb, "Vorname Nachname");
+ sp.Children.Add(tb);
+
+
+ wrapPanel.Children.Add(sp);
+ this.Height = this.Height + 60;
+ // Das WrapPanel zum StackPanel hinzufügen
+
+ if (zeroPanels)
+ {
+ spGroup.Children.Add(wrapPanel);
+ this.Height = this.Height + 20;
+ zeroPanels = false;
+ }
+
+ //width = (columnCount * 320) + 10;
+ }
+
+
+ private void Window_LocationChanged(object sender, EventArgs e)
+ {
+ Helper.CheckWindowIsInScreenSpace(this);
+ }
+
+ private async void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+ {
+ await SendIt();
+ }
}
}
diff --git a/ZKuP/App.xaml b/ZKuP/App.xaml
index bd38b26..f646394 100644
--- a/ZKuP/App.xaml
+++ b/ZKuP/App.xaml
@@ -1,6 +1,7 @@
@@ -11,6 +12,14 @@
+
+
+
+
diff --git a/ZKuP/App.xaml.cs b/ZKuP/App.xaml.cs
index 135691d..1a5d585 100644
--- a/ZKuP/App.xaml.cs
+++ b/ZKuP/App.xaml.cs
@@ -2,9 +2,14 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data;
+using System.Diagnostics;
using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows;
+using System.Windows.Input;
+using System.Windows.Threading;
namespace ZKuP
{
@@ -18,14 +23,19 @@ namespace ZKuP
public App()
{
//AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
-#if !DEBUG
+//#if !DEBUG
AppDomain.CurrentDomain.FirstChanceException += CurrentDomain_FirstChanceException; // Example 1
DispatcherUnhandledException += App_DispatcherUnhandledException;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; // Example 3
- TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
-#endif
+ TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
+
+
+ //#endif
}
+
+
+
void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{
if (!e.Exception.ToString().Contains("System.Windows.Automation.ElementNotAvailableException:")
@@ -50,9 +60,12 @@ namespace ZKuP
void CurrentDomain_FirstChanceException(object sender, System.Runtime.ExceptionServices.FirstChanceExceptionEventArgs e)
{
- if (!e.Exception.ToString().Contains("System.Windows.Automation.ElementNotAvailableException:")
- && !e.Exception.ToString().Contains("signotec.STPadLibNet.STPadException: Zu dem ausgewählten Signierpad wurde keine Verbindung geöffnet."))
- Log.WriteLog("2: " + e.Exception.ToString());
+ if (SQL.isOnline && !e.Exception.ToString().Contains("System.Windows.Automation.ElementNotAvailableException:")
+ && !e.Exception.ToString().Contains("System.OperationCanceledException")
+ && !e.Exception.ToString().Contains("System.ObjectDisposedException")
+ && !e.Exception.ToString().Contains("signotec.STPadLibNet.STPadException: Zu dem ausgewählten Signierpad wurde keine Verbindung geöffnet.")
+ && !e.Exception.ToString().Contains("Derzeit ist kein Layout"))
+ Log.WriteLog("2: " + e.Exception.ToString() + "\n" + e.ToString() + "\n" + (sender.GetType().ToString()));
//if (MessageBox.Show(MainWindow, "Es ist ein unbehandelter Fehler aufgetreten\n\nMöchten Sie einen Bericht an den Entwickler der Anwendung senden?", "Unbehandelter Fehler", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.Yes) == MessageBoxResult.Yes)
//{
@@ -115,6 +128,52 @@ namespace ZKuP
//}
e.SetObserved();
}
-//#endif
+
+
+ //private static Mutex _mutex;
+
+ [DllImport("user32.dll")]
+ private static extern bool SetForegroundWindow(IntPtr hWnd);
+
+ [DllImport("user32.dll")]
+ private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+ private const int SW_RESTORE = 9;
+
+ //protected override void OnStartup(StartupEventArgs e)
+ //{
+ // const string mutexName = "ZKuPMutex";
+
+ // bool createdNew;
+ // _mutex = new Mutex(true, mutexName, out createdNew);
+
+ // if (!createdNew)
+ // {
+ // // Another instance is already running
+ // BringOtherInstanceToFront();
+ // Environment.Exit(0); // Exit this instance
+ // return;
+ // }
+
+ // base.OnStartup(e);
+ //}
+
+ public static void BringOtherInstanceToFront()
+ {
+ var current = Process.GetCurrentProcess();
+ var other = Process.GetProcessesByName(current.ProcessName)
+ .FirstOrDefault(p => p.Id != current.Id);
+
+ if (other != null)
+ {
+ IntPtr hWnd = other.MainWindowHandle;
+ if (hWnd != IntPtr.Zero)
+ {
+ ShowWindow(hWnd, SW_RESTORE);
+ SetForegroundWindow(hWnd);
+ }
+ }
+ }
+ //#endif
}
}
diff --git a/ZKuP/ApproveFzg.xaml b/ZKuP/ApproveFzg.xaml
new file mode 100644
index 0000000..4950853
--- /dev/null
+++ b/ZKuP/ApproveFzg.xaml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ZKuP/ApproveFzg.xaml.cs b/ZKuP/ApproveFzg.xaml.cs
new file mode 100644
index 0000000..c8c251d
--- /dev/null
+++ b/ZKuP/ApproveFzg.xaml.cs
@@ -0,0 +1,156 @@
+using MahApps.Metro.Controls;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ZKuP
+{
+ ///
+ /// Interaktionslogik für ApproveFzg.xaml
+ ///
+ public partial class ApproveFzg : MetroWindow
+ {
+ DataTable Fzg = new DataTable("Fzg");
+
+ public ApproveFzg()
+ {
+ this.DataContext = this;
+
+ InitializeComponent();
+
+ Fzg = SQL.ReadSQL($"SELECT * FROM {MainWindow.table}.fzgAnmeldung").Result;
+
+ dgFzg.DataContext = Fzg;
+ }
+
+
+ private async void InfoButton_Click(object sender, RoutedEventArgs e)
+ {
+ var buttons = Helper.FindVisualChildren
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+ OpenSource Bibliotheken:
+
+
+ http://bouncycastle.org/csharp/
+
+
+ https://github.com/iamartyom/ColorHelper
+
+
+ https://github.com/Fody/Costura
+
+
+ https://github.com/protocolbuffers/protobuf
+
+
+ https://github.com/MiloszKrajewski/K4os.Compression.LZ4
+
+
+ https://github.com/MahApps/MahApps.Metro
+
+
+ https://www.newtonsoft.com/json
+
+
+ https://github.com/micdenny/WpfScreenHelper
+
+
+ https://github.com/XamlAnimatedGif/XamlAnimatedGif
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -985,12 +1044,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/ZKuP/MainWindow.xaml.cs b/ZKuP/MainWindow.xaml.cs
index 57233e3..9b9dd7b 100644
--- a/ZKuP/MainWindow.xaml.cs
+++ b/ZKuP/MainWindow.xaml.cs
@@ -1,39 +1,33 @@
-using Renci.SshNet.Messages;
+using ColorHelper;
+using ControlzEx.Standard;
+using FuzzySharp;
+using MahApps.Metro.Controls;
+using Microsoft.Toolkit.Uwp.Notifications;
+using MySql.Data.MySqlClient;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
+using System.Diagnostics;
using System.DirectoryServices.AccountManagement;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
-using System.Security.Permissions;
using System.Security.Principal;
using System.Text;
+using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
using System.Windows.Input;
+using System.Windows.Interop;
using System.Windows.Media;
using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
using System.Windows.Shapes;
using System.Windows.Threading;
-using MahApps.Metro.Controls;
-using Microsoft.Toolkit.Uwp.Notifications;
-using System.Diagnostics;
-using MySql.Data.MySqlClient;
-using System.Xml.Linq;
-using FuzzySharp;
+using Windows.UI.Composition;
using Process = System.Diagnostics.Process;
-using System.Collections;
-using System.Diagnostics.Eventing.Reader;
-using ColorHelper;
-using System.Text.RegularExpressions;
-using Windows.Devices.PointOfService;
namespace ZKuP
{
@@ -49,12 +43,15 @@ namespace ZKuP
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
-
+ public const string Version = "5.0.5.8";
public static Roles LoggedInRole { get; private set; } = Roles.None;
-#if !DEBUG
+
+
+//#warning No Release, Tabellen vertauscht
+#if DEBUG
+ public static string table { get; } = "zkupTestEnv";//
+#elif !DEBUG
public static string table { get; } = "zkup";
-#elif DEBUG
- public static string table { get; } = "zkupTestEnv";
#endif
public string NoToolTip { get; } = "Doppelklick um Ankunft zu Bestätigen";
@@ -72,6 +69,14 @@ namespace ZKuP
set { parkEmailUsers = value; OnPropertyChanged(); }
}
+ private DataTable fzgAnmeldungEmailUsers = new DataTable("FzgAnmeldungEmailUsers");
+ public DataTable FzgAnmeldungEmailUsers
+ {
+ get { return fzgAnmeldungEmailUsers; }
+ set { fzgAnmeldungEmailUsers = value; OnPropertyChanged(); }
+ }
+
+
DataTable overv = new DataTable("Overview");
DataTable todayFirm = new DataTable("TodayFirm");
@@ -83,25 +88,35 @@ namespace ZKuP
DispatcherTimer reloadTimerHinweis = new DispatcherTimer();
DispatcherTimer checkUpdateTimer = new DispatcherTimer();
DispatcherTimer connTimer = new DispatcherTimer();
+ DispatcherTimer ausfahrtTimer = new DispatcherTimer();
RoutedCommand resetWindow;
RoutedCommand skullWindow;
int maxBikes = 24;
-
+ bool ReadyToSavePosition = false;
public MainWindow()
{
InitializeComponent();
+ Startup();
+ }
+
+ private async void Startup()
+ {
AppDomain.CurrentDomain.SetPrincipalPolicy(PrincipalPolicy.WindowsPrincipal);
- //this.WindowState = WindowState.Normal;
+ await CheckConnection(true);
- cbShowParkcardToAccept.IsChecked = Properties.Settings.Default.ShowParkcardAccept;
+ cbShowParkcardToAccept.IsChecked = Settings.GetSettingBool("ShowParkcardAccept");
- if ((Properties.Settings.Default.Width + Properties.Settings.Default.Left) >= System.Windows.SystemParameters.PrimaryScreenWidth) CenterWindowOnScreen(this);
- if ((Properties.Settings.Default.Height + Properties.Settings.Default.Top) >= System.Windows.SystemParameters.PrimaryScreenHeight) CenterWindowOnScreen(this);
+ lblVersion.Text = "Version " + Version;
+
+
+
+ //if ((Settings.GetSettingDouble("Width") + Settings.GetSettingDouble("Left")) >= System.Windows.SystemParameters.PrimaryScreenWidth) CenterWindowOnScreen(this);
+ //if ((Settings.GetSettingDouble("Height") + Settings.GetSettingDouble("Top")) >= System.Windows.SystemParameters.PrimaryScreenHeight) CenterWindowOnScreen(this);
if (!File.Exists(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\ZKuPUpdater.exe") || File.GetLastWriteTime(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\ZKuPUpdater.exe") != File.GetLastWriteTime(@"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\ZKuPUpdater.exe"))
{
@@ -115,7 +130,9 @@ namespace ZKuP
CheckWorkingDir();
CheckVersion();
- CheckConnection();
+ CheckMaintenance();
+ CheckNotification();
+
resetWindow = new RoutedCommand();
resetWindow.InputGestures.Add(new KeyGesture(Key.R, ModifierKeys.Control));
@@ -144,7 +161,7 @@ namespace ZKuP
try
{
var newVersion = new Version(File.ReadAllText(@"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\Version.txt"));
- var oldVersion = new Version(lblVersion.Text.Split(' ')[1]);
+ var oldVersion = new Version(Version);
var result = newVersion.CompareTo(oldVersion);
if (result >= 1)
@@ -192,7 +209,7 @@ namespace ZKuP
private void CheckForNewVersion()
{
var newVersion = new Version(File.ReadAllText(@"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\Version.txt"));
- var oldVersion = new Version(lblVersion.Text.Split(' ')[1]);
+ var oldVersion = new Version(Version);
var result = newVersion.CompareTo(oldVersion);
if (result >= 1)
@@ -220,26 +237,117 @@ namespace ZKuP
return;
}
}
- else updateAlreadyAsked = true;
+ else updateAlreadyAsked = true;
+ }
}
- }
+
+
+ private void CheckNotification()
+ {
+ if (LoggedInRole != Roles.None)
+ {
+ var path = @"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\Notification.txt";
+
+ var text = File.ReadAllText(path).Split('|')[0];
+
+ bool repeat = false;
+ if (text.EndsWith("|true")) repeat = true;
+
+ if (text.Length > 0)
+ {
+ if (!Settings.GetSettingBool("HinweisShown")) MessageBox.Show(text, "Hinweis", MessageBoxButton.OK, MessageBoxImage.Stop);
+ if (!repeat) Settings.WriteSetting("HinweisShown", true);
+ }
+ else Settings.WriteSetting("HinweisShown", false);
+ }
+ }
+
+ private void CheckMaintenance()
+ {
+ var path = @"\\mhb00swfs003v.fv-werke.db.de\GLW99\ZKuP\Maintenance.txt";
+
+ var text = File.ReadAllText(path);
+ if (text.Length > 0)
+ {
+ MessageBox.Show(text + "\n\nDie Anwendung wird jetzt wieder geschlossen!", "Wartungsarbeiten", MessageBoxButton.OK, MessageBoxImage.Stop);
+ Application.Current.Shutdown();
+ }
+ }
+
private async void Window_Loaded(object sender, RoutedEventArgs e)
{
await Task.Run(() => AuthenticateUser());
+//#if !DEBUG
+ Helper.CheckIfMultipleInstances();
+//#endif
+
double maxheight = this.ActualHeight - 120 - 191;
double actualheight = this.ActualHeight - 120 - gridBackground.RowDefinitions[1].Height.Value;
if (actualheight <= 191) gridBackground.RowDefinitions[1].Height = new GridLength(maxheight);
//gridSpinner.Visibility = Visibility.Collapsed;
+ Helper.width = this.MinWidth;
+ Helper.height = this.MinHeight;
+
connTimer.Interval = TimeSpan.FromSeconds(2);
connTimer.Tick += ConnTimer_Tick;
connTimer.Start();
+
+ Helper.CheckScale(this);
+ Helper.CheckWindowIsInScreenSpace(this);
+
}
+ #region Check if Window was moved and released
+ private const int WM_ENTERSIZEMOVE = 0x0231;
+ private const int WM_EXITSIZEMOVE = 0x0232;
+
+ private Point _startPosition;
+ private Size _startSize;
+
+
+ protected override void OnSourceInitialized(EventArgs e)
+ {
+ base.OnSourceInitialized(e);
+ HwndSource source = (HwndSource)PresentationSource.FromVisual(this);
+ source.AddHook(WndProc);
+ }
+
+ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+ {
+ switch (msg)
+ {
+ case WM_ENTERSIZEMOVE:
+ _startPosition = new Point(Left, Top);
+ _startSize = new Size(Width, Height);
+ break;
+
+ case WM_EXITSIZEMOVE:
+ bool sizeChanged = Width != _startSize.Width || Height != _startSize.Height;
+ bool positionChanged = Left != _startPosition.X || Top != _startPosition.Y;
+
+ if (positionChanged && !sizeChanged)
+ {
+ OnWindowMoveFinished();
+ }
+ break;
+ }
+
+ return IntPtr.Zero;
+ }
+
+ private void OnWindowMoveFinished()
+ {
+ Helper.CheckScale(this);
+ }
+ #endregion
+
+
+
private async void AuthenticateUser()
{
if (!SQL.CheckDeviceConnection())
@@ -270,7 +378,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}', '{lblVersion.Text.Split(' ')[1]}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}')")));
+ 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(() => pgLoad.Value = 20));
@@ -284,7 +392,7 @@ namespace ZKuP
//CheckVersion();
await Dispatcher.BeginInvoke(new Action(() =>
{
- var res = MessageBox.Show($"Ihr User {Environment.UserName} ist nicht zum Zugriff berechtigt\n\nMöchten Sie einen Besucher erstellen, eine Parkkarte beantragen oder eine Werksführung buchen?", "Zugriff verweigert", MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ var res = MessageBox.Show($"Ihr User {Helper.InsertSpaceBeforeUpperCase(Environment.UserName)} ist nicht zum Zugriff berechtigt\n\nMöchten Sie einen Parkausweis beantragen, einen McFit User erstellen oder eine Werksführung buchen?", "Zugriff verweigert", MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (res == MessageBoxResult.Yes)
{
@@ -325,34 +433,22 @@ namespace ZKuP
case "5":
OrganisatorStart();
break;
+ case "6":
+ M2_AMStart();
+ break;
default:
BesucherCreateStart();
break;
}
+
+ this.Title = "ZKuP - " + Version + "\tRolle: " + LoggedInRole.ToString().Replace("_", " ");
+
}));
- var beInfos = await SQL.ReadListStringTwoColumns($"SELECT flaeche, bereich FROM {MainWindow.table}.`be-belegung`");
- await Dispatcher.BeginInvoke(new Action(() =>
+ //var beInfos = await SQL.ReadListStringTwoColumns($"SELECT flaeche, bereich FROM {MainWindow.table}.`be-belegung`");
+ await Dispatcher.BeginInvoke(new Action(async () =>
{
- //foreach (TextBlock tb in Helper.FindVisualChildren(BE).Where(p => p.Tag != null))
- //{
- // if (tb.Tag.ToString() != "0")
- // {
- // StackPanel sp = new StackPanel();
-
- // string ort = beInfos.Where(p => p.StartsWith(tb.Tag.ToString())).First().Split(';')[1];
-
- // var img = new BitmapImage(new Uri(@"pack://application:,,,/"
- // + System.Reflection.Assembly.GetExecutingAssembly().GetName().Name
- // + ";component/"
- // + $"Assets/BE{tb.Tag.ToString()}.png", UriKind.Absolute));
-
- // sp.Children.Add(new TextBlock() { Text = $"BE-Fläche {tb.Tag.ToString()} - {ort}", FontWeight = FontWeights.Bold });
- // sp.Children.Add(new Image() { Source = img, Width = img.Width / 1.5, Height = img.Height / 1.5 });
-
- // tb.ToolTip = sp;
- // }
- //}
+ var ausgegebenAn = 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);
foreach (TextBlock tb in Helper.FindVisualChildren(BE))//.Where(p => p.Tag == null))
{
@@ -369,7 +465,14 @@ namespace ZKuP
sp.Children.Add(new TextBlock() { Text = $"Parkplatz {tb.Text.PadLeft(2,'0')}", FontWeight = FontWeights.Bold });
sp.Children.Add(new Image() { Source = img, Width = img.Width, Height = img.Height });
+
+ var x = ausgegebenAn.TryGetValue(parkplatz, out string y);
+ if (ausgegebenAn.ContainsKey(parkplatz) && x && !string.IsNullOrWhiteSpace(y))
+ sp.Children.Add(new TextBlock() { Text = $"Ausgegeben an {y}" });
+
tb.ToolTip = sp;
+ ToolTipService.SetInitialShowDelay(tb, 100);
+ ToolTipService.SetBetweenShowDelay(tb, 100);
}
}
}));
@@ -410,7 +513,35 @@ namespace ZKuP
dgOverview.Items.SortDescriptions.Add(new SortDescription("Zutritt", ListSortDirection.Descending));
dgOverview.Items.Refresh();
- gridSpinner.Visibility = Visibility.Collapsed;
+ //var gif = XamlAnimatedGif.AnimationBehavior.GetAnimator(imgLoading);
+ //if (gif != null)
+ //{
+ // gif.Pause();
+ //}
+ //imgLoading.Visibility = Visibility.Collapsed;
+
+ this.Height = Settings.GetSettingDouble("Height");
+ this.Width = Settings.GetSettingDouble("Width");
+ this.Left = Settings.GetSettingDouble("Left");
+ this.Top = Settings.GetSettingDouble("Top");
+
+ var ws = Settings.GetSetting("WindowState");
+ this.WindowState = ws == "" ? WindowState.Normal : (WindowState)ws;
+
+ //double ratio = Settings.GetSettingDouble("ColumnRatio");
+
+ // Gespeicherte Werte laden
+ double col1Width = Settings.GetSettingDouble("LeftColumn");
+ double col2Width = Settings.GetSettingDouble("RightColumn");
+
+ // Column-Breiten setzen
+ gridToday.ColumnDefinitions[0].Width = new GridLength(col1Width, GridUnitType.Star);
+ gridToday.ColumnDefinitions[2].Width = new GridLength(col2Width, GridUnitType.Star);
+ // Index 1 ist der GridSplitter mit Auto-Breite
+
+
+ ReadyToSavePosition = true;
+ gridSpinner.Visibility = Visibility.Hidden;
@@ -418,9 +549,9 @@ namespace ZKuP
reloadTimer.Tick += ReloadTimer_Tick;
reloadTimer.Start();
- reloadTimerHinweis.Interval = TimeSpan.FromSeconds(10);
- reloadTimerHinweis.Tick += ReloadTimerHinweis_Tick;
- reloadTimerHinweis.Start();
+ //reloadTimerHinweis.Interval = TimeSpan.FromSeconds(10);
+ //reloadTimerHinweis.Tick += ReloadTimerHinweis_Tick;
+ //reloadTimerHinweis.Start();
checkUpdateTimer.Interval = TimeSpan.FromMinutes(5);
checkUpdateTimer.Tick += CheckUpdateTimer_Tick;
@@ -429,7 +560,7 @@ namespace ZKuP
- if (LoggedInRole == Roles.Admin && Properties.Settings.Default.ShowParkcardAccept)
+ if ((LoggedInRole == Roles.Admin || LoggedInRole == Roles.M2_AM) && Settings.GetSettingBool("ShowParkcardAccept"))
{
if (SQL.RowExists("parkausweise", "Genehmigt", "0").Result == true)
{
@@ -441,7 +572,7 @@ namespace ZKuP
}
}
}
- else if (LoggedInRole == Roles.Admin && Properties.Settings.Default.ShowParkcardPrint)
+ else if ((LoggedInRole == Roles.Admin || LoggedInRole == Roles.M2_AM) && Settings.GetSettingBool("ShowParkcardPrint"))
{
if (SQL.RowExists("parkausweise", "Genehmigt = '1' AND Gedruckt", "0").Result == true)
{
@@ -456,6 +587,12 @@ namespace ZKuP
}));
}
+
+ Dispatcher.Invoke(() => Helper.FindVisualChildren