Wirl/Programm_Wirl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Div. Bugfixes und neue AuftragAuswahl für FelmengeCount.

Browse Source
This commit is contained in:
Kilian Wirl 2026-06-12 12:15:50 +02:00
parent 06273b8094
commit 8ef544fe8e
34 changed files with 1203 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
AA-Forms/FormAuftragAuswahl.Designer.cs generated Normal file
View File

@ -0,0 +1,103 @@
namespace Deckungsbeitrag.AA_Forms
{
partial class FormAuftragAuswahl
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAuftragAuswahl));
this.panelAuswahl = new System.Windows.Forms.FlowLayoutPanel();
this.panelSuchen = new System.Windows.Forms.Panel();
this.textBoxKunde = new System.Windows.Forms.TextBox();
this.panelSuchen.SuspendLayout();
this.SuspendLayout();
//
// panelAuswahl
//
this.panelAuswahl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panelAuswahl.AutoScroll = true;
this.panelAuswahl.AutoScrollMargin = new System.Drawing.Size(20, 20);
this.panelAuswahl.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
this.panelAuswahl.Location = new System.Drawing.Point(0, 70);
this.panelAuswahl.Margin = new System.Windows.Forms.Padding(0);
this.panelAuswahl.Name = "panelAuswahl";
this.panelAuswahl.Padding = new System.Windows.Forms.Padding(20);
this.panelAuswahl.Size = new System.Drawing.Size(1674, 928);
this.panelAuswahl.TabIndex = 0;
//
// panelSuchen
//
this.panelSuchen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.panelSuchen.Controls.Add(this.textBoxKunde);
this.panelSuchen.Dock = System.Windows.Forms.DockStyle.Top;
this.panelSuchen.Location = new System.Drawing.Point(0, 0);
this.panelSuchen.Margin = new System.Windows.Forms.Padding(5);
this.panelSuchen.Name = "panelSuchen";
this.panelSuchen.Padding = new System.Windows.Forms.Padding(15);
this.panelSuchen.Size = new System.Drawing.Size(1674, 65);
this.panelSuchen.TabIndex = 1;
//
// textBoxKunde
//
this.textBoxKunde.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBoxKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxKunde.ForeColor = System.Drawing.Color.Silver;
this.textBoxKunde.Location = new System.Drawing.Point(10, 10);
this.textBoxKunde.Margin = new System.Windows.Forms.Padding(10);
this.textBoxKunde.Name = "textBoxKunde";
this.textBoxKunde.Size = new System.Drawing.Size(1654, 45);
this.textBoxKunde.TabIndex = 1;
this.textBoxKunde.Text = "Kunde suchen";
this.textBoxKunde.Click += new System.EventHandler(this.TextBoxKunde_Click);
this.textBoxKunde.TextChanged += new System.EventHandler(this.TextBoxKunde_TextChanged);
//
// FormAuftragAuswahl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1674, 998);
this.Controls.Add(this.panelSuchen);
this.Controls.Add(this.panelAuswahl);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FormAuftragAuswahl";
this.Text = "Auftrag wählen";
this.Load += new System.EventHandler(this.FormAuftragAuswahl_Load);
this.panelSuchen.ResumeLayout(false);
this.panelSuchen.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.FlowLayoutPanel panelAuswahl;
private System.Windows.Forms.Panel panelSuchen;
private System.Windows.Forms.TextBox textBoxKunde;
}
}

113
AA-Forms/FormAuftragAuswahl.cs Normal file
View File

@ -0,0 +1,113 @@
using DatenDB;
using Deckungsbeitrag.AA_Klassen;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
using System.Drawing.Printing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using VirtualKeyboard;
using static System.Net.Mime.MediaTypeNames;
namespace Deckungsbeitrag.AA_Forms
{
public partial class FormAuftragAuswahl : Form
{
private ArtikelKategorie Abteilung;
private List<View_Auftrag_Expedit> Auftragliste;
private QwertzKeyboard keyboard;
public FormAuftragAuswahl()
{
InitializeComponent();
switch (ConfigurationManager.AppSettings["ConnectionString"].Split(';')[0].Split('=')[1])
{
case var t when t.Contains("frottee"): Abteilung = ArtikelKategorie.Frottee; break;
case var t when t.Contains("kleinteile"): Abteilung = ArtikelKategorie.Kleinteile; break;
case var t when t.Contains("grossteile"): Abteilung = ArtikelKategorie.Grossteile; break;
case var t when t.Contains("spannleintuch"): Abteilung = ArtikelKategorie.Spannleintuch; break;
default: Abteilung = ArtikelKategorie.Kleinteile; break; //TODO: Default Zuweisung löschen bevor in Echtbetrieb.
}
}
private async void FormAuftragAuswahl_Load(object sender, EventArgs e)
{
new TouchScroll(panelAuswahl);
await GetAuftragliste();
Load_PanelAuswahl(this.Auftragliste);
}
private async Task GetAuftragliste()
{
this.Auftragliste = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Gewaschen, kategorie: Abteilung);
}
private async void Load_PanelAuswahl(List<View_Auftrag_Expedit> _liste)
{
this.panelAuswahl.Controls.Clear();
_liste = _liste.OrderBy(x => x.KundeName).ToList();
foreach (View_Auftrag_Expedit item in _liste)
{
string name = string.Empty;
if (item.KundeName.Length > 15) name = item.KundeName.Substring(0, 15) + "...";
else name = item.KundeName;
Label lbl = new Label()
{
Text = name,
BackColor = Color.Silver,
BorderStyle = BorderStyle.FixedSingle,
Font = new Font("Microsoft Sans Serif", 20, FontStyle.Bold),
Size = new Size(400, 70),
TextAlign = ContentAlignment.MiddleCenter,
Margin = new Padding(5, 5, 5, 5),
Padding = new Padding(15, 15, 15, 15),
};
panelAuswahl.Controls.Add(lbl);
}
}
private void TextBoxKunde_TextChanged(object sender, EventArgs e)
{
TextBox textbox = sender as TextBox;
string text = textbox.Text.Trim().ToLower();
if (!string.IsNullOrWhiteSpace(text))
{
var filtered = string.IsNullOrWhiteSpace(text) ? this.Auftragliste : this.Auftragliste.Where(x => x.KundeName != null && x.KundeName.ToLower().Contains(text)).ToList();
Load_PanelAuswahl(filtered);
}
else Load_PanelAuswahl(this.Auftragliste);
}
private void TextBoxKunde_Click(object sender, EventArgs e)
{
TextBox textbox = sender as TextBox;
textbox.Clear();
if (Program.istTouch & Screen.PrimaryScreen.WorkingArea.Width > 0 & Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{
keyboard = new QwertzKeyboard(textBoxKunde, "isAlpha");
if (keyboard.ShowDialog() == DialogResult.OK) this.ActiveControl.Focus();
}
else
{
keyboard.Close();
keyboard = new QwertzKeyboard(textBoxKunde, "isAlpha");
if (keyboard.ShowDialog() == DialogResult.OK) this.ActiveControl.Focus();
}
}
}
}
}

219
AA-Forms/FormAuftragAuswahl.resx Normal file
View File

@ -0,0 +1,219 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
QmCC
</value>
</data>
</root>

12
AA-Forms/FormAuftragDetail.cs
View File

@ -38,7 +38,6 @@ namespace Deckungsbeitrag
private Saison saison = Saison.GetAktivSaison(); private Saison saison = Saison.GetAktivSaison();
//WENN AUFTRAG SPEICHERN //WENN AUFTRAG SPEICHERN
private bool _tosave = false; private bool _tosave = false;
public bool Tosave public bool Tosave
@ -146,10 +145,13 @@ namespace Deckungsbeitrag
break; break;
} }
this.ClientSize = new Size(this.oLVArtikel.Right + 10, this.ClientSize.Height);
if (this.oLVArtikel.Visible) if (this.oLVArtikel.Visible)
{
if (this.oLVArtikel.Items.Count == this.oLVArtikel.CheckedItems.Count) Toclose = true; if (this.oLVArtikel.Items.Count == this.oLVArtikel.CheckedItems.Count) Toclose = true;
this.ClientSize = new Size(this.oLVArtikel.Right + 10, this.ClientSize.Height);
}
else this.ClientSize = new Size(this.textBoxZusatz.Right + 10, this.ClientSize.Height);
} }
private void Load_NWAusgleich() private void Load_NWAusgleich()
@ -245,7 +247,6 @@ namespace Deckungsbeitrag
auftrag.TourID = this.comboBoxFahrer.SelectedIndex == -1 ? null : (int?)this.comboBoxFahrer.SelectedValue; auftrag.TourID = this.comboBoxFahrer.SelectedIndex == -1 ? null : (int?)this.comboBoxFahrer.SelectedValue;
auftrag.Priority = this.comboBoxPriority.SelectedIndex == -1 ? Priority.None : ((Priority)this.comboBoxPriority.SelectedItem); auftrag.Priority = this.comboBoxPriority.SelectedIndex == -1 ? Priority.None : ((Priority)this.comboBoxPriority.SelectedItem);
auftrag.ZusatzInfo = this.textBoxZusatz.Text; auftrag.ZusatzInfo = this.textBoxZusatz.Text;
auftrag.Save();
if (auftrag.Status == AuftragStatus.Herrichten) if (auftrag.Status == AuftragStatus.Herrichten)
{ {
@ -341,8 +342,10 @@ namespace Deckungsbeitrag
} }
break; break;
} }
if (this.oLVArtikel.CheckedItems.Count == this.oLVArtikel.Items.Count) { auftrag.Erledigt = DateTime.Now; auftrag.ErledigtVon = this.benutzer.BenutzerID; }
} }
auftrag.Save();
Tosave = false; Tosave = false;
} }
//SCHMUTZWÄSCHESCHEIN DRUCKEN //SCHMUTZWÄSCHESCHEIN DRUCKEN
@ -357,7 +360,6 @@ namespace Deckungsbeitrag
} }
} }
#region ToSave #region ToSave
//BEI CLICK AUF CONTAINER +/- SPEICHERN WIRD AKITV //BEI CLICK AUF CONTAINER +/- SPEICHERN WIRD AKITV
@ -681,7 +683,7 @@ namespace Deckungsbeitrag
{ {
this.Width--; this.Width--;
} }
if (oLVArtikel != null) this.ClientSize = new Size(oLVArtikel.Right + 10, oLVArtikel.Bottom + buttonAbbrechen.Height + 25); //if (oLVArtikel != null) this.ClientSize = new Size(oLVArtikel.Right + 10, oLVArtikel.Bottom + buttonAbbrechen.Height + 25);
} }
private void ChangeAnzahl(int newValue, int oldvalue, object _artikel) private void ChangeAnzahl(int newValue, int oldvalue, object _artikel)
{ {

48
AA-Forms/FormExpedit.Designer.cs generated
View File

@ -56,6 +56,10 @@
this.containerSauberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.containerSauberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.containerSchmutzigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.containerSchmutzigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tourToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tourToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.abteilungStatusToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.kleinteileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.frotteeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.großteileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.auftraginfoAnsehenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.auftraginfoAnsehenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aufgabeErledigtToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aufgabeErledigtToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.auftragVerschiebenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.auftragVerschiebenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -352,12 +356,13 @@
this.statusToolStripMenuItem, this.statusToolStripMenuItem,
this.containerSauberToolStripMenuItem, this.containerSauberToolStripMenuItem,
this.containerSchmutzigToolStripMenuItem, this.containerSchmutzigToolStripMenuItem,
this.tourToolStripMenuItem}); this.tourToolStripMenuItem,
this.abteilungStatusToolStripMenuItem});
this.bearbeitenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.PenOne_16x; this.bearbeitenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.PenOne_16x;
this.bearbeitenToolStripMenuItem.Name = "bearbeitenToolStripMenuItem"; this.bearbeitenToolStripMenuItem.Name = "bearbeitenToolStripMenuItem";
this.bearbeitenToolStripMenuItem.Size = new System.Drawing.Size(239, 26); this.bearbeitenToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.bearbeitenToolStripMenuItem.Text = "Bearbeiten"; this.bearbeitenToolStripMenuItem.Text = "Bearbeiten";
this.bearbeitenToolStripMenuItem.DropDownOpening += new System.EventHandler(this.ContextMenuStripBearbeiten_DropDownOpening); this.bearbeitenToolStripMenuItem.DropDownOpening += new System.EventHandler(this.ContextMenuStrip_DropDownOpening);
// //
// liefertagToolStripMenuItem // liefertagToolStripMenuItem
// //
@ -399,6 +404,40 @@
this.tourToolStripMenuItem.Text = "Tour"; this.tourToolStripMenuItem.Text = "Tour";
this.tourToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click); this.tourToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
// //
// abteilungStatusToolStripMenuItem
//
this.abteilungStatusToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.kleinteileToolStripMenuItem,
this.frotteeToolStripMenuItem,
this.großteileToolStripMenuItem});
this.abteilungStatusToolStripMenuItem.Name = "abteilungStatusToolStripMenuItem";
this.abteilungStatusToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.abteilungStatusToolStripMenuItem.Text = "Abteilung Status";
//
// kleinteileToolStripMenuItem
//
this.kleinteileToolStripMenuItem.AccessibleName = "Kleinteile";
this.kleinteileToolStripMenuItem.Name = "kleinteileToolStripMenuItem";
this.kleinteileToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.kleinteileToolStripMenuItem.Text = "Kleinteile beendet";
this.kleinteileToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAbteilungStatus_Click);
//
// frotteeToolStripMenuItem
//
this.frotteeToolStripMenuItem.AccessibleName = "Frottee";
this.frotteeToolStripMenuItem.Name = "frotteeToolStripMenuItem";
this.frotteeToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.frotteeToolStripMenuItem.Text = "Frottee beendet";
this.frotteeToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAbteilungStatus_Click);
//
// großteileToolStripMenuItem
//
this.großteileToolStripMenuItem.AccessibleName = "Grossteile";
this.großteileToolStripMenuItem.Name = "großteileToolStripMenuItem";
this.großteileToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
this.großteileToolStripMenuItem.Text = "Großteile beendet";
this.großteileToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAbteilungStatus_Click);
//
// auftraginfoAnsehenToolStripMenuItem // auftraginfoAnsehenToolStripMenuItem
// //
this.auftraginfoAnsehenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.InformationSymbol_16x; this.auftraginfoAnsehenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.InformationSymbol_16x;
@ -561,6 +600,7 @@
this.objectListViewAuftrag.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting); this.objectListViewAuftrag.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewAuftrag.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick); this.objectListViewAuftrag.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewAuftrag.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell); this.objectListViewAuftrag.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
this.objectListViewAuftrag.FormatRow += new System.EventHandler<BrightIdeasSoftware.FormatRowEventArgs>(this.ObjectListViewAuftrag_FormatRow);
this.objectListViewAuftrag.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick); this.objectListViewAuftrag.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
// //
// tabControlAuftragList // tabControlAuftragList
@ -748,5 +788,9 @@
private System.Windows.Forms.ToolStripMenuItem aufgabeErledigtToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aufgabeErledigtToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem auftragLöschenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem auftragLöschenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem auftraginfoAnsehenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem auftraginfoAnsehenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem abteilungStatusToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem frotteeToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem kleinteileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem großteileToolStripMenuItem;
} }
} }

143
AA-Forms/FormExpedit.cs
View File

@ -5,6 +5,7 @@ using Deckungsbeitrag.AA_Klassen;
using Deckungsbeitrag.Properties; using Deckungsbeitrag.Properties;
using Deckungsbeitrag.UserControls; using Deckungsbeitrag.UserControls;
using Microsoft.VisualBasic; using Microsoft.VisualBasic;
using Microsoft.VisualBasic.ApplicationServices;
using Npgsql; using Npgsql;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -17,6 +18,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices.ComTypes;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
@ -68,6 +70,26 @@ namespace Deckungsbeitrag
private List<View_Auftrag_Expedit> listRampe; private List<View_Auftrag_Expedit> listRampe;
public TrelloCardClient _trelloClient; public TrelloCardClient _trelloClient;
private bool TrelloKarte = true; private bool TrelloKarte = true;
private bool _toPrint = true;
public bool ToPrint
{
get { return _toPrint; }
set
{
_toPrint = value;
if (_toPrint)
{
buttonEtikettenDrucken.Enabled = true;
buttonEtikettenDrucken.BackColor = Color.FromArgb(0, 192, 0);
}
else
{
buttonEtikettenDrucken.Enabled = false;
buttonEtikettenDrucken.BackColor = Color.Gray;
}
}
}
#endregion #endregion
public FormExpedit(Benutzer benutzer) public FormExpedit(Benutzer benutzer)
{ {
@ -114,23 +136,38 @@ namespace Deckungsbeitrag
{ {
try try
{ {
await Task.WhenAll( await GetAuftraegeAsync(null);
GetAuftraegeAsync(null));
// UI-Update NACH Daten (Invoke!) // UI-Update NACH Daten (Invoke!)
this.Invoke(new Action(() => if (this.IsHandleCreated && !this.IsDisposed)
{
this.BeginInvoke(new Action(() =>
{
// OLVs füllen
if (listAuftragToday.Count > 0) Load_OLV(this.objectListViewAuftrag, listAuftragToday);
if (listAuftragGeschaeft != null && listAuftragGeschaeft.Count > 0) Load_OLV(this.objectListViewGeschaeft, listAuftragGeschaeft);
if (listSonderAuftrag.Count > 0) Load_OLV(this.objectListViewSonder, listSonderAuftrag);
if (listVorbereitet != null && listVorbereitet.Count > 0) Load_OLV(this.objectListViewVorbereitet, listVorbereitet);
if (listRampe != null && listRampe.Count > 0) Load_OLV(this.objectListViewRampe, listRampe);
// Controls aktivieren und deaktivieren nach BenutzerRolle
Enable_Controls();
}));
}
else
{ {
// OLVs füllen // OLVs füllen
if (listAuftragToday.Count > 0) Load_OLV(this.objectListViewAuftrag, listAuftragToday); if (listAuftragToday.Count > 0) Load_OLV(this.objectListViewAuftrag, listAuftragToday);
if (listAuftragGeschaeft != null && listAuftragGeschaeft.Count > 0) Load_OLV(this.objectListViewGeschaeft, listAuftragGeschaeft); if (listAuftragGeschaeft != null && listAuftragGeschaeft.Count > 0) Load_OLV(this.objectListViewGeschaeft, listAuftragGeschaeft);
if (listSonderAuftrag.Count > 0) Load_OLV(this.objectListViewSonder, listSonderAuftrag); if (listSonderAuftrag.Count > 0) Load_OLV(this.objectListViewSonder, listSonderAuftrag);
if (listVorbereitet != null && listVorbereitet.Count > 0) Load_OLV(this.objectListViewVorbereitet, listVorbereitet); if (listVorbereitet != null && listVorbereitet.Count > 0) Load_OLV(this.objectListViewVorbereitet, listVorbereitet);
if (listRampe!= null && listRampe.Count > 0) Load_OLV(this.objectListViewRampe, listRampe); if (listRampe != null && listRampe.Count > 0) Load_OLV(this.objectListViewRampe, listRampe);
// Controls aktivieren und deaktivieren nach BenutzerRolle // Controls aktivieren und deaktivieren nach BenutzerRolle
Enable_Controls(); Enable_Controls();
})); }
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -349,19 +386,43 @@ namespace Deckungsbeitrag
showUserControl.Show(); showUserControl.Show();
} }
private void ContextMenuStripAbteilungStatus_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
ToolStripItem item = (ToolStripItem)sender;
// Überprüfung ob Click auf einem Item war.
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
if (_auftrag == null) return;
if (item.AccessibleName == "Kleinteile") { _auftrag.Abteilungen |= AbteilungsStatus.KleinteileBeendet; _auftrag.Save(); }
if (item.AccessibleName == "Grossteile") { _auftrag.Abteilungen |= AbteilungsStatus.GrossteileBeendet; _auftrag.Save(); }
if (item.AccessibleName == "Frottee") { _auftrag.Abteilungen |= AbteilungsStatus.FrotteeBeendet; _auftrag.Save(); }
Neuladen_OLV(olv);
}
#endregion #endregion
private void ContextMenuStripBearbeiten_DropDownOpening(object sender, EventArgs e) private void ContextMenuStrip_DropDownOpening(object sender, EventArgs e)
{ {
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0]; ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
ToolStripMenuItem tsi = (ToolStripMenuItem)sender; ToolStripMenuItem tsi = (ToolStripMenuItem)sender;
foreach (ToolStripDropDownItem item in tsi.DropDownItems) foreach (ToolStripDropDownItem item in tsi.DropDownItems)
{ {
if (item.AccessibleName == null) continue;
string aspect = item.AccessibleName; string aspect = item.AccessibleName;
var col = olv.AllColumns.OfType<OLVColumn>().First(x => x.AspectName == aspect); var col = olv.AllColumns.OfType<OLVColumn>().First(x => x.AspectName == aspect);
if (col.IsEditable) item.Enabled = true; if (col.IsEditable) item.Enabled = true;
else item.Enabled = false; else item.Enabled = false;
} }
// MenuItem Abteilungen Status Enablen oder Disablen
ToolStripMenuItem menuitem = (ToolStripMenuItem)tsi.DropDownItems[5];
var varcol = olv.AllColumns.OfType<OLVColumn>().First(x => x.AspectName == "KleinteileAnzeige");
if (varcol.IsEditable) menuitem.Enabled = true;
else menuitem.Enabled = false;
} }
private void ContextMenuStripExpedit_Opening(object sender, System.ComponentModel.CancelEventArgs e) private void ContextMenuStripExpedit_Opening(object sender, System.ComponentModel.CancelEventArgs e)
{ {
@ -381,6 +442,7 @@ namespace Deckungsbeitrag
else this.auftragLöschenToolStripMenuItem.Enabled = true; else this.auftragLöschenToolStripMenuItem.Enabled = true;
} }
#region ObjectListView-Events #region ObjectListView-Events
private void Load_OLV(ObjectListView olv, List<View_Auftrag_Expedit> auftragliste) private void Load_OLV(ObjectListView olv, List<View_Auftrag_Expedit> auftragliste)
@ -454,6 +516,19 @@ namespace Deckungsbeitrag
OLVColumn Find(string header) => OLVColumn Find(string header) =>
columns.FirstOrDefault(c => String.Equals(c.Text, header, StringComparison.OrdinalIgnoreCase)); columns.FirstOrDefault(c => String.Equals(c.Text, header, StringComparison.OrdinalIgnoreCase));
// --- Typ-String ---
var typColumn = Find("Typ");
typColumn.AspectToStringConverter = delegate (object x)
{
if (x == null) return string.Empty;
var typ = (AuftragTyp)x;
if (typ == AuftragTyp.Standart)
return string.Empty;
return typ.ToString();
};
// --- Aufgabe-Icon --- // --- Aufgabe-Icon ---
var aufgabeCol = Find("Aufgabe"); var aufgabeCol = Find("Aufgabe");
if (aufgabeCol != null) if (aufgabeCol != null)
@ -477,15 +552,13 @@ namespace Deckungsbeitrag
} }
// --- Kunde-Icon --- // ---Tour-AspectName ---
var tourCol = Find("TourID"); var tourCol = Find("TourID");
if (tourCol != null) if (tourCol != null)
{ {
tourCol.AspectName = "Tour"; tourCol.AspectName = "Tour";
} }
// --- Schmutzig / Sauber --- // --- Schmutzig / Sauber ---
var dirtCol = Find("Schmutzig"); var dirtCol = Find("Schmutzig");
if (dirtCol != null) if (dirtCol != null)
@ -499,7 +572,7 @@ namespace Deckungsbeitrag
{ {
cleanCol.HeaderImageKey = "clean"; cleanCol.HeaderImageKey = "clean";
cleanCol.ShowTextInHeader = false; cleanCol.ShowTextInHeader = false;
cleanCol.MinimumWidth = cleanCol.MaximumWidth = 80; // Bugfix: nicht dirtCol.MaximumWidth cleanCol.MinimumWidth = cleanCol.MaximumWidth = 80;
} }
// --- Abschließen-Button --- // --- Abschließen-Button ---
@ -522,7 +595,7 @@ namespace Deckungsbeitrag
break; break;
case BenutzerRolle.Fahrer: case BenutzerRolle.Fahrer:
break; break;
case BenutzerRolle.Admin: if (col.AspectName is "ContainerDirt" || col.AspectName is "Liefertag" || col.AspectName is "ContainerClean" || col.AspectName is "Status" || col.AspectName is "Tour") col.IsEditable = true; case BenutzerRolle.Admin: if (col.AspectName is "ContainerDirt" || col.AspectName is "Liefertag" || col.AspectName is "ContainerClean" || col.AspectName is "Status" || col.AspectName is "Tour" || col.AspectName is "FrotteeAnzeige" || col.AspectName is "KleinteileAnzeige" || col.AspectName is "GrossteileAnzeige") col.IsEditable = true;
break; break;
case BenutzerRolle.Waschstrasse: case BenutzerRolle.Waschstrasse:
break; break;
@ -581,6 +654,9 @@ namespace Deckungsbeitrag
} }
private void ObjectListViewAuftrag_FormatCell(object sender, FormatCellEventArgs e) private void ObjectListViewAuftrag_FormatCell(object sender, FormatCellEventArgs e)
{ {
ObjectListView olv = sender as ObjectListView;
// Button Spalte immer mit Hintergrund damit besser sichtbar.
if (e.Column.IsButton) if (e.Column.IsButton)
{ {
if(e.SubItem.BackColor != Color.LightBlue) if(e.SubItem.BackColor != Color.LightBlue)
@ -595,17 +671,32 @@ namespace Deckungsbeitrag
} }
} }
// Abteilungstatus wird farblich gekennzeichnet
if (e.Column.Text == "FR" || e.Column.Text == "KT" || e.Column.Text == "GT") if (e.Column.Text == "FR" || e.Column.Text == "KT" || e.Column.Text == "GT")
{ {
if (e.CellValue.ToString() == "☑") if (e.CellValue.ToString() == "☑")
{ {
e.SubItem.Font = new Font("Segoe UI Symbol", 14F, FontStyle.Bold); e.SubItem.Font = new Font("Segoe UI Symbol", 14F, FontStyle.Bold);
e.SubItem.ForeColor = Color.YellowGreen; if (e.SubItem.BackColor == Color.YellowGreen) e.SubItem.ForeColor = Color.Black;
else e.SubItem.ForeColor = Color.YellowGreen;
} }
if (e.CellValue.ToString() == "☐") if (e.CellValue.ToString() == "☐")
{ {
e.SubItem.Font = new Font("Segoe UI Symbol", 14F, FontStyle.Bold); e.SubItem.Font = new Font("Segoe UI Symbol", 14F, FontStyle.Bold);
e.SubItem.ForeColor = Color.Yellow; e.SubItem.ForeColor = Color.Yellow;
// Wenn FrotteeExpedit und FrotteeAbteilung ist in Bearbeitung dann Zeile Gelb hinterlegen.
if (this.benutzer.Rolle == BenutzerRolle.Frottee && e.Column.Text == "FR")
{
foreach (OLVListSubItem sitem in e.Item.SubItems)
{
sitem.BackColor = Color.Yellow;
}
e.SubItem.ForeColor = Color.Black;
e.Item.BackColor = Color.Yellow;
}
} }
if (e.CellValue.ToString() == "☒") if (e.CellValue.ToString() == "☒")
{ {
@ -617,12 +708,35 @@ namespace Deckungsbeitrag
} }
private void ObjectListViewAuftrag_FormatRow(object sender, FormatRowEventArgs e)
{
bool isFertig = false;
ObjectListView olv = sender as ObjectListView;
View_Auftrag_Expedit vwAuftrag = e.Model as View_Auftrag_Expedit;
if (vwAuftrag.FrotteeStatus > 1 & vwAuftrag.KleinteileStatus > 1 & vwAuftrag.GrossteileStatus > 1) isFertig = true;
if (vwAuftrag.FrotteeStatus > 2 & vwAuftrag.KleinteileStatus > 2 & vwAuftrag.GrossteileStatus > 2) isFertig = false;
if (this.benutzer.Rolle != BenutzerRolle.Frottee & isFertig)
{
foreach (OLVListSubItem subitem in e.Item.SubItems)
{
subitem.BackColor = Color.YellowGreen;
}
}
}
private async void ObjectListViewAuftrag_CellClick(object sender, CellClickEventArgs e) private async void ObjectListViewAuftrag_CellClick(object sender, CellClickEventArgs e)
{ {
itemlocation = new Point(e.Location.X, e.Location.Y); itemlocation = new Point(e.Location.X, e.Location.Y);
ObjectListView olv = (ObjectListView)sender; ObjectListView olv = (ObjectListView)sender;
View_Auftrag_Expedit expAuftrag;
if (e.Model == null) { chartFehlmenge.Visible = false; groupBoxKndInfo.Visible = false; return; } if (e.Model == null) { chartFehlmenge.Visible = false; groupBoxKndInfo.Visible = false; return; }
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.Model).AuftragID); else expAuftrag = (View_Auftrag_Expedit)e.Model;
Auftrag _auftrag = Auftrag.GetAuftrag(expAuftrag.AuftragID);
if (expAuftrag.FrotteeStatus == 1 || expAuftrag.KleinteileStatus == 1 || expAuftrag.GrossteileStatus == 1) ToPrint = false;
else ToPrint = true;
if (_auftrag.Status != AuftragStatus.Fertig) if (_auftrag.Status != AuftragStatus.Fertig)
{ {
@ -1513,7 +1627,7 @@ namespace Deckungsbeitrag
Typ = AuftragTyp.IST_Erhoehung, Typ = AuftragTyp.IST_Erhoehung,
Erstellt = DateTime.Now, Erstellt = DateTime.Now,
ErstelltVon = (int)this.benutzer.BenutzerID, ErstelltVon = (int)this.benutzer.BenutzerID,
Status = AuftragStatus.Vorbereitet, Status = AuftragStatus.Herrichten,
}; };
@ -1526,6 +1640,7 @@ namespace Deckungsbeitrag
private void FormExpedit_MouseMove(object sender, MouseEventArgs e) private void FormExpedit_MouseMove(object sender, MouseEventArgs e)
{ {
} }
} }
} }
//DONE: Lösung zum Löschen von Aufträgen überlegen. (Kevin fragen) //DONE: Lösung zum Löschen von Aufträgen überlegen. (Kevin fragen)

2
AA-Forms/FormExpedit.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="contextMenuStripExpedit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStripExpedit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>12, 17</value> <value>7, 21</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="auftragVerschiebenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="auftragVerschiebenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

6
AA-Forms/FormFehlmengeCount.cs
View File

@ -402,6 +402,10 @@ namespace Deckungsbeitrag
/// <param name="e"></param> /// <param name="e"></param>
private async void ButtonFertig_Click(object sender, EventArgs e) private async void ButtonFertig_Click(object sender, EventArgs e)
{ {
// Neuladen des AbteilungStatus bevor gespeichert wird.
Auftrag _auftrag = Auftrag.GetAuftrag(auftrag.AuftragID);
auftrag = _auftrag;
foreach (Button btn in this.tableLayoutPanelArtikel.Controls.OfType<Button>()) foreach (Button btn in this.tableLayoutPanelArtikel.Controls.OfType<Button>())
{ {
KundeArtikel kndart = null; KundeArtikel kndart = null;
@ -411,6 +415,7 @@ namespace Deckungsbeitrag
kndart.Save(); kndart.Save();
} }
} }
if (auftrag != null) if (auftrag != null)
{ {
// Controls werden durchgegangen und ausgeblendet oder der Text entfernt. // Controls werden durchgegangen und ausgeblendet oder der Text entfernt.
@ -464,6 +469,7 @@ namespace Deckungsbeitrag
} }
} }
//Kunde wird durch Scan oder Handeingabe Ausgewählt. //Kunde wird durch Scan oder Handeingabe Ausgewählt.
await Open_Liste(); await Open_Liste();
ControlLaden(); ControlLaden();

97
AA-Forms/FormKundeVW.cs
View File

@ -57,6 +57,25 @@ namespace Deckungsbeitrag
} }
} }
} }
private bool _tosaveStand = false;
public bool TosaveStand
{
get { return _tosaveStand; }
set
{
_tosaveStand = value;
if (_tosaveStand)
{
buttonSpeichern.Enabled = true;
buttonSpeichern.BackColor = Color.FromArgb(0, 192, 0);
}
else
{
buttonSpeichern.Enabled = false;
buttonSpeichern.BackColor = Color.Gray;
}
}
}
public FormKundeVW() public FormKundeVW()
{ {
@ -91,18 +110,14 @@ namespace Deckungsbeitrag
this.labelAnzahlChars.Location = new Point(this.textBoxAnmerkung.Right - this.labelAnzahlChars.Width, this.labelAnzahlChars.Location.Y); this.labelAnzahlChars.Location = new Point(this.textBoxAnmerkung.Right - this.labelAnzahlChars.Width, this.labelAnzahlChars.Location.Y);
this.tabControlKunde.Location = new Point(this.textBoxAnmerkung.Right + 10, 11); this.tabControlKunde.Location = new Point(this.textBoxAnmerkung.Right + 10, 11);
//this.tabControlKunde.TabPages.Remove(tabPageArtikel);
ComboBox_Laden(); ComboBox_Laden();
if (this.kunde == null) this.kunde = Funktionen.KundenAuswahl(); if (this.kunde == null) this.kunde = Funktionen.KundenAuswahl();
if (this.kunde != null) DatenLesen(); if (this.kunde != null) DatenLesen();
else this.Close(); else this.Close();
} }
private void FormKundeVW_Shown(object sender, EventArgs e) private void FormKundeVW_Shown(object sender, EventArgs e)
{ {
@ -154,17 +169,15 @@ namespace Deckungsbeitrag
//kundeid ist falls bereits ein Stand existiert und die Artikel gespeichert wurden. //kundeid ist falls bereits ein Stand existiert und die Artikel gespeichert wurden.
string kundeid = this.kunde.KundeID.ToString(); string kundeid = this.kunde.KundeID.ToString();
this.standListe = KundeArtikel.GetList(kundeid);
// Wenn bereits ein Stand gespeichert ist, kommt er aus der DB. Wenn kein Stand gespeichert kommt Liste aus Sortiment. // Wenn bereits ein Stand gespeichert ist, kommt er aus der DB. Wenn kein Stand gespeichert kommt Liste aus Sortiment.
if (KundeArtikel.GetList(kundeid).Count > 0) if (this.standListe.Count > 0)
{ {
this.standListe = KundeArtikel.GetList(kundeid); CompareToSortiment();
if (this.standListe[0].ArtikelID == null || this.standListe[0].Reihung == 0)
{
CompareToSortiment();
}
Load_Gridview(this.standListe); Load_Gridview(this.standListe);
this.dGArtikel.Enabled = false; if (this.benutzer.Rolle == BenutzerRolle.Admin) this.dGArtikel.Enabled = true;
else this.dGArtikel.Enabled = false;
} }
else else
{ {
@ -195,6 +208,8 @@ namespace Deckungsbeitrag
//GridView mit der jeweiligen Liste füllen. //GridView mit der jeweiligen Liste füllen.
Load_Gridview(standListe); Load_Gridview(standListe);
if (this.benutzer.Rolle == BenutzerRolle.Admin) this.dGArtikel.Enabled = true;
else this.dGArtikel.Enabled = false;
} }
// QR-Code wird erstellt // QR-Code wird erstellt
@ -270,17 +285,50 @@ namespace Deckungsbeitrag
int reihung = 1; int reihung = 1;
Kunde _kunde = Kunde.GetKunde(null, this.standListe[0].KundeID, null); Kunde _kunde = Kunde.GetKunde(null, this.standListe[0].KundeID, null);
foreach (Sortiment sort in sortimentListe.FindAll(Sortiment => Sortiment.KundeNummer == _kunde.KundeNummer)) List<Sortiment> _sortListe = new List<Sortiment>();
foreach (Sortiment sort in sortimentListe.FindAll(Sortiment => Sortiment.KundeNummer == _kunde.KundeNummer)) _sortListe.Add(sort);
if (_sortListe.Count == this.standListe.Count && this.standListe[0].ArtikelID == null || this.standListe[0].Reihung == 0)
{ {
if (sort.ArtName.Contains("*EK")) continue; foreach (Sortiment sort in _sortListe)
KundeArtikel kndart = this.standListe.Find(s => s.ArtikelNR == sort.ArtNr); {
kndart.ArtikelID = Artikel.GetArtikelID(sort.ArtNr); //if (sort.ArtName.Contains("*EK")) continue;
kndart.Reihung = reihung; KundeArtikel kndart = this.standListe.Find(s => s.ArtikelNR == sort.ArtNr);
kndart.ArtikelID = Artikel.GetArtikelID(sort.ArtNr);
kndart.Reihung = reihung;
kndart.Save(); kndart.Save();
reihung++; reihung++;
}
} }
else
{
if (_sortListe.Count > this.standListe.Count)
{
int reih = 1;
foreach (Sortiment sort in _sortListe)
{
KundeArtikel kndart = this.standListe.Find(s => s.ArtikelNR == sort.ArtNr);
if (kndart == null)
{
kndart = new KundeArtikel
{
ArtikelNR = sort.ArtNr,
ArtikelName = sort.ArtName,
KundeID = Kunde.GetKundeID(sort.KundeNummer, null),
ArtikelID = Artikel.GetArtikelID(sort.ArtNr),
};
standListe.Add(kndart);
}
kndart.Reihung = reih;
kndart.Save();
reih++;
}
}
}
this.standListe = this.standListe.OrderBy(x => x.Reihung).ToList(); this.standListe = this.standListe.OrderBy(x => x.Reihung).ToList();
} }
@ -295,8 +343,6 @@ namespace Deckungsbeitrag
{ {
} }
private void TSBBeenden_Click(object sender, EventArgs e) private void TSBBeenden_Click(object sender, EventArgs e)
{ {
this.DialogResult = DialogResult.Cancel; this.DialogResult = DialogResult.Cancel;
@ -567,6 +613,7 @@ namespace Deckungsbeitrag
{ {
item.Stand = int.Parse(row.Cells[e.ColumnIndex].Value.ToString()); item.Stand = int.Parse(row.Cells[e.ColumnIndex].Value.ToString());
item.StandBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString(); item.StandBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString();
TosaveStand = true;
} }
if (row.Cells[e.ColumnIndex].OwningColumn.Name == "Fehlmenge") if (row.Cells[e.ColumnIndex].OwningColumn.Name == "Fehlmenge")
{ {
@ -588,6 +635,10 @@ namespace Deckungsbeitrag
} }
else
{
if (row.Cells[e.ColumnIndex].OwningColumn.Name == "Stand") TosaveStand = false;
}
} }
} }
@ -623,7 +674,7 @@ namespace Deckungsbeitrag
if (formloading) return; if (formloading) return;
_tosave = true; _tosave = true;
labelAnzahlChars.Text = textBoxAnmerkung.TextLength.ToString() + "/" + textBoxAnmerkung.MaxLength.ToString(); labelAnzahlChars.Text = textBoxAnmerkung.TextLength.ToString() + "/" + textBoxAnmerkung.MaxLength.ToString();
TextBoxAnmerkung_Leave(this, null); //TextBoxAnmerkung_Leave(this, null);
} }
private void ComboBoxAufgabe_SelectedIndexChanged(object sender, EventArgs e) private void ComboBoxAufgabe_SelectedIndexChanged(object sender, EventArgs e)
{ {

2
AA-Forms/FormKundeVW.designer.cs generated
View File

@ -616,7 +616,7 @@ namespace Deckungsbeitrag
// buttonSpeichern // buttonSpeichern
// //
this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonSpeichern.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.buttonSpeichern.BackColor = System.Drawing.Color.Gray;
this.buttonSpeichern.Enabled = false; this.buttonSpeichern.Enabled = false;
this.buttonSpeichern.FlatAppearance.BorderSize = 0; this.buttonSpeichern.FlatAppearance.BorderSize = 0;
this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

39
AA-Forms/FormLaden.Designer.cs generated
View File

@ -42,10 +42,10 @@
this.pictureBoxWalli.BackColor = System.Drawing.Color.White; this.pictureBoxWalli.BackColor = System.Drawing.Color.White;
this.pictureBoxWalli.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pictureBoxWalli.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBoxWalli.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWalli.Image"))); this.pictureBoxWalli.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxWalli.Image")));
this.pictureBoxWalli.Location = new System.Drawing.Point(138, 156); this.pictureBoxWalli.Location = new System.Drawing.Point(184, 192);
this.pictureBoxWalli.Margin = new System.Windows.Forms.Padding(2); this.pictureBoxWalli.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBoxWalli.Name = "pictureBoxWalli"; this.pictureBoxWalli.Name = "pictureBoxWalli";
this.pictureBoxWalli.Size = new System.Drawing.Size(226, 140); this.pictureBoxWalli.Size = new System.Drawing.Size(301, 172);
this.pictureBoxWalli.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; this.pictureBoxWalli.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
this.pictureBoxWalli.TabIndex = 0; this.pictureBoxWalli.TabIndex = 0;
this.pictureBoxWalli.TabStop = false; this.pictureBoxWalli.TabStop = false;
@ -57,39 +57,42 @@
this.labelLaden.Anchor = System.Windows.Forms.AnchorStyles.None; this.labelLaden.Anchor = System.Windows.Forms.AnchorStyles.None;
this.labelLaden.BackColor = System.Drawing.Color.White; this.labelLaden.BackColor = System.Drawing.Color.White;
this.labelLaden.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.labelLaden.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labelLaden.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelLaden.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelLaden.Location = new System.Drawing.Point(138, 295); this.labelLaden.Location = new System.Drawing.Point(184, 363);
this.labelLaden.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelLaden.Name = "labelLaden"; this.labelLaden.Name = "labelLaden";
this.labelLaden.Size = new System.Drawing.Size(226, 58); this.labelLaden.Size = new System.Drawing.Size(301, 71);
this.labelLaden.TabIndex = 1; this.labelLaden.TabIndex = 1;
this.labelLaden.Text = "LÄDT..."; this.labelLaden.Text = "LÄDT UPDATE...";
this.labelLaden.TextAlign = System.Drawing.ContentAlignment.BottomCenter; this.labelLaden.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labelLaden.UseWaitCursor = true; this.labelLaden.UseWaitCursor = true;
// //
// buttonAbbrechen // buttonAbbrechen
// //
this.buttonAbbrechen.Location = new System.Drawing.Point(205, 397); this.buttonAbbrechen.Location = new System.Drawing.Point(273, 489);
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.buttonAbbrechen.Name = "buttonAbbrechen"; this.buttonAbbrechen.Name = "buttonAbbrechen";
this.buttonAbbrechen.Size = new System.Drawing.Size(75, 23); this.buttonAbbrechen.Size = new System.Drawing.Size(100, 28);
this.buttonAbbrechen.TabIndex = 2; this.buttonAbbrechen.TabIndex = 2;
this.buttonAbbrechen.Text = "Abbrechen"; this.buttonAbbrechen.Text = "Abbrechen";
this.buttonAbbrechen.UseVisualStyleBackColor = true; this.buttonAbbrechen.UseVisualStyleBackColor = true;
this.buttonAbbrechen.UseWaitCursor = true;
this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click); this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click);
// //
// progressBar1 // progressBar1
// //
this.progressBar1.Location = new System.Drawing.Point(138, 357); this.progressBar1.Location = new System.Drawing.Point(184, 439);
this.progressBar1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.progressBar1.Name = "progressBar1"; this.progressBar1.Name = "progressBar1";
this.progressBar1.Size = new System.Drawing.Size(226, 23); this.progressBar1.Size = new System.Drawing.Size(301, 28);
this.progressBar1.TabIndex = 3; this.progressBar1.TabIndex = 3;
this.progressBar1.UseWaitCursor = true;
// //
// FormLaden // FormLaden
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Yellow; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.ClientSize = new System.Drawing.Size(500, 500); this.ClientSize = new System.Drawing.Size(667, 615);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.progressBar1); this.Controls.Add(this.progressBar1);
this.Controls.Add(this.buttonAbbrechen); this.Controls.Add(this.buttonAbbrechen);
@ -98,14 +101,16 @@
this.Cursor = System.Windows.Forms.Cursors.WaitCursor; this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "FormLaden"; this.Name = "FormLaden";
this.Opacity = 0.8D;
this.ShowIcon = false; this.ShowIcon = false;
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.TransparencyKey = System.Drawing.Color.Yellow; this.TransparencyKey = System.Drawing.Color.Yellow;
this.UseWaitCursor = true; this.UseWaitCursor = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FormLaden_Load); this.Load += new System.EventHandler(this.FormLaden_Load);
((System.ComponentModel.ISupportInitialize)(this.pictureBoxWalli)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWalli)).EndInit();
this.ResumeLayout(false); this.ResumeLayout(false);

39
AA-Forms/FormListe.Designer.cs generated
View File

@ -59,11 +59,11 @@ namespace Deckungsbeitrag
this.listViewKunde.HideSelection = false; this.listViewKunde.HideSelection = false;
this.listViewKunde.HotTracking = true; this.listViewKunde.HotTracking = true;
this.listViewKunde.HoverSelection = true; this.listViewKunde.HoverSelection = true;
this.listViewKunde.Location = new System.Drawing.Point(12, 76); this.listViewKunde.Location = new System.Drawing.Point(9, 62);
this.listViewKunde.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.listViewKunde.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.listViewKunde.MultiSelect = false; this.listViewKunde.MultiSelect = false;
this.listViewKunde.Name = "listViewKunde"; this.listViewKunde.Name = "listViewKunde";
this.listViewKunde.Size = new System.Drawing.Size(850, 551); this.listViewKunde.Size = new System.Drawing.Size(638, 448);
this.listViewKunde.TabIndex = 1; this.listViewKunde.TabIndex = 1;
this.listViewKunde.UseCompatibleStateImageBehavior = false; this.listViewKunde.UseCompatibleStateImageBehavior = false;
this.listViewKunde.View = System.Windows.Forms.View.Details; this.listViewKunde.View = System.Windows.Forms.View.Details;
@ -90,11 +90,11 @@ namespace Deckungsbeitrag
// textBoxKunde // textBoxKunde
// //
this.textBoxKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBoxKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxKunde.ForeColor = System.Drawing.Color.Silver; this.textBoxKunde.ForeColor = System.Drawing.Color.Black;
this.textBoxKunde.Location = new System.Drawing.Point(12, 16); this.textBoxKunde.Location = new System.Drawing.Point(9, 13);
this.textBoxKunde.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.textBoxKunde.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.textBoxKunde.Name = "textBoxKunde"; this.textBoxKunde.Name = "textBoxKunde";
this.textBoxKunde.Size = new System.Drawing.Size(393, 38); this.textBoxKunde.Size = new System.Drawing.Size(296, 32);
this.textBoxKunde.TabIndex = 0; this.textBoxKunde.TabIndex = 0;
this.textBoxKunde.Text = "Hier eingeben"; this.textBoxKunde.Text = "Hier eingeben";
this.textBoxKunde.Click += new System.EventHandler(this.TextBoxKunde_Click); this.textBoxKunde.Click += new System.EventHandler(this.TextBoxKunde_Click);
@ -106,10 +106,9 @@ namespace Deckungsbeitrag
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.White; this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(412, 19); this.label1.Location = new System.Drawing.Point(309, 15);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(304, 32); this.label1.Size = new System.Drawing.Size(248, 26);
this.label1.TabIndex = 2; this.label1.TabIndex = 2;
this.label1.Text = "KundeNr. oder Name eingeben.\r\nKunde nicht vorhanden? Starte die Eingabe mit (?)."; this.label1.Text = "KundeNr. oder Name eingeben.\r\nKunde nicht vorhanden? Starte die Eingabe mit (?).";
// //
@ -121,10 +120,10 @@ namespace Deckungsbeitrag
this.buttonOK.FlatAppearance.BorderSize = 0; this.buttonOK.FlatAppearance.BorderSize = 0;
this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonOK.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonOK.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonOK.Location = new System.Drawing.Point(84, 85); this.buttonOK.Location = new System.Drawing.Point(63, 69);
this.buttonOK.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonOK.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.buttonOK.Name = "buttonOK"; this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(704, 50); this.buttonOK.Size = new System.Drawing.Size(528, 41);
this.buttonOK.TabIndex = 15; this.buttonOK.TabIndex = 15;
this.buttonOK.Text = "Kunde übernehmen"; this.buttonOK.Text = "Kunde übernehmen";
this.buttonOK.UseVisualStyleBackColor = false; this.buttonOK.UseVisualStyleBackColor = false;
@ -138,10 +137,10 @@ namespace Deckungsbeitrag
this.buttonNeuerAuftrag.FlatAppearance.BorderSize = 0; this.buttonNeuerAuftrag.FlatAppearance.BorderSize = 0;
this.buttonNeuerAuftrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonNeuerAuftrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonNeuerAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonNeuerAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonNeuerAuftrag.Location = new System.Drawing.Point(160, 574); this.buttonNeuerAuftrag.Location = new System.Drawing.Point(120, 466);
this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag"; this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag";
this.buttonNeuerAuftrag.Size = new System.Drawing.Size(545, 42); this.buttonNeuerAuftrag.Size = new System.Drawing.Size(409, 34);
this.buttonNeuerAuftrag.TabIndex = 16; this.buttonNeuerAuftrag.TabIndex = 16;
this.buttonNeuerAuftrag.Text = "Neuer Auftrag"; this.buttonNeuerAuftrag.Text = "Neuer Auftrag";
this.buttonNeuerAuftrag.UseVisualStyleBackColor = false; this.buttonNeuerAuftrag.UseVisualStyleBackColor = false;
@ -149,10 +148,10 @@ namespace Deckungsbeitrag
// //
// FormListe // FormListe
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.ClientSize = new System.Drawing.Size(874, 642); this.ClientSize = new System.Drawing.Size(656, 522);
this.Controls.Add(this.buttonNeuerAuftrag); this.Controls.Add(this.buttonNeuerAuftrag);
this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonOK);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
@ -160,10 +159,10 @@ namespace Deckungsbeitrag
this.Controls.Add(this.listViewKunde); this.Controls.Add(this.listViewKunde);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.MinimumSize = new System.Drawing.Size(564, 54); this.MinimumSize = new System.Drawing.Size(427, 51);
this.Name = "FormListe"; this.Name = "FormListe";
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

21
AA-Forms/FormListe.cs
View File

@ -350,7 +350,6 @@ namespace Deckungsbeitrag
} }
private void TextBoxKunde_Click(object sender, EventArgs e) private void TextBoxKunde_Click(object sender, EventArgs e)
{ {
this.textBoxKunde.ForeColor = Color.Black;
this.textBoxKunde.Clear(); this.textBoxKunde.Clear();
if (Program.istTouch & Screen.PrimaryScreen.WorkingArea.Width > 0 & Screen.PrimaryScreen.WorkingArea.Width < 2000) if (Program.istTouch & Screen.PrimaryScreen.WorkingArea.Width > 0 & Screen.PrimaryScreen.WorkingArea.Width < 2000)
@ -372,7 +371,7 @@ namespace Deckungsbeitrag
private void TextBoxKunde_TextChanged(object sender, EventArgs e) private void TextBoxKunde_TextChanged(object sender, EventArgs e)
{ {
TextBox textbox = (TextBox)sender; TextBox textbox = (TextBox)sender;
if (textbox.ForeColor == Color.Black) if (!textbox.Text.StartsWith("SCAN") && textbox.Text.Length >= 4)
{ {
// TextChanged tritt nur ein wenn x Sekunden keine Eingabe erfolgt. Logik befindet sich in Timer_Tick // TextChanged tritt nur ein wenn x Sekunden keine Eingabe erfolgt. Logik befindet sich in Timer_Tick
timer.Stop(); // Alten Timer beenden timer.Stop(); // Alten Timer beenden
@ -489,13 +488,17 @@ namespace Deckungsbeitrag
if (!textBoxKunde.Text.StartsWith("?")) if (!textBoxKunde.Text.StartsWith("?"))
{ {
string text; string text;
if (textBoxKunde.Text.ToLower().StartsWith("https")) if (textBoxKunde.Text.StartsWith("SCAN"))
{ {
int index = 1; if (textBoxKunde.Text.ToLower().StartsWith("scanhttps"))
index += textBoxKunde.Text.IndexOf("=", index); {
int i = textBoxKunde.Text.IndexOf("%", index); int index = 1;
text = textBoxKunde.Text.Substring(index, i - index); index += textBoxKunde.Text.IndexOf("=", index);
textBoxKunde.Text = text; int i = textBoxKunde.Text.IndexOf("%", index);
text = textBoxKunde.Text.Substring(index, i - index);
textBoxKunde.Text = text;
}
else text = this.textBoxKunde.Text.Substring(4);
} }
else text = this.textBoxKunde.Text; else text = this.textBoxKunde.Text;
@ -544,7 +547,7 @@ namespace Deckungsbeitrag
{ {
e.SuppressKeyPress = true; e.SuppressKeyPress = true;
string code = txtScan.Text.Trim(); string code = txtScan.Text.Trim();
txtScan.Clear(); //txtScan.Clear();
if (!string.IsNullOrEmpty(code)) if (!string.IsNullOrEmpty(code))
TextBoxKunde_Leave(txtScan, null); TextBoxKunde_Leave(txtScan, null);

2
AA-Forms/FormMain.Designer.cs generated
View File

@ -510,7 +510,7 @@ namespace Deckungsbeitrag
this.buttonTest.Name = "buttonTest"; this.buttonTest.Name = "buttonTest";
this.buttonTest.Size = new System.Drawing.Size(333, 50); this.buttonTest.Size = new System.Drawing.Size(333, 50);
this.buttonTest.TabIndex = 73; this.buttonTest.TabIndex = 73;
this.buttonTest.Text = "Trello Test"; this.buttonTest.Text = "AuftragAuswahlTest";
this.buttonTest.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.buttonTest.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.buttonTest.UseVisualStyleBackColor = false; this.buttonTest.UseVisualStyleBackColor = false;
this.buttonTest.Visible = false; this.buttonTest.Visible = false;

81
AA-Forms/FormMain.cs
View File

@ -1394,44 +1394,53 @@ namespace Deckungsbeitrag
private async void buttonTest_Click(object sender, EventArgs e) private async void buttonTest_Click(object sender, EventArgs e)
{ {
if (TrelloConfig.HasCredentials()) FormAuftragAuswahl auswahl = new FormAuftragAuswahl();
if (auswahl.ShowDialog() == DialogResult.OK)
{ {
var apiKey = TrelloConfig.GetApiKey();
var token = TrelloConfig.GetToken();
TrelloCardClient _trelloClient = new TrelloCardClient(apiKey, token);
if (_trelloClient == null)
{
MessageBox.Show("Bitte zuerst Credentials speichern.", "Fehler",
MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
try
{
var options = new CreateCardOptions
{
Name = "TestKarte",
Desc = "TestKarte wurde aus Verwaltung importiert",
IdList = "6a1fcdc9a1995f42c537ae10",
Pos = "top",
DueDate = new DateTime(2026, 6, 10, 17, 0, 0, DateTimeKind.Local)
};
var card = await _trelloClient.CreateCardAndParseAsync(options);
MessageBox.Show(
$"Karte erstellt:\nID: {card.Id}\nName: {card.Name}\nURL: {card.ShortUrl}",
"Erfolg",
MessageBoxButtons.OK,
MessageBoxIcon.Information);
}
catch (Exception ex)
{
MessageBox.Show($"Fehler beim Erstellen der Karte:\n{ex.Message}", "Fehler",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
} }
// TRELLO TEST
//if (TrelloConfig.HasCredentials())
//{
// var apiKey = TrelloConfig.GetApiKey();
// var token = TrelloConfig.GetToken();
// TrelloCardClient _trelloClient = new TrelloCardClient(apiKey, token);
// if (_trelloClient == null)
// {
// MessageBox.Show("Bitte zuerst Credentials speichern.", "Fehler",
// MessageBoxButtons.OK, MessageBoxIcon.Warning);
// return;
// }
// try
// {
// var options = new CreateCardOptions
// {
// Name = "TestKarte",
// Desc = "TestKarte wurde aus Verwaltung importiert",
// IdList = "6a1fcdc9a1995f42c537ae10",
// Pos = "top",
// DueDate = new DateTime(2026, 6, 10, 17, 0, 0, DateTimeKind.Local)
// };
// var card = await _trelloClient.CreateCardAndParseAsync(options);
// MessageBox.Show(
// $"Karte erstellt:\nID: {card.Id}\nName: {card.Name}\nURL: {card.ShortUrl}",
// "Erfolg",
// MessageBoxButtons.OK,
// MessageBoxIcon.Information);
// }
// catch (Exception ex)
// {
// MessageBox.Show($"Fehler beim Erstellen der Karte:\n{ex.Message}", "Fehler",
// MessageBoxButtons.OK, MessageBoxIcon.Error);
// }
//}
} }
} }
} }

2
AA-Forms/FormNeuerAuftrag.cs
View File

@ -721,7 +721,7 @@ namespace Deckungsbeitrag
{ {
if (Auftrag.FindeAuftrag(true).Gefunden) if (Auftrag.FindeAuftrag(true).Gefunden)
{ {
int aufID = Auftrag.FindeAuftrag(false).auftragID; int aufID = Auftrag.FindeAuftrag(true).auftragID;
Auftrag auf = Auftrag.GetAuftrag(aufID); Auftrag auf = Auftrag.GetAuftrag(aufID);
List<AuftragArtikel> liste = AuftragArtikel.GetList(auf.AuftragID); List<AuftragArtikel> liste = AuftragArtikel.GetList(auf.AuftragID);
string output = string.Join(Environment.NewLine, liste.Select(a => $"{a.ArtikelName,-20} {a.Anzahl,4} Stk.")); string output = string.Join(Environment.NewLine, liste.Select(a => $"{a.ArtikelName,-20} {a.Anzahl,4} Stk."));

1
AA-Forms/FormShowUserControl.cs
View File

@ -54,6 +54,7 @@ namespace Deckungsbeitrag.AA_Forms
public FormShowUserControl(string groupBox, Benutzer user, Auftrag _auftrag) : this(groupBox, user) public FormShowUserControl(string groupBox, Benutzer user, Auftrag _auftrag) : this(groupBox, user)
{ {
this.auftrag = _auftrag; this.auftrag = _auftrag;
this.Text += " ID: " + this.auftrag.AuftragID.ToString();
} }
public FormShowUserControl(string groupBox, Benutzer user, Kunde kunde) : this(groupBox, user) public FormShowUserControl(string groupBox, Benutzer user, Kunde kunde) : this(groupBox, user)

193
AA-Klassen/Auftrag.cs
View File

@ -163,76 +163,33 @@ namespace DatenDB
} }
#endregion #endregion
public static List<Auftrag> GetFinishingList(ArtikelKategorie kategorie) internal static AbteilungsStatus GetAbteilungStatus(int? auftragID)
{ {
DatenbankConnection.GetConnection().Open(); AbteilungsStatus result = AbteilungsStatus.Keine;
List<Auftrag> resultList = new List<Auftrag>();
using (NpgsqlCommand cmd = new NpgsqlCommand()) try
{ {
cmd.Connection = DatenbankConnection.GetConnection(); DatenbankConnection.GetConnection().Open();
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"select abteilungen_status from {TABLE} where auftrag_id = {auftragID}";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read()) result = (AbteilungsStatus)reader.GetInt16(0);
reader.Close();
}
if (kategorie == ArtikelKategorie.Frottee) cmd.CommandText = $"select {ACOLUMNS} from {TABLE} a JOIN kundenverwaltung.kunde_artikel k ON a.kunde_id = k.kunde_id JOIN kundenverwaltung.artikel b ON k.artikel_id = b.artikel_id WHERE a.status = 2 and b.kategorie = {(int)kategorie} or a.status = 2 and b.kategorie = 4 GROUP BY a.auftrag_id, a.kunde_id HAVING COUNT(*) >= 1"; DatenbankConnection.GetConnection().Close();
else cmd.CommandText = $"select {ACOLUMNS} from {TABLE} a JOIN kundenverwaltung.kunde_artikel k ON a.kunde_id = k.kunde_id JOIN kundenverwaltung.artikel b ON k.artikel_id = b.artikel_id WHERE a.status = 2 and b.kategorie = {(int)kategorie} GROUP BY a.auftrag_id, a.kunde_id HAVING COUNT(*) >= 1";
return result;
NpgsqlDataReader reader = cmd.ExecuteReader();
while (reader.Read()) resultList.Add(new Auftrag(reader));
reader.Close();
} }
catch (Exception)
DatenbankConnection.GetConnection().Close(); {
return resultList; return result;
}
} }
public static List<Auftrag> GetRampeAuftragList()
{
DatenbankConnection.GetConnection().Open();
List<Auftrag> resultList = new List<Auftrag>();
using (NpgsqlCommand cmd = new NpgsqlCommand())
{
cmd.Connection = DatenbankConnection.GetConnection();
cmd.CommandText = $"select {COLUMNS} from {TABLE} where status = 0 order by liefertag asc";
NpgsqlDataReader reader = cmd.ExecuteReader();
while (reader.Read()) resultList.Add(new Auftrag(reader));
reader.Close();
}
DatenbankConnection.GetConnection().Close();
return resultList;
}
public static List<Auftrag> GetAuftragList(string s, Auftrag auftrag)
{
int? aID = null;
int? mID = null;
//Get MaschineID und AuftragID für Aufträge vor und nach Auftrag
if (auftrag != null)
{
mID = auftrag.MaschineID;
aID = auftrag.AuftragID;
}
//Get AufgabeID für Anzeige von Standerhöhungen
if (s == "STH") aID = (int)Aufgabe.GetAufgabe(s, null).AufgabeID;
DatenbankConnection.GetConnection().Open();
List<Auftrag> resultList = new List<Auftrag>();
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
if (s == "Expedit") command.CommandText = $"select {COLUMNS} from {TABLE} where status = 3 order by liefertag asc";
if (s == string.Empty) command.CommandText = $"select {COLUMNS} from {TABLE} where gedruckt is null and erledigt is null";
if (s == "davor") command.CommandText = $"select {COLUMNS} from {TABLE} where maschine_id = {mID} and auftrag_id < {aID} order by liefertag asc limit 3";
if (s == "danach") command.CommandText = $"select {COLUMNS} from {TABLE} where maschine_id = {mID} and auftrag_id > {aID} order by liefertag asc limit 3";
if (s == "STH") command.CommandText = $"select {COLUMNS} from {TABLE} where status = 3 and aufgabe_id = {aID} order by liefertag";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read()) resultList.Add(new Auftrag(reader));
reader.Close();
}
DatenbankConnection.GetConnection().Close();
return resultList;
}
public static List<Auftrag> GetAuftragStatsListToday(DateTime produktion) public static List<Auftrag> GetAuftragStatsListToday(DateTime produktion)
{ {
DatenbankConnection.GetConnection().Open(); DatenbankConnection.GetConnection().Open();
@ -300,23 +257,6 @@ namespace DatenDB
return result; return result;
} }
public static Auftrag GetLastAuftrag(int? benutzerID)
{
DatenbankConnection.GetConnection().Open();
Auftrag result = new Auftrag();
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"select {COLUMNS} from {TABLE} where erstellt_von = {benutzerID} order by erstellt desc limit 1";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read()) result = new Auftrag(reader);
reader.Close();
}
DatenbankConnection.GetConnection().Close();
return result;
}
public static List<Auftrag> FindeAuftragVonKunde(Kunde kunde, string zusatz, string datum, DateTime? date) public static List<Auftrag> FindeAuftragVonKunde(Kunde kunde, string zusatz, string datum, DateTime? date)
{ {
List<Auftrag> result = new List<Auftrag>(); List<Auftrag> result = new List<Auftrag>();
@ -343,69 +283,6 @@ namespace DatenDB
return result; return result;
} }
private bool FindAuftragStatus(int? auftragid, AuftragStatus status)
{
if (!auftragid.HasValue) return false;
NpgsqlConnection conn = null;
NpgsqlCommand cmd = null;
try
{
conn = new NpgsqlConnection(ConfigurationManager.AppSettings["ConnectionString"]);
conn.Open();
cmd = new NpgsqlCommand(@"
SELECT CASE WHEN COUNT(*) > 0 THEN 1 ELSE 0 END
FROM kundenverwaltung.auftrag_status
WHERE auftrag_id = @AuftragId AND auftrag_status = @Status", conn);
cmd.Parameters.AddWithValue("AuftragId", auftragid.Value);
cmd.Parameters.AddWithValue("Status", (int)status);
int result = (int)cmd.ExecuteScalar();
return result > 0;
}
catch (Exception)
{
throw;
}
finally
{
cmd?.Dispose();
if (conn != null && conn.State == ConnectionState.Open)
{
conn.Close();
conn.Dispose();
}
}
}
internal int? FindeFahrerIDZuAuftrag(Kunde kunde, DateTime liefertag)
{
int? result = null;
try
{
DatenbankConnection.GetConnection().Open();
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"select a.benutzer_id from {TABLE} a inner join kundenverwaltung.kunde k on a.kunde_id = k.kunde_id where k.region = '{kunde.Region}' and a.liefertag = '{liefertag.Date}' order by a.benutzer_id limit 1";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read()) result = reader.GetInt32(0);
reader.Close();
}
DatenbankConnection.GetConnection().Close();
return result;
}
catch (Exception)
{
return result;
}
}
public (bool Gefunden, int auftragID) FindeAuftrag(bool exakt) public (bool Gefunden, int auftragID) FindeAuftrag(bool exakt)
{ {
@ -419,7 +296,7 @@ namespace DatenDB
command.Connection = DatenbankConnection.GetConnection(); command.Connection = DatenbankConnection.GetConnection();
if (this.Typ != AuftragTyp.Regelmäßig) if (this.Typ != AuftragTyp.Regelmäßig)
{ {
if (exakt) command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and typ = {(int)this.Typ} and liefertag = '{this.Liefertag}'"; if (exakt) command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and typ = {(int)this.Typ} and liefertag = '{this.Liefertag}' and erledigt is null";
else command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and liefertag = '{this.Liefertag}' and status = {(int)this.Status}"; else command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and liefertag = '{this.Liefertag}' and status = {(int)this.Status}";
} }
else command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and typ = {(int)this.Typ}"; else command.CommandText = $"select auftrag_id from {TABLE} where kunde_id = {this.KundeID} and typ = {(int)this.Typ}";
@ -482,31 +359,6 @@ namespace DatenDB
connection?.Close(); connection?.Close();
} }
} }
public static int[] GetContaineranzahl(int? kundeId)
{
int[] result = { 0, 0, 0 };
int i = 0;
DatenbankConnection.GetConnection().Open();
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"select max(container_clean), avg(container_clean), min(container_clean) from {TABLE} where kunde_id = {kundeId}";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read())
{
result[i] = reader.IsDBNull(i) ? 0 : reader.GetInt16(i);
i++;
}
reader.Close();
}
DatenbankConnection.GetConnection().Close();
return result;
}
public Auftrag(NpgsqlDataReader reader, bool isExpedit = true) public Auftrag(NpgsqlDataReader reader, bool isExpedit = true)
{ {
this.AuftragID = reader.GetInt32(0); this.AuftragID = reader.GetInt32(0);
@ -683,7 +535,7 @@ namespace DatenDB
{ {
get get
{ {
if (this.AufgabeID != null) return _auftragaufgabe = Aufgabe.GetAufgabe(null, this.AufgabeID).Bezeichnung; if (this.AufgabeID != null && this.AufgabeErledigt == false) return _auftragaufgabe = Aufgabe.GetAufgabe(null, this.AufgabeID).Bezeichnung;
else return null; else return null;
} }
@ -910,6 +762,7 @@ namespace DatenDB
return result; return result;
} }
} }
} }
//TODO: Non-Hard-Coded-Lösung für Priority finden. //TODO: Non-Hard-Coded-Lösung für Priority finden.

56
AA-Klassen/DataClass.cs
View File

@ -62,7 +62,7 @@ namespace Deckungsbeitrag.AA_Klassen
var result = new List<AuftragInfo>(); var result = new List<AuftragInfo>();
using (var conn = new NpgsqlConnection(_connectionString)) using (var conn = new NpgsqlConnection(_connectionString))
using (var cmd = new NpgsqlCommand($"SELECT auftrag_status_id, auftrag_id, benutzer_id, auftrag_status, status_changed FROM kundenverwaltung.auftrag_status WHERE auftrag_id = {auftrag.AuftragID} ORDER BY auftrag_id, status_changed ASC", conn)) using (var cmd = new NpgsqlCommand($"SELECT audit_id, spalten_name, alter_wert, neuer_wert, changed_by, changed_at FROM kundenverwaltung.vw_auftrag_audit WHERE auftrag_id = {auftrag.AuftragID} ORDER BY changed_at DESC", conn))
{ {
conn.Open(); conn.Open();
using (var reader = cmd.ExecuteReader()) using (var reader = cmd.ExecuteReader())
@ -71,11 +71,12 @@ namespace Deckungsbeitrag.AA_Klassen
{ {
result.Add(new AuftragInfo result.Add(new AuftragInfo
{ {
StatusID = reader.GetInt32(0), ChangeID = reader.GetInt32(0),
AuftragID = reader.GetInt32(1), Bezeichnung = reader.GetString(1),
BenutzerID= reader.GetInt32(2), AlterWert = reader.GetString(2),
Status = (AuftragStatus)reader.GetInt16(3), NeuerWert = reader.GetString(3),
Datum = reader.GetDateTime(4), Client = reader.GetString(4),
Datum = reader.GetDateTime(5),
}); });
} }
} }
@ -84,10 +85,35 @@ namespace Deckungsbeitrag.AA_Klassen
return result; return result;
} }
public int? StatusID { get; set; } public int? ChangeID { get; set; }
public int? AuftragID { get; set; } public string Bezeichnung { get; set; }
public int? BenutzerID { get; set; } public string AlterWert { get; set; }
public AuftragStatus Status { get; set; } public string NeuerWert { get; set; }
public string Client { get; set; }
public AuftragStatus? StatusAlt
{
get
{
if (Bezeichnung == "status")
{
if (int.TryParse(AlterWert, out int i)) return (AuftragStatus)i;
return null;
}
return null;
}
}
public AuftragStatus? StatusNeu
{
get
{
if (Bezeichnung == "status")
{
if (int.TryParse(NeuerWert, out int i)) return (AuftragStatus)i;
return null;
}
return null;
}
}
public DateTime Datum { get; set; } public DateTime Datum { get; set; }
} }
@ -313,6 +339,7 @@ namespace Deckungsbeitrag.AA_Klassen
return resultList; return resultList;
} }
// Auftrag-Felder (ACOLUMNS) // Auftrag-Felder (ACOLUMNS)
[OLVIgnore]public int AuftragID { get; set; } [OLVIgnore]public int AuftragID { get; set; }
[OLVIgnore]public int BenutzerID { get; set; } [OLVIgnore]public int BenutzerID { get; set; }
@ -381,7 +408,7 @@ namespace Deckungsbeitrag.AA_Klassen
get get
{ {
// Wenn NICHT gedruckt (null oder MinValue) → Druck-Symbol // Wenn NICHT gedruckt (null oder MinValue) → Druck-Symbol
if (Gedruckt.HasValue) if (Status == AuftragStatus.Vorbereitet)
return "✅"; return "✅";
if (FrotteeStatus < 2) if (FrotteeStatus < 2)
@ -445,6 +472,13 @@ namespace Deckungsbeitrag.AA_Klassen
name += reader.IsDBNull(ordinal + 1) ? string.Empty : " (" + reader.GetString(ordinal + 1) + ")"; name += reader.IsDBNull(ordinal + 1) ? string.Empty : " (" + reader.GetString(ordinal + 1) + ")";
} }
break; break;
case var t when t == "aufgabe_bez":
{
var ord = reader.GetOrdinal("aufgabe_erledigt");
if (reader.GetBoolean(ord) == false) name = reader.IsDBNull(ordinal) ? null : reader.GetString(ordinal);
else name = string.Empty;
}
break;
default: default:
name = reader.IsDBNull(ordinal) ? null : reader.GetString(ordinal); name = reader.IsDBNull(ordinal) ? null : reader.GetString(ordinal);
break; break;

3
AA-Klassen/Funktionen.cs
View File

@ -20,6 +20,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using System.Windows.Forms.DataVisualization.Charting; using System.Windows.Forms.DataVisualization.Charting;
using VirtualKeyboard;
using ZXing; using ZXing;
using ZXing.QrCode.Internal; using ZXing.QrCode.Internal;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
@ -50,6 +51,8 @@ namespace Deckungsbeitrag
private static bool printed = false; private static bool printed = false;
private static bool inPreview = false; private static bool inPreview = false;
private static int KundeID; private static int KundeID;
private QwertzKeyboard keyboard;
public Funktionen() public Funktionen()
{ {

94
AA-Klassen/TouchScroll.cs Normal file
View File

@ -0,0 +1,94 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Deckungsbeitrag.AA_Klassen
{
public class TouchScroll
{
private ScrollableControl scrollCtr;
private Point lastMousePosition;
private bool isDragging;
private const int DragThreshold = 5; // Pixel, ab denen es "Drag" ist
public TouchScroll(ScrollableControl panel)
{
this.scrollCtr = panel;
panel.MouseDown += OnMouseDown;
panel.MouseMove += OnMouseMove;
panel.MouseUp += OnMouseUp;
// Sub-Controls: Mouse-Events abfangen, aber nicht scrollen lassen
foreach (Control child in panel.Controls)
{
PreventChildScrolling(child);
}
panel.ControlAdded += (s, e) => PreventChildScrolling(e.Control);
}
private void PreventChildScrolling(Control child)
{
// MouseDown: Nicht zum Scrollen verwenden (Click bleibt)
child.MouseDown += (s, e) => {
// Klick-Event wird trotzdem vom Control ausgelöst
};
// MouseMove: Nicht zum Scrollen verwenden
child.MouseMove += (s, e) => {
// Bewegung wird vom Kind „verbraucht", nicht zum Panel-Scrollen
};
// Nested Controls auch behandeln
foreach (Control nested in child.Controls)
{
PreventChildScrolling(nested);
}
}
private void OnMouseDown(object sender, MouseEventArgs e)
{
isDragging = false;
lastMousePosition = e.Location;
}
private void OnMouseMove(object sender, MouseEventArgs e)
{
// Nur scrollen, wenn LEFT-BUTTON gedrückt UND Bewegung > Threshold
if (e.Button != MouseButtons.Left) return;
int deltaX = Math.Abs(e.X - lastMousePosition.X);
int deltaY = Math.Abs(e.Y - lastMousePosition.Y);
// Erst beim echten Draggen als "Drag" markieren
if (deltaX > DragThreshold || deltaY > DragThreshold)
{
isDragging = true;
}
if (!isDragging) return; // Kurz antippen → kein Scrollen
// Korrektur: AutoScrollPosition beim Lesen ist negativ!
Point currentScroll = scrollCtr.AutoScrollPosition;
int actualDeltaX = e.X - lastMousePosition.X;
int actualDeltaY = e.Y - lastMousePosition.Y;
// Positive Werte setzen (bugfix für WinForms)
scrollCtr.AutoScrollPosition = new Point(
-currentScroll.X - actualDeltaX, // Negativität umkehren
-currentScroll.Y - actualDeltaY
);
lastMousePosition = e.Location;
}
private void OnMouseUp(object sender, MouseEventArgs e)
{
// Wenn es kein Drag war → Click wird normal vom Control ausgelöst
isDragging = false;
}
}
}

2
App.config
View File

@ -6,7 +6,7 @@
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<appSettings> <appSettings>
<add key="ConnectionString" value="user id=postgres;password=Ki985941Wi;host=10.10.10.1;port=5432;database=Test_Wirl;Timeout=15" /> <add key="ConnectionString" value="user id=postgres;password=Ki985941Wi;host=10.10.10.1;port=5432;database=Wirl_DB_17012023;Timeout=15" />
<add key="SortimentPfad" value="N:\\TECHNIK\\Software\\Wirl-Verwaltung\\Listen\\Kundensortiment.txt" /> <add key="SortimentPfad" value="N:\\TECHNIK\\Software\\Wirl-Verwaltung\\Listen\\Kundensortiment.txt" />
<add key="InventurPfad" value="N:\BÜRO\KUNDEN\INVENTUREN\Verwaltung" /> <add key="InventurPfad" value="N:\BÜRO\KUNDEN\INVENTUREN\Verwaltung" />
<add key="BildPfad" value="C:\\Users\\KilianWirl\\OneDrive - gehgassi GmbH\\Wäscherei Wirl\\Programme\\Deckungsbeitrag\\Deckungsbeitrag\\Star.png" /> <add key="BildPfad" value="C:\\Users\\KilianWirl\\OneDrive - gehgassi GmbH\\Wäscherei Wirl\\Programme\\Deckungsbeitrag\\Deckungsbeitrag\\Star.png" />

42
Program.cs
View File

@ -123,6 +123,7 @@ namespace Deckungsbeitrag
[STAThread] [STAThread]
static void Main() static void Main()
{ {
userid = ConfigurationManager.AppSettings["ConnectionString"].Split(';')[0]; userid = ConfigurationManager.AppSettings["ConnectionString"].Split(';')[0];
userid = userid.Split('=')[1]; userid = userid.Split('=')[1];
timer = new System.Timers.Timer timer = new System.Timers.Timer
@ -134,9 +135,10 @@ namespace Deckungsbeitrag
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Screen[] screens = Screen.AllScreens; Screen[] screens = Screen.AllScreens;
Application.UseWaitCursor = true; Cursor.Current = Cursors.WaitCursor;
string assemblyGUID = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(GuidAttribute), false).Cast<GuidAttribute>().First().Value; string assemblyGUID = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(GuidAttribute), false).Cast<GuidAttribute>().First().Value;
mutex = new Mutex(true, $"Global\\{assemblyGUID}"); mutex = new Mutex(true, $"Global\\{assemblyGUID}");
if (!mutex.WaitOne(TimeSpan.Zero, true)) if (!mutex.WaitOne(TimeSpan.Zero, true))
{ {
@ -144,15 +146,20 @@ namespace Deckungsbeitrag
"Nur eine Instanz", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); "Nur eine Instanz", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return; return;
} }
//FormLaden laden = new FormLaden();
//laden.Show();
// Check, Install und Update wenn Update vorhanden. // Check, Install und Update wenn Update vorhanden.
if (CheckAndInstallUpdate()) if (CheckAndInstallUpdate())
{ {
MessageBox.Show("Update wurde erfolgreich durchgeführt.\nStarte das Programm über den Desktop neu.", "UPDATE INFO", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Update wurde erfolgreich durchgeführt.\nStarte das Programm über den Desktop neu.", "UPDATE INFO", MessageBoxButtons.OK, MessageBoxIcon.Information);
Software_Updated = true; Software_Updated = true;
Settings.Default.LastSoftwareUpdate = DateTime.Now; Settings.Default.LastSoftwareUpdate = DateTime.Now;
Application.UseWaitCursor = false; Cursor.Current = Cursors.Default;
return; return;
} }
// Laden der Image-Liste mit Icons für ObjectListView in Export etc. // Laden der Image-Liste mit Icons für ObjectListView in Export etc.
ImageList_Laden(); ImageList_Laden();
@ -191,6 +198,8 @@ namespace Deckungsbeitrag
Application.UseWaitCursor = false; Application.UseWaitCursor = false;
if (istest) { Application.Run(new FormAufleger()); return; } if (istest) { Application.Run(new FormAufleger()); return; }
//laden.Close();
if (userid.StartsWith("ms") | userid.StartsWith("ps")) if (userid.StartsWith("ms") | userid.StartsWith("ps"))
{ {
@ -589,11 +598,12 @@ namespace Deckungsbeitrag
// Prüfen ob neue Version ist größer als aktuelle Version. // Prüfen ob neue Version ist größer als aktuelle Version.
if (new Version(newVersion).CompareTo(new Version(currentVersion)) > 0) if (new Version(newVersion).CompareTo(new Version(currentVersion)) > 0)
{ {
DialogResult result = MessageBox.Show( DialogResult result = DialogResult.Yes;
$"Update verfügbar: {newVersion}\nInstallieren?", //DialogResult result = MessageBox.Show(
"UPDATE VERFÜGBAR", // $"Update verfügbar: {newVersion}\nInstallieren?",
MessageBoxButtons.YesNo, // "UPDATE VERFÜGBAR",
MessageBoxIcon.Question); // MessageBoxButtons.YesNo,
// MessageBoxIcon.Question);
string msiPath = Path.Combine(updatePath, $"SetupVerwaltung{newVersion}.msi"); string msiPath = Path.Combine(updatePath, $"SetupVerwaltung{newVersion}.msi");
@ -616,17 +626,17 @@ namespace Deckungsbeitrag
// Prozesse und Programm schließen. // Prozesse und Programm schließen.
// 1. SELBST schließen (wichtig!) // 1. SELBST schließen (wichtig!)
Application.Exit(); //Application.Exit();
// 2. ALLE Prozesse killen //// 2. ALLE Prozesse killen
foreach (Process p in Process.GetProcessesByName("Deckungsbeitrag")) //foreach (Process p in Process.GetProcessesByName("Deckungsbeitrag"))
if (p.Id != Process.GetCurrentProcess().Id) // if (p.Id != Process.GetCurrentProcess().Id)
p.Kill(); // p.Kill();
foreach (Process p in Process.GetProcessesByName("Wirl-Verwaltung")) //foreach (Process p in Process.GetProcessesByName("Wirl-Verwaltung"))
p.Kill(); // p.Kill();
foreach (Process p in Process.GetProcessesByName("SetupVerwaltung")) //foreach (Process p in Process.GetProcessesByName("SetupVerwaltung"))
p.Kill(); // p.Kill();
// 3. 10 Sekunden warten (Restart Manager) // 3. 10 Sekunden warten (Restart Manager)
Thread.Sleep(10000); Thread.Sleep(10000);

4
Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
[assembly: AssemblyVersion("1.1.4.6")] [assembly: AssemblyVersion("1.1.5.7")]
[assembly: AssemblyFileVersion("1.1.4.6")] [assembly: AssemblyFileVersion("1.1.5.7")]

8
SetupVerwaltung/SetupVerwaltung.vdproj
View File

@ -1253,7 +1253,7 @@
{ {
"AssemblyRegister" = "3:1" "AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE" "AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:VirtualKeyboard, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL" "AssemblyAsmDisplayName" = "8:VirtualKeyboard, Version=1.0.2.1, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies" "ScatterAssemblies"
{ {
"_848FCB2438E4DBC274C4D124CEB9562C" "_848FCB2438E4DBC274C4D124CEB9562C"
@ -1739,15 +1739,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:SetupVerwaltung" "ProductName" = "8:SetupVerwaltung"
"ProductCode" = "8:{BABBCDCC-82FB-4255-A001-52CEF9447E68}" "ProductCode" = "8:{9B884941-E5E0-4EA9-AC95-2AEB0FA80FE8}"
"PackageCode" = "8:{003301E2-76CD-42AB-AA06-006C82D2B296}" "PackageCode" = "8:{04A6506F-B180-44A8-AAAC-ECBEB36FCC19}"
"UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}" "UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}"
"AspNetVersion" = "8:" "AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.46" "ProductVersion" = "8:1.1.57"
"Manufacturer" = "8:Kilian Wirl GmbH" "Manufacturer" = "8:Kilian Wirl GmbH"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

37
UserControls/UCAuftrag.Designer.cs generated
View File

@ -41,10 +41,9 @@ namespace Deckungsbeitrag
// //
this.labelKunde.AutoSize = true; this.labelKunde.AutoSize = true;
this.labelKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelKunde.Location = new System.Drawing.Point(2, 2); this.labelKunde.Location = new System.Drawing.Point(3, 2);
this.labelKunde.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelKunde.Name = "labelKunde"; this.labelKunde.Name = "labelKunde";
this.labelKunde.Size = new System.Drawing.Size(97, 20); this.labelKunde.Size = new System.Drawing.Size(122, 25);
this.labelKunde.TabIndex = 0; this.labelKunde.TabIndex = 0;
this.labelKunde.Text = "KundeName"; this.labelKunde.Text = "KundeName";
// //
@ -52,10 +51,9 @@ namespace Deckungsbeitrag
// //
this.labelRegion.AutoSize = true; this.labelRegion.AutoSize = true;
this.labelRegion.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelRegion.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelRegion.Location = new System.Drawing.Point(3, 22); this.labelRegion.Location = new System.Drawing.Point(4, 27);
this.labelRegion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelRegion.Name = "labelRegion"; this.labelRegion.Name = "labelRegion";
this.labelRegion.Size = new System.Drawing.Size(53, 17); this.labelRegion.Size = new System.Drawing.Size(61, 20);
this.labelRegion.TabIndex = 1; this.labelRegion.TabIndex = 1;
this.labelRegion.Text = "Region"; this.labelRegion.Text = "Region";
// //
@ -63,10 +61,9 @@ namespace Deckungsbeitrag
// //
this.labelFahrer.AutoSize = true; this.labelFahrer.AutoSize = true;
this.labelFahrer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelFahrer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelFahrer.Location = new System.Drawing.Point(3, 39); this.labelFahrer.Location = new System.Drawing.Point(4, 48);
this.labelFahrer.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelFahrer.Name = "labelFahrer"; this.labelFahrer.Name = "labelFahrer";
this.labelFahrer.Size = new System.Drawing.Size(46, 16); this.labelFahrer.Size = new System.Drawing.Size(58, 20);
this.labelFahrer.TabIndex = 2; this.labelFahrer.TabIndex = 2;
this.labelFahrer.Text = "Fahrer"; this.labelFahrer.Text = "Fahrer";
// //
@ -75,9 +72,10 @@ namespace Deckungsbeitrag
this.labelCont.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelCont.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelCont.AutoSize = true; this.labelCont.AutoSize = true;
this.labelCont.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelCont.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelCont.Location = new System.Drawing.Point(203, 39); this.labelCont.Location = new System.Drawing.Point(271, 48);
this.labelCont.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelCont.Name = "labelCont"; this.labelCont.Name = "labelCont";
this.labelCont.Size = new System.Drawing.Size(37, 16); this.labelCont.Size = new System.Drawing.Size(49, 20);
this.labelCont.TabIndex = 3; this.labelCont.TabIndex = 3;
this.labelCont.Text = "Cont:"; this.labelCont.Text = "Cont:";
// //
@ -86,9 +84,10 @@ namespace Deckungsbeitrag
this.labelContAnz.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.labelContAnz.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelContAnz.AutoSize = true; this.labelContAnz.AutoSize = true;
this.labelContAnz.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContAnz.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelContAnz.Location = new System.Drawing.Point(246, 39); this.labelContAnz.Location = new System.Drawing.Point(328, 48);
this.labelContAnz.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelContAnz.Name = "labelContAnz"; this.labelContAnz.Name = "labelContAnz";
this.labelContAnz.Size = new System.Drawing.Size(31, 16); this.labelContAnz.Size = new System.Drawing.Size(39, 20);
this.labelContAnz.TabIndex = 4; this.labelContAnz.TabIndex = 4;
this.labelContAnz.Text = "000"; this.labelContAnz.Text = "000";
this.labelContAnz.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.labelContAnz.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -98,16 +97,15 @@ namespace Deckungsbeitrag
this.labelTyp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.labelTyp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.labelTyp.AutoSize = true; this.labelTyp.AutoSize = true;
this.labelTyp.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelTyp.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelTyp.Location = new System.Drawing.Point(203, 22); this.labelTyp.Location = new System.Drawing.Point(271, 27);
this.labelTyp.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.labelTyp.Name = "labelTyp"; this.labelTyp.Name = "labelTyp";
this.labelTyp.Size = new System.Drawing.Size(32, 17); this.labelTyp.Size = new System.Drawing.Size(36, 20);
this.labelTyp.TabIndex = 5; this.labelTyp.TabIndex = 5;
this.labelTyp.Text = "Typ"; this.labelTyp.Text = "Typ";
// //
// UCAuftrag // UCAuftrag
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.BackColor = System.Drawing.Color.Silver; this.BackColor = System.Drawing.Color.Silver;
@ -118,9 +116,10 @@ namespace Deckungsbeitrag
this.Controls.Add(this.labelFahrer); this.Controls.Add(this.labelFahrer);
this.Controls.Add(this.labelRegion); this.Controls.Add(this.labelRegion);
this.Controls.Add(this.labelKunde); this.Controls.Add(this.labelKunde);
this.Margin = new System.Windows.Forms.Padding(2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UCAuftrag"; this.Name = "UCAuftrag";
this.Size = new System.Drawing.Size(280, 59); this.Size = new System.Drawing.Size(373, 73);
this.Load += new System.EventHandler(this.UCAuftrag_Load);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();

26
UserControls/UCAuftrag.cs
View File

@ -1,4 +1,5 @@
using DatenDB; using DatenDB;
using Deckungsbeitrag.AA_Klassen;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -8,12 +9,14 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using ZXing;
namespace Deckungsbeitrag namespace Deckungsbeitrag
{ {
public partial class UCAuftrag : UserControl public partial class UCAuftrag : UserControl
{ {
private Auftrag auftrag; private Auftrag auftrag;
private View_Auftrag_Expedit vwAuftrag;
private Kunde kunde; private Kunde kunde;
public string KundenName public string KundenName
@ -48,8 +51,6 @@ namespace Deckungsbeitrag
} }
public UCAuftrag(Auftrag auftrag) : this() public UCAuftrag(Auftrag auftrag) : this()
{ {
this.auftrag = auftrag; this.auftrag = auftrag;
this.kunde = Kunde.GetKunde(null, auftrag.KundeID, null); this.kunde = Kunde.GetKunde(null, auftrag.KundeID, null);
Benutzer fahrer = Benutzer.GetBenutzer(null, auftrag.ArbeiterID); Benutzer fahrer = Benutzer.GetBenutzer(null, auftrag.ArbeiterID);
@ -66,6 +67,23 @@ namespace Deckungsbeitrag
if (this.auftrag.Status == AuftragStatus.Aufgelegt) this.BackColor = Color.YellowGreen; if (this.auftrag.Status == AuftragStatus.Aufgelegt) this.BackColor = Color.YellowGreen;
else if (this.auftrag.Typ == AuftragTyp.AufAbruf) this.BackColor = Color.Gray; else if (this.auftrag.Typ == AuftragTyp.AufAbruf) this.BackColor = Color.Gray;
} }
public UCAuftrag(View_Auftrag_Expedit vwAuftrag) : this()
} {
this.vwAuftrag = vwAuftrag;
this.kunde = Kunde.GetKunde(null, this.vwAuftrag.KundeID, null);
KundenName = this.vwAuftrag.KundeName;
KundenRegion = this.kunde.Region;
Typ = this.vwAuftrag.Typ.ToString();
Fahrer = string.Empty;
ContainerAnzahl = string.Empty;
if (string.IsNullOrWhiteSpace(ContainerAnzahl)) labelCont.Visible = false;
}
private void UCAuftrag_Load(object sender, EventArgs e)
{
}
}
} }

14
UserControls/UCAuftragInfo.cs
View File

@ -1,14 +1,18 @@
using DatenDB; using DatenDB;
using Deckungsbeitrag.AA_Klassen; using Deckungsbeitrag.AA_Klassen;
using Npgsql;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Configuration;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Net.NetworkInformation;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using static System.Windows.Forms.AxHost;
using static System.Windows.Forms.VisualStyles.VisualStyleElement; using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace Deckungsbeitrag.UserControls namespace Deckungsbeitrag.UserControls
@ -16,7 +20,7 @@ namespace Deckungsbeitrag.UserControls
public partial class UCAuftragInfo : UserControl public partial class UCAuftragInfo : UserControl
{ {
private readonly Auftrag auftrag; private readonly Auftrag auftrag;
private List<AuftragInfo> Statis; private List<AuftragInfo> Infos;
private int x = 20; private int x = 20;
private int y = 20; private int y = 20;
List<string> infoListe = new List<string>(); List<string> infoListe = new List<string>();
@ -75,12 +79,10 @@ namespace Deckungsbeitrag.UserControls
int i = 1; int i = 1;
Statis = AuftragInfo.LadeInfos(this.auftrag); Infos = AuftragInfo.LadeInfos(this.auftrag);
foreach (AuftragInfo aufinfo in Statis) foreach (AuftragInfo aufinfo in Infos)
{ {
benutzer = Benutzer.GetBenutzer(null, aufinfo.BenutzerID); info = $"{aufinfo.Datum} {aufinfo.Bezeichnung.ToUpper()} von {aufinfo.AlterWert} zu {aufinfo.NeuerWert}";
info = $"{i}.Statusänderung von {benutzer.Vorname} {benutzer.Nachname} am/um {aufinfo.Datum} zu {aufinfo.Status}";
infoListe.Add(info); infoListe.Add(info);
i++; i++;

213
UserControls/UCTourenplan.Designer.cs generated
View File

@ -70,6 +70,7 @@
// //
// tableLPTourenplan // tableLPTourenplan
// //
this.tableLPTourenplan.AutoSize = true;
this.tableLPTourenplan.ColumnCount = 6; this.tableLPTourenplan.ColumnCount = 6;
this.tableLPTourenplan.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLPTourenplan.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLPTourenplan.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
@ -118,23 +119,25 @@
this.tableLPTourenplan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.tableLPTourenplan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tableLPTourenplan.Name = "tableLPTourenplan"; this.tableLPTourenplan.Name = "tableLPTourenplan";
this.tableLPTourenplan.RowCount = 6; this.tableLPTourenplan.RowCount = 6;
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLPTourenplan.Size = new System.Drawing.Size(1440, 894); this.tableLPTourenplan.Size = new System.Drawing.Size(1288, 715);
this.tableLPTourenplan.TabIndex = 0; this.tableLPTourenplan.TabIndex = 0;
// //
// button25 // button25
// //
this.button25.AutoSize = true;
this.button25.BackColor = System.Drawing.Color.Lime; this.button25.BackColor = System.Drawing.Color.Lime;
this.button25.Dock = System.Windows.Forms.DockStyle.Fill; this.button25.Dock = System.Windows.Forms.DockStyle.Fill;
this.button25.Location = new System.Drawing.Point(1182, 726); this.button25.Location = new System.Drawing.Point(1056, 583);
this.button25.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button25.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button25.Name = "button25"; this.button25.Name = "button25";
this.button25.Size = new System.Drawing.Size(255, 166); this.button25.Padding = new System.Windows.Forms.Padding(20);
this.button25.Size = new System.Drawing.Size(229, 130);
this.button25.TabIndex = 57; this.button25.TabIndex = 57;
this.button25.Text = "button25"; this.button25.Text = "button25";
this.button25.UseVisualStyleBackColor = false; this.button25.UseVisualStyleBackColor = false;
@ -142,12 +145,14 @@
// //
// button24 // button24
// //
this.button24.AutoSize = true;
this.button24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button24.Dock = System.Windows.Forms.DockStyle.Fill; this.button24.Dock = System.Windows.Forms.DockStyle.Fill;
this.button24.Location = new System.Drawing.Point(921, 726); this.button24.Location = new System.Drawing.Point(821, 583);
this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button24.Name = "button24"; this.button24.Name = "button24";
this.button24.Size = new System.Drawing.Size(255, 166); this.button24.Padding = new System.Windows.Forms.Padding(20);
this.button24.Size = new System.Drawing.Size(229, 130);
this.button24.TabIndex = 56; this.button24.TabIndex = 56;
this.button24.Text = "button24"; this.button24.Text = "button24";
this.button24.UseVisualStyleBackColor = false; this.button24.UseVisualStyleBackColor = false;
@ -155,12 +160,14 @@
// //
// button23 // button23
// //
this.button23.AutoSize = true;
this.button23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.button23.Dock = System.Windows.Forms.DockStyle.Fill; this.button23.Dock = System.Windows.Forms.DockStyle.Fill;
this.button23.Location = new System.Drawing.Point(660, 726); this.button23.Location = new System.Drawing.Point(586, 583);
this.button23.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button23.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button23.Name = "button23"; this.button23.Name = "button23";
this.button23.Size = new System.Drawing.Size(255, 166); this.button23.Padding = new System.Windows.Forms.Padding(20);
this.button23.Size = new System.Drawing.Size(229, 130);
this.button23.TabIndex = 55; this.button23.TabIndex = 55;
this.button23.Text = "button23"; this.button23.Text = "button23";
this.button23.UseVisualStyleBackColor = false; this.button23.UseVisualStyleBackColor = false;
@ -168,12 +175,14 @@
// //
// button22 // button22
// //
this.button22.AutoSize = true;
this.button22.BackColor = System.Drawing.Color.Lime; this.button22.BackColor = System.Drawing.Color.Lime;
this.button22.Dock = System.Windows.Forms.DockStyle.Fill; this.button22.Dock = System.Windows.Forms.DockStyle.Fill;
this.button22.Location = new System.Drawing.Point(399, 726); this.button22.Location = new System.Drawing.Point(351, 583);
this.button22.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button22.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button22.Name = "button22"; this.button22.Name = "button22";
this.button22.Size = new System.Drawing.Size(255, 166); this.button22.Padding = new System.Windows.Forms.Padding(20);
this.button22.Size = new System.Drawing.Size(229, 130);
this.button22.TabIndex = 54; this.button22.TabIndex = 54;
this.button22.Text = "button22"; this.button22.Text = "button22";
this.button22.UseVisualStyleBackColor = false; this.button22.UseVisualStyleBackColor = false;
@ -181,12 +190,14 @@
// //
// button21 // button21
// //
this.button21.AutoSize = true;
this.button21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button21.Dock = System.Windows.Forms.DockStyle.Fill; this.button21.Dock = System.Windows.Forms.DockStyle.Fill;
this.button21.Location = new System.Drawing.Point(138, 726); this.button21.Location = new System.Drawing.Point(116, 583);
this.button21.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button21.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button21.Name = "button21"; this.button21.Name = "button21";
this.button21.Size = new System.Drawing.Size(255, 166); this.button21.Padding = new System.Windows.Forms.Padding(20);
this.button21.Size = new System.Drawing.Size(229, 130);
this.button21.TabIndex = 53; this.button21.TabIndex = 53;
this.button21.Text = "button21"; this.button21.Text = "button21";
this.button21.UseVisualStyleBackColor = false; this.button21.UseVisualStyleBackColor = false;
@ -194,12 +205,14 @@
// //
// button20 // button20
// //
this.button20.AutoSize = true;
this.button20.BackColor = System.Drawing.Color.Yellow; this.button20.BackColor = System.Drawing.Color.Yellow;
this.button20.Dock = System.Windows.Forms.DockStyle.Fill; this.button20.Dock = System.Windows.Forms.DockStyle.Fill;
this.button20.Location = new System.Drawing.Point(1182, 559); this.button20.Location = new System.Drawing.Point(1056, 449);
this.button20.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button20.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button20.Name = "button20"; this.button20.Name = "button20";
this.button20.Size = new System.Drawing.Size(255, 163); this.button20.Padding = new System.Windows.Forms.Padding(20);
this.button20.Size = new System.Drawing.Size(229, 130);
this.button20.TabIndex = 52; this.button20.TabIndex = 52;
this.button20.Text = "button20"; this.button20.Text = "button20";
this.button20.UseVisualStyleBackColor = false; this.button20.UseVisualStyleBackColor = false;
@ -207,12 +220,14 @@
// //
// button19 // button19
// //
this.button19.AutoSize = true;
this.button19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button19.Dock = System.Windows.Forms.DockStyle.Fill; this.button19.Dock = System.Windows.Forms.DockStyle.Fill;
this.button19.Location = new System.Drawing.Point(921, 559); this.button19.Location = new System.Drawing.Point(821, 449);
this.button19.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button19.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button19.Name = "button19"; this.button19.Name = "button19";
this.button19.Size = new System.Drawing.Size(255, 163); this.button19.Padding = new System.Windows.Forms.Padding(20);
this.button19.Size = new System.Drawing.Size(229, 130);
this.button19.TabIndex = 51; this.button19.TabIndex = 51;
this.button19.Text = "button19"; this.button19.Text = "button19";
this.button19.UseVisualStyleBackColor = false; this.button19.UseVisualStyleBackColor = false;
@ -220,12 +235,14 @@
// //
// button18 // button18
// //
this.button18.AutoSize = true;
this.button18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.button18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.button18.Dock = System.Windows.Forms.DockStyle.Fill; this.button18.Dock = System.Windows.Forms.DockStyle.Fill;
this.button18.Location = new System.Drawing.Point(660, 559); this.button18.Location = new System.Drawing.Point(586, 449);
this.button18.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button18.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button18.Name = "button18"; this.button18.Name = "button18";
this.button18.Size = new System.Drawing.Size(255, 163); this.button18.Padding = new System.Windows.Forms.Padding(20);
this.button18.Size = new System.Drawing.Size(229, 130);
this.button18.TabIndex = 50; this.button18.TabIndex = 50;
this.button18.Text = "button18"; this.button18.Text = "button18";
this.button18.UseVisualStyleBackColor = false; this.button18.UseVisualStyleBackColor = false;
@ -233,12 +250,14 @@
// //
// button17 // button17
// //
this.button17.AutoSize = true;
this.button17.BackColor = System.Drawing.Color.Yellow; this.button17.BackColor = System.Drawing.Color.Yellow;
this.button17.Dock = System.Windows.Forms.DockStyle.Fill; this.button17.Dock = System.Windows.Forms.DockStyle.Fill;
this.button17.Location = new System.Drawing.Point(399, 559); this.button17.Location = new System.Drawing.Point(351, 449);
this.button17.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button17.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button17.Name = "button17"; this.button17.Name = "button17";
this.button17.Size = new System.Drawing.Size(255, 163); this.button17.Padding = new System.Windows.Forms.Padding(20);
this.button17.Size = new System.Drawing.Size(229, 130);
this.button17.TabIndex = 49; this.button17.TabIndex = 49;
this.button17.Text = "button17"; this.button17.Text = "button17";
this.button17.UseVisualStyleBackColor = false; this.button17.UseVisualStyleBackColor = false;
@ -246,12 +265,14 @@
// //
// button16 // button16
// //
this.button16.AutoSize = true;
this.button16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); this.button16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button16.Dock = System.Windows.Forms.DockStyle.Fill; this.button16.Dock = System.Windows.Forms.DockStyle.Fill;
this.button16.Location = new System.Drawing.Point(138, 559); this.button16.Location = new System.Drawing.Point(116, 449);
this.button16.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button16.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button16.Name = "button16"; this.button16.Name = "button16";
this.button16.Size = new System.Drawing.Size(255, 163); this.button16.Padding = new System.Windows.Forms.Padding(20);
this.button16.Size = new System.Drawing.Size(229, 130);
this.button16.TabIndex = 48; this.button16.TabIndex = 48;
this.button16.Text = "button16"; this.button16.Text = "button16";
this.button16.UseVisualStyleBackColor = false; this.button16.UseVisualStyleBackColor = false;
@ -259,12 +280,14 @@
// //
// button15 // button15
// //
this.button15.AutoSize = true;
this.button15.BackColor = System.Drawing.Color.CornflowerBlue; this.button15.BackColor = System.Drawing.Color.CornflowerBlue;
this.button15.Dock = System.Windows.Forms.DockStyle.Fill; this.button15.Dock = System.Windows.Forms.DockStyle.Fill;
this.button15.Location = new System.Drawing.Point(1182, 392); this.button15.Location = new System.Drawing.Point(1056, 315);
this.button15.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button15.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button15.Name = "button15"; this.button15.Name = "button15";
this.button15.Size = new System.Drawing.Size(255, 163); this.button15.Padding = new System.Windows.Forms.Padding(20);
this.button15.Size = new System.Drawing.Size(229, 130);
this.button15.TabIndex = 47; this.button15.TabIndex = 47;
this.button15.Text = "button15"; this.button15.Text = "button15";
this.button15.UseVisualStyleBackColor = false; this.button15.UseVisualStyleBackColor = false;
@ -272,12 +295,14 @@
// //
// button14 // button14
// //
this.button14.AutoSize = true;
this.button14.BackColor = System.Drawing.Color.LightSkyBlue; this.button14.BackColor = System.Drawing.Color.LightSkyBlue;
this.button14.Dock = System.Windows.Forms.DockStyle.Fill; this.button14.Dock = System.Windows.Forms.DockStyle.Fill;
this.button14.Location = new System.Drawing.Point(921, 392); this.button14.Location = new System.Drawing.Point(821, 315);
this.button14.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button14.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button14.Name = "button14"; this.button14.Name = "button14";
this.button14.Size = new System.Drawing.Size(255, 163); this.button14.Padding = new System.Windows.Forms.Padding(20);
this.button14.Size = new System.Drawing.Size(229, 130);
this.button14.TabIndex = 46; this.button14.TabIndex = 46;
this.button14.Text = "button14"; this.button14.Text = "button14";
this.button14.UseVisualStyleBackColor = false; this.button14.UseVisualStyleBackColor = false;
@ -285,12 +310,14 @@
// //
// button13 // button13
// //
this.button13.AutoSize = true;
this.button13.BackColor = System.Drawing.Color.LightBlue; this.button13.BackColor = System.Drawing.Color.LightBlue;
this.button13.Dock = System.Windows.Forms.DockStyle.Fill; this.button13.Dock = System.Windows.Forms.DockStyle.Fill;
this.button13.Location = new System.Drawing.Point(660, 392); this.button13.Location = new System.Drawing.Point(586, 315);
this.button13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button13.Name = "button13"; this.button13.Name = "button13";
this.button13.Size = new System.Drawing.Size(255, 163); this.button13.Padding = new System.Windows.Forms.Padding(20);
this.button13.Size = new System.Drawing.Size(229, 130);
this.button13.TabIndex = 45; this.button13.TabIndex = 45;
this.button13.Text = "button13"; this.button13.Text = "button13";
this.button13.UseVisualStyleBackColor = false; this.button13.UseVisualStyleBackColor = false;
@ -298,12 +325,14 @@
// //
// button12 // button12
// //
this.button12.AutoSize = true;
this.button12.BackColor = System.Drawing.Color.CornflowerBlue; this.button12.BackColor = System.Drawing.Color.CornflowerBlue;
this.button12.Dock = System.Windows.Forms.DockStyle.Fill; this.button12.Dock = System.Windows.Forms.DockStyle.Fill;
this.button12.Location = new System.Drawing.Point(399, 392); this.button12.Location = new System.Drawing.Point(351, 315);
this.button12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button12.Name = "button12"; this.button12.Name = "button12";
this.button12.Size = new System.Drawing.Size(255, 163); this.button12.Padding = new System.Windows.Forms.Padding(20);
this.button12.Size = new System.Drawing.Size(229, 130);
this.button12.TabIndex = 44; this.button12.TabIndex = 44;
this.button12.Text = "button12"; this.button12.Text = "button12";
this.button12.UseVisualStyleBackColor = false; this.button12.UseVisualStyleBackColor = false;
@ -311,12 +340,14 @@
// //
// button11 // button11
// //
this.button11.AutoSize = true;
this.button11.BackColor = System.Drawing.Color.LightSkyBlue; this.button11.BackColor = System.Drawing.Color.LightSkyBlue;
this.button11.Dock = System.Windows.Forms.DockStyle.Fill; this.button11.Dock = System.Windows.Forms.DockStyle.Fill;
this.button11.Location = new System.Drawing.Point(138, 392); this.button11.Location = new System.Drawing.Point(116, 315);
this.button11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button11.Name = "button11"; this.button11.Name = "button11";
this.button11.Size = new System.Drawing.Size(255, 163); this.button11.Padding = new System.Windows.Forms.Padding(20);
this.button11.Size = new System.Drawing.Size(229, 130);
this.button11.TabIndex = 43; this.button11.TabIndex = 43;
this.button11.Text = "button11"; this.button11.Text = "button11";
this.button11.UseVisualStyleBackColor = false; this.button11.UseVisualStyleBackColor = false;
@ -324,12 +355,14 @@
// //
// button10 // button10
// //
this.button10.AutoSize = true;
this.button10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.button10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.button10.Dock = System.Windows.Forms.DockStyle.Fill; this.button10.Dock = System.Windows.Forms.DockStyle.Fill;
this.button10.Location = new System.Drawing.Point(1182, 225); this.button10.Location = new System.Drawing.Point(1056, 181);
this.button10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button10.Name = "button10"; this.button10.Name = "button10";
this.button10.Size = new System.Drawing.Size(255, 163); this.button10.Padding = new System.Windows.Forms.Padding(20);
this.button10.Size = new System.Drawing.Size(229, 130);
this.button10.TabIndex = 42; this.button10.TabIndex = 42;
this.button10.Text = "button10"; this.button10.Text = "button10";
this.button10.UseVisualStyleBackColor = false; this.button10.UseVisualStyleBackColor = false;
@ -337,12 +370,14 @@
// //
// button9 // button9
// //
this.button9.AutoSize = true;
this.button9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.button9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.button9.Dock = System.Windows.Forms.DockStyle.Fill; this.button9.Dock = System.Windows.Forms.DockStyle.Fill;
this.button9.Location = new System.Drawing.Point(921, 225); this.button9.Location = new System.Drawing.Point(821, 181);
this.button9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button9.Name = "button9"; this.button9.Name = "button9";
this.button9.Size = new System.Drawing.Size(255, 163); this.button9.Padding = new System.Windows.Forms.Padding(20);
this.button9.Size = new System.Drawing.Size(229, 130);
this.button9.TabIndex = 41; this.button9.TabIndex = 41;
this.button9.Text = "button9"; this.button9.Text = "button9";
this.button9.UseVisualStyleBackColor = false; this.button9.UseVisualStyleBackColor = false;
@ -350,12 +385,14 @@
// //
// button8 // button8
// //
this.button8.AutoSize = true;
this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.button8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.button8.Dock = System.Windows.Forms.DockStyle.Fill; this.button8.Dock = System.Windows.Forms.DockStyle.Fill;
this.button8.Location = new System.Drawing.Point(660, 225); this.button8.Location = new System.Drawing.Point(586, 181);
this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button8.Name = "button8"; this.button8.Name = "button8";
this.button8.Size = new System.Drawing.Size(255, 163); this.button8.Padding = new System.Windows.Forms.Padding(20);
this.button8.Size = new System.Drawing.Size(229, 130);
this.button8.TabIndex = 40; this.button8.TabIndex = 40;
this.button8.Text = "button8"; this.button8.Text = "button8";
this.button8.UseVisualStyleBackColor = false; this.button8.UseVisualStyleBackColor = false;
@ -363,12 +400,14 @@
// //
// button7 // button7
// //
this.button7.AutoSize = true;
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
this.button7.Dock = System.Windows.Forms.DockStyle.Fill; this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
this.button7.Location = new System.Drawing.Point(399, 225); this.button7.Location = new System.Drawing.Point(351, 181);
this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button7.Name = "button7"; this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(255, 163); this.button7.Padding = new System.Windows.Forms.Padding(20);
this.button7.Size = new System.Drawing.Size(229, 130);
this.button7.TabIndex = 39; this.button7.TabIndex = 39;
this.button7.Text = "button7"; this.button7.Text = "button7";
this.button7.UseVisualStyleBackColor = false; this.button7.UseVisualStyleBackColor = false;
@ -376,12 +415,14 @@
// //
// button6 // button6
// //
this.button6.AutoSize = true;
this.button6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128))))); this.button6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
this.button6.Dock = System.Windows.Forms.DockStyle.Fill; this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
this.button6.Location = new System.Drawing.Point(138, 225); this.button6.Location = new System.Drawing.Point(116, 181);
this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button6.Name = "button6"; this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(255, 163); this.button6.Padding = new System.Windows.Forms.Padding(20);
this.button6.Size = new System.Drawing.Size(229, 130);
this.button6.TabIndex = 38; this.button6.TabIndex = 38;
this.button6.Text = "button6"; this.button6.Text = "button6";
this.button6.UseVisualStyleBackColor = false; this.button6.UseVisualStyleBackColor = false;
@ -389,12 +430,14 @@
// //
// button5 // button5
// //
this.button5.AutoSize = true;
this.button5.BackColor = System.Drawing.Color.Gray; this.button5.BackColor = System.Drawing.Color.Gray;
this.button5.Dock = System.Windows.Forms.DockStyle.Fill; this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
this.button5.Location = new System.Drawing.Point(1182, 58); this.button5.Location = new System.Drawing.Point(1056, 47);
this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(255, 163); this.button5.Padding = new System.Windows.Forms.Padding(20);
this.button5.Size = new System.Drawing.Size(229, 130);
this.button5.TabIndex = 37; this.button5.TabIndex = 37;
this.button5.Text = "button5"; this.button5.Text = "button5";
this.button5.UseVisualStyleBackColor = false; this.button5.UseVisualStyleBackColor = false;
@ -402,12 +445,14 @@
// //
// button4 // button4
// //
this.button4.AutoSize = true;
this.button4.BackColor = System.Drawing.Color.Silver; this.button4.BackColor = System.Drawing.Color.Silver;
this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
this.button4.Location = new System.Drawing.Point(921, 58); this.button4.Location = new System.Drawing.Point(821, 47);
this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button4.Name = "button4"; this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(255, 163); this.button4.Padding = new System.Windows.Forms.Padding(20);
this.button4.Size = new System.Drawing.Size(229, 130);
this.button4.TabIndex = 36; this.button4.TabIndex = 36;
this.button4.Text = "button4"; this.button4.Text = "button4";
this.button4.UseVisualStyleBackColor = false; this.button4.UseVisualStyleBackColor = false;
@ -415,12 +460,14 @@
// //
// button3 // button3
// //
this.button3.AutoSize = true;
this.button3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.button3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.button3.Dock = System.Windows.Forms.DockStyle.Fill; this.button3.Dock = System.Windows.Forms.DockStyle.Fill;
this.button3.Location = new System.Drawing.Point(660, 58); this.button3.Location = new System.Drawing.Point(586, 47);
this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button3.Name = "button3"; this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(255, 163); this.button3.Padding = new System.Windows.Forms.Padding(20);
this.button3.Size = new System.Drawing.Size(229, 130);
this.button3.TabIndex = 35; this.button3.TabIndex = 35;
this.button3.Text = "button3"; this.button3.Text = "button3";
this.button3.UseVisualStyleBackColor = false; this.button3.UseVisualStyleBackColor = false;
@ -428,12 +475,14 @@
// //
// button2 // button2
// //
this.button2.AutoSize = true;
this.button2.BackColor = System.Drawing.Color.Gray; this.button2.BackColor = System.Drawing.Color.Gray;
this.button2.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
this.button2.Location = new System.Drawing.Point(399, 58); this.button2.Location = new System.Drawing.Point(351, 47);
this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button2.Name = "button2"; this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(255, 163); this.button2.Padding = new System.Windows.Forms.Padding(20);
this.button2.Size = new System.Drawing.Size(229, 130);
this.button2.TabIndex = 34; this.button2.TabIndex = 34;
this.button2.Text = "button2"; this.button2.Text = "button2";
this.button2.UseVisualStyleBackColor = false; this.button2.UseVisualStyleBackColor = false;
@ -445,9 +494,9 @@
this.label25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.label25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.label25.Dock = System.Windows.Forms.DockStyle.Fill; this.label25.Dock = System.Windows.Forms.DockStyle.Fill;
this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label25.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label25.Location = new System.Drawing.Point(3, 724); this.label25.Location = new System.Drawing.Point(3, 581);
this.label25.Name = "label25"; this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(129, 170); this.label25.Size = new System.Drawing.Size(107, 134);
this.label25.TabIndex = 31; this.label25.TabIndex = 31;
this.label25.Text = "Tour1"; this.label25.Text = "Tour1";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -458,9 +507,9 @@
this.label19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.label19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.label19.Dock = System.Windows.Forms.DockStyle.Fill; this.label19.Dock = System.Windows.Forms.DockStyle.Fill;
this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label19.Location = new System.Drawing.Point(3, 557); this.label19.Location = new System.Drawing.Point(3, 447);
this.label19.Name = "label19"; this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(129, 167); this.label19.Size = new System.Drawing.Size(107, 134);
this.label19.TabIndex = 25; this.label19.TabIndex = 25;
this.label19.Text = "Tour1"; this.label19.Text = "Tour1";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -471,9 +520,9 @@
this.label13.BackColor = System.Drawing.Color.LightBlue; this.label13.BackColor = System.Drawing.Color.LightBlue;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill; this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Location = new System.Drawing.Point(3, 390); this.label13.Location = new System.Drawing.Point(3, 313);
this.label13.Name = "label13"; this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(129, 167); this.label13.Size = new System.Drawing.Size(107, 134);
this.label13.TabIndex = 19; this.label13.TabIndex = 19;
this.label13.Text = "Tour1"; this.label13.Text = "Tour1";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -484,9 +533,9 @@
this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label7.Location = new System.Drawing.Point(3, 223); this.label7.Location = new System.Drawing.Point(3, 179);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(129, 167); this.label7.Size = new System.Drawing.Size(107, 134);
this.label7.TabIndex = 13; this.label7.TabIndex = 13;
this.label7.Text = "Tour1"; this.label7.Text = "Tour1";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@ -496,9 +545,9 @@
this.labelFR.AutoSize = true; this.labelFR.AutoSize = true;
this.labelFR.Dock = System.Windows.Forms.DockStyle.Fill; this.labelFR.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelFR.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelFR.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelFR.Location = new System.Drawing.Point(1182, 0); this.labelFR.Location = new System.Drawing.Point(1056, 0);
this.labelFR.Name = "labelFR"; this.labelFR.Name = "labelFR";
this.labelFR.Size = new System.Drawing.Size(255, 56); this.labelFR.Size = new System.Drawing.Size(229, 45);
this.labelFR.TabIndex = 5; this.labelFR.TabIndex = 5;
this.labelFR.Text = "FR"; this.labelFR.Text = "FR";
this.labelFR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelFR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -508,9 +557,9 @@
this.labelDO.AutoSize = true; this.labelDO.AutoSize = true;
this.labelDO.Dock = System.Windows.Forms.DockStyle.Fill; this.labelDO.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelDO.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelDO.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelDO.Location = new System.Drawing.Point(921, 0); this.labelDO.Location = new System.Drawing.Point(821, 0);
this.labelDO.Name = "labelDO"; this.labelDO.Name = "labelDO";
this.labelDO.Size = new System.Drawing.Size(255, 56); this.labelDO.Size = new System.Drawing.Size(229, 45);
this.labelDO.TabIndex = 4; this.labelDO.TabIndex = 4;
this.labelDO.Text = "DO"; this.labelDO.Text = "DO";
this.labelDO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -520,9 +569,9 @@
this.labelMI.AutoSize = true; this.labelMI.AutoSize = true;
this.labelMI.Dock = System.Windows.Forms.DockStyle.Fill; this.labelMI.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelMI.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelMI.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelMI.Location = new System.Drawing.Point(660, 0); this.labelMI.Location = new System.Drawing.Point(586, 0);
this.labelMI.Name = "labelMI"; this.labelMI.Name = "labelMI";
this.labelMI.Size = new System.Drawing.Size(255, 56); this.labelMI.Size = new System.Drawing.Size(229, 45);
this.labelMI.TabIndex = 3; this.labelMI.TabIndex = 3;
this.labelMI.Text = "MI"; this.labelMI.Text = "MI";
this.labelMI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelMI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -532,9 +581,9 @@
this.labelDI.AutoSize = true; this.labelDI.AutoSize = true;
this.labelDI.Dock = System.Windows.Forms.DockStyle.Fill; this.labelDI.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelDI.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelDI.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelDI.Location = new System.Drawing.Point(399, 0); this.labelDI.Location = new System.Drawing.Point(351, 0);
this.labelDI.Name = "labelDI"; this.labelDI.Name = "labelDI";
this.labelDI.Size = new System.Drawing.Size(255, 56); this.labelDI.Size = new System.Drawing.Size(229, 45);
this.labelDI.TabIndex = 2; this.labelDI.TabIndex = 2;
this.labelDI.Text = "DI"; this.labelDI.Text = "DI";
this.labelDI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelDI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -544,9 +593,9 @@
this.labelMO.AutoSize = true; this.labelMO.AutoSize = true;
this.labelMO.Dock = System.Windows.Forms.DockStyle.Fill; this.labelMO.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelMO.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelMO.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelMO.Location = new System.Drawing.Point(138, 0); this.labelMO.Location = new System.Drawing.Point(116, 0);
this.labelMO.Name = "labelMO"; this.labelMO.Name = "labelMO";
this.labelMO.Size = new System.Drawing.Size(255, 56); this.labelMO.Size = new System.Drawing.Size(229, 45);
this.labelMO.TabIndex = 0; this.labelMO.TabIndex = 0;
this.labelMO.Text = "MO"; this.labelMO.Text = "MO";
this.labelMO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labelMO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -557,21 +606,23 @@
this.labelTour1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.labelTour1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.labelTour1.Dock = System.Windows.Forms.DockStyle.Fill; this.labelTour1.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelTour1.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelTour1.Font = new System.Drawing.Font("Microsoft Sans Serif", 19.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelTour1.Location = new System.Drawing.Point(3, 56); this.labelTour1.Location = new System.Drawing.Point(3, 45);
this.labelTour1.Name = "labelTour1"; this.labelTour1.Name = "labelTour1";
this.labelTour1.Size = new System.Drawing.Size(129, 167); this.labelTour1.Size = new System.Drawing.Size(107, 134);
this.labelTour1.TabIndex = 6; this.labelTour1.TabIndex = 6;
this.labelTour1.Text = "Tour1"; this.labelTour1.Text = "Tour1";
this.labelTour1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.labelTour1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// button1 // button1
// //
this.button1.AutoSize = true;
this.button1.BackColor = System.Drawing.Color.Silver; this.button1.BackColor = System.Drawing.Color.Silver;
this.button1.Dock = System.Windows.Forms.DockStyle.Fill; this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
this.button1.Location = new System.Drawing.Point(138, 58); this.button1.Location = new System.Drawing.Point(116, 47);
this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(255, 163); this.button1.Padding = new System.Windows.Forms.Padding(20);
this.button1.Size = new System.Drawing.Size(229, 130);
this.button1.TabIndex = 32; this.button1.TabIndex = 32;
this.button1.Text = "button1"; this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = false; this.button1.UseVisualStyleBackColor = false;
@ -583,23 +634,25 @@
this.labelZusatz.Dock = System.Windows.Forms.DockStyle.Fill; this.labelZusatz.Dock = System.Windows.Forms.DockStyle.Fill;
this.labelZusatz.Location = new System.Drawing.Point(3, 0); this.labelZusatz.Location = new System.Drawing.Point(3, 0);
this.labelZusatz.Name = "labelZusatz"; this.labelZusatz.Name = "labelZusatz";
this.labelZusatz.Size = new System.Drawing.Size(129, 56); this.labelZusatz.Size = new System.Drawing.Size(107, 45);
this.labelZusatz.TabIndex = 33; this.labelZusatz.TabIndex = 33;
this.labelZusatz.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.labelZusatz.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// UCTourenplan // UCTourenplan
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.Controls.Add(this.tableLPTourenplan); this.Controls.Add(this.tableLPTourenplan);
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UCTourenplan"; this.Name = "UCTourenplan";
this.Size = new System.Drawing.Size(1440, 894); this.Size = new System.Drawing.Size(1288, 715);
this.Load += new System.EventHandler(this.UCTourenplan_Load); this.Load += new System.EventHandler(this.UCTourenplan_Load);
this.tableLPTourenplan.ResumeLayout(false); this.tableLPTourenplan.ResumeLayout(false);
this.tableLPTourenplan.PerformLayout(); this.tableLPTourenplan.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout();
} }

6
UserControls/UCTourenplan.cs
View File

@ -36,6 +36,7 @@ namespace Deckungsbeitrag.UserControls
ReadCSV(); ReadCSV();
GetTouren(); GetTouren();
} }
private void GetTouren() private void GetTouren()
@ -90,6 +91,10 @@ namespace Deckungsbeitrag.UserControls
{ {
var control = this.tableLPTourenplan.GetControlFromPosition(j, i - 1); var control = this.tableLPTourenplan.GetControlFromPosition(j, i - 1);
control.Text = linedata[j].Replace(",", "\n\n"); control.Text = linedata[j].Replace(",", "\n\n");
//if (control.Text == "FEIERTAG" || control.Text.Contains("ZA"))
//{
// control.Enabled = false;
//}
if (i >= 2 & j == 0) touren[i - 2] = linedata[0]; if (i >= 2 & j == 0) touren[i - 2] = linedata[0];
} }
i++; i++;
@ -126,6 +131,7 @@ namespace Deckungsbeitrag.UserControls
tlp.RowStyles.RemoveAt(tlp.RowCount - 1); tlp.RowStyles.RemoveAt(tlp.RowCount - 1);
tlp.RowCount--; tlp.RowCount--;
} }
return tlp; return tlp;
} }

10
Verwaltung.csproj
View File

@ -169,6 +169,12 @@
<Compile Include="AA-Forms\FehlmengeChart.Designer.cs"> <Compile Include="AA-Forms\FehlmengeChart.Designer.cs">
<DependentUpon>FehlmengeChart.cs</DependentUpon> <DependentUpon>FehlmengeChart.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="AA-Forms\FormAuftragAuswahl.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AA-Forms\FormAuftragAuswahl.Designer.cs">
<DependentUpon>FormAuftragAuswahl.cs</DependentUpon>
</Compile>
<Compile Include="AA-Forms\FormOnBoarding.cs"> <Compile Include="AA-Forms\FormOnBoarding.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
@ -345,6 +351,7 @@
<Compile Include="AA-Klassen\OLVBewertung.cs" /> <Compile Include="AA-Klassen\OLVBewertung.cs" />
<Compile Include="AA-Klassen\OLVKundenumsatz.cs" /> <Compile Include="AA-Klassen\OLVKundenumsatz.cs" />
<Compile Include="AA-Klassen\Saison.cs" /> <Compile Include="AA-Klassen\Saison.cs" />
<Compile Include="AA-Klassen\TouchScroll.cs" />
<Compile Include="AA-Klassen\Tour.cs" /> <Compile Include="AA-Klassen\Tour.cs" />
<Compile Include="AA-Klassen\WSFach.cs" /> <Compile Include="AA-Klassen\WSFach.cs" />
<Compile Include="Config.cs" /> <Compile Include="Config.cs" />
@ -440,6 +447,9 @@
<EmbeddedResource Include="AA-Forms\FehlmengeChart.resx"> <EmbeddedResource Include="AA-Forms\FehlmengeChart.resx">
<DependentUpon>FehlmengeChart.cs</DependentUpon> <DependentUpon>FehlmengeChart.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="AA-Forms\FormAuftragAuswahl.resx">
<DependentUpon>FormAuftragAuswahl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="AA-Forms\FormOnBoarding.resx"> <EmbeddedResource Include="AA-Forms\FormOnBoarding.resx">
<DependentUpon>FormOnBoarding.cs</DependentUpon> <DependentUpon>FormOnBoarding.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>

6
Verwaltung_ReadMe.txt
View File

@ -1,11 +1,11 @@
===================================== =====================================
NEUIGKEITEN - Version 1.1.4.6 NEUIGKEITEN - Version 1.1.5.7
===================================== =====================================
Build-Info: Build-Info:
- Build-Typ: Release Build - Build-Typ: Release Build
- Erledigte TODOs: 10 - Erledigte TODOs: 10
- Offene TODOs: 21 - Offene TODOs: 22
- Install-Reminders: 0 - Install-Reminders: 0
- Changes: 32 - Changes: 32
@ -72,5 +72,5 @@ Build-Info:
Keine Install-Reminder vorhanden ✅ Keine Install-Reminder vorhanden ✅
Installation: 08.06.2026 13:02 Installation: 12.06.2026 12:15
===================================== =====================================

4
VirtualKeyboard/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Buildnummer // Buildnummer
// Revision // Revision
// //
[assembly: AssemblyVersion("1.0.2.0")] [assembly: AssemblyVersion("1.0.2.1")]
[assembly: AssemblyFileVersion("1.0.2.0")] [assembly: AssemblyFileVersion("1.0.2.1")]

5
VirtualKeyboard/QwertzKeyboard.cs
View File

@ -230,13 +230,14 @@ namespace VirtualKeyboard
if (targetTextBox.Text.Length > 0) if (targetTextBox.Text.Length > 0)
targetTextBox.Text = targetTextBox.Text.Substring(0, targetTextBox.Text.Length - 1); targetTextBox.Text = targetTextBox.Text.Substring(0, targetTextBox.Text.Length - 1);
break; break;
case var t when t == "Leertaste":
targetTextBox.Text += " ";
break;
default: targetTextBox.Text += btn.Text; default: targetTextBox.Text += btn.Text;
break; break;
} }
if (isShift && char.IsLetter(ch)) ch = char.ToUpper(ch); if (isShift && char.IsLetter(ch)) ch = char.ToUpper(ch);
//targetTextBox.Focus();
//targetTextBox.SelectionStart = targetTextBox.Text.Length;
} }
private void Shift_Click(object sender, EventArgs e) private void Shift_Click(object sender, EventArgs e)
{ {