diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs
index e997f7a..db40f65 100644
--- a/AA-Forms/FormExpedit.cs
+++ b/AA-Forms/FormExpedit.cs
@@ -220,7 +220,7 @@ namespace Deckungsbeitrag
else
{
- FormShowGroupBox showGroupBox = new FormShowGroupBox("Auftrag Suchen", this.benutzer);
+ FormShowUserControl showGroupBox = new FormShowUserControl("Auftrag Suchen", this.benutzer);
if (showGroupBox.ShowDialog() == DialogResult.OK)
{
suchliste = showGroupBox.auftragliste;
@@ -255,7 +255,7 @@ namespace Deckungsbeitrag
}
private void ButtonStats_Click(object sender, EventArgs e)
{
- FormShowGroupBox showGroupBox = new FormShowGroupBox("Statistik", this.benutzer);
+ FormShowUserControl showGroupBox = new FormShowUserControl("Statistik", this.benutzer);
showGroupBox.ShowDialog();
}
@@ -892,6 +892,14 @@ namespace Deckungsbeitrag
this.auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.RowObject).AuftragID);
if (e.Column.Text == "sauber") altecontclean = (int?)e.Value;
if (!string.IsNullOrWhiteSpace(e.NewValue.ToString())) Save_Auftrag(this.auftrag, false);
+
+ if (this.auftrag.Status == AuftragStatus.Vorbereitet & e.Value != e.NewValue)
+ {
+ if (MessageBox.Show("Die Containeranzahl wurde verändert. Möchtest du die Etiketten nochmals drucken?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ Funktionen.Etikett_Drucken(this.auftrag, nocont);
+ }
+ }
//Neuladen_OLV(olv);
}
diff --git a/AA-Forms/FormListe.cs b/AA-Forms/FormListe.cs
index d02ade7..bdd0193 100644
--- a/AA-Forms/FormListe.cs
+++ b/AA-Forms/FormListe.cs
@@ -115,10 +115,12 @@ namespace Deckungsbeitrag
if (this.Kundenliste == null) this.Kundenliste = Kunde.GetTmpList(string.Empty, kndService);
foreach (Kunde kunde in this.Kundenliste)
{
- ListViewItem item = new ListViewItem();
- item.Tag = kunde;
- item.Text = kunde.KundeNummer;
- item.SubItems.Add(kunde.Suchtext);
+ ListViewItem item = new ListViewItem
+ {
+ Tag = kunde,
+ Text = kunde.KundeNummer
+ };
+ item.SubItems.Add(kunde.Suchtext);
item.SubItems.Add(kunde.KundeName);
item.SubItems.Add(kunde.Ort);
diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs
index fc795d2..01bcef5 100644
--- a/AA-Forms/FormMain.Designer.cs
+++ b/AA-Forms/FormMain.Designer.cs
@@ -496,6 +496,27 @@ namespace Deckungsbeitrag
this.panelMain.Paint += new System.Windows.Forms.PaintEventHandler(this.PanelMain_Paint);
this.panelMain.Resize += new System.EventHandler(this.PanelMain_Resize);
//
+ // buttonTestInventur
+ //
+ this.buttonTestInventur.BackColor = System.Drawing.Color.LightGreen;
+ this.buttonTestInventur.Enabled = false;
+ this.buttonTestInventur.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.buttonTestInventur.FlatAppearance.BorderSize = 0;
+ this.buttonTestInventur.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonTestInventur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.buttonTestInventur.ForeColor = System.Drawing.Color.Black;
+ this.buttonTestInventur.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.buttonTestInventur.Location = new System.Drawing.Point(11, 268);
+ this.buttonTestInventur.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.buttonTestInventur.Name = "buttonTestInventur";
+ this.buttonTestInventur.Size = new System.Drawing.Size(333, 50);
+ this.buttonTestInventur.TabIndex = 72;
+ this.buttonTestInventur.Text = "Div. Tests";
+ this.buttonTestInventur.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+ this.buttonTestInventur.UseVisualStyleBackColor = false;
+ this.buttonTestInventur.Visible = false;
+ this.buttonTestInventur.Click += new System.EventHandler(this.buttonTestInventur_Click);
+ //
// groupBoxAuftrag
//
this.groupBoxAuftrag.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -818,7 +839,7 @@ namespace Deckungsbeitrag
this.label14.Dock = System.Windows.Forms.DockStyle.Right;
this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label14.ForeColor = System.Drawing.SystemColors.ControlText;
- this.label14.Location = new System.Drawing.Point(306, 222);
+ this.label14.Location = new System.Drawing.Point(417, 222);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(54, 37);
@@ -874,7 +895,7 @@ namespace Deckungsbeitrag
this.label5.Dock = System.Windows.Forms.DockStyle.Right;
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.ForeColor = System.Drawing.SystemColors.ControlText;
- this.label5.Location = new System.Drawing.Point(310, 185);
+ this.label5.Location = new System.Drawing.Point(421, 185);
this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(50, 37);
@@ -930,7 +951,7 @@ namespace Deckungsbeitrag
this.labelZeit52.Dock = System.Windows.Forms.DockStyle.Right;
this.labelZeit52.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelZeit52.ForeColor = System.Drawing.SystemColors.ControlText;
- this.labelZeit52.Location = new System.Drawing.Point(310, 148);
+ this.labelZeit52.Location = new System.Drawing.Point(421, 148);
this.labelZeit52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelZeit52.Name = "labelZeit52";
this.labelZeit52.Size = new System.Drawing.Size(50, 37);
@@ -944,7 +965,7 @@ namespace Deckungsbeitrag
this.labelZeit42.Dock = System.Windows.Forms.DockStyle.Right;
this.labelZeit42.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelZeit42.ForeColor = System.Drawing.SystemColors.ControlText;
- this.labelZeit42.Location = new System.Drawing.Point(310, 111);
+ this.labelZeit42.Location = new System.Drawing.Point(421, 111);
this.labelZeit42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelZeit42.Name = "labelZeit42";
this.labelZeit42.Size = new System.Drawing.Size(50, 37);
@@ -958,7 +979,7 @@ namespace Deckungsbeitrag
this.labelZeit32.Dock = System.Windows.Forms.DockStyle.Right;
this.labelZeit32.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelZeit32.ForeColor = System.Drawing.SystemColors.ControlText;
- this.labelZeit32.Location = new System.Drawing.Point(310, 74);
+ this.labelZeit32.Location = new System.Drawing.Point(421, 74);
this.labelZeit32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelZeit32.Name = "labelZeit32";
this.labelZeit32.Size = new System.Drawing.Size(50, 37);
@@ -972,7 +993,7 @@ namespace Deckungsbeitrag
this.labelZeit22.Dock = System.Windows.Forms.DockStyle.Right;
this.labelZeit22.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelZeit22.ForeColor = System.Drawing.SystemColors.ControlText;
- this.labelZeit22.Location = new System.Drawing.Point(310, 37);
+ this.labelZeit22.Location = new System.Drawing.Point(421, 37);
this.labelZeit22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelZeit22.Name = "labelZeit22";
this.labelZeit22.Size = new System.Drawing.Size(50, 37);
@@ -989,7 +1010,7 @@ namespace Deckungsbeitrag
this.labelZeit12.Location = new System.Drawing.Point(306, 0);
this.labelZeit12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelZeit12.Name = "labelZeit12";
- this.labelZeit12.Size = new System.Drawing.Size(54, 37);
+ this.labelZeit12.Size = new System.Drawing.Size(165, 37);
this.labelZeit12.TabIndex = 15;
this.labelZeit12.Text = "2";
this.labelZeit12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1195,11 +1216,11 @@ namespace Deckungsbeitrag
this.groupBoxSaison.Controls.Add(this.comboBoxSaison);
this.groupBoxSaison.Enabled = false;
this.groupBoxSaison.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
- this.groupBoxSaison.Location = new System.Drawing.Point(375, 143);
+ this.groupBoxSaison.Location = new System.Drawing.Point(294, 408);
this.groupBoxSaison.Margin = new System.Windows.Forms.Padding(4);
this.groupBoxSaison.Name = "groupBoxSaison";
this.groupBoxSaison.Padding = new System.Windows.Forms.Padding(4);
- this.groupBoxSaison.Size = new System.Drawing.Size(372, 73);
+ this.groupBoxSaison.Size = new System.Drawing.Size(372, 70);
this.groupBoxSaison.TabIndex = 62;
this.groupBoxSaison.TabStop = false;
this.groupBoxSaison.Text = "AKTIVE SAISON";
diff --git a/AA-Forms/FormMain.cs b/AA-Forms/FormMain.cs
index 7d8b7cf..42a9608 100644
--- a/AA-Forms/FormMain.cs
+++ b/AA-Forms/FormMain.cs
@@ -99,7 +99,7 @@ namespace Deckungsbeitrag
this.labelSoftwareDatum.Text = @"N:\TECHNIK\Software\Wirl-Verwaltung\Setup\SetupVerwaltung*.msi";
this.labelArtikelDatum.Text = @"N:\TECHNIK\Software\Wirl-Verwaltung\Listen\Artikelkurzliste.csv";
- GetInventuren();
+ if (this.benutzer.Rolle == BenutzerRolle.Admin || this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Master) GetInventuren();
GetSaison();
if (this.groupBoxContAnz.Visible)
@@ -378,17 +378,21 @@ namespace Deckungsbeitrag
{
onBoardingArt = OnboardingSchritt.NeueInventur;
ZeigeOnboarding();
- FormListe liste;
- if (kunde == null)
+ Kunde kunde = null;
+ FormListe liste = new FormListe(null, (int)Listentyp.Reklamationliste, "Miete");
+ if (liste.ShowDialog() == DialogResult.OK)
{
- liste = new FormListe(null, (int)Listentyp.Reklamationliste, "Miete");
- if (liste.ShowDialog() == DialogResult.OK)
- {
- kunde = liste.kunde;
- }
- else return;
+ kunde = liste.kunde;
+ uCInventur = new UCInventur(kunde, this.benutzer);
+ uCInventur.UCInventur_Update += () => { this.GetInventuren(); };
+ uCInventur.UCInventur_Delete += Do_UCInventur_Delete;
+ this.panelMain.Controls.Add(uCInventur);
+ uCInventur.Location = new Point(100, 100);
+ uCInventur.BringToFront();
+ RegisterDragEvents(uCInventur);
}
+ }
uCInventur = new UCInventur(kunde, this.benutzer);
uCInventur.UCInventur_Update += () => { this.GetInventuren(); };
@@ -1475,6 +1479,14 @@ namespace Deckungsbeitrag
textBox1.Width = (int)size.Width + 10; // +10 als Puffer
}
}
+
+ private void buttonTestInventur_Click(object sender, EventArgs e)
+ {
+ FormShowUserControl showUserControl = new FormShowUserControl("Tourenplan", this.benutzer);
+ showUserControl.ShowDialog();
+ var data = showUserControl.lieferDaten;
+ MessageBox.Show($"{data.datum} {data.text}", "Test", MessageBoxButtons.OK);
+ }
}
}
//CHANGES: Fahrer können abgeholte Aufträge erstellen und ausgelieferte Aufträge markieren.
diff --git a/AA-Forms/FormNeuerAuftrag.cs b/AA-Forms/FormNeuerAuftrag.cs
index f18a6d0..0922585 100644
--- a/AA-Forms/FormNeuerAuftrag.cs
+++ b/AA-Forms/FormNeuerAuftrag.cs
@@ -1,5 +1,7 @@
using DatenDB;
+using Deckungsbeitrag.AA_Forms;
using Deckungsbeitrag.AA_Klassen;
+using Deckungsbeitrag.UserControls;
using Microsoft.VisualBasic;
using System;
using System.Collections.Generic;
@@ -10,15 +12,14 @@ using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
+using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
+using System.Text.Json;
using System.Threading.Tasks;
using System.Web.Caching;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
-using System.Text.Json;
-using System.Reflection;
-using Deckungsbeitrag.UserControls;
namespace Deckungsbeitrag
@@ -44,6 +45,8 @@ namespace Deckungsbeitrag
private string eingabe = string.Empty;
private DateTime nextLiefertag = DateTime.Today;
private OnboardingSchritt onBoardingArt = OnboardingSchritt.NeuerAuftrag;
+ string[] touren;
+ string tour;
#endregion
@@ -83,6 +86,7 @@ namespace Deckungsbeitrag
// Kunde holen
if (auftragtyp == AuftragTyp.Regelmäßig) kndService = "Geschäft";
+ if (this.benutzer.Rolle == BenutzerRolle.Fahrer) kndService = "Geschäft";
this.kunde = Funktionen.Open_List(kndService);
// ComboBox AuftragTyp wird geladen und richtiges Item selected.
@@ -96,19 +100,21 @@ namespace Deckungsbeitrag
if (Saison.Bezeichnung == "Winter") nextLiefertag = Funktionen.GetNextLiefertag((Liefertage)this.kunde.WinterLieferRhythmus);
if (Saison.Bezeichnung == "Zwischensaison")
{
- meldung.GetInfo(this, "Achtung Liefertag kann falsch sein, da Zwischensaison ist.", false);
- DateTime datum = DateTime.Today;
- int tage = 2;
- while (tage > 0)
+ if (!ShowTourenplan())
{
- datum = datum.AddDays(1);
- if (datum.DayOfWeek != DayOfWeek.Saturday && datum.DayOfWeek != DayOfWeek.Sunday)
+ meldung.GetInfo(this, "Achtung Liefertag kann falsch sein, da Zwischensaison ist.", false);
+ DateTime datum = DateTime.Today;
+ int tage = 2;
+ while (tage > 0)
{
- tage--;
+ datum = datum.AddDays(1);
+ if (datum.DayOfWeek != DayOfWeek.Saturday && datum.DayOfWeek != DayOfWeek.Sunday)
+ {
+ tage--;
+ }
}
+ nextLiefertag = datum;
}
- nextLiefertag = datum;
-
}
}
comboBoxTyp_Load();
@@ -129,7 +135,19 @@ namespace Deckungsbeitrag
}
-
+ private bool ShowTourenplan()
+ {
+ FormShowUserControl showUserControl = new FormShowUserControl("Tourenplan", this.benutzer, this.kunde);
+ if (showUserControl.ShowDialog() == DialogResult.OK)
+ {
+ var data = showUserControl.lieferDaten;
+ nextLiefertag = data.datum;
+ touren = data.touren;
+ tour = data.text;
+ return true;
+ }
+ else return false;
+ }
///
/// Kundendaten Liefertag werden eingefügt.
///
@@ -141,8 +159,14 @@ namespace Deckungsbeitrag
this.dTPLiefertag.Value = nextLiefertag;
this.textBoxCont.Text = "0";
+ if (this.benutzer.Rolle == BenutzerRolle.Fahrer)
+ {
+ if (this.benutzer.Tour == tour) this.comboBoxFahrer.SelectedItem = this.comboBoxFahrer.Items.Cast().FirstOrDefault(t => t.Tour == tour);
+ else this.comboBoxFahrer.SelectedItem = this.comboBoxFahrer.Items.Cast().FirstOrDefault(t => t.Tour == tour);
+ }
+ else this.comboBoxFahrer.SelectedIndex = -1;
+
dTPLiefertag_Leave(this.dTPLiefertag, EventArgs.Empty);
- //textBoxCont_TextChanged(this.textBoxCont, EventArgs.Empty);
}
private void comboBoxTyp_Load()
{
@@ -177,10 +201,9 @@ namespace Deckungsbeitrag
{
List benutzerliste = Benutzer.GetFahrerList();
this.comboBoxFahrer.DataSource = benutzerliste;
- this.comboBoxFahrer.DisplayMember = "BenutzerName";
+ if (string.IsNullOrWhiteSpace(tour)) this.comboBoxFahrer.DisplayMember = "BenutzerName";
+ else this.comboBoxFahrer.DisplayMember = "Tour";
- if (this.benutzer.Rolle == BenutzerRolle.Fahrer) this.comboBoxFahrer.SelectedItem = this.benutzer;
- else this.comboBoxFahrer.SelectedIndex = -1;
}
///
@@ -421,11 +444,23 @@ namespace Deckungsbeitrag
}
else if (Auftrag.Save()[0] != 1) meldung.Speicherfehler();
- this.Auftrag = null;
- this.kunde = Funktionen.KundenAuswahl();
- if (this.kunde != null) { DatenLaden(); return; }
- else this.Close();
+ if (this.benutzer.Rolle == BenutzerRolle.Fahrer)
+ {
+ this.Auftrag = null;
+ this.kunde = Funktionen.KundenAuswahl();
+ if (this.kunde != null)
+ {
+ if (ShowTourenplan())
+ {
+ DatenLaden();
+ return;
+ }
+ else this.Close();
+ }
+ else this.Close();
+ }
}
+
private void Container_Click(object sender, EventArgs e)
{
PictureBox pb = (PictureBox)sender;
@@ -586,12 +621,13 @@ namespace Deckungsbeitrag
{
if (((ComboBox)sender).SelectedIndex == -1) return;
if (((Benutzer)((ComboBox)sender).SelectedItem).BenutzerID == this.benutzer.BenutzerID) return;
- if (this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Admin) return;
+ if (this.benutzer.Rolle == BenutzerRolle.Verwaltung || this.benutzer.Rolle == BenutzerRolle.Admin || this.benutzer.Rolle == BenutzerRolle.Expedit) return;
if (meldung.GetFrage(this, "Möchtest du den Auftrag wirklich einem anderen Fahrer zuteilen?", false) == DialogResult.No) { ((ComboBox)sender).SelectedIndex = -1; e.Cancel = true; }
else
{
eingabe = Interaction.InputBox("Warum möchtest du den Auftrag einem anderen Fahrer zuteilen?\n\nGrund:", "Sonderzuteilung", "");
- eingabe += " / ";
+ if (string.IsNullOrWhiteSpace(eingabe)) e.Cancel = true;
+ else eingabe += " / ";
}
}
diff --git a/AA-Forms/FormShowGroupBox.Designer.cs b/AA-Forms/FormShowUserControl.Designer.cs
similarity index 83%
rename from AA-Forms/FormShowGroupBox.Designer.cs
rename to AA-Forms/FormShowUserControl.Designer.cs
index b8935a8..cdcc3fa 100644
--- a/AA-Forms/FormShowGroupBox.Designer.cs
+++ b/AA-Forms/FormShowUserControl.Designer.cs
@@ -1,6 +1,6 @@
namespace Deckungsbeitrag.AA_Forms
{
- partial class FormShowGroupBox
+ partial class FormShowUserControl
{
///
/// Required designer variable.
@@ -28,7 +28,7 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormShowGroupBox));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormShowUserControl));
this.SuspendLayout();
//
// FormShowGroupBox
@@ -41,12 +41,12 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "FormShowGroupBox";
+ this.Name = "FormShowUserControl";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
- this.Text = "FormShowGroupBox";
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormShowGroupBox_FormClosing);
- this.Load += new System.EventHandler(this.FormShowGroupBox_Load);
- this.Shown += new System.EventHandler(this.FormShowGroupBox_Shown);
+ this.Text = "FormShowUserControl";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormShowUserControl_FormClosing);
+ this.Load += new System.EventHandler(this.FormShowUserControl_Load);
+ this.Shown += new System.EventHandler(this.FormShowUserControl_Shown);
this.ResumeLayout(false);
}
diff --git a/AA-Forms/FormShowGroupBox.cs b/AA-Forms/FormShowUserControl.cs
similarity index 52%
rename from AA-Forms/FormShowGroupBox.cs
rename to AA-Forms/FormShowUserControl.cs
index ae6f911..e8d2944 100644
--- a/AA-Forms/FormShowGroupBox.cs
+++ b/AA-Forms/FormShowUserControl.cs
@@ -13,13 +13,14 @@ using System.Windows.Forms;
namespace Deckungsbeitrag.AA_Forms
{
- public partial class FormShowGroupBox : Form
+ public partial class FormShowUserControl : Form
{
private Benutzer benutzer;
private UserControl uc;
public List auftragliste;
private string gb;
private bool toclose = false;
+ public (DateTime datum, string text, string[] touren) lieferDaten;
public bool _toclose
{
@@ -36,22 +37,28 @@ namespace Deckungsbeitrag.AA_Forms
}
}
}
- public FormShowGroupBox()
+ public FormShowUserControl()
{
InitializeComponent();
}
- public FormShowGroupBox(string groupBox, Benutzer user) : this()
+ public FormShowUserControl(string groupBox, Benutzer user) : this()
{
this.gb = groupBox;
this.benutzer = user;
this.Text = gb;
}
- public FormShowGroupBox(string groupBox, Benutzer user, List auftragListe) : this(groupBox, user)
+ public FormShowUserControl(string groupBox, Benutzer user, List auftragListe) : this(groupBox, user)
{
this.auftragliste = auftragListe;
}
-
- private void FormShowGroupBox_Load(object sender, EventArgs e)
+
+ public FormShowUserControl(string groupBox, Benutzer user, Kunde kunde) : this(groupBox, user)
+ {
+ this.Text = string.IsNullOrWhiteSpace(kunde.Suchtext) ? kunde.KundeName : kunde.Suchtext;
+ this.Text += " " + kunde.Ort;
+ }
+
+ private void FormShowUserControl_Load(object sender, EventArgs e)
{
switch (this.gb)
{
@@ -68,22 +75,36 @@ namespace Deckungsbeitrag.AA_Forms
}
break;
case var t when t == "Auftragliste":
- uc = new UCAuftragListe(this.benutzer, this.auftragliste);
- this.Controls.Add(uc);
+ {
+ uc = new UCAuftragListe(this.benutzer, this.auftragliste);
+ this.Controls.Add(uc);
+ }
+ break;
+ case var t when t == "Tourenplan":
+ {
+ uc = new UCTourenplan(this.benutzer);
+ this.Controls.Add(uc);
+ }
break;
default:
break;
}
}
- private void FormShowGroupBox_Shown(object sender, EventArgs e)
+ private void FormShowUserControl_Shown(object sender, EventArgs e)
{
this.ClientSize = new Size(uc.Width, uc.Height);
//ucs.Location = new Point(5, 10);
}
- private void FormShowGroupBox_FormClosing(object sender, FormClosingEventArgs e)
+ private void FormShowUserControl_FormClosing(object sender, FormClosingEventArgs e)
{
- if (this.benutzer.Rolle == BenutzerRolle.Expedit) this.DialogResult = DialogResult.OK;
+ var form = sender as Form;
+ if (this.benutzer.Rolle != BenutzerRolle.Expedit)
+ {
+ UCTourenplan uc = (UCTourenplan)form.Controls[0];
+ lieferDaten = uc.lieferDaten;
+ //this.DialogResult = DialogResult.OK;
+ }
}
}
}
diff --git a/AA-Forms/FormShowGroupBox.resx b/AA-Forms/FormShowUserControl.resx
similarity index 100%
rename from AA-Forms/FormShowGroupBox.resx
rename to AA-Forms/FormShowUserControl.resx
diff --git a/AA-Forms/FormTourenplanung.Designer.cs b/AA-Forms/FormTourenplanung.Designer.cs
index 2e81e1d..ca538c1 100644
--- a/AA-Forms/FormTourenplanung.Designer.cs
+++ b/AA-Forms/FormTourenplanung.Designer.cs
@@ -35,6 +35,7 @@
this.buttonAddPage = new System.Windows.Forms.Button();
this.radioButtonSommer = new System.Windows.Forms.RadioButton();
this.radioButtonWinter = new System.Windows.Forms.RadioButton();
+ this.radioButtonFruehling26 = new System.Windows.Forms.RadioButton();
this.SuspendLayout();
//
// tabControlLKW
@@ -69,7 +70,7 @@
this.comboBoxFilter.Location = new System.Drawing.Point(5, 7);
this.comboBoxFilter.Margin = new System.Windows.Forms.Padding(5);
this.comboBoxFilter.Name = "comboBoxFilter";
- this.comboBoxFilter.Size = new System.Drawing.Size(199, 28);
+ this.comboBoxFilter.Size = new System.Drawing.Size(199, 33);
this.comboBoxFilter.TabIndex = 2;
this.comboBoxFilter.SelectedIndexChanged += new System.EventHandler(this.comboBoxFilter_SelectedIndexChanged);
//
@@ -129,11 +130,29 @@
this.radioButtonWinter.UseVisualStyleBackColor = false;
this.radioButtonWinter.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
//
+ // radioButtonFruehling26
+ //
+ this.radioButtonFruehling26.Appearance = System.Windows.Forms.Appearance.Button;
+ this.radioButtonFruehling26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+ this.radioButtonFruehling26.FlatAppearance.BorderSize = 0;
+ this.radioButtonFruehling26.FlatAppearance.CheckedBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
+ this.radioButtonFruehling26.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.radioButtonFruehling26.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.radioButtonFruehling26.Location = new System.Drawing.Point(424, 5);
+ this.radioButtonFruehling26.Name = "radioButtonFruehling26";
+ this.radioButtonFruehling26.Size = new System.Drawing.Size(100, 30);
+ this.radioButtonFruehling26.TabIndex = 60;
+ this.radioButtonFruehling26.TabStop = true;
+ this.radioButtonFruehling26.Text = "Frühling26";
+ this.radioButtonFruehling26.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.radioButtonFruehling26.UseVisualStyleBackColor = false;
+ //
// FormTourenplanung
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.radioButtonFruehling26);
this.Controls.Add(this.radioButtonWinter);
this.Controls.Add(this.radioButtonSommer);
this.Controls.Add(this.buttonAddPage);
@@ -160,5 +179,6 @@
private System.Windows.Forms.Button buttonAddPage;
private System.Windows.Forms.RadioButton radioButtonSommer;
private System.Windows.Forms.RadioButton radioButtonWinter;
+ private System.Windows.Forms.RadioButton radioButtonFruehling26;
}
}
\ No newline at end of file
diff --git a/AA-Forms/FormTourenplanung.cs b/AA-Forms/FormTourenplanung.cs
index adfffe9..def9a2e 100644
--- a/AA-Forms/FormTourenplanung.cs
+++ b/AA-Forms/FormTourenplanung.cs
@@ -174,7 +174,8 @@ namespace Deckungsbeitrag.AA_Forms
});
if (rb.Text == "Sommer") File.WriteAllText("lkw-touren-sommer.json", json);
- else File.WriteAllText("lkw-touren-winter.json", json);
+ if (rb.Text == "Winter") File.WriteAllText("lkw-touren-winter.json", json);
+ if (rb.Name.Contains("Fruehling26")) File.WriteAllText("lkw-touren-fruehling26.json", json);
}
private void LadeAlleTabs()
{
diff --git a/AA-Klassen/Benutzer.cs b/AA-Klassen/Benutzer.cs
index 7c71c42..ccee06b 100644
--- a/AA-Klassen/Benutzer.cs
+++ b/AA-Klassen/Benutzer.cs
@@ -36,7 +36,7 @@ namespace DatenDB
public class Benutzer
{
// 0 1 2 3 4 5 6 7 8 9
- public const string COLUMNS = "benutzer_id, rolle, passwort, vorname, nachname, schein, gueltig_bis, ist_aktiv, benutzer_name, onboarding_status";
+ public const string COLUMNS = "benutzer_id, rolle, passwort, vorname, nachname, schein, gueltig_bis, ist_aktiv, benutzer_name, onboarding_status, tour";
private const string TABLE = "kundenverwaltung.benutzer";
public Benutzer()
@@ -170,6 +170,8 @@ namespace DatenDB
[OLVIgnore]
public int OnboardingStatus { get; set; }
+ [OLVColumn("Tour", DisplayIndex = 10)]
+ public string Tour { get; set; }
#endregion
public static Benutzer Get(string benutzerName, string passwort)
@@ -212,6 +214,7 @@ namespace DatenDB
this.Aktiv = reader.IsDBNull(7) ? true : reader.GetBoolean(7);
this.BenutzerName = reader.IsDBNull(8) ? string.Empty : reader.GetString(8);
this.OnboardingStatus = reader.GetInt32(9);
+ this.Tour = reader.IsDBNull(10) ? string.Empty : reader.GetString(10);
}
public int Save()
{
@@ -222,13 +225,13 @@ namespace DatenDB
if (this.BenutzerID.HasValue & this.BenutzerID != 0)
{
- command.CommandText = $"update {TABLE} set rolle = :p1, passwort = :p2, vorname = :p3, nachname = :p4, schein = :p5, gueltig_bis = :p6, ist_aktiv = :p7, benutzer_name = :p8, onboarding_status = :p9 where benutzer_id = :p0";
+ command.CommandText = $"update {TABLE} set rolle = :p1, passwort = :p2, vorname = :p3, nachname = :p4, schein = :p5, gueltig_bis = :p6, ist_aktiv = :p7, benutzer_name = :p8, onboarding_status = :p9, tour = :p10 where benutzer_id = :p0";
}
else
{
command.CommandText = "select nextval('kundenverwaltung.benutzer_seq')";
this.BenutzerID = (int)(long)command.ExecuteScalar();
- command.CommandText = $"insert into {TABLE} ({COLUMNS}) values (:p0, :p1, :p2, :p3, :p4, :p5, :p6, :p7, :p8, :p9)";
+ command.CommandText = $"insert into {TABLE} ({COLUMNS}) values (:p0, :p1, :p2, :p3, :p4, :p5, :p6, :p7, :p8, :p9, :p10)";
}
command.Parameters.AddWithValue("p0", this.BenutzerID);
@@ -241,6 +244,7 @@ namespace DatenDB
command.Parameters.AddWithValue("p7", this.Aktiv);
command.Parameters.AddWithValue("p8", string.IsNullOrEmpty(this.BenutzerName) ? (object)DBNull.Value : this.BenutzerName);
command.Parameters.AddWithValue("p9", this.OnboardingStatus);
+ command.Parameters.AddWithValue("p10", string.IsNullOrWhiteSpace(this.Tour) ? (object)DBNull.Value : this.Tour);
int result = command.ExecuteNonQuery();
DatenbankConnection.GetConnection().Close();
diff --git a/UserControls/UCAuftragSuchen.cs b/UserControls/UCAuftragSuchen.cs
index 9617513..2f52265 100644
--- a/UserControls/UCAuftragSuchen.cs
+++ b/UserControls/UCAuftragSuchen.cs
@@ -15,7 +15,7 @@ namespace Deckungsbeitrag.UserControls
public partial class UCAuftragSuchen : UserControl
{
private Benutzer benutzer;
- private FormShowGroupBox showbox;
+ private FormShowUserControl showbox;
public UCAuftragSuchen()
{
InitializeComponent();
@@ -28,7 +28,7 @@ namespace Deckungsbeitrag.UserControls
private void UCAuftragSuchen_Load(object sender, EventArgs e)
{
- showbox = this.Parent as FormShowGroupBox;
+ showbox = this.Parent as FormShowUserControl;
}
#region Suchen-GroupBox
diff --git a/UserControls/UCKunde.cs b/UserControls/UCKunde.cs
index 01dffcd..17644e9 100644
--- a/UserControls/UCKunde.cs
+++ b/UserControls/UCKunde.cs
@@ -17,7 +17,7 @@ namespace Deckungsbeitrag.UserControls
//private Label lblRegion;
//private FlowLayoutPanel flp; // ← Field deklarieren!
private Kunde kunde;
-
+ public int[] ContAnzahl = new int[3];
public string KundenName
{
get => lblKunde.Text;
@@ -33,7 +33,6 @@ namespace Deckungsbeitrag.UserControls
get => lblCont.Text;
set => lblCont.Text = value;
}
- public int[] ContAnzahl = new int[3];
public UCKunde()
{
@@ -84,7 +83,10 @@ namespace Deckungsbeitrag.UserControls
private void KundenControl_MouseClick(object sender, MouseEventArgs e)
{
- if (e.Button == MouseButtons.Right)
+ var cont = (UserControl)sender;
+ var parent = (FlowLayoutPanel)cont.Parent;
+
+ if (e.Button == MouseButtons.Right && !parent.Name.Contains("Kunden"))
{
UserControl kndctrl = (UserControl)sender;
kndctrl.Parent.Controls.Remove(kndctrl);
diff --git a/UserControls/UCTabPageLKW.cs b/UserControls/UCTabPageLKW.cs
index 1eb2679..1ac1c5f 100644
--- a/UserControls/UCTabPageLKW.cs
+++ b/UserControls/UCTabPageLKW.cs
@@ -104,6 +104,7 @@ namespace Deckungsbeitrag.UserControls
UCKunde kundeKopie = (UCKunde)kundectr.Clone();
kundeKopie.Tag = kundectr.Tag;
kundeKopie.Parent = dropTarget;
+ kundeKopie.Width = dropTarget.Width - 30;
dropTarget.Controls.Add(kundeKopie);
}
}
diff --git a/UserControls/UCTourenplan.Designer.cs b/UserControls/UCTourenplan.Designer.cs
new file mode 100644
index 0000000..01118a1
--- /dev/null
+++ b/UserControls/UCTourenplan.Designer.cs
@@ -0,0 +1,646 @@
+namespace Deckungsbeitrag.UserControls
+{
+ partial class UCTourenplan
+ {
+ ///
+ /// Erforderliche Designervariable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Verwendete Ressourcen bereinigen.
+ ///
+ /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Vom Komponenten-Designer generierter Code
+
+ ///
+ /// Erforderliche Methode für die Designerunterstützung.
+ /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
+ ///
+ private void InitializeComponent()
+ {
+ this.tableLPTourenplan = new System.Windows.Forms.TableLayoutPanel();
+ this.button25 = new System.Windows.Forms.Button();
+ this.button24 = new System.Windows.Forms.Button();
+ this.button23 = new System.Windows.Forms.Button();
+ this.button22 = new System.Windows.Forms.Button();
+ this.button21 = new System.Windows.Forms.Button();
+ this.button20 = new System.Windows.Forms.Button();
+ this.button19 = new System.Windows.Forms.Button();
+ this.button18 = new System.Windows.Forms.Button();
+ this.button17 = new System.Windows.Forms.Button();
+ this.button16 = new System.Windows.Forms.Button();
+ this.button15 = new System.Windows.Forms.Button();
+ this.button14 = new System.Windows.Forms.Button();
+ this.button13 = new System.Windows.Forms.Button();
+ this.button12 = new System.Windows.Forms.Button();
+ this.button11 = new System.Windows.Forms.Button();
+ this.button10 = new System.Windows.Forms.Button();
+ this.button9 = new System.Windows.Forms.Button();
+ this.button8 = new System.Windows.Forms.Button();
+ this.button7 = new System.Windows.Forms.Button();
+ this.button6 = new System.Windows.Forms.Button();
+ this.button5 = new System.Windows.Forms.Button();
+ this.button4 = new System.Windows.Forms.Button();
+ this.button3 = new System.Windows.Forms.Button();
+ this.button2 = new System.Windows.Forms.Button();
+ this.label25 = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
+ this.labelFR = new System.Windows.Forms.Label();
+ this.labelDO = new System.Windows.Forms.Label();
+ this.labelMI = new System.Windows.Forms.Label();
+ this.labelDI = new System.Windows.Forms.Label();
+ this.labelMO = new System.Windows.Forms.Label();
+ this.labelTour1 = new System.Windows.Forms.Label();
+ this.button1 = new System.Windows.Forms.Button();
+ this.labelZusatz = new System.Windows.Forms.Label();
+ this.tableLPTourenplan.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // tableLPTourenplan
+ //
+ this.tableLPTourenplan.ColumnCount = 6;
+ 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));
+ 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));
+ this.tableLPTourenplan.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLPTourenplan.Controls.Add(this.button25, 5, 5);
+ this.tableLPTourenplan.Controls.Add(this.button24, 4, 5);
+ this.tableLPTourenplan.Controls.Add(this.button23, 3, 5);
+ this.tableLPTourenplan.Controls.Add(this.button22, 2, 5);
+ this.tableLPTourenplan.Controls.Add(this.button21, 1, 5);
+ this.tableLPTourenplan.Controls.Add(this.button20, 5, 4);
+ this.tableLPTourenplan.Controls.Add(this.button19, 4, 4);
+ this.tableLPTourenplan.Controls.Add(this.button18, 3, 4);
+ this.tableLPTourenplan.Controls.Add(this.button17, 2, 4);
+ this.tableLPTourenplan.Controls.Add(this.button16, 1, 4);
+ this.tableLPTourenplan.Controls.Add(this.button15, 5, 3);
+ this.tableLPTourenplan.Controls.Add(this.button14, 4, 3);
+ this.tableLPTourenplan.Controls.Add(this.button13, 3, 3);
+ this.tableLPTourenplan.Controls.Add(this.button12, 2, 3);
+ this.tableLPTourenplan.Controls.Add(this.button11, 1, 3);
+ this.tableLPTourenplan.Controls.Add(this.button10, 5, 2);
+ this.tableLPTourenplan.Controls.Add(this.button9, 4, 2);
+ this.tableLPTourenplan.Controls.Add(this.button8, 3, 2);
+ this.tableLPTourenplan.Controls.Add(this.button7, 2, 2);
+ this.tableLPTourenplan.Controls.Add(this.button6, 1, 2);
+ this.tableLPTourenplan.Controls.Add(this.button5, 5, 1);
+ this.tableLPTourenplan.Controls.Add(this.button4, 4, 1);
+ this.tableLPTourenplan.Controls.Add(this.button3, 3, 1);
+ this.tableLPTourenplan.Controls.Add(this.button2, 2, 1);
+ this.tableLPTourenplan.Controls.Add(this.label25, 0, 5);
+ this.tableLPTourenplan.Controls.Add(this.label19, 0, 4);
+ this.tableLPTourenplan.Controls.Add(this.label13, 0, 3);
+ this.tableLPTourenplan.Controls.Add(this.label7, 0, 2);
+ this.tableLPTourenplan.Controls.Add(this.labelFR, 5, 0);
+ this.tableLPTourenplan.Controls.Add(this.labelDO, 4, 0);
+ this.tableLPTourenplan.Controls.Add(this.labelMI, 3, 0);
+ this.tableLPTourenplan.Controls.Add(this.labelDI, 2, 0);
+ this.tableLPTourenplan.Controls.Add(this.labelMO, 1, 0);
+ this.tableLPTourenplan.Controls.Add(this.labelTour1, 0, 1);
+ this.tableLPTourenplan.Controls.Add(this.button1, 1, 1);
+ this.tableLPTourenplan.Controls.Add(this.labelZusatz, 0, 0);
+ this.tableLPTourenplan.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLPTourenplan.Location = new System.Drawing.Point(0, 0);
+ this.tableLPTourenplan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tableLPTourenplan.Name = "tableLPTourenplan";
+ 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.Percent, 20F));
+ this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLPTourenplan.Size = new System.Drawing.Size(1440, 894);
+ this.tableLPTourenplan.TabIndex = 0;
+ //
+ // button25
+ //
+ this.button25.BackColor = System.Drawing.Color.Lime;
+ this.button25.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button25.Location = new System.Drawing.Point(1182, 726);
+ this.button25.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button25.Name = "button25";
+ this.button25.Size = new System.Drawing.Size(255, 166);
+ this.button25.TabIndex = 57;
+ this.button25.Text = "button25";
+ this.button25.UseVisualStyleBackColor = false;
+ this.button25.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button24
+ //
+ 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.Location = new System.Drawing.Point(921, 726);
+ this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button24.Name = "button24";
+ this.button24.Size = new System.Drawing.Size(255, 166);
+ this.button24.TabIndex = 56;
+ this.button24.Text = "button24";
+ this.button24.UseVisualStyleBackColor = false;
+ this.button24.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button23
+ //
+ 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.Location = new System.Drawing.Point(660, 726);
+ this.button23.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button23.Name = "button23";
+ this.button23.Size = new System.Drawing.Size(255, 166);
+ this.button23.TabIndex = 55;
+ this.button23.Text = "button23";
+ this.button23.UseVisualStyleBackColor = false;
+ this.button23.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button22
+ //
+ this.button22.BackColor = System.Drawing.Color.Lime;
+ this.button22.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button22.Location = new System.Drawing.Point(399, 726);
+ this.button22.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button22.Name = "button22";
+ this.button22.Size = new System.Drawing.Size(255, 166);
+ this.button22.TabIndex = 54;
+ this.button22.Text = "button22";
+ this.button22.UseVisualStyleBackColor = false;
+ this.button22.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button21
+ //
+ 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.Location = new System.Drawing.Point(138, 726);
+ this.button21.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button21.Name = "button21";
+ this.button21.Size = new System.Drawing.Size(255, 166);
+ this.button21.TabIndex = 53;
+ this.button21.Text = "button21";
+ this.button21.UseVisualStyleBackColor = false;
+ this.button21.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button20
+ //
+ this.button20.BackColor = System.Drawing.Color.Yellow;
+ this.button20.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button20.Location = new System.Drawing.Point(1182, 559);
+ this.button20.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button20.Name = "button20";
+ this.button20.Size = new System.Drawing.Size(255, 163);
+ this.button20.TabIndex = 52;
+ this.button20.Text = "button20";
+ this.button20.UseVisualStyleBackColor = false;
+ this.button20.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button19
+ //
+ 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.Location = new System.Drawing.Point(921, 559);
+ this.button19.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button19.Name = "button19";
+ this.button19.Size = new System.Drawing.Size(255, 163);
+ this.button19.TabIndex = 51;
+ this.button19.Text = "button19";
+ this.button19.UseVisualStyleBackColor = false;
+ this.button19.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button18
+ //
+ 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.Location = new System.Drawing.Point(660, 559);
+ this.button18.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button18.Name = "button18";
+ this.button18.Size = new System.Drawing.Size(255, 163);
+ this.button18.TabIndex = 50;
+ this.button18.Text = "button18";
+ this.button18.UseVisualStyleBackColor = false;
+ this.button18.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button17
+ //
+ this.button17.BackColor = System.Drawing.Color.Yellow;
+ this.button17.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button17.Location = new System.Drawing.Point(399, 559);
+ this.button17.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button17.Name = "button17";
+ this.button17.Size = new System.Drawing.Size(255, 163);
+ this.button17.TabIndex = 49;
+ this.button17.Text = "button17";
+ this.button17.UseVisualStyleBackColor = false;
+ this.button17.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button16
+ //
+ 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.Location = new System.Drawing.Point(138, 559);
+ this.button16.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button16.Name = "button16";
+ this.button16.Size = new System.Drawing.Size(255, 163);
+ this.button16.TabIndex = 48;
+ this.button16.Text = "button16";
+ this.button16.UseVisualStyleBackColor = false;
+ this.button16.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button15
+ //
+ this.button15.BackColor = System.Drawing.Color.CornflowerBlue;
+ this.button15.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button15.Location = new System.Drawing.Point(1182, 392);
+ this.button15.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button15.Name = "button15";
+ this.button15.Size = new System.Drawing.Size(255, 163);
+ this.button15.TabIndex = 47;
+ this.button15.Text = "button15";
+ this.button15.UseVisualStyleBackColor = false;
+ this.button15.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button14
+ //
+ this.button14.BackColor = System.Drawing.Color.LightSkyBlue;
+ this.button14.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button14.Location = new System.Drawing.Point(921, 392);
+ this.button14.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button14.Name = "button14";
+ this.button14.Size = new System.Drawing.Size(255, 163);
+ this.button14.TabIndex = 46;
+ this.button14.Text = "button14";
+ this.button14.UseVisualStyleBackColor = false;
+ this.button14.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button13
+ //
+ this.button13.BackColor = System.Drawing.Color.LightBlue;
+ this.button13.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button13.Location = new System.Drawing.Point(660, 392);
+ this.button13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button13.Name = "button13";
+ this.button13.Size = new System.Drawing.Size(255, 163);
+ this.button13.TabIndex = 45;
+ this.button13.Text = "button13";
+ this.button13.UseVisualStyleBackColor = false;
+ this.button13.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button12
+ //
+ this.button12.BackColor = System.Drawing.Color.CornflowerBlue;
+ this.button12.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button12.Location = new System.Drawing.Point(399, 392);
+ this.button12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button12.Name = "button12";
+ this.button12.Size = new System.Drawing.Size(255, 163);
+ this.button12.TabIndex = 44;
+ this.button12.Text = "button12";
+ this.button12.UseVisualStyleBackColor = false;
+ this.button12.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button11
+ //
+ this.button11.BackColor = System.Drawing.Color.LightSkyBlue;
+ this.button11.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button11.Location = new System.Drawing.Point(138, 392);
+ this.button11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button11.Name = "button11";
+ this.button11.Size = new System.Drawing.Size(255, 163);
+ this.button11.TabIndex = 43;
+ this.button11.Text = "button11";
+ this.button11.UseVisualStyleBackColor = false;
+ this.button11.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button10
+ //
+ 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.Location = new System.Drawing.Point(1182, 225);
+ this.button10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button10.Name = "button10";
+ this.button10.Size = new System.Drawing.Size(255, 163);
+ this.button10.TabIndex = 42;
+ this.button10.Text = "button10";
+ this.button10.UseVisualStyleBackColor = false;
+ this.button10.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button9
+ //
+ 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.Location = new System.Drawing.Point(921, 225);
+ this.button9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button9.Name = "button9";
+ this.button9.Size = new System.Drawing.Size(255, 163);
+ this.button9.TabIndex = 41;
+ this.button9.Text = "button9";
+ this.button9.UseVisualStyleBackColor = false;
+ this.button9.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button8
+ //
+ 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.Location = new System.Drawing.Point(660, 225);
+ this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button8.Name = "button8";
+ this.button8.Size = new System.Drawing.Size(255, 163);
+ this.button8.TabIndex = 40;
+ this.button8.Text = "button8";
+ this.button8.UseVisualStyleBackColor = false;
+ this.button8.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button7
+ //
+ 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.Location = new System.Drawing.Point(399, 225);
+ this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button7.Name = "button7";
+ this.button7.Size = new System.Drawing.Size(255, 163);
+ this.button7.TabIndex = 39;
+ this.button7.Text = "button7";
+ this.button7.UseVisualStyleBackColor = false;
+ this.button7.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button6
+ //
+ 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.Location = new System.Drawing.Point(138, 225);
+ this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button6.Name = "button6";
+ this.button6.Size = new System.Drawing.Size(255, 163);
+ this.button6.TabIndex = 38;
+ this.button6.Text = "button6";
+ this.button6.UseVisualStyleBackColor = false;
+ this.button6.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button5
+ //
+ this.button5.BackColor = System.Drawing.Color.Gray;
+ this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button5.Location = new System.Drawing.Point(1182, 58);
+ this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button5.Name = "button5";
+ this.button5.Size = new System.Drawing.Size(255, 163);
+ this.button5.TabIndex = 37;
+ this.button5.Text = "button5";
+ this.button5.UseVisualStyleBackColor = false;
+ this.button5.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button4
+ //
+ this.button4.BackColor = System.Drawing.Color.Silver;
+ this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button4.Location = new System.Drawing.Point(921, 58);
+ this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(255, 163);
+ this.button4.TabIndex = 36;
+ this.button4.Text = "button4";
+ this.button4.UseVisualStyleBackColor = false;
+ this.button4.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button3
+ //
+ 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.Location = new System.Drawing.Point(660, 58);
+ this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(255, 163);
+ this.button3.TabIndex = 35;
+ this.button3.Text = "button3";
+ this.button3.UseVisualStyleBackColor = false;
+ this.button3.Click += new System.EventHandler(this.Button_Click);
+ //
+ // button2
+ //
+ this.button2.BackColor = System.Drawing.Color.Gray;
+ this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button2.Location = new System.Drawing.Point(399, 58);
+ this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(255, 163);
+ this.button2.TabIndex = 34;
+ this.button2.Text = "button2";
+ this.button2.UseVisualStyleBackColor = false;
+ this.button2.Click += new System.EventHandler(this.Button_Click);
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ 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.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.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(129, 170);
+ this.label25.TabIndex = 31;
+ this.label25.Text = "Tour1";
+ this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ 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.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.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(129, 167);
+ this.label19.TabIndex = 25;
+ this.label19.Text = "Tour1";
+ this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.LightBlue;
+ 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.Location = new System.Drawing.Point(3, 390);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(129, 167);
+ this.label13.TabIndex = 19;
+ this.label13.Text = "Tour1";
+ this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ 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.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.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(129, 167);
+ this.label7.TabIndex = 13;
+ this.label7.Text = "Tour1";
+ this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // labelFR
+ //
+ this.labelFR.AutoSize = true;
+ 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.Location = new System.Drawing.Point(1182, 0);
+ this.labelFR.Name = "labelFR";
+ this.labelFR.Size = new System.Drawing.Size(255, 56);
+ this.labelFR.TabIndex = 5;
+ this.labelFR.Text = "FR";
+ this.labelFR.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labelDO
+ //
+ this.labelDO.AutoSize = true;
+ 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.Location = new System.Drawing.Point(921, 0);
+ this.labelDO.Name = "labelDO";
+ this.labelDO.Size = new System.Drawing.Size(255, 56);
+ this.labelDO.TabIndex = 4;
+ this.labelDO.Text = "DO";
+ this.labelDO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labelMI
+ //
+ this.labelMI.AutoSize = true;
+ 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.Location = new System.Drawing.Point(660, 0);
+ this.labelMI.Name = "labelMI";
+ this.labelMI.Size = new System.Drawing.Size(255, 56);
+ this.labelMI.TabIndex = 3;
+ this.labelMI.Text = "MI";
+ this.labelMI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labelDI
+ //
+ this.labelDI.AutoSize = true;
+ 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.Location = new System.Drawing.Point(399, 0);
+ this.labelDI.Name = "labelDI";
+ this.labelDI.Size = new System.Drawing.Size(255, 56);
+ this.labelDI.TabIndex = 2;
+ this.labelDI.Text = "DI";
+ this.labelDI.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labelMO
+ //
+ this.labelMO.AutoSize = true;
+ 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.Location = new System.Drawing.Point(138, 0);
+ this.labelMO.Name = "labelMO";
+ this.labelMO.Size = new System.Drawing.Size(255, 56);
+ this.labelMO.TabIndex = 0;
+ this.labelMO.Text = "MO";
+ this.labelMO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labelTour1
+ //
+ this.labelTour1.AutoSize = true;
+ 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.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.Name = "labelTour1";
+ this.labelTour1.Size = new System.Drawing.Size(129, 167);
+ this.labelTour1.TabIndex = 6;
+ this.labelTour1.Text = "Tour1";
+ this.labelTour1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // button1
+ //
+ this.button1.BackColor = System.Drawing.Color.Silver;
+ this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.button1.Location = new System.Drawing.Point(138, 58);
+ this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(255, 163);
+ this.button1.TabIndex = 32;
+ this.button1.Text = "button1";
+ this.button1.UseVisualStyleBackColor = false;
+ this.button1.Click += new System.EventHandler(this.Button_Click);
+ //
+ // labelZusatz
+ //
+ this.labelZusatz.AutoSize = true;
+ this.labelZusatz.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.labelZusatz.Location = new System.Drawing.Point(3, 0);
+ this.labelZusatz.Name = "labelZusatz";
+ this.labelZusatz.Size = new System.Drawing.Size(129, 56);
+ this.labelZusatz.TabIndex = 33;
+ this.labelZusatz.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ //
+ // UCTourenplan
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.White;
+ this.Controls.Add(this.tableLPTourenplan);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Name = "UCTourenplan";
+ this.Size = new System.Drawing.Size(1440, 894);
+ this.Load += new System.EventHandler(this.UCTourenplan_Load);
+ this.tableLPTourenplan.ResumeLayout(false);
+ this.tableLPTourenplan.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TableLayoutPanel tableLPTourenplan;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label labelFR;
+ private System.Windows.Forms.Label labelDO;
+ private System.Windows.Forms.Label labelMI;
+ private System.Windows.Forms.Label labelDI;
+ private System.Windows.Forms.Label labelMO;
+ private System.Windows.Forms.Label labelTour1;
+ private System.Windows.Forms.Button button25;
+ private System.Windows.Forms.Button button24;
+ private System.Windows.Forms.Button button23;
+ private System.Windows.Forms.Button button22;
+ private System.Windows.Forms.Button button21;
+ private System.Windows.Forms.Button button20;
+ private System.Windows.Forms.Button button19;
+ private System.Windows.Forms.Button button18;
+ private System.Windows.Forms.Button button17;
+ private System.Windows.Forms.Button button16;
+ private System.Windows.Forms.Button button15;
+ private System.Windows.Forms.Button button14;
+ private System.Windows.Forms.Button button13;
+ private System.Windows.Forms.Button button12;
+ private System.Windows.Forms.Button button11;
+ private System.Windows.Forms.Button button10;
+ private System.Windows.Forms.Button button9;
+ private System.Windows.Forms.Button button8;
+ private System.Windows.Forms.Button button7;
+ private System.Windows.Forms.Button button6;
+ private System.Windows.Forms.Button button5;
+ private System.Windows.Forms.Button button4;
+ private System.Windows.Forms.Button button3;
+ private System.Windows.Forms.Button button2;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label labelZusatz;
+ }
+}
diff --git a/UserControls/UCTourenplan.cs b/UserControls/UCTourenplan.cs
new file mode 100644
index 0000000..0c65828
--- /dev/null
+++ b/UserControls/UCTourenplan.cs
@@ -0,0 +1,138 @@
+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.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Deckungsbeitrag.UserControls
+{
+ public partial class UCTourenplan : UserControl
+ {
+ private static string savePath = ConfigurationManager.AppSettings["DateiSavePfad"];
+ private Benutzer benutzer;
+ private string[] touren;
+ public (DateTime datum, string text, string[] touren) lieferDaten;
+
+ public UCTourenplan()
+ {
+ InitializeComponent();
+ }
+
+ public UCTourenplan(Benutzer benutzer) : this()
+ {
+ this.benutzer = benutzer;
+ }
+
+ private void UCTourenplan_Load(object sender, EventArgs e)
+ {
+
+ ReadCSV();
+
+ }
+
+ ///
+ /// Bereitgestellten Tourenplan in .CSV lesen und den Controls des TableLayoutPanels zuordnen
+ ///
+ private void ReadCSV()
+ {
+ string updatePath = Path.Combine(savePath, "Listen");
+ string dateiName = "Tourenplan_Aktuell.csv";
+ string row;
+ string[] rows;
+
+
+ try
+ {
+ if (File.Exists(Path.Combine(updatePath, dateiName)))
+ {
+ string filename = Path.Combine(updatePath, dateiName);
+ StreamReader sr = new StreamReader(filename, Encoding.GetEncoding("iso-8859-1"));
+ row = string.Empty;
+ rows = new string[0];
+ int idx = 0;
+
+ while (!sr.EndOfStream)
+ {
+ Array.Resize(ref rows, ++idx);
+ row = sr.ReadLine();
+ rows[idx - 1] = row;
+ }
+ sr.Close();
+
+ int i = 0;
+ touren = new string[rows.Length - 2];
+ foreach (string line in rows)
+ {
+ if (i == 0) { i++; continue; }
+ string[] linedata = line.Split(';');
+ for (int j = 0; j < this.tableLPTourenplan.ColumnCount; j++)
+ {
+ var control = this.tableLPTourenplan.GetControlFromPosition(j, i - 1);
+ control.Text = linedata[j].Replace(",", "\n\n");
+ if (i >= 2 & j == 0) touren[i - 2] = linedata[0];
+ }
+ i++;
+ }
+ this.tableLPTourenplan = RemoveTLPanelRow(i - 1, tableLPTourenplan);
+ }
+ }
+ catch (Exception)
+ {
+ throw;
+ }
+ }
+
+ ///
+ /// Nicht benötigte Zeilen des TableLayoutPanels entfernen.
+ ///
+ ///
+ ///
+ /// TableLayoutPanel ohne nicht benutzten Zeilen
+ private TableLayoutPanel RemoveTLPanelRow(int lines, TableLayoutPanel tlp)
+ {
+ for (int i = lines; i <= tlp.RowCount; i++)
+ {
+ for (int col = 0; col < tlp.ColumnCount; col++)
+ {
+ var ctl = tlp.GetControlFromPosition(col, i);
+ if (ctl != null)
+ tlp.Controls.Remove(ctl);
+ }
+ }
+
+ while (tlp.RowCount > lines)
+ {
+ tlp.RowStyles.RemoveAt(tlp.RowCount - 1);
+ tlp.RowCount--;
+ }
+ return tlp;
+ }
+
+ private void Button_Click(object sender, EventArgs e)
+ {
+ var btn = (Button)sender;
+ var tlp = (TableLayoutPanel)btn.Parent;
+ TableLayoutPanelCellPosition tlpCellPosition = tlp.GetCellPosition(btn);
+ int row = tlpCellPosition.Row;
+ int col = tlpCellPosition.Column;
+
+ DateTime liefertag = Funktionen.GetNextLiefertag((Liefertage)(1 << col));
+ string tour = touren[row - 1];
+ lieferDaten = (liefertag, tour, touren);
+
+ if (this.ParentForm != null)
+ {
+ this.ParentForm.DialogResult = DialogResult.OK;
+ this.ParentForm?.Close();
+ }
+ }
+ }
+}
diff --git a/UserControls/UCTourenplan.resx b/UserControls/UCTourenplan.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/UserControls/UCTourenplan.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Verwaltung.csproj b/Verwaltung.csproj
index 83d0afb..958ec49 100644
--- a/Verwaltung.csproj
+++ b/Verwaltung.csproj
@@ -174,11 +174,11 @@
FormNeuerBenutzer.cs
-
+
Form
-
- FormShowGroupBox.cs
+
+ FormShowUserControl.cs
Form
@@ -420,6 +420,12 @@
UCTabPageLKW.cs
+
+ UserControl
+
+
+ UCTourenplan.cs
+
FehlmengeChart.cs
@@ -537,6 +543,9 @@
UCTabPageLKW.cs
+
+ UCTourenplan.cs
+
SettingsSingleFileGenerator
diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt
index a15fe59..c16e3ed 100644
--- a/Verwaltung_ReadMe.txt
+++ b/Verwaltung_ReadMe.txt
@@ -95,5 +95,5 @@ Build-Info:
- 🔄 Wenn Frottee-Expedit auch Relamation bearbeitet, muss BenutzerRolle abgefragt werden. siehe CHANGES. [FormFehlmengeCount.cs]
- 🔄 Zuweisung zu Fahrer muss geklärt werden. [Funktionen.cs]
-Installation: 15.04.2026 11:03
+Installation: 16.04.2026 11:03
=====================================