From f77b89f84478bcb65e610ba81752f3ea738c75aa Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Fri, 5 Dec 2025 11:50:10 +0100 Subject: [PATCH 1/2] WSFAch vorbereitet und Ausschlager Umbau --- AA-Forms/FormAusschlager.Designer.cs | 23 +- AA-Forms/FormAusschlager.cs | 313 ++++++++++++++++++++------- AA-Forms/FormNeuerAuftrag.cs | 32 ++- AA-Klassen/Fehlermeldungen.cs | 9 + AA-Klassen/Funktionen.cs | 1 + AA-Klassen/WSFach.cs | 86 ++++++++ App.config | 14 +- Config.cs | 27 +++ Program.cs | 4 +- Properties/Settings.Designer.cs | 6 + Properties/Settings.settings | 12 +- Verwaltung.csproj | 2 + 12 files changed, 433 insertions(+), 96 deletions(-) create mode 100644 AA-Klassen/WSFach.cs create mode 100644 Config.cs diff --git a/AA-Forms/FormAusschlager.Designer.cs b/AA-Forms/FormAusschlager.Designer.cs index e88c341..27c23b5 100644 --- a/AA-Forms/FormAusschlager.Designer.cs +++ b/AA-Forms/FormAusschlager.Designer.cs @@ -28,15 +28,32 @@ /// private void InitializeComponent() { + this.tableLayoutPanelWS = new System.Windows.Forms.TableLayoutPanel(); this.SuspendLayout(); // + // tableLayoutPanelWS + // + this.tableLayoutPanelWS.ColumnCount = 2; + this.tableLayoutPanelWS.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanelWS.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanelWS.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanelWS.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanelWS.Name = "tableLayoutPanelWS"; + this.tableLayoutPanelWS.RowCount = 2; + this.tableLayoutPanelWS.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanelWS.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanelWS.Size = new System.Drawing.Size(600, 366); + this.tableLayoutPanelWS.TabIndex = 0; + // // FormAusschlager // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.ClientSize = new System.Drawing.Size(800, 450); + this.ClientSize = new System.Drawing.Size(600, 366); + this.Controls.Add(this.tableLayoutPanelWS); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FormAusschlager"; @@ -52,5 +69,7 @@ } #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanelWS; } } \ No newline at end of file diff --git a/AA-Forms/FormAusschlager.cs b/AA-Forms/FormAusschlager.cs index 8d951ae..97c7012 100644 --- a/AA-Forms/FormAusschlager.cs +++ b/AA-Forms/FormAusschlager.cs @@ -1,4 +1,5 @@ using DatenDB; +using Deckungsbeitrag.AA_Klassen; using Deckungsbeitrag.Properties; using System; using System.Collections.Generic; @@ -11,120 +12,284 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using System.Windows.Forms.DataVisualization.Charting; using System.Xml.Serialization; namespace Deckungsbeitrag { public partial class FormAusschlager : Form { - + private Fehlermeldungen meldung = new Fehlermeldungen(); + private Auftrag auftrag; public Maschine maschine; public List fachliste; bool maximised = false; int height; Point loc; + public bool ws1transport = false; public bool ws2transport = false; - public FormAusschlager(Maschine ms) + private string Userid { get; } + + public FormAusschlager() { - maschine = ms; InitializeComponent(); } - public FormAusschlager(Maschine ms, Screen[] screens) :this(ms) + public FormAusschlager(string userid) : this() { - //maschine = ms; - if (maschine.TrocknerKaputt == true) maschine.Faecher = maschine.Faecher - 1; //Wenn Trockner kaputt wird Fachanzahl um 1 reduziert. - if (screens.Length > 1) - { - if (WindowState == FormWindowState.Maximized) - { - WindowState = FormWindowState.Normal; - maximised = true; - } - foreach (Screen screen in screens) if (screen.Primary == false) { this.Location = screen.WorkingArea.Location; } - if (maximised) - { - WindowState = FormWindowState.Maximized; - } - } //Wenn nur ein Screen vorhanden wird alles auf eine Screen gelegt. Wenn mehrere Screens muss Zuordnung getroffen werden. + this.Userid = userid; + if (userid.Contains("01")) this.maschine = Maschine.GetMaschine(null, "Waschstrasse 1"); + if (userid.Contains("02")) this.maschine = Maschine.GetMaschine(null, "Waschstrasse 2"); } + private void FormAusschlager_Load(object sender, EventArgs e) { - height = (this.Height / maschine.Faecher) - 1; //Label Height wird berechnet anhand Screen Height und Mschinenfächer. - loc = new Point(this.Width / 2 - 250, 10); //Die Location des ersten KundenLabels wird berechnet. + // WaitCursor und Controls ausblenden. + this.Cursor = Cursors.WaitCursor; + Funktionen.HideControls(this.Controls); - for (int i = 1; i <= maschine.Faecher; i++) - { - Funktionen funk = new Funktionen(); - this.Controls.AddRange(funk.GetFachLabels(i, maschine, height, loc, this.Width, "Ausschlager")); - } //Label für neuen Screen von Funktionen holen. + + this.BackColor = Properties.Settings.Default.Wirlblau; + this.WindowState = FormWindowState.Maximized; + this.FormBorderStyle = FormBorderStyle.None; + + if (maschine.TrocknerKaputt) this.tableLayoutPanelWS.RowCount = maschine.Faecher - 1; + else this.tableLayoutPanelWS.RowCount = maschine.Faecher; + this.tableLayoutPanelWS.ColumnCount = 4; + + Get_TableLayoutPanel(this.tableLayoutPanelWS); + Load_TableLayoutPanel(this.tableLayoutPanelWS); + + //DefaultCursor und Controls einblenden. + Funktionen.ShowControls(this.Controls); + this.Cursor = Cursors.Default; } - public void Form_Refresh(Maschine ms, SPSDaten spsdaten) + + private void Load_TableLayoutPanel(TableLayoutPanel tlp) { - this.SuspendLayout(); - - foreach (Label lbl in this.Controls) + // Fachliste für Maschine holen. + List fachliste = WSFach.GetFachliste(this.maschine); + if (fachliste.Count > 0) { - if (spsdaten.WS_1_Transport || spsdaten.WS_2_Transport) + // Alle Zellen einer Spalte durchlaufen + int columnIndex = 1; + for (int row = 0; row < tlp.RowCount; row++) { - Call_Funktionen(lbl, ms, spsdaten); - } - else - { - if (ms.Bezeichnung == "Waschstrasse 1") - { - if (spsdaten.Presse1_Leer) - { - if (lbl.Name.Contains("14") || lbl.Name.Contains("15")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Presse 1 entladen und auf true geschaltet. - if (spsdaten.Trockner11_Beladen || spsdaten.Trockner12_Beladen) - { - if (lbl.Name.Contains("15") || lbl.Name.Contains("16") || lbl.Name.Contains("17")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Trockner beladen und auf true geschaltet. - if (spsdaten.Trockner11_Entladen || spsdaten.Trockner12_Entladen) - { - if (lbl.Name.Contains("18") || lbl.Name.Contains("16") || lbl.Name.Contains("17")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Trockner entladen und auf true geschaltet. - } + Control cellControl = tlp.GetControlFromPosition(columnIndex, row); - if (ms.Bezeichnung == "Waschstrasse 2") + if (cellControl != null && cellControl is Label lbl) { - if (spsdaten.Presse2_Leer) - { - if (lbl.Name.Contains("17") || lbl.Name.Contains("18")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Presse 2 entladen und auf true geschaltet. - if (spsdaten.Trockner21_Beladen || spsdaten.Trockner22_Beladen) - { - if (lbl.Name.Contains("18") || lbl.Name.Contains("19") || lbl.Name.Contains("20")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Trockner beladen und auf true geschaltet. - if (spsdaten.Trockner21_Entladen || spsdaten.Trockner22_Entladen) - { - if (lbl.Name.Contains("21") || lbl.Name.Contains("19") || lbl.Name.Contains("20")) Call_Funktionen(lbl, maschine, spsdaten); - } //SPS Steuerung hat Trockner entladen und auf true geschalltet. + // Label in Zelle (col=2, row) bearbeiten + lbl.BackColor = Color.LightBlue; + lbl.Text = $"Col {columnIndex} Row {row}"; } } } - //this.Refresh(); - this.ResumeLayout(); + else { meldung.MaschineIstLeer(null); } } - private void Call_Funktionen(Label lbl, Maschine maschine, SPSDaten spsdaten) + + /// + /// Label in jede Zelle des Panels einfügen und mit Schriftfarben aus den Settings versehen. Fach Label hat auch Text erhalten. + /// + /// + private void Get_TableLayoutPanel(TableLayoutPanel tlp) + { + int rows = tlp.RowCount; + int cols = tlp.ColumnCount; + + // Alle Spalten und Zeilen Styles entfernen. + tlp.ColumnStyles.Clear(); + tlp.RowStyles.Clear(); + + + // Labels in jeder Zelle erstellen + for (int row = 0; row < rows; row++) + { + // Reihen gleichmäßig am Screen verteilen. + tlp.RowStyles.Add(new RowStyle(SizeType.Percent, 100F / rows)); + + for (int col = 0; col < cols; col++) + { + tlp.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute)); + Label lbl = new Label(); + lbl.Name = $"Zeile {row}, Spalte {col}"; + lbl.Dock = DockStyle.Fill; + lbl.Tag = Tuple.Create(row, col); + lbl.BackColor = Color.Transparent; + + // Content Alignment pro Spalte festlegen. + switch (col) + { + case 0: + lbl.TextAlign = ContentAlignment.MiddleRight; + lbl.Text = "Fach"; + break; + case 1: + lbl.TextAlign = ContentAlignment.MiddleCenter; + lbl.Text = "Kunde"; + break; + case 2: + lbl.TextAlign = ContentAlignment.MiddleLeft; + lbl.Text = "Liefertag"; + break; + case 3: + lbl.TextAlign = ContentAlignment.MiddleLeft; + lbl.Text = "Aufgabe"; + break; + default: + break; + } + + // Schriftfarbe nach Fachzahl zuordnen. + if(this.maschine.Bezeichnung == "Waschstrasse 1") + { + switch (row) + { + case int n when (n <= 4): + lbl.ForeColor = Config.FarbenConfig.Farben["Beladeband"]; + if (lbl.Text == "Fach") lbl.Text = $"F"; + break; + case int n when (n >= 5 && n <= 13): + lbl.ForeColor = Config.FarbenConfig.Farben["Waschstrasse"]; + if (lbl.Text == "Fach") lbl.Text = $"W"; + break; + case int n when (n == 14): + lbl.ForeColor = Config.FarbenConfig.Farben["Presse"]; + if (lbl.Text == "Fach") lbl.Text = $"P"; + break; + case int n when (n == 15): + lbl.ForeColor = Config.FarbenConfig.Farben["Hubband"]; + if (lbl.Text == "Fach") lbl.Text = $"H"; + break; + case int n when (n == 16): + lbl.ForeColor = Config.FarbenConfig.Farben["Trockner"]; + if (lbl.Text == "Fach") lbl.Text = $"T"; + break; + case int n when (n == 17): + if (maschine.TrocknerKaputt) { lbl.ForeColor = Config.FarbenConfig.Farben["Entladeband"]; if (lbl.Text == "Fach") lbl.Text = $"E"; } + else { lbl.ForeColor = Config.FarbenConfig.Farben["Trockner"]; if (lbl.Text == "Fach") lbl.Text = $"T"; } + break; + case int n when (n == 18): + lbl.ForeColor = Config.FarbenConfig.Farben["Entladeband"]; + if (lbl.Text == "Fach") lbl.Text = $"E"; + break; + default: + break; + } + + } + if(this.maschine.Bezeichnung == "Waschstrasse 2") + { + switch (row) + { + case int n when (n <= 5): + lbl.ForeColor = Config.FarbenConfig.Farben["Beladeband"]; + if (lbl.Text == "Fach") lbl.Text = $"F"; + break; + case int n when (n >= 6 && n <= 17): + lbl.ForeColor = Config.FarbenConfig.Farben["Waschstrasse"]; + if (lbl.Text == "Fach") lbl.Text = $"W"; + break; + case int n when (n == 18): + lbl.ForeColor = Config.FarbenConfig.Farben["Presse"]; + if (lbl.Text == "Fach") lbl.Text = $"P"; + break; + case int n when (n == 19): + lbl.ForeColor = Config.FarbenConfig.Farben["Hubband"]; + if (lbl.Text == "Fach") lbl.Text = $"H"; + break; + case int n when (n == 20): + lbl.ForeColor = Config.FarbenConfig.Farben["Trockner"]; + if (lbl.Text == "Fach") lbl.Text = $"T"; + break; + case int n when (n == 21): + if (maschine.TrocknerKaputt) { lbl.ForeColor = Config.FarbenConfig.Farben["Entladeband"]; if (lbl.Text == "Fach") lbl.Text = $"E"; } + else { lbl.ForeColor = Config.FarbenConfig.Farben["Trockner"]; if (lbl.Text == "Fach") lbl.Text = $"T"; } + break; + case int n when (n == 22): + lbl.ForeColor = Config.FarbenConfig.Farben["Entladeband"]; + if (lbl.Text == "Fach") lbl.Text = $"E"; + break; + default: + break; + } + + } + + // Schriftgröße an Zellenhöhe anpassen. + lbl.Font = Funktionen.Get_Label_Font(lbl.Font, lbl.Text, GetCellSizeInPixels(tlp, cols, rows)); + + + tlp.Controls.Add(lbl, col, row); + } + } + } + + + public void Form_Refresh(Maschine ms, SPSDaten spsdaten) { - Funktionen.Label_Refresh(lbl, maschine, spsdaten, "Ausschlager"); } private void FormAusschlager_SizeChanged(object sender, EventArgs e) { - if(WindowState == FormWindowState.Maximized) - { - this.Controls.Clear(); - FormAusschlager_Load(this, null); - } } private void FormAusschlager_ResizeEnd(object sender, EventArgs e) { - this.Controls.Clear(); - FormAusschlager_Load(this, null); } + + /// + /// Umrechnen der Prozentgröße der Zeile in Pixelhöhe (int). + /// + /// + /// + /// + /// + public static Size GetCellSizeInPixels(TableLayoutPanel tlp, int column, int row) + { + float colPercent = 0; + float rowPercent = tlp.RowStyles[0].Height; + + int pixelWidth = colPercent == 0 ? 0 : (int)(tlp.Width * (colPercent / 100f)); + int pixelHeight = rowPercent == 0 ? 0 : (int)(tlp.Height * (rowPercent / 100f)); + + return new Size(pixelWidth, pixelHeight); + } + + + /// + /// KEIN VERWEIS NOTWENDIG + /// Wenn ESC gedrückt wird schließt sich das Fenster. + /// + /// + /// + protected override bool ProcessDialogKey(Keys keyData) + { + if (Form.ModifierKeys == Keys.None && keyData == Keys.Escape) + { + this.Close(); + return true; + } + if (Form.ModifierKeys == Keys.None && keyData == Keys.Insert) + { + Open_NeuerAuftrag(); + return true; + } + return base.ProcessDialogKey(keyData); + } + private void Open_NeuerAuftrag() + { + FormNeuerAuftrag neuerAuftrag = new FormNeuerAuftrag(this.Userid); + if (neuerAuftrag.ShowDialog() == DialogResult.OK) + { + this.auftrag = neuerAuftrag.Auftrag; + } + } + + //TODO: Wenn NeuerAuftrag gewählt wie gehts weiter? + //TODO: Bei Transport wir ein Fach mit Aktuellem Auftrag erstellt. Das Alte wird bei Transport gespeichert. + //TODO: Wenn NeuerAuftrag gewählt Fach ändern nicht vergessen. + //TODO: Eventuell einen "Nächsten Auftrag" erstellen damit im Vorraus erstellt werden kann? + } } diff --git a/AA-Forms/FormNeuerAuftrag.cs b/AA-Forms/FormNeuerAuftrag.cs index 561b1e3..07f1ed3 100644 --- a/AA-Forms/FormNeuerAuftrag.cs +++ b/AA-Forms/FormNeuerAuftrag.cs @@ -33,6 +33,7 @@ namespace Deckungsbeitrag public DateTime? letzterLiefertag; private Kunde knd; public DataGridViewCell aktivCell; + private string userid; public FormNeuerAuftrag() { @@ -48,6 +49,13 @@ namespace Deckungsbeitrag this.letzterLiefertag = letzterLiefertag; } + public FormNeuerAuftrag(string userid) : this() + { + this.userid = userid; + if (userid.Contains("wstrasse01")) this.benutzer = Benutzer.GetBenutzer("ws1", null); + if (userid.Contains("wstrasse02")) this.benutzer = Benutzer.GetBenutzer("ws2", null); + } + private void FormNeuerAuftrag_Load(object sender, EventArgs e) { // SortimentListe holen @@ -61,8 +69,10 @@ namespace Deckungsbeitrag else { // Wenn NICHT Waschstrasse dann Fenster schließen. - if (benutzer.Rolle == BenutzerRolle.Waschstrasse) FormNeuerAuftrag_Load(this, e); - else this.Close(); + //if (this.userid.Contains("wstrasse")) FormNeuerAuftrag_Load(this, e); + //else this.Close(); + this.DialogResult = DialogResult.Cancel; + this.Close(); } this.dGArtikel.ForeColor = Color.Black; @@ -75,10 +85,21 @@ namespace Deckungsbeitrag comboBox_Load(); //Unterscheidung zwischen BenutzerRollen. Verschiedene Controls werden gesperrt, angezeigt oder verändert - if (this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Admin || this.benutzer.Rolle == BenutzerRolle.Master) + if (this.benutzer != null) { - this.comboBoxTyp.Enabled = true; - this.comboBoxTyp.SelectedIndex = 1; + if (this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Admin || this.benutzer.Rolle == BenutzerRolle.Master) + { + this.comboBoxTyp.Enabled = true; + this.comboBoxTyp.SelectedIndex = 1; + } + else + { + this.comboBoxTyp.Enabled = false; + this.dGArtikel.Enabled = this.dGArtikel.Visible = false; + this.Width = textBoxKundeName.Right + 10; + this.Height = 405; + this.comboBoxTyp.SelectedIndex = 1; + } } else { @@ -88,6 +109,7 @@ namespace Deckungsbeitrag this.Height = 405; this.comboBoxTyp.SelectedIndex = 1; } + } /// diff --git a/AA-Klassen/Fehlermeldungen.cs b/AA-Klassen/Fehlermeldungen.cs index bdbda15..383aba2 100644 --- a/AA-Klassen/Fehlermeldungen.cs +++ b/AA-Klassen/Fehlermeldungen.cs @@ -264,5 +264,14 @@ namespace DatenDB return result; } + internal void MaschineIstLeer(string s) + { + if (s == null) s = $"Die Maschine ist leer. Es konnten keine Fächer gefunden werden."; + + string caption = "FEHLER"; + MessageBoxButtons buttons = MessageBoxButtons.OK; + MessageBoxIcon icon = MessageBoxIcon.Error; + MessageBox.Show(s, caption, buttons, icon); + } } } diff --git a/AA-Klassen/Funktionen.cs b/AA-Klassen/Funktionen.cs index 44b67d7..ee796b8 100644 --- a/AA-Klassen/Funktionen.cs +++ b/AA-Klassen/Funktionen.cs @@ -37,6 +37,7 @@ namespace Deckungsbeitrag public Funktionen() { } + public static HeaderFormatStyle GetHeader() { HeaderFormatStyle headerFormat = new HeaderFormatStyle(); diff --git a/AA-Klassen/WSFach.cs b/AA-Klassen/WSFach.cs new file mode 100644 index 0000000..c685daa --- /dev/null +++ b/AA-Klassen/WSFach.cs @@ -0,0 +1,86 @@ +using DatenDB; +using Npgsql; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Deckungsbeitrag.AA_Klassen +{ + public class WSFach + { + private const string COLUMNS = "fach_id, auftrag_id, maschine_id, gewaschen, extraauftrag_id, gewicht, wprogramm_id"; + private const string TABLE = "kundenverwaltung.wsfach"; + + public WSFach() + { + } + + + public int? FachID { get; set; } + public int AuftragID { get; set; } + public int MaschineID { get; set; } + public DateTime Gewaschen { get; set; } + public int? ExtraAuftragID { get; set; } + public double Gewicht { get; set; } = 0; + public int? WProgrammID { get; set; } + + internal static List GetFachliste(Maschine maschine) + { + int faecher = 0; + if (maschine.TrocknerKaputt) faecher = maschine.Faecher - 1; + else faecher = maschine.Faecher; + DatenbankConnection.GetConnection().Open(); + List resultlist = new List(); + NpgsqlCommand command = new NpgsqlCommand(); + command.Connection = DatenbankConnection.GetConnection(); + command.CommandText = $"select {COLUMNS} from {TABLE} where maschine_id = {maschine.MaschineID} order by fach_id desc limit {faecher}"; + NpgsqlDataReader reader = command.ExecuteReader(); + while (reader.Read()) resultlist.Add(new WSFach(reader)); + reader.Close(); + DatenbankConnection.GetConnection().Close(); + return resultlist; + } + + public WSFach(NpgsqlDataReader reader) + { + this.FachID = reader.GetInt32(0); + this.AuftragID = reader.GetInt32(1); + this.MaschineID = reader.GetInt32(2); + this.Gewaschen = reader.GetDateTime(3); + this.ExtraAuftragID = reader.IsDBNull(4) ? null : (int?)reader.GetInt32(4); + this.Gewicht = reader.GetDouble(5); + this.WProgrammID = reader.IsDBNull(6) ? null : (int?)reader.GetInt32(6); + } + public int Save() + { + DatenbankConnection.GetConnection().Open(); + NpgsqlCommand command = new NpgsqlCommand(); + command.Connection = DatenbankConnection.GetConnection(); + + if (this.FachID.HasValue & this.FachID != 0) + { + command.CommandText = $"update {TABLE} set auftrag_id = :p1, maschine_id = :p2, gewaschen = :p3, extraauftrag_id = :p4, gewicht = :p5, wprogramm_id = :p6 where fach_id = :p0"; + } + else + { + command.CommandText = "select nextval('kundenverwaltung.wsfach_seq')"; + this.FachID = (int)(long)command.ExecuteScalar(); + command.CommandText = $"insert into {TABLE} ({COLUMNS}) values (:p0, :p1, :p2, :p3, :p4, :p5, :p6)"; + } + command.Parameters.AddWithValue("p0", this.FachID); + command.Parameters.AddWithValue("p1", this.AuftragID); + command.Parameters.AddWithValue("p2", this.MaschineID); + command.Parameters.AddWithValue("p3", this.Gewaschen); + command.Parameters.AddWithValue("p4", this.ExtraAuftragID.HasValue ? this.ExtraAuftragID.Value : (object)DBNull.Value); + command.Parameters.AddWithValue("p5", this.Gewicht); + command.Parameters.AddWithValue("p6", this.WProgrammID.HasValue ? this.WProgrammID.Value : (object)DBNull.Value); + + int result = command.ExecuteNonQuery(); + DatenbankConnection.GetConnection().Close(); + return result; + } + + } +} diff --git a/App.config b/App.config index 425d060..beb2533 100644 --- a/App.config +++ b/App.config @@ -9,7 +9,7 @@ - + @@ -113,22 +113,22 @@ False - + Yellow - + White - + Red - + LightBlue - + Green - + Violet diff --git a/Config.cs b/Config.cs new file mode 100644 index 0000000..9f99f17 --- /dev/null +++ b/Config.cs @@ -0,0 +1,27 @@ +using Deckungsbeitrag.Properties; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Deckungsbeitrag +{ + public static class Config + { + public static class FarbenConfig + { + public static readonly IReadOnlyDictionary Farben = new Dictionary + { + ["Beladeband"] = Settings.Default.Beladeband, + ["Waschstrasse"] = Settings.Default.Waschstrasse, + ["Presse"] = Settings.Default.Presse, + ["Trockner"] = Settings.Default.Trockner, + ["Entladeband"] = Settings.Default.Entladeband, + ["Hubband"] = Settings.Default.Hubband + }; + } + + } +} diff --git a/Program.cs b/Program.cs index c86508f..3987786 100644 --- a/Program.cs +++ b/Program.cs @@ -29,8 +29,8 @@ namespace Deckungsbeitrag //TODO: Wenn mit Anmeldung dann if-Clause entfernen und Switch alleine verwenden. if (userid.StartsWith("ms") | userid.StartsWith("ps")) { - // Maschinen Einstiegspunkt. Keine Anmeldung notwendig. - Application.Run(new FormFehlmengeCount(userid)); + if (userid.Contains("wstrasse")) Application.Run(new FormAusschlager(userid)); + else Application.Run(new FormFehlmengeCount(userid)); } else { diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 58828f9..9ce26e6 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -139,6 +139,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Yellow")] public global::System.Drawing.Color Beladeband { get { return ((global::System.Drawing.Color)(this["Beladeband"])); @@ -150,6 +151,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("White")] public global::System.Drawing.Color Waschstrasse { get { return ((global::System.Drawing.Color)(this["Waschstrasse"])); @@ -161,6 +163,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Red")] public global::System.Drawing.Color Presse { get { return ((global::System.Drawing.Color)(this["Presse"])); @@ -172,6 +175,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("LightBlue")] public global::System.Drawing.Color Hubband { get { return ((global::System.Drawing.Color)(this["Hubband"])); @@ -183,6 +187,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Green")] public global::System.Drawing.Color Trockner { get { return ((global::System.Drawing.Color)(this["Trockner"])); @@ -194,6 +199,7 @@ namespace Deckungsbeitrag.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Violet")] public global::System.Drawing.Color Entladeband { get { return ((global::System.Drawing.Color)(this["Entladeband"])); diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 10aec7e..0099f09 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -33,22 +33,22 @@ False - + Yellow - + White - + Red - + LightBlue - + Green - + Violet diff --git a/Verwaltung.csproj b/Verwaltung.csproj index 66665fd..6ab76fc 100644 --- a/Verwaltung.csproj +++ b/Verwaltung.csproj @@ -330,6 +330,8 @@ + + From 888a80aaaf11e9f7912c0c0f8f84e8420d24ee77 Mon Sep 17 00:00:00 2001 From: Kilian Wirl Date: Sun, 7 Dec 2025 11:12:00 +0100 Subject: [PATCH 2/2] AusschlagerScreen NOT DONE --- AA-Forms/FormEinstellung.Designer.cs | 341 ++++++++++++++++++--------- AA-Forms/FormEinstellung.cs | 8 +- AA-Forms/FormEinstellung.resx | 18 +- AA-Klassen/Funktionen.cs | 4 +- App.config | 6 + Properties/Settings.Designer.cs | 24 ++ Properties/Settings.settings | 6 + 7 files changed, 279 insertions(+), 128 deletions(-) diff --git a/AA-Forms/FormEinstellung.Designer.cs b/AA-Forms/FormEinstellung.Designer.cs index 9045534..9d40af0 100644 --- a/AA-Forms/FormEinstellung.Designer.cs +++ b/AA-Forms/FormEinstellung.Designer.cs @@ -70,9 +70,14 @@ this.buttonWaschstrasse = new System.Windows.Forms.Button(); this.buttonEntladeband = new System.Windows.Forms.Button(); this.groupBoxFarben = new System.Windows.Forms.GroupBox(); - this.label4 = new System.Windows.Forms.Label(); - this.buttonAuftAbgel = new System.Windows.Forms.Button(); this.buttonAuftBald = new System.Windows.Forms.Button(); + this.buttonAuftAbgel = new System.Windows.Forms.Button(); + this.label4 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.comboBoxSWSDrucker = new System.Windows.Forms.ComboBox(); + this.comboBoxEtikettDrucker = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMinWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownMaxWert)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numUpDownAnzahl)).BeginInit(); @@ -89,9 +94,10 @@ this.buttonVarKost.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonVarKost.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonVarKost.ForeColor = System.Drawing.Color.White; - this.buttonVarKost.Location = new System.Drawing.Point(12, 53); + this.buttonVarKost.Location = new System.Drawing.Point(9, 43); + this.buttonVarKost.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonVarKost.Name = "buttonVarKost"; - this.buttonVarKost.Size = new System.Drawing.Size(214, 30); + this.buttonVarKost.Size = new System.Drawing.Size(160, 24); this.buttonVarKost.TabIndex = 0; this.buttonVarKost.Text = "Variable Kosten"; this.buttonVarKost.UseVisualStyleBackColor = false; @@ -100,9 +106,10 @@ // textBoxVarKosten // this.textBoxVarKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxVarKosten.Location = new System.Drawing.Point(268, 53); + this.textBoxVarKosten.Location = new System.Drawing.Point(201, 43); + this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxVarKosten.Name = "textBoxVarKosten"; - this.textBoxVarKosten.Size = new System.Drawing.Size(310, 30); + this.textBoxVarKosten.Size = new System.Drawing.Size(234, 26); this.textBoxVarKosten.TabIndex = 1; this.textBoxVarKosten.Visible = false; // @@ -112,9 +119,10 @@ this.buttonVarSpeichern.FlatAppearance.BorderSize = 0; this.buttonVarSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonVarSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonVarSpeichern.Image"))); - this.buttonVarSpeichern.Location = new System.Drawing.Point(232, 53); + this.buttonVarSpeichern.Location = new System.Drawing.Point(174, 43); + this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonVarSpeichern.Name = "buttonVarSpeichern"; - this.buttonVarSpeichern.Size = new System.Drawing.Size(30, 30); + this.buttonVarSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonVarSpeichern.TabIndex = 2; this.buttonVarSpeichern.UseVisualStyleBackColor = false; this.buttonVarSpeichern.Visible = false; @@ -126,9 +134,10 @@ this.buttonFixLohnSpeichern.FlatAppearance.BorderSize = 0; this.buttonFixLohnSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixLohnSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixLohnSpeichern.Image"))); - this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(232, 89); + this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(174, 72); + this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonFixLohnSpeichern.Name = "buttonFixLohnSpeichern"; - this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(30, 30); + this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonFixLohnSpeichern.TabIndex = 5; this.buttonFixLohnSpeichern.UseVisualStyleBackColor = false; this.buttonFixLohnSpeichern.Visible = false; @@ -137,9 +146,10 @@ // textBoxFixLohnKosten // this.textBoxFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxFixLohnKosten.Location = new System.Drawing.Point(268, 89); + this.textBoxFixLohnKosten.Location = new System.Drawing.Point(201, 72); + this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxFixLohnKosten.Name = "textBoxFixLohnKosten"; - this.textBoxFixLohnKosten.Size = new System.Drawing.Size(310, 30); + this.textBoxFixLohnKosten.Size = new System.Drawing.Size(234, 26); this.textBoxFixLohnKosten.TabIndex = 4; this.textBoxFixLohnKosten.Visible = false; // @@ -152,9 +162,10 @@ this.buttonFixLohnKosten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixLohnKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixLohnKosten.ForeColor = System.Drawing.Color.White; - this.buttonFixLohnKosten.Location = new System.Drawing.Point(12, 89); + this.buttonFixLohnKosten.Location = new System.Drawing.Point(9, 72); + this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonFixLohnKosten.Name = "buttonFixLohnKosten"; - this.buttonFixLohnKosten.Size = new System.Drawing.Size(214, 30); + this.buttonFixLohnKosten.Size = new System.Drawing.Size(160, 24); this.buttonFixLohnKosten.TabIndex = 3; this.buttonFixLohnKosten.Text = "Fix Lohn Kosten"; this.buttonFixLohnKosten.UseVisualStyleBackColor = false; @@ -166,9 +177,10 @@ this.buttonFixMietSpeichern.FlatAppearance.BorderSize = 0; this.buttonFixMietSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixMietSpeichern.Image = ((System.Drawing.Image)(resources.GetObject("buttonFixMietSpeichern.Image"))); - this.buttonFixMietSpeichern.Location = new System.Drawing.Point(232, 125); + this.buttonFixMietSpeichern.Location = new System.Drawing.Point(174, 102); + this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonFixMietSpeichern.Name = "buttonFixMietSpeichern"; - this.buttonFixMietSpeichern.Size = new System.Drawing.Size(30, 30); + this.buttonFixMietSpeichern.Size = new System.Drawing.Size(22, 24); this.buttonFixMietSpeichern.TabIndex = 8; this.buttonFixMietSpeichern.UseVisualStyleBackColor = false; this.buttonFixMietSpeichern.Visible = false; @@ -177,9 +189,10 @@ // textBoxFixMietKosten // this.textBoxFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxFixMietKosten.Location = new System.Drawing.Point(268, 125); + this.textBoxFixMietKosten.Location = new System.Drawing.Point(201, 102); + this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxFixMietKosten.Name = "textBoxFixMietKosten"; - this.textBoxFixMietKosten.Size = new System.Drawing.Size(310, 30); + this.textBoxFixMietKosten.Size = new System.Drawing.Size(234, 26); this.textBoxFixMietKosten.TabIndex = 7; this.textBoxFixMietKosten.Visible = false; // @@ -192,9 +205,10 @@ this.buttonFixMietKosten.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonFixMietKosten.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonFixMietKosten.ForeColor = System.Drawing.Color.White; - this.buttonFixMietKosten.Location = new System.Drawing.Point(12, 125); + this.buttonFixMietKosten.Location = new System.Drawing.Point(9, 102); + this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonFixMietKosten.Name = "buttonFixMietKosten"; - this.buttonFixMietKosten.Size = new System.Drawing.Size(214, 30); + this.buttonFixMietKosten.Size = new System.Drawing.Size(160, 24); this.buttonFixMietKosten.TabIndex = 6; this.buttonFixMietKosten.Text = "Fix Miet Kosten"; this.buttonFixMietKosten.UseVisualStyleBackColor = false; @@ -209,9 +223,10 @@ this.buttonColNeg.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColNeg.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColNeg.ForeColor = System.Drawing.Color.White; - this.buttonColNeg.Location = new System.Drawing.Point(6, 43); + this.buttonColNeg.Location = new System.Drawing.Point(4, 35); + this.buttonColNeg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonColNeg.Name = "buttonColNeg"; - this.buttonColNeg.Size = new System.Drawing.Size(214, 50); + this.buttonColNeg.Size = new System.Drawing.Size(160, 41); this.buttonColNeg.TabIndex = 9; this.buttonColNeg.Text = "Farbe Negativsumme"; this.buttonColNeg.UseVisualStyleBackColor = false; @@ -226,9 +241,10 @@ this.buttonColPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColPos.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColPos.ForeColor = System.Drawing.Color.White; - this.buttonColPos.Location = new System.Drawing.Point(226, 43); + this.buttonColPos.Location = new System.Drawing.Point(170, 35); + this.buttonColPos.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonColPos.Name = "buttonColPos"; - this.buttonColPos.Size = new System.Drawing.Size(214, 50); + this.buttonColPos.Size = new System.Drawing.Size(160, 41); this.buttonColPos.TabIndex = 10; this.buttonColPos.Text = "Farbe Positivsumme"; this.buttonColPos.UseVisualStyleBackColor = false; @@ -243,9 +259,10 @@ this.buttonColEqu.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonColEqu.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonColEqu.ForeColor = System.Drawing.Color.White; - this.buttonColEqu.Location = new System.Drawing.Point(446, 43); + this.buttonColEqu.Location = new System.Drawing.Point(334, 35); + this.buttonColEqu.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonColEqu.Name = "buttonColEqu"; - this.buttonColEqu.Size = new System.Drawing.Size(214, 50); + this.buttonColEqu.Size = new System.Drawing.Size(160, 41); this.buttonColEqu.TabIndex = 11; this.buttonColEqu.Text = "Farbe Nullsumme"; this.buttonColEqu.UseVisualStyleBackColor = false; @@ -255,9 +272,10 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(6, 9); + this.label2.Location = new System.Drawing.Point(4, 7); + this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(363, 32); + this.label2.Size = new System.Drawing.Size(286, 26); this.label2.TabIndex = 13; this.label2.Text = "Konto Nr. für Kostenstelle"; // @@ -265,9 +283,10 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(6, 404); + this.label3.Location = new System.Drawing.Point(4, 328); + this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(103, 32); + this.label3.Size = new System.Drawing.Size(81, 26); this.label3.TabIndex = 14; this.label3.Text = "Rating"; // @@ -281,14 +300,15 @@ 0, 0, 0}); - this.numUpDownMinWert.Location = new System.Drawing.Point(12, 477); + this.numUpDownMinWert.Location = new System.Drawing.Point(9, 388); + this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.numUpDownMinWert.Maximum = new decimal(new int[] { 1000000, 0, 0, 0}); this.numUpDownMinWert.Name = "numUpDownMinWert"; - this.numUpDownMinWert.Size = new System.Drawing.Size(150, 30); + this.numUpDownMinWert.Size = new System.Drawing.Size(112, 26); this.numUpDownMinWert.TabIndex = 15; this.numUpDownMinWert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numUpDownMinWert.ThousandsSeparator = true; @@ -303,14 +323,15 @@ 0, 0, 0}); - this.numUpDownMaxWert.Location = new System.Drawing.Point(168, 477); + this.numUpDownMaxWert.Location = new System.Drawing.Point(126, 388); + this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.numUpDownMaxWert.Maximum = new decimal(new int[] { 1000000, 0, 0, 0}); this.numUpDownMaxWert.Name = "numUpDownMaxWert"; - this.numUpDownMaxWert.Size = new System.Drawing.Size(150, 30); + this.numUpDownMaxWert.Size = new System.Drawing.Size(112, 26); this.numUpDownMaxWert.TabIndex = 16; this.numUpDownMaxWert.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.numUpDownMaxWert.ThousandsSeparator = true; @@ -318,14 +339,15 @@ // numUpDownAnzahl // this.numUpDownAnzahl.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numUpDownAnzahl.Location = new System.Drawing.Point(324, 477); + this.numUpDownAnzahl.Location = new System.Drawing.Point(243, 388); + this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.numUpDownAnzahl.Maximum = new decimal(new int[] { 20, 0, 0, 0}); this.numUpDownAnzahl.Name = "numUpDownAnzahl"; - this.numUpDownAnzahl.Size = new System.Drawing.Size(97, 30); + this.numUpDownAnzahl.Size = new System.Drawing.Size(73, 26); this.numUpDownAnzahl.TabIndex = 17; this.numUpDownAnzahl.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -333,9 +355,10 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(320, 454); + this.label6.Location = new System.Drawing.Point(240, 369); + this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(60, 20); + this.label6.Size = new System.Drawing.Size(51, 17); this.label6.TabIndex = 20; this.label6.Text = "Anzahl"; // @@ -343,9 +366,10 @@ // this.checkBoxMinWert.AutoSize = true; this.checkBoxMinWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxMinWert.Location = new System.Drawing.Point(12, 450); + this.checkBoxMinWert.Location = new System.Drawing.Point(9, 366); + this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.checkBoxMinWert.Name = "checkBoxMinWert"; - this.checkBoxMinWert.Size = new System.Drawing.Size(103, 24); + this.checkBoxMinWert.Size = new System.Drawing.Size(87, 21); this.checkBoxMinWert.TabIndex = 21; this.checkBoxMinWert.Text = "Min. Wert"; this.checkBoxMinWert.UseVisualStyleBackColor = true; @@ -355,9 +379,10 @@ // this.checkBoxMaxWert.AutoSize = true; this.checkBoxMaxWert.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxMaxWert.Location = new System.Drawing.Point(168, 450); + this.checkBoxMaxWert.Location = new System.Drawing.Point(126, 366); + this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.checkBoxMaxWert.Name = "checkBoxMaxWert"; - this.checkBoxMaxWert.Size = new System.Drawing.Size(107, 24); + this.checkBoxMaxWert.Size = new System.Drawing.Size(90, 21); this.checkBoxMaxWert.TabIndex = 22; this.checkBoxMaxWert.Text = "Max. Wert"; this.checkBoxMaxWert.UseVisualStyleBackColor = true; @@ -366,9 +391,10 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(115, 417); + this.label5.Location = new System.Drawing.Point(86, 339); + this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(231, 16); + this.label5.Size = new System.Drawing.Size(185, 13); this.label5.TabIndex = 24; this.label5.Text = "Regelt die Sterneverteilung im Rating."; // @@ -378,9 +404,11 @@ this.groupBox1.Controls.Add(this.label9); this.groupBox1.Controls.Add(this.label8); this.groupBox1.Controls.Add(this.label7); - this.groupBox1.Location = new System.Drawing.Point(452, 404); + this.groupBox1.Location = new System.Drawing.Point(339, 328); + this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(440, 103); + this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Size = new System.Drawing.Size(330, 84); this.groupBox1.TabIndex = 25; this.groupBox1.TabStop = false; // @@ -388,45 +416,50 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(6, 80); + this.label10.Location = new System.Drawing.Point(4, 65); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(390, 16); + this.label10.Size = new System.Drawing.Size(331, 13); this.label10.TabIndex = 3; this.label10.Text = "Wenn nicht angehackt wird Wert automatisch berechnet."; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(6, 60); + this.label9.Location = new System.Drawing.Point(4, 49); + this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(288, 16); + this.label9.Size = new System.Drawing.Size(233, 13); this.label9.TabIndex = 2; this.label9.Text = "-> Anzahl: Maximal mögliche Anzahl an Sternen."; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(6, 40); + this.label8.Location = new System.Drawing.Point(4, 32); + this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(404, 16); + this.label8.Size = new System.Drawing.Size(329, 13); this.label8.TabIndex = 1; this.label8.Text = "-> Max.Wert: Alle Werte darüber werden mit Max. Sternen versehen."; // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 20); + this.label7.Location = new System.Drawing.Point(4, 16); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(373, 16); + this.label7.Size = new System.Drawing.Size(306, 13); this.label7.TabIndex = 0; this.label7.Text = "-> Min.Wert: Alle Wert darunter werden mit 0 Sternen versehen."; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(375, 22); + this.label11.Location = new System.Drawing.Point(301, 18); + this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(335, 16); + this.label11.Size = new System.Drawing.Size(275, 13); this.label11.TabIndex = 26; this.label11.Text = "KontoNr. zu einer Kostenstelle für den Import hinzufügen."; // @@ -434,18 +467,20 @@ // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(6, 521); + this.label12.Location = new System.Drawing.Point(4, 423); + this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(231, 32); + this.label12.Size = new System.Drawing.Size(182, 26); this.label12.TabIndex = 27; this.label12.Text = "DokumentPfade"; // // textBoxSortiment // this.textBoxSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxSortiment.Location = new System.Drawing.Point(232, 567); + this.textBoxSortiment.Location = new System.Drawing.Point(174, 461); + this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxSortiment.Name = "textBoxSortiment"; - this.textBoxSortiment.Size = new System.Drawing.Size(561, 30); + this.textBoxSortiment.Size = new System.Drawing.Size(422, 26); this.textBoxSortiment.TabIndex = 28; this.textBoxSortiment.Visible = false; this.textBoxSortiment.TextChanged += new System.EventHandler(this.TextBox_TextChanged); @@ -455,9 +490,10 @@ // textBoxRatingbild // this.textBoxRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxRatingbild.Location = new System.Drawing.Point(232, 603); + this.textBoxRatingbild.Location = new System.Drawing.Point(174, 490); + this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.textBoxRatingbild.Name = "textBoxRatingbild"; - this.textBoxRatingbild.Size = new System.Drawing.Size(561, 30); + this.textBoxRatingbild.Size = new System.Drawing.Size(422, 26); this.textBoxRatingbild.TabIndex = 30; this.textBoxRatingbild.Visible = false; this.textBoxRatingbild.TextChanged += new System.EventHandler(this.TextBox_TextChanged); @@ -473,9 +509,10 @@ this.buttonSortiment.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSortiment.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSortiment.ForeColor = System.Drawing.Color.White; - this.buttonSortiment.Location = new System.Drawing.Point(12, 567); + this.buttonSortiment.Location = new System.Drawing.Point(9, 461); + this.buttonSortiment.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonSortiment.Name = "buttonSortiment"; - this.buttonSortiment.Size = new System.Drawing.Size(214, 30); + this.buttonSortiment.Size = new System.Drawing.Size(160, 24); this.buttonSortiment.TabIndex = 32; this.buttonSortiment.Text = "Sortiment"; this.buttonSortiment.UseVisualStyleBackColor = false; @@ -490,9 +527,10 @@ this.buttonRatingbild.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonRatingbild.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonRatingbild.ForeColor = System.Drawing.Color.White; - this.buttonRatingbild.Location = new System.Drawing.Point(12, 603); + this.buttonRatingbild.Location = new System.Drawing.Point(9, 490); + this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonRatingbild.Name = "buttonRatingbild"; - this.buttonRatingbild.Size = new System.Drawing.Size(214, 30); + this.buttonRatingbild.Size = new System.Drawing.Size(160, 24); this.buttonRatingbild.TabIndex = 33; this.buttonRatingbild.Text = "Ratingbild"; this.buttonRatingbild.UseVisualStyleBackColor = false; @@ -508,9 +546,10 @@ this.buttonSpeichern.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonSpeichern.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonSpeichern.ForeColor = System.Drawing.Color.White; - this.buttonSpeichern.Location = new System.Drawing.Point(12, 702); + this.buttonSpeichern.Location = new System.Drawing.Point(9, 639); + this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonSpeichern.Name = "buttonSpeichern"; - this.buttonSpeichern.Size = new System.Drawing.Size(214, 35); + this.buttonSpeichern.Size = new System.Drawing.Size(160, 28); this.buttonSpeichern.TabIndex = 34; this.buttonSpeichern.Text = "Speichern"; this.buttonSpeichern.UseVisualStyleBackColor = false; @@ -527,9 +566,10 @@ this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAbbrechen.ForeColor = System.Drawing.Color.White; - this.buttonAbbrechen.Location = new System.Drawing.Point(232, 702); + this.buttonAbbrechen.Location = new System.Drawing.Point(174, 639); + this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonAbbrechen.Name = "buttonAbbrechen"; - this.buttonAbbrechen.Size = new System.Drawing.Size(214, 35); + this.buttonAbbrechen.Size = new System.Drawing.Size(160, 28); this.buttonAbbrechen.TabIndex = 35; this.buttonAbbrechen.Text = "Abbrechen"; this.buttonAbbrechen.UseVisualStyleBackColor = false; @@ -544,9 +584,10 @@ this.buttonBeladeband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonBeladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonBeladeband.ForeColor = System.Drawing.Color.White; - this.buttonBeladeband.Location = new System.Drawing.Point(6, 99); + this.buttonBeladeband.Location = new System.Drawing.Point(4, 80); + this.buttonBeladeband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonBeladeband.Name = "buttonBeladeband"; - this.buttonBeladeband.Size = new System.Drawing.Size(214, 50); + this.buttonBeladeband.Size = new System.Drawing.Size(160, 41); this.buttonBeladeband.TabIndex = 36; this.buttonBeladeband.Text = "Farbe Beladeband"; this.buttonBeladeband.UseVisualStyleBackColor = false; @@ -561,9 +602,10 @@ this.buttonTrockner.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonTrockner.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonTrockner.ForeColor = System.Drawing.Color.White; - this.buttonTrockner.Location = new System.Drawing.Point(886, 99); + this.buttonTrockner.Location = new System.Drawing.Point(664, 80); + this.buttonTrockner.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonTrockner.Name = "buttonTrockner"; - this.buttonTrockner.Size = new System.Drawing.Size(214, 50); + this.buttonTrockner.Size = new System.Drawing.Size(160, 41); this.buttonTrockner.TabIndex = 37; this.buttonTrockner.Text = "Farbe Trockner"; this.buttonTrockner.UseVisualStyleBackColor = false; @@ -578,9 +620,10 @@ this.buttonHubband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonHubband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonHubband.ForeColor = System.Drawing.Color.White; - this.buttonHubband.Location = new System.Drawing.Point(666, 99); + this.buttonHubband.Location = new System.Drawing.Point(500, 80); + this.buttonHubband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonHubband.Name = "buttonHubband"; - this.buttonHubband.Size = new System.Drawing.Size(214, 50); + this.buttonHubband.Size = new System.Drawing.Size(160, 41); this.buttonHubband.TabIndex = 38; this.buttonHubband.Text = "Farbe Hubband"; this.buttonHubband.UseVisualStyleBackColor = false; @@ -595,9 +638,10 @@ this.buttonPresse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonPresse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonPresse.ForeColor = System.Drawing.Color.White; - this.buttonPresse.Location = new System.Drawing.Point(446, 99); + this.buttonPresse.Location = new System.Drawing.Point(334, 80); + this.buttonPresse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonPresse.Name = "buttonPresse"; - this.buttonPresse.Size = new System.Drawing.Size(214, 50); + this.buttonPresse.Size = new System.Drawing.Size(160, 41); this.buttonPresse.TabIndex = 39; this.buttonPresse.Text = "Farbe Presse"; this.buttonPresse.UseVisualStyleBackColor = false; @@ -612,9 +656,10 @@ this.buttonWaschstrasse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonWaschstrasse.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonWaschstrasse.ForeColor = System.Drawing.Color.White; - this.buttonWaschstrasse.Location = new System.Drawing.Point(226, 99); + this.buttonWaschstrasse.Location = new System.Drawing.Point(170, 80); + this.buttonWaschstrasse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonWaschstrasse.Name = "buttonWaschstrasse"; - this.buttonWaschstrasse.Size = new System.Drawing.Size(214, 50); + this.buttonWaschstrasse.Size = new System.Drawing.Size(160, 41); this.buttonWaschstrasse.TabIndex = 40; this.buttonWaschstrasse.Text = "Farbe Waschstrasse"; this.buttonWaschstrasse.UseVisualStyleBackColor = false; @@ -629,9 +674,10 @@ this.buttonEntladeband.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonEntladeband.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonEntladeband.ForeColor = System.Drawing.Color.White; - this.buttonEntladeband.Location = new System.Drawing.Point(1106, 99); + this.buttonEntladeband.Location = new System.Drawing.Point(830, 80); + this.buttonEntladeband.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonEntladeband.Name = "buttonEntladeband"; - this.buttonEntladeband.Size = new System.Drawing.Size(214, 50); + this.buttonEntladeband.Size = new System.Drawing.Size(160, 41); this.buttonEntladeband.TabIndex = 41; this.buttonEntladeband.Text = "Farbe Entladeband"; this.buttonEntladeband.UseVisualStyleBackColor = false; @@ -652,40 +698,15 @@ this.groupBoxFarben.Controls.Add(this.buttonHubband); this.groupBoxFarben.Controls.Add(this.buttonTrockner); this.groupBoxFarben.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBoxFarben.Location = new System.Drawing.Point(12, 161); + this.groupBoxFarben.Location = new System.Drawing.Point(9, 131); + this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.groupBoxFarben.Name = "groupBoxFarben"; - this.groupBoxFarben.Size = new System.Drawing.Size(1391, 217); + this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBoxFarben.Size = new System.Drawing.Size(1043, 176); this.groupBoxFarben.TabIndex = 42; this.groupBoxFarben.TabStop = false; this.groupBoxFarben.Text = "Farben"; // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(666, 60); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(255, 16); - this.label4.TabIndex = 23; - this.label4.Text = "Gibt an welche Farben verwendet werden."; - // - // buttonAuftAbgel - // - this.buttonAuftAbgel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.buttonAuftAbgel.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); - this.buttonAuftAbgel.FlatAppearance.BorderSize = 10; - this.buttonAuftAbgel.FlatAppearance.MouseDownBackColor = System.Drawing.Color.LightSteelBlue; - this.buttonAuftAbgel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.buttonAuftAbgel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buttonAuftAbgel.ForeColor = System.Drawing.Color.White; - this.buttonAuftAbgel.Location = new System.Drawing.Point(6, 155); - this.buttonAuftAbgel.Name = "buttonAuftAbgel"; - this.buttonAuftAbgel.Size = new System.Drawing.Size(214, 50); - this.buttonAuftAbgel.TabIndex = 42; - this.buttonAuftAbgel.Text = "Farbe Auftrag zu spät"; - this.buttonAuftAbgel.UseVisualStyleBackColor = false; - this.buttonAuftAbgel.Click += new System.EventHandler(this.Color_button_Click); - // // buttonAuftBald // this.buttonAuftBald.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); @@ -695,19 +716,101 @@ this.buttonAuftBald.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.buttonAuftBald.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buttonAuftBald.ForeColor = System.Drawing.Color.White; - this.buttonAuftBald.Location = new System.Drawing.Point(226, 155); + this.buttonAuftBald.Location = new System.Drawing.Point(170, 126); + this.buttonAuftBald.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.buttonAuftBald.Name = "buttonAuftBald"; - this.buttonAuftBald.Size = new System.Drawing.Size(214, 50); + this.buttonAuftBald.Size = new System.Drawing.Size(160, 41); this.buttonAuftBald.TabIndex = 43; this.buttonAuftBald.Text = "Farbe Auftrag bald"; this.buttonAuftBald.UseVisualStyleBackColor = false; this.buttonAuftBald.Click += new System.EventHandler(this.Color_button_Click); // + // buttonAuftAbgel + // + this.buttonAuftAbgel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.buttonAuftAbgel.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101))))); + this.buttonAuftAbgel.FlatAppearance.BorderSize = 10; + this.buttonAuftAbgel.FlatAppearance.MouseDownBackColor = System.Drawing.Color.LightSteelBlue; + this.buttonAuftAbgel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonAuftAbgel.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buttonAuftAbgel.ForeColor = System.Drawing.Color.White; + this.buttonAuftAbgel.Location = new System.Drawing.Point(4, 126); + this.buttonAuftAbgel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.buttonAuftAbgel.Name = "buttonAuftAbgel"; + this.buttonAuftAbgel.Size = new System.Drawing.Size(160, 41); + this.buttonAuftAbgel.TabIndex = 42; + this.buttonAuftAbgel.Text = "Farbe Auftrag zu spät"; + this.buttonAuftAbgel.UseVisualStyleBackColor = false; + this.buttonAuftAbgel.Click += new System.EventHandler(this.Color_button_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(500, 49); + this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(208, 13); + this.label4.TabIndex = 23; + this.label4.Text = "Gibt an welche Farben verwendet werden."; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(4, 535); + this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(192, 26); + this.label1.TabIndex = 43; + this.label1.Text = "Standart Drucker"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(6, 572); + this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(73, 13); + this.label13.TabIndex = 44; + this.label13.Text = "SWS-Drucker"; + // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(6, 598); + this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(78, 13); + this.label14.TabIndex = 45; + this.label14.Text = "Etikett-Drucker"; + // + // comboBoxSWSDrucker + // + this.comboBoxSWSDrucker.FormattingEnabled = true; + this.comboBoxSWSDrucker.Location = new System.Drawing.Point(95, 564); + this.comboBoxSWSDrucker.Name = "comboBoxSWSDrucker"; + this.comboBoxSWSDrucker.Size = new System.Drawing.Size(121, 21); + this.comboBoxSWSDrucker.TabIndex = 46; + // + // comboBoxEtikettDrucker + // + this.comboBoxEtikettDrucker.FormattingEnabled = true; + this.comboBoxEtikettDrucker.Location = new System.Drawing.Point(95, 595); + this.comboBoxEtikettDrucker.Name = "comboBoxEtikettDrucker"; + this.comboBoxEtikettDrucker.Size = new System.Drawing.Size(121, 21); + this.comboBoxEtikettDrucker.TabIndex = 47; + // // FormEinstellung // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1589, 749); + this.ClientSize = new System.Drawing.Size(1192, 678); + this.Controls.Add(this.comboBoxEtikettDrucker); + this.Controls.Add(this.comboBoxSWSDrucker); + this.Controls.Add(this.label14); + this.Controls.Add(this.label13); + this.Controls.Add(this.label1); this.Controls.Add(this.buttonAbbrechen); this.Controls.Add(this.buttonSpeichern); this.Controls.Add(this.buttonRatingbild); @@ -737,6 +840,7 @@ this.Controls.Add(this.buttonVarKost); this.Controls.Add(this.groupBoxFarben); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "FormEinstellung"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Einstellung"; @@ -799,5 +903,10 @@ private System.Windows.Forms.Label label4; private System.Windows.Forms.Button buttonAuftBald; private System.Windows.Forms.Button buttonAuftAbgel; - } + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.ComboBox comboBoxSWSDrucker; + private System.Windows.Forms.ComboBox comboBoxEtikettDrucker; + } } \ No newline at end of file diff --git a/AA-Forms/FormEinstellung.cs b/AA-Forms/FormEinstellung.cs index 588fffb..1783a0c 100644 --- a/AA-Forms/FormEinstellung.cs +++ b/AA-Forms/FormEinstellung.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Configuration; using System.Data; using System.Drawing; +using System.Drawing.Printing; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -54,6 +55,9 @@ namespace Deckungsbeitrag btn.FlatAppearance.BorderColor = (Color)Settings.Default[btn.Name.Substring(6)]; } } + + this.comboBoxEtikettDrucker.DataSource = this.comboBoxSWSDrucker.DataSource = PrinterSettings.InstalledPrinters; + this.comboBoxEtikettDrucker.SelectedIndex = this.comboBoxSWSDrucker.SelectedIndex = -1; } private void Save_Settings() { @@ -74,7 +78,9 @@ namespace Deckungsbeitrag if (this.checkBoxMinWert.Checked) Settings.Default.MinChecked = this.checkBoxMinWert.Checked; if (this.numUpDownMinWert.Enabled) Settings.Default.RatMin = (double)this.numUpDownMinWert.Value; if (this.numUpDownMaxWert.Enabled) Settings.Default.RatMax = (double)this.numUpDownMaxWert.Value; - + if (this.comboBoxEtikettDrucker.SelectedIndex > -1) Settings.Default.Etikett_Drucker = this.comboBoxEtikettDrucker.SelectedText; + if (this.comboBoxSWSDrucker.SelectedIndex > -1) Settings.Default.Etikett_Drucker = this.comboBoxEtikettDrucker.SelectedText; + Settings.Default.ZAnzahl = (int)this.numUpDownAnzahl.Value; Settings.Default.Save(); diff --git a/AA-Forms/FormEinstellung.resx b/AA-Forms/FormEinstellung.resx index d4aabe1..ad8f84a 100644 --- a/AA-Forms/FormEinstellung.resx +++ b/AA-Forms/FormEinstellung.resx @@ -121,25 +121,25 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAHhJREFUOE9j+PbtWzgQvwHi/yRikJ5wkAFvtAvW/GcInkMSBukB6QUZgFUBMRis - F9mAD+8/EoWHswGk4kFqADY/I2NktbQ1AJ2PLg7CMAPuFM8/hqEBnY8uDsIwA2SQDUFXiKwZWRyEwQaA - AMwQkABIEYgmDn/7DwBpTOrUXkrGYgAAAABJRU5ErkJggg== + vAAADrwBlbxySQAAAG5JREFUOE9j+PbtW/i3b9/efPv27T+JGKQnnAHE0C5Y858heA5JGKQHpBdkAIYk + sRisF9mAD+8/EoWHswGk4kFqALp/0TH9DEDno4sjG3CneP4xDA3ofHRxZANkkA1BV0jQABCAGQISACkC + 0cRiAGlM6tRr9T1CAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAHhJREFUOE9j+PbtWzgQvwHi/yRikJ5wkAFvtAvW/GcInkMSBukB6QUZgFUBMRis - F9mAD+8/EoWHswGk4kFqADY/I2NktbQ1AJ2PLg7CMAPuFM8/hqEBnY8uDsIwA2SQDUFXiKwZWRyEwQaA - AMwQkABIEYgmDn/7DwBpTOrUXkrGYgAAAABJRU5ErkJggg== + vAAADrwBlbxySQAAAG5JREFUOE9j+PbtW/i3b9/efPv27T+JGKQnnAHE0C5Y858heA5JGKQHpBdkAIYk + sRisF9mAD+8/EoWHswGk4kFqALp/0TH9DEDno4sjG3CneP4xDA3ofHRxZANkkA1BV0jQABCAGQISACkC + 0cRiAGlM6tRr9T1CAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAAHhJREFUOE9j+PbtWzgQvwHi/yRikJ5wkAFvtAvW/GcInkMSBukB6QUZgFUBMRis - F9mAD+8/EoWHswGk4kFqADY/I2NktbQ1AJ2PLg7CMAPuFM8/hqEBnY8uDsIwA2SQDUFXiKwZWRyEwQaA - AMwQkABIEYgmDn/7DwBpTOrUXkrGYgAAAABJRU5ErkJggg== + vAAADrwBlbxySQAAAG5JREFUOE9j+PbtW/i3b9/efPv27T+JGKQnnAHE0C5Y858heA5JGKQHpBdkAIYk + sRisF9mAD+8/EoWHswGk4kFqALp/0TH9DEDno4sjG3CneP4xDA3ofHRxZANkkA1BV0jQABCAGQISACkC + 0cRiAGlM6tRr9T1CAAAAAElFTkSuQmCC diff --git a/AA-Klassen/Funktionen.cs b/AA-Klassen/Funktionen.cs index ee796b8..1338fa5 100644 --- a/AA-Klassen/Funktionen.cs +++ b/AA-Klassen/Funktionen.cs @@ -709,7 +709,7 @@ namespace Deckungsbeitrag if (adresse != null) _adresse = adresse; PrintDialog dialog = new PrintDialog(); - foreach (string printer in PrinterSettings.InstalledPrinters) if (printer.Contains(ConfigurationManager.AppSettings["PrinterName"])) dialog.PrinterSettings.PrinterName = printer; + foreach (string printer in PrinterSettings.InstalledPrinters) if (printer.Contains(Properties.Settings.Default.SWS_Drucker)) dialog.PrinterSettings.PrinterName = printer; @@ -782,7 +782,7 @@ namespace Deckungsbeitrag PrintPreviewDialog preview = new PrintPreviewDialog(); PrintDocument printDocument = new PrintDocument(); - foreach (string printer in PrinterSettings.InstalledPrinters) if (printer.Contains(ConfigurationManager.AppSettings["PrinterName"])) dialog.PrinterSettings.PrinterName = printer; + foreach (string printer in PrinterSettings.InstalledPrinters) if (printer.Contains(Properties.Settings.Default.Etikett_Drucker)) dialog.PrinterSettings.PrinterName = printer; dialog.PrinterSettings.Copies = (short)auftrag.ContainerClean; if (dialog.ShowDialog() == DialogResult.OK) diff --git a/App.config b/App.config index beb2533..d852c68 100644 --- a/App.config +++ b/App.config @@ -145,6 +145,12 @@ 0, 0 + + QL-500 + + + MFC-7440 + diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs index 9ce26e6..8781f2a 100644 --- a/Properties/Settings.Designer.cs +++ b/Properties/Settings.Designer.cs @@ -266,5 +266,29 @@ namespace Deckungsbeitrag.Properties { this["Location_ButtonNeuerAuftrag_Main"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("QL-500")] + public string Etikett_Drucker { + get { + return ((string)(this["Etikett_Drucker"])); + } + set { + this["Etikett_Drucker"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("MFC-7440")] + public string SWS_Drucker { + get { + return ((string)(this["SWS_Drucker"])); + } + set { + this["SWS_Drucker"] = value; + } + } } } diff --git a/Properties/Settings.settings b/Properties/Settings.settings index 0099f09..6844eb8 100644 --- a/Properties/Settings.settings +++ b/Properties/Settings.settings @@ -65,5 +65,11 @@ 0, 0 + + QL-500 + + + MFC-7440 + \ No newline at end of file