diff --git a/AA-Forms/FormEinstellung.Designer.cs b/AA-Forms/FormEinstellung.Designer.cs
index 31cbf7c..8ae26dd 100644
--- a/AA-Forms/FormEinstellung.Designer.cs
+++ b/AA-Forms/FormEinstellung.Designer.cs
@@ -78,8 +78,33 @@
this.comboBoxSWSDrucker = new System.Windows.Forms.ComboBox();
this.comboBoxEtikettDrucker = new System.Windows.Forms.ComboBox();
this.groupBoxDrucker = new System.Windows.Forms.GroupBox();
- this.label1 = new System.Windows.Forms.Label();
this.numericUpDownSWSKopien = new System.Windows.Forms.NumericUpDown();
+ this.label1 = new System.Windows.Forms.Label();
+ this.tabControlEinstellung = new System.Windows.Forms.TabControl();
+ this.tabPageFarben = new System.Windows.Forms.TabPage();
+ this.tabPageDeckungsbeitrag = new System.Windows.Forms.TabPage();
+ this.tabPageDrucker = new System.Windows.Forms.TabPage();
+ this.tabPageTourenplanung = new System.Windows.Forms.TabPage();
+ this.groupBoxRegeln = new System.Windows.Forms.GroupBox();
+ this.label17 = new System.Windows.Forms.Label();
+ this.label18 = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label20 = new System.Windows.Forms.Label();
+ this.comboBoxLieferrhythmus = new System.Windows.Forms.ComboBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.tabPageAllgemein = new System.Windows.Forms.TabPage();
+ this.panelButtons = new System.Windows.Forms.Panel();
+ this.comboBoxLT1 = new System.Windows.Forms.ComboBox();
+ this.comboBoxLT2 = new System.Windows.Forms.ComboBox();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.comboBox2 = new System.Windows.Forms.ComboBox();
+ this.label21 = new System.Windows.Forms.Label();
+ this.comboBox3 = new System.Windows.Forms.ComboBox();
+ this.comboBox4 = new System.Windows.Forms.ComboBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.comboBox5 = new System.Windows.Forms.ComboBox();
+ this.label23 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.numUpDownMinWert)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numUpDownMaxWert)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numUpDownAnzahl)).BeginInit();
@@ -87,6 +112,14 @@
this.groupBoxFarben.SuspendLayout();
this.groupBoxDrucker.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).BeginInit();
+ this.tabControlEinstellung.SuspendLayout();
+ this.tabPageFarben.SuspendLayout();
+ this.tabPageDeckungsbeitrag.SuspendLayout();
+ this.tabPageDrucker.SuspendLayout();
+ this.tabPageTourenplanung.SuspendLayout();
+ this.groupBoxRegeln.SuspendLayout();
+ this.tabPageAllgemein.SuspendLayout();
+ this.panelButtons.SuspendLayout();
this.SuspendLayout();
//
// buttonVarKost
@@ -98,7 +131,7 @@
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(9, 43);
+ this.buttonVarKost.Location = new System.Drawing.Point(10, 214);
this.buttonVarKost.Margin = new System.Windows.Forms.Padding(2);
this.buttonVarKost.Name = "buttonVarKost";
this.buttonVarKost.Size = new System.Drawing.Size(160, 24);
@@ -110,7 +143,7 @@
// 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(201, 43);
+ this.textBoxVarKosten.Location = new System.Drawing.Point(202, 214);
this.textBoxVarKosten.Margin = new System.Windows.Forms.Padding(2);
this.textBoxVarKosten.Name = "textBoxVarKosten";
this.textBoxVarKosten.Size = new System.Drawing.Size(234, 26);
@@ -123,7 +156,7 @@
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(174, 43);
+ this.buttonVarSpeichern.Location = new System.Drawing.Point(175, 214);
this.buttonVarSpeichern.Margin = new System.Windows.Forms.Padding(2);
this.buttonVarSpeichern.Name = "buttonVarSpeichern";
this.buttonVarSpeichern.Size = new System.Drawing.Size(22, 24);
@@ -138,7 +171,7 @@
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(174, 72);
+ this.buttonFixLohnSpeichern.Location = new System.Drawing.Point(175, 243);
this.buttonFixLohnSpeichern.Margin = new System.Windows.Forms.Padding(2);
this.buttonFixLohnSpeichern.Name = "buttonFixLohnSpeichern";
this.buttonFixLohnSpeichern.Size = new System.Drawing.Size(22, 24);
@@ -150,7 +183,7 @@
// 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(201, 72);
+ this.textBoxFixLohnKosten.Location = new System.Drawing.Point(202, 243);
this.textBoxFixLohnKosten.Margin = new System.Windows.Forms.Padding(2);
this.textBoxFixLohnKosten.Name = "textBoxFixLohnKosten";
this.textBoxFixLohnKosten.Size = new System.Drawing.Size(234, 26);
@@ -166,7 +199,7 @@
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(9, 72);
+ this.buttonFixLohnKosten.Location = new System.Drawing.Point(10, 243);
this.buttonFixLohnKosten.Margin = new System.Windows.Forms.Padding(2);
this.buttonFixLohnKosten.Name = "buttonFixLohnKosten";
this.buttonFixLohnKosten.Size = new System.Drawing.Size(160, 24);
@@ -181,7 +214,7 @@
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(174, 102);
+ this.buttonFixMietSpeichern.Location = new System.Drawing.Point(175, 273);
this.buttonFixMietSpeichern.Margin = new System.Windows.Forms.Padding(2);
this.buttonFixMietSpeichern.Name = "buttonFixMietSpeichern";
this.buttonFixMietSpeichern.Size = new System.Drawing.Size(22, 24);
@@ -193,7 +226,7 @@
// 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(201, 102);
+ this.textBoxFixMietKosten.Location = new System.Drawing.Point(202, 273);
this.textBoxFixMietKosten.Margin = new System.Windows.Forms.Padding(2);
this.textBoxFixMietKosten.Name = "textBoxFixMietKosten";
this.textBoxFixMietKosten.Size = new System.Drawing.Size(234, 26);
@@ -209,7 +242,7 @@
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(9, 102);
+ this.buttonFixMietKosten.Location = new System.Drawing.Point(10, 273);
this.buttonFixMietKosten.Margin = new System.Windows.Forms.Padding(2);
this.buttonFixMietKosten.Name = "buttonFixMietKosten";
this.buttonFixMietKosten.Size = new System.Drawing.Size(160, 24);
@@ -276,7 +309,7 @@
//
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(4, 7);
+ this.label2.Location = new System.Drawing.Point(5, 178);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(286, 26);
@@ -287,7 +320,7 @@
//
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(4, 328);
+ this.label3.Location = new System.Drawing.Point(5, 28);
this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(81, 26);
@@ -304,7 +337,7 @@
0,
0,
0});
- this.numUpDownMinWert.Location = new System.Drawing.Point(9, 388);
+ this.numUpDownMinWert.Location = new System.Drawing.Point(10, 88);
this.numUpDownMinWert.Margin = new System.Windows.Forms.Padding(2);
this.numUpDownMinWert.Maximum = new decimal(new int[] {
1000000,
@@ -327,7 +360,7 @@
0,
0,
0});
- this.numUpDownMaxWert.Location = new System.Drawing.Point(126, 388);
+ this.numUpDownMaxWert.Location = new System.Drawing.Point(127, 88);
this.numUpDownMaxWert.Margin = new System.Windows.Forms.Padding(2);
this.numUpDownMaxWert.Maximum = new decimal(new int[] {
1000000,
@@ -343,7 +376,7 @@
// 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(243, 388);
+ this.numUpDownAnzahl.Location = new System.Drawing.Point(244, 88);
this.numUpDownAnzahl.Margin = new System.Windows.Forms.Padding(2);
this.numUpDownAnzahl.Maximum = new decimal(new int[] {
20,
@@ -359,7 +392,7 @@
//
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(240, 369);
+ this.label6.Location = new System.Drawing.Point(241, 69);
this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(51, 17);
@@ -370,7 +403,7 @@
//
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(9, 366);
+ this.checkBoxMinWert.Location = new System.Drawing.Point(10, 66);
this.checkBoxMinWert.Margin = new System.Windows.Forms.Padding(2);
this.checkBoxMinWert.Name = "checkBoxMinWert";
this.checkBoxMinWert.Size = new System.Drawing.Size(87, 21);
@@ -383,7 +416,7 @@
//
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(126, 366);
+ this.checkBoxMaxWert.Location = new System.Drawing.Point(127, 66);
this.checkBoxMaxWert.Margin = new System.Windows.Forms.Padding(2);
this.checkBoxMaxWert.Name = "checkBoxMaxWert";
this.checkBoxMaxWert.Size = new System.Drawing.Size(90, 21);
@@ -395,7 +428,7 @@
// label5
//
this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(86, 339);
+ this.label5.Location = new System.Drawing.Point(87, 39);
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(185, 13);
@@ -408,7 +441,7 @@
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(339, 328);
+ this.groupBox1.Location = new System.Drawing.Point(340, 28);
this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
@@ -460,7 +493,7 @@
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(301, 18);
+ this.label11.Location = new System.Drawing.Point(302, 189);
this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(275, 13);
@@ -471,7 +504,7 @@
//
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(4, 423);
+ this.label12.Location = new System.Drawing.Point(5, 123);
this.label12.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(182, 26);
@@ -481,7 +514,7 @@
// 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(174, 461);
+ this.textBoxSortiment.Location = new System.Drawing.Point(181, 75);
this.textBoxSortiment.Margin = new System.Windows.Forms.Padding(2);
this.textBoxSortiment.Name = "textBoxSortiment";
this.textBoxSortiment.Size = new System.Drawing.Size(422, 26);
@@ -494,7 +527,7 @@
// 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(174, 490);
+ this.textBoxRatingbild.Location = new System.Drawing.Point(181, 104);
this.textBoxRatingbild.Margin = new System.Windows.Forms.Padding(2);
this.textBoxRatingbild.Name = "textBoxRatingbild";
this.textBoxRatingbild.Size = new System.Drawing.Size(422, 26);
@@ -513,7 +546,7 @@
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(9, 461);
+ this.buttonSortiment.Location = new System.Drawing.Point(16, 75);
this.buttonSortiment.Margin = new System.Windows.Forms.Padding(2);
this.buttonSortiment.Name = "buttonSortiment";
this.buttonSortiment.Size = new System.Drawing.Size(160, 24);
@@ -531,7 +564,7 @@
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(9, 490);
+ this.buttonRatingbild.Location = new System.Drawing.Point(16, 104);
this.buttonRatingbild.Margin = new System.Windows.Forms.Padding(2);
this.buttonRatingbild.Name = "buttonRatingbild";
this.buttonRatingbild.Size = new System.Drawing.Size(160, 24);
@@ -542,7 +575,7 @@
//
// buttonSpeichern
//
- this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonSpeichern.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonSpeichern.BackColor = System.Drawing.Color.Green;
this.buttonSpeichern.FlatAppearance.BorderColor = System.Drawing.Color.Green;
this.buttonSpeichern.FlatAppearance.BorderSize = 0;
@@ -550,7 +583,7 @@
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(9, 639);
+ this.buttonSpeichern.Location = new System.Drawing.Point(856, 10);
this.buttonSpeichern.Margin = new System.Windows.Forms.Padding(2);
this.buttonSpeichern.Name = "buttonSpeichern";
this.buttonSpeichern.Size = new System.Drawing.Size(160, 28);
@@ -561,7 +594,7 @@
//
// buttonAbbrechen
//
- this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonAbbrechen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
this.buttonAbbrechen.CausesValidation = false;
this.buttonAbbrechen.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
@@ -570,7 +603,7 @@
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(174, 639);
+ this.buttonAbbrechen.Location = new System.Drawing.Point(1021, 10);
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(2);
this.buttonAbbrechen.Name = "buttonAbbrechen";
this.buttonAbbrechen.Size = new System.Drawing.Size(160, 28);
@@ -702,7 +735,7 @@
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(9, 131);
+ this.groupBoxFarben.Location = new System.Drawing.Point(24, 121);
this.groupBoxFarben.Margin = new System.Windows.Forms.Padding(2);
this.groupBoxFarben.Name = "groupBoxFarben";
this.groupBoxFarben.Padding = new System.Windows.Forms.Padding(2);
@@ -807,13 +840,21 @@
this.groupBoxDrucker.Controls.Add(this.label13);
this.groupBoxDrucker.Controls.Add(this.label14);
this.groupBoxDrucker.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBoxDrucker.Location = new System.Drawing.Point(9, 533);
+ this.groupBoxDrucker.Location = new System.Drawing.Point(14, 32);
this.groupBoxDrucker.Name = "groupBoxDrucker";
this.groupBoxDrucker.Size = new System.Drawing.Size(547, 90);
this.groupBoxDrucker.TabIndex = 48;
this.groupBoxDrucker.TabStop = false;
this.groupBoxDrucker.Text = "Standart Drucker";
//
+ // numericUpDownSWSKopien
+ //
+ this.numericUpDownSWSKopien.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.numericUpDownSWSKopien.Location = new System.Drawing.Point(404, 30);
+ this.numericUpDownSWSKopien.Name = "numericUpDownSWSKopien";
+ this.numericUpDownSWSKopien.Size = new System.Drawing.Size(47, 20);
+ this.numericUpDownSWSKopien.TabIndex = 49;
+ //
// label1
//
this.label1.AutoSize = true;
@@ -825,48 +866,305 @@
this.label1.TabIndex = 48;
this.label1.Text = "SWS-Kopien";
//
- // numericUpDownSWSKopien
+ // tabControlEinstellung
//
- this.numericUpDownSWSKopien.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.numericUpDownSWSKopien.Location = new System.Drawing.Point(404, 30);
- this.numericUpDownSWSKopien.Name = "numericUpDownSWSKopien";
- this.numericUpDownSWSKopien.Size = new System.Drawing.Size(47, 20);
- this.numericUpDownSWSKopien.TabIndex = 49;
+ this.tabControlEinstellung.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tabControlEinstellung.Controls.Add(this.tabPageFarben);
+ this.tabControlEinstellung.Controls.Add(this.tabPageDeckungsbeitrag);
+ this.tabControlEinstellung.Controls.Add(this.tabPageDrucker);
+ this.tabControlEinstellung.Controls.Add(this.tabPageTourenplanung);
+ this.tabControlEinstellung.Controls.Add(this.tabPageAllgemein);
+ this.tabControlEinstellung.Location = new System.Drawing.Point(0, 0);
+ this.tabControlEinstellung.Name = "tabControlEinstellung";
+ this.tabControlEinstellung.SelectedIndex = 0;
+ this.tabControlEinstellung.Size = new System.Drawing.Size(1192, 623);
+ this.tabControlEinstellung.TabIndex = 49;
+ //
+ // tabPageFarben
+ //
+ this.tabPageFarben.Controls.Add(this.groupBoxFarben);
+ this.tabPageFarben.Location = new System.Drawing.Point(4, 22);
+ this.tabPageFarben.Name = "tabPageFarben";
+ this.tabPageFarben.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageFarben.Size = new System.Drawing.Size(1184, 597);
+ this.tabPageFarben.TabIndex = 0;
+ this.tabPageFarben.Text = "Farben";
+ this.tabPageFarben.UseVisualStyleBackColor = true;
+ //
+ // tabPageDeckungsbeitrag
+ //
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label3);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.numUpDownMinWert);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.numUpDownMaxWert);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.numUpDownAnzahl);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label6);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.checkBoxMinWert);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.checkBoxMaxWert);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label5);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label11);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label12);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.label2);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonFixMietSpeichern);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.groupBox1);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.textBoxFixMietKosten);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonVarKost);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonFixMietKosten);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.textBoxVarKosten);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonFixLohnSpeichern);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonVarSpeichern);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.textBoxFixLohnKosten);
+ this.tabPageDeckungsbeitrag.Controls.Add(this.buttonFixLohnKosten);
+ this.tabPageDeckungsbeitrag.Location = new System.Drawing.Point(4, 22);
+ this.tabPageDeckungsbeitrag.Name = "tabPageDeckungsbeitrag";
+ this.tabPageDeckungsbeitrag.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPageDeckungsbeitrag.Size = new System.Drawing.Size(1184, 597);
+ this.tabPageDeckungsbeitrag.TabIndex = 1;
+ this.tabPageDeckungsbeitrag.Text = "Deckungsbeitrag";
+ this.tabPageDeckungsbeitrag.UseVisualStyleBackColor = true;
+ //
+ // tabPageDrucker
+ //
+ this.tabPageDrucker.Controls.Add(this.groupBoxDrucker);
+ this.tabPageDrucker.Location = new System.Drawing.Point(4, 22);
+ this.tabPageDrucker.Name = "tabPageDrucker";
+ this.tabPageDrucker.Size = new System.Drawing.Size(1184, 597);
+ this.tabPageDrucker.TabIndex = 2;
+ this.tabPageDrucker.Text = "Drucker";
+ this.tabPageDrucker.UseVisualStyleBackColor = true;
+ //
+ // tabPageTourenplanung
+ //
+ this.tabPageTourenplanung.Controls.Add(this.groupBoxRegeln);
+ this.tabPageTourenplanung.Controls.Add(this.comboBoxLieferrhythmus);
+ this.tabPageTourenplanung.Controls.Add(this.label16);
+ this.tabPageTourenplanung.Controls.Add(this.label15);
+ this.tabPageTourenplanung.Location = new System.Drawing.Point(4, 22);
+ this.tabPageTourenplanung.Name = "tabPageTourenplanung";
+ this.tabPageTourenplanung.Size = new System.Drawing.Size(1184, 597);
+ this.tabPageTourenplanung.TabIndex = 3;
+ this.tabPageTourenplanung.Text = "Tourenplanung";
+ this.tabPageTourenplanung.UseVisualStyleBackColor = true;
+ //
+ // groupBoxRegeln
+ //
+ this.groupBoxRegeln.Controls.Add(this.comboBox5);
+ this.groupBoxRegeln.Controls.Add(this.label23);
+ this.groupBoxRegeln.Controls.Add(this.comboBox3);
+ this.groupBoxRegeln.Controls.Add(this.comboBox4);
+ this.groupBoxRegeln.Controls.Add(this.label22);
+ this.groupBoxRegeln.Controls.Add(this.comboBox1);
+ this.groupBoxRegeln.Controls.Add(this.comboBox2);
+ this.groupBoxRegeln.Controls.Add(this.label21);
+ this.groupBoxRegeln.Controls.Add(this.comboBoxLT2);
+ this.groupBoxRegeln.Controls.Add(this.comboBoxLT1);
+ this.groupBoxRegeln.Controls.Add(this.label17);
+ this.groupBoxRegeln.Controls.Add(this.label18);
+ this.groupBoxRegeln.Controls.Add(this.label19);
+ this.groupBoxRegeln.Controls.Add(this.label20);
+ this.groupBoxRegeln.Location = new System.Drawing.Point(12, 98);
+ this.groupBoxRegeln.Margin = new System.Windows.Forms.Padding(2);
+ this.groupBoxRegeln.Name = "groupBoxRegeln";
+ this.groupBoxRegeln.Padding = new System.Windows.Forms.Padding(2);
+ this.groupBoxRegeln.Size = new System.Drawing.Size(1165, 249);
+ this.groupBoxRegeln.TabIndex = 48;
+ this.groupBoxRegeln.TabStop = false;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label17.Location = new System.Drawing.Point(4, 224);
+ this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(331, 13);
+ this.label17.TabIndex = 3;
+ this.label17.Text = "Wenn nicht angehackt wird Wert automatisch berechnet.";
+ //
+ // label18
+ //
+ this.label18.AutoSize = true;
+ this.label18.Location = new System.Drawing.Point(4, 90);
+ this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label18.Name = "label18";
+ this.label18.Size = new System.Drawing.Size(66, 13);
+ this.label18.TabIndex = 2;
+ this.label18.Text = "3 Liefertage:";
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.Location = new System.Drawing.Point(125, 16);
+ this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(25, 13);
+ this.label19.TabIndex = 1;
+ this.label19.Text = "und";
+ //
+ // label20
+ //
+ this.label20.AutoSize = true;
+ this.label20.Location = new System.Drawing.Point(4, 16);
+ this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label20.Name = "label20";
+ this.label20.Size = new System.Drawing.Size(66, 13);
+ this.label20.TabIndex = 0;
+ this.label20.Text = "2 Liefertage:";
+ //
+ // comboBoxLieferrhythmus
+ //
+ this.comboBoxLieferrhythmus.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBoxLieferrhythmus.FormattingEnabled = true;
+ this.comboBoxLieferrhythmus.Location = new System.Drawing.Point(281, 77);
+ this.comboBoxLieferrhythmus.Name = "comboBoxLieferrhythmus";
+ this.comboBoxLieferrhythmus.Size = new System.Drawing.Size(195, 21);
+ this.comboBoxLieferrhythmus.TabIndex = 47;
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Location = new System.Drawing.Point(9, 80);
+ this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(267, 13);
+ this.label16.TabIndex = 25;
+ this.label16.Text = "Folgende Regeln gelten bei Kunden mit Lieferrhythmus:";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label15.Location = new System.Drawing.Point(7, 19);
+ this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(442, 26);
+ this.label15.TabIndex = 15;
+ this.label15.Text = "Regeln für automatische Tourenplanung:";
+ //
+ // tabPageAllgemein
+ //
+ this.tabPageAllgemein.Controls.Add(this.buttonSortiment);
+ this.tabPageAllgemein.Controls.Add(this.textBoxSortiment);
+ this.tabPageAllgemein.Controls.Add(this.textBoxRatingbild);
+ this.tabPageAllgemein.Controls.Add(this.buttonRatingbild);
+ this.tabPageAllgemein.Location = new System.Drawing.Point(4, 22);
+ this.tabPageAllgemein.Name = "tabPageAllgemein";
+ this.tabPageAllgemein.Size = new System.Drawing.Size(1184, 597);
+ this.tabPageAllgemein.TabIndex = 4;
+ this.tabPageAllgemein.Text = "Allgemein";
+ this.tabPageAllgemein.UseVisualStyleBackColor = true;
+ //
+ // panelButtons
+ //
+ this.panelButtons.Controls.Add(this.buttonAbbrechen);
+ this.panelButtons.Controls.Add(this.buttonSpeichern);
+ this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelButtons.Location = new System.Drawing.Point(0, 629);
+ this.panelButtons.Name = "panelButtons";
+ this.panelButtons.Size = new System.Drawing.Size(1192, 49);
+ this.panelButtons.TabIndex = 50;
+ //
+ // comboBoxLT1
+ //
+ this.comboBoxLT1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBoxLT1.FormattingEnabled = true;
+ this.comboBoxLT1.Location = new System.Drawing.Point(75, 13);
+ this.comboBoxLT1.Name = "comboBoxLT1";
+ this.comboBoxLT1.Size = new System.Drawing.Size(45, 21);
+ this.comboBoxLT1.TabIndex = 49;
+ //
+ // comboBoxLT2
+ //
+ this.comboBoxLT2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBoxLT2.FormattingEnabled = true;
+ this.comboBoxLT2.Location = new System.Drawing.Point(155, 13);
+ this.comboBoxLT2.Name = "comboBoxLT2";
+ this.comboBoxLT2.Size = new System.Drawing.Size(45, 21);
+ this.comboBoxLT2.TabIndex = 50;
+ //
+ // comboBox1
+ //
+ this.comboBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Location = new System.Drawing.Point(155, 43);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(45, 21);
+ this.comboBox1.TabIndex = 53;
+ //
+ // comboBox2
+ //
+ this.comboBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBox2.FormattingEnabled = true;
+ this.comboBox2.Location = new System.Drawing.Point(75, 40);
+ this.comboBox2.Name = "comboBox2";
+ this.comboBox2.Size = new System.Drawing.Size(45, 21);
+ this.comboBox2.TabIndex = 52;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Location = new System.Drawing.Point(125, 43);
+ this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(25, 13);
+ this.label21.TabIndex = 51;
+ this.label21.Text = "und";
+ //
+ // comboBox3
+ //
+ this.comboBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBox3.FormattingEnabled = true;
+ this.comboBox3.Location = new System.Drawing.Point(155, 87);
+ this.comboBox3.Name = "comboBox3";
+ this.comboBox3.Size = new System.Drawing.Size(45, 21);
+ this.comboBox3.TabIndex = 56;
+ //
+ // comboBox4
+ //
+ this.comboBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBox4.FormattingEnabled = true;
+ this.comboBox4.Location = new System.Drawing.Point(75, 87);
+ this.comboBox4.Name = "comboBox4";
+ this.comboBox4.Size = new System.Drawing.Size(45, 21);
+ this.comboBox4.TabIndex = 55;
+ //
+ // label22
+ //
+ this.label22.AutoSize = true;
+ this.label22.Location = new System.Drawing.Point(125, 90);
+ this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label22.Name = "label22";
+ this.label22.Size = new System.Drawing.Size(25, 13);
+ this.label22.TabIndex = 54;
+ this.label22.Text = "und";
+ //
+ // comboBox5
+ //
+ this.comboBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBox5.FormattingEnabled = true;
+ this.comboBox5.Location = new System.Drawing.Point(235, 87);
+ this.comboBox5.Name = "comboBox5";
+ this.comboBox5.Size = new System.Drawing.Size(45, 21);
+ this.comboBox5.TabIndex = 58;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Location = new System.Drawing.Point(205, 90);
+ this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(25, 13);
+ this.label23.TabIndex = 57;
+ this.label23.Text = "und";
//
// FormEinstellung
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1192, 678);
- this.Controls.Add(this.groupBoxDrucker);
- this.Controls.Add(this.buttonAbbrechen);
- this.Controls.Add(this.buttonSpeichern);
- this.Controls.Add(this.buttonRatingbild);
- this.Controls.Add(this.buttonSortiment);
- this.Controls.Add(this.textBoxRatingbild);
- this.Controls.Add(this.textBoxSortiment);
- this.Controls.Add(this.label12);
- this.Controls.Add(this.label11);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.label5);
- this.Controls.Add(this.checkBoxMaxWert);
- this.Controls.Add(this.checkBoxMinWert);
- this.Controls.Add(this.label6);
- this.Controls.Add(this.numUpDownAnzahl);
- this.Controls.Add(this.numUpDownMaxWert);
- this.Controls.Add(this.numUpDownMinWert);
- this.Controls.Add(this.label3);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.buttonFixMietSpeichern);
- this.Controls.Add(this.textBoxFixMietKosten);
- this.Controls.Add(this.buttonFixMietKosten);
- this.Controls.Add(this.buttonFixLohnSpeichern);
- this.Controls.Add(this.textBoxFixLohnKosten);
- this.Controls.Add(this.buttonFixLohnKosten);
- this.Controls.Add(this.buttonVarSpeichern);
- this.Controls.Add(this.textBoxVarKosten);
- this.Controls.Add(this.buttonVarKost);
- this.Controls.Add(this.groupBoxFarben);
+ this.Controls.Add(this.panelButtons);
+ this.Controls.Add(this.tabControlEinstellung);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "FormEinstellung";
@@ -883,8 +1181,19 @@
this.groupBoxDrucker.ResumeLayout(false);
this.groupBoxDrucker.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownSWSKopien)).EndInit();
+ this.tabControlEinstellung.ResumeLayout(false);
+ this.tabPageFarben.ResumeLayout(false);
+ this.tabPageDeckungsbeitrag.ResumeLayout(false);
+ this.tabPageDeckungsbeitrag.PerformLayout();
+ this.tabPageDrucker.ResumeLayout(false);
+ this.tabPageTourenplanung.ResumeLayout(false);
+ this.tabPageTourenplanung.PerformLayout();
+ this.groupBoxRegeln.ResumeLayout(false);
+ this.groupBoxRegeln.PerformLayout();
+ this.tabPageAllgemein.ResumeLayout(false);
+ this.tabPageAllgemein.PerformLayout();
+ this.panelButtons.ResumeLayout(false);
this.ResumeLayout(false);
- this.PerformLayout();
}
@@ -941,5 +1250,30 @@
private System.Windows.Forms.GroupBox groupBoxDrucker;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.NumericUpDown numericUpDownSWSKopien;
+ private System.Windows.Forms.TabControl tabControlEinstellung;
+ private System.Windows.Forms.TabPage tabPageFarben;
+ private System.Windows.Forms.TabPage tabPageDeckungsbeitrag;
+ private System.Windows.Forms.TabPage tabPageDrucker;
+ private System.Windows.Forms.TabPage tabPageTourenplanung;
+ private System.Windows.Forms.TabPage tabPageAllgemein;
+ private System.Windows.Forms.Panel panelButtons;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.ComboBox comboBoxLieferrhythmus;
+ private System.Windows.Forms.GroupBox groupBoxRegeln;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label label18;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label label20;
+ private System.Windows.Forms.ComboBox comboBoxLT2;
+ private System.Windows.Forms.ComboBox comboBoxLT1;
+ private System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.ComboBox comboBox2;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.ComboBox comboBox5;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.ComboBox comboBox3;
+ private System.Windows.Forms.ComboBox comboBox4;
+ private System.Windows.Forms.Label label22;
}
}
\ No newline at end of file
diff --git a/AA-Forms/FormExpedit.Designer.cs b/AA-Forms/FormExpedit.Designer.cs
index 14919f2..a778b1f 100644
--- a/AA-Forms/FormExpedit.Designer.cs
+++ b/AA-Forms/FormExpedit.Designer.cs
@@ -29,8 +29,8 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormExpedit));
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.label10 = new System.Windows.Forms.Label();
this.buttonDrucken = new System.Windows.Forms.Button();
this.groupBoxEtikett = new System.Windows.Forms.GroupBox();
@@ -82,11 +82,11 @@
this.labelStatistik2 = new System.Windows.Forms.Label();
this.labelZahl1 = new System.Windows.Forms.Label();
this.labelStatistik1 = new System.Windows.Forms.Label();
+ this.buttonSuchen = new System.Windows.Forms.Button();
+ this.buttonNW = new System.Windows.Forms.Button();
this.buttonStats = new System.Windows.Forms.Button();
this.buttonEinstellung = new System.Windows.Forms.Button();
this.buttonSWS_Drucken = new System.Windows.Forms.Button();
- this.buttonSuchen = new System.Windows.Forms.Button();
- this.buttonNW = new System.Windows.Forms.Button();
this.groupBoxEtikett.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxMinus)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit();
@@ -415,14 +415,14 @@
// dGArtikel
//
this.dGArtikel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dGArtikel.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dGArtikel.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
this.dGArtikel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dGArtikel.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.KundeArtikelID,
@@ -435,16 +435,17 @@
this.StandBearbeitet,
this.FehlmengeBearbeitet,
this.KorrekturBearbeitet});
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dGArtikel.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dGArtikel.DefaultCellStyle = dataGridViewCellStyle2;
this.dGArtikel.Location = new System.Drawing.Point(576, 42);
this.dGArtikel.Name = "dGArtikel";
+ this.dGArtikel.RowHeadersVisible = false;
this.dGArtikel.RowHeadersWidth = 62;
this.dGArtikel.Size = new System.Drawing.Size(527, 592);
this.dGArtikel.TabIndex = 44;
@@ -879,6 +880,40 @@
this.labelStatistik1.Text = "Statistik 1";
this.labelStatistik1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // buttonSuchen
+ //
+ this.buttonSuchen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonSuchen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.buttonSuchen.BackColor = System.Drawing.Color.DarkOrange;
+ this.buttonSuchen.FlatAppearance.BorderSize = 0;
+ this.buttonSuchen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonSuchen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.buttonSuchen.ForeColor = System.Drawing.Color.Black;
+ this.buttonSuchen.Location = new System.Drawing.Point(67, 649);
+ this.buttonSuchen.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonSuchen.Name = "buttonSuchen";
+ this.buttonSuchen.Size = new System.Drawing.Size(200, 41);
+ this.buttonSuchen.TabIndex = 63;
+ this.buttonSuchen.Text = "Suchen";
+ this.buttonSuchen.UseVisualStyleBackColor = false;
+ this.buttonSuchen.Click += new System.EventHandler(this.buttonSuchen_Click);
+ //
+ // buttonNW
+ //
+ this.buttonNW.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonNW.FlatAppearance.BorderColor = System.Drawing.Color.White;
+ this.buttonNW.FlatAppearance.BorderSize = 3;
+ this.buttonNW.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonNW.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.buttonNW.ForeColor = System.Drawing.Color.White;
+ this.buttonNW.Location = new System.Drawing.Point(4, 649);
+ this.buttonNW.Name = "buttonNW";
+ this.buttonNW.Size = new System.Drawing.Size(58, 41);
+ this.buttonNW.TabIndex = 64;
+ this.buttonNW.Text = "NW";
+ this.buttonNW.UseVisualStyleBackColor = true;
+ this.buttonNW.Click += new System.EventHandler(this.buttonNW_Click);
+ //
// buttonStats
//
this.buttonStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
@@ -923,40 +958,6 @@
this.buttonSWS_Drucken.UseVisualStyleBackColor = false;
this.buttonSWS_Drucken.Click += new System.EventHandler(this.buttonSWS_Drucken_Click);
//
- // buttonSuchen
- //
- this.buttonSuchen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonSuchen.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
- this.buttonSuchen.BackColor = System.Drawing.Color.DarkOrange;
- this.buttonSuchen.FlatAppearance.BorderSize = 0;
- this.buttonSuchen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonSuchen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonSuchen.ForeColor = System.Drawing.Color.Black;
- this.buttonSuchen.Location = new System.Drawing.Point(67, 649);
- this.buttonSuchen.Margin = new System.Windows.Forms.Padding(2);
- this.buttonSuchen.Name = "buttonSuchen";
- this.buttonSuchen.Size = new System.Drawing.Size(200, 41);
- this.buttonSuchen.TabIndex = 63;
- this.buttonSuchen.Text = "Suchen";
- this.buttonSuchen.UseVisualStyleBackColor = false;
- this.buttonSuchen.Click += new System.EventHandler(this.buttonSuchen_Click);
- //
- // buttonNW
- //
- this.buttonNW.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.buttonNW.FlatAppearance.BorderColor = System.Drawing.Color.White;
- this.buttonNW.FlatAppearance.BorderSize = 3;
- this.buttonNW.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonNW.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonNW.ForeColor = System.Drawing.Color.White;
- this.buttonNW.Location = new System.Drawing.Point(4, 649);
- this.buttonNW.Name = "buttonNW";
- this.buttonNW.Size = new System.Drawing.Size(58, 41);
- this.buttonNW.TabIndex = 64;
- this.buttonNW.Text = "NW";
- this.buttonNW.UseVisualStyleBackColor = true;
- this.buttonNW.Click += new System.EventHandler(this.buttonNW_Click);
- //
// FormExpedit
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs
index fc57962..b5f9e6e 100644
--- a/AA-Forms/FormExpedit.cs
+++ b/AA-Forms/FormExpedit.cs
@@ -44,7 +44,7 @@ namespace Deckungsbeitrag
Timer timer2 = new Timer(); // Timer für Refresh Auftragliste
private Screen[] screens;
private Point itemlocation;
- private ImageList imagelist = new ImageList();
+ //private ImageList imagelist = new ImageList();
private volatile bool _isProcessing = false; // Thread-sicherer Flag gegen Überlappung
private int _consecutiveFailures = 0;
private const int MAX_FAILURES = 3;
@@ -117,9 +117,6 @@ namespace Deckungsbeitrag
string.Format("Laden fehlgeschlagen: {0}", ex.Message))));
}
});
-
- // Image Liste für ObjectListView laden.
- ImageList_Laden();
// Controls aktivieren und deaktivieren nach BenutzerRolle
Enable_Controls();
@@ -349,63 +346,6 @@ namespace Deckungsbeitrag
// this.pictureBoxEntwurf.Image = etikett;
//}
}
- private void Load_Gridview(Auftrag auftrag)
- {
- //Alle Einträge der DataGridView entfernen. Davor muss die DataSource entfernt werden.
- this.dGArtikel.DataSource = null;
- this.dGArtikel.Rows.Clear();
-
- if (auftrag != null)
- {
- Aufgabe auf;
- if (auftrag.AufgabeID.HasValue) auf = Aufgabe.GetAufgabe(null, auftrag.AufgabeID);
- else auf = new Aufgabe();
-
- this.dGArtikel.AutoGenerateColumns = false;
-
- foreach (DataGridViewColumn col in this.dGArtikel.Columns)
- {
- col.DataPropertyName = col.Name;
- if (col.Name.Contains("Bearbeitet")) col.Visible = false;
- if (col.Name == "Fehlmenge")
- {
- if (auf.Bezeichnung == null || auf.Bezeichnung == "STA") col.Visible = true;
- else col.Visible = false;
- }
- if (col.Name == "Korrektur")
- {
- if (auf.Bezeichnung != null && auf.Bezeichnung != "STA") col.Visible = true;
- else col.Visible = false;
- }
- }
-
- // DataGridView mit ArtikelStand Liste verbinden und Columns automatisch generieren.
- artikelListe = KundeArtikel.GetList(auftrag.KundeID.ToString());
- this.dGArtikel.DataSource = artikelListe;
-
- this.dGArtikel.ClearSelection();
- //this.dGArtikel.CurrentCell = this.dGArtikel.Rows[0].Cells[3];
-
- // Alle Spaltenbreiten an den Zellinhalt anpassen
- this.dGArtikel.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
- // Alle Zeilenhöhen an Zellinhalt anpassen
- this.dGArtikel.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells;
-
- this.dGArtikel = Funktionen.DGV_Size_Anpassen(this.dGArtikel);
- //this.dGArtikel.Width = this.Width - dGArtikel.Left;
-
- // Rechter Rand von letzter Spalte berechnen.
- int x = 0;
- foreach (ColumnHeader col in objectListViewAuftrag.Columns) x += col.Width;// x ist jetzt die Position direkt rechts von der letzten Spalte (relativ zu client origin)
-
-
- this.dGArtikel.Location = new Point(this.objectListViewAuftrag.Left + x, this.dGArtikel.Location.Y);
- if (this.dGArtikel.Rows.Count > 0) { this.dGArtikel.Visible = true; timer1.Start(); }
- else this.dGArtikel.Visible = false;
- }
-
-
- }
#region Container-Events
@@ -830,8 +770,10 @@ namespace Deckungsbeitrag
// Layout- und Update-Änderungen pausieren, um Flackern zu verhindern
olv.SuspendLayout(); // Stoppt Layout-Berechnungen (Anchor/Dock)
-
-
+
+ // SpaltenHeader-Design anpassen
+ //this.objectListViewAuftrag.HeaderFormatStyle = Funktionen.GetHeader();
+
// Automatisch alle Properties von Auftrag als Spalten generieren
Generator.GenerateColumns(olv, typeof(Auftrag), true);
@@ -955,11 +897,12 @@ namespace Deckungsbeitrag
//TODO: OLV State speichern.
olv.RebuildColumns();
- if (_settings.OLV_State != null) this.objectListViewAuftrag.RestoreState(_settings.OLV_State);
+ if (_settings.OLV_State != null) olv.RestoreState(_settings.OLV_State);
// ========== IMAGE-LIST ZUWEISEN ==========
// SmallImageList für Icons in Detail-View (24x24 Pixel standard)
- olv.SmallImageList = imagelist; // Voraussetzung: imagelist mit Icon Index 0 gefüllt
+ Program.imagelist.ImageSize = new Size(24, 24);
+ olv.SmallImageList = Program.imagelist; // Voraussetzung: imagelist mit Icon Index 0 gefüllt
// ========== TOOLTIP FÜR ICON-SPALTEN ==========
// Automatischer Cell-Tooltip bei Mouse-Hover über Spalte 10 und 1
@@ -981,6 +924,10 @@ namespace Deckungsbeitrag
}
}
//TODO: Alle Icons in einer Spalte anzeigen? I für Anmerkung und ! für Aufgabe??
+ if (e.Column.Text == "Fahrer" && e.Model is Auftrag auftrag1)
+ {
+ e.Text = auftrag1.ZusatzInfo;
+ }
};
// ========== DATEN LADEN ==========
@@ -990,10 +937,6 @@ namespace Deckungsbeitrag
// ========== SORTIERUNG ==========
olv.Sort();
- // ========== CHECKBOX-FUNKTIONALITÄT ==========
- // Aktiviert Checkboxen basierend auf "IsChecked" Property des Auftrag-Modells
- //olv.CheckedAspectName = "IsChecked";
-
// ========== SPALTEN ANPASSEN ==========
Funktionen.Columns_Resize(olv); // Externe Funktion für responsive Spaltenbreiten
@@ -1027,17 +970,7 @@ namespace Deckungsbeitrag
private void objectListViewAuftrag_CellEditStarting(object sender, CellEditEventArgs e)
{
if(meldung.GetFrage(this, $"Möchtest du die gewählte Zelle wirklich bearbeiten?", false) == DialogResult.No) e.Cancel = true;
- }
- private void ImageList_Laden()
- {
- imagelist.Images.Add(Resources.Exclamation_Red);
- imagelist.Images.Add(Resources.InformationSymbol_16x);
- imagelist.Images.Add("print", Resources.Print_16x);
- imagelist.Images.Add("abschließen", Resources.Checkmark_blue_16x);
- imagelist.Images.Add("dirt", Resources.dirt);
- imagelist.Images.Add("clean", Resources.clean);
- imagelist.ImageSize = new Size(24, 24);
-
+ //TODO: Soll hier ebenfalls der nächste Liefertag laut Rhythmus vorgeschlagen werden?
}
#endregion
@@ -1145,7 +1078,62 @@ namespace Deckungsbeitrag
this.dGArtikel.Rows.Clear();
this.dGArtikel.Visible = false;
}
-
+
+ #region DataGridView-Events
+ private void Load_Gridview(Auftrag auftrag)
+ {
+ //Alle Einträge der DataGridView entfernen. Davor muss die DataSource entfernt werden.
+ this.dGArtikel.DataSource = null;
+ this.dGArtikel.Rows.Clear();
+
+ if (auftrag != null)
+ {
+ Aufgabe auf;
+ if (auftrag.AufgabeID.HasValue) auf = Aufgabe.GetAufgabe(null, auftrag.AufgabeID);
+ else auf = new Aufgabe();
+
+ this.dGArtikel.AutoGenerateColumns = false;
+
+ foreach (DataGridViewColumn col in this.dGArtikel.Columns)
+ {
+ col.DataPropertyName = col.Name;
+ if (col.Name.Contains("Bearbeitet")) col.Visible = false;
+ if (col.Name == "Fehlmenge")
+ {
+ if (auf.Bezeichnung == null || auf.Bezeichnung == "STA") col.Visible = true;
+ else col.Visible = false;
+ }
+ if (col.Name == "Korrektur")
+ {
+ if (auf.Bezeichnung != null && auf.Bezeichnung != "STA") col.Visible = true;
+ else col.Visible = false;
+ }
+ }
+
+ // DataGridView mit ArtikelStand Liste verbinden und Columns automatisch generieren.
+ artikelListe = KundeArtikel.GetList(auftrag.KundeID.ToString());
+ this.dGArtikel.DataSource = artikelListe;
+
+ this.dGArtikel.ClearSelection();
+ //this.dGArtikel.CurrentCell = this.dGArtikel.Rows[0].Cells[3];
+
+ // Alle Spaltenbreiten an den Zellinhalt anpassen
+ this.dGArtikel.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.DisplayedCells;
+ // Alle Zeilenhöhen an Zellinhalt anpassen
+ this.dGArtikel.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.DisplayedCells;
+
+ this.dGArtikel = Funktionen.DGV_Size_Anpassen(this.dGArtikel);
+ //this.dGArtikel.Width = this.Width - dGArtikel.Left;
+
+ // Rechter Rand von letzter Spalte berechnen.
+ int x = 0;
+ foreach (ColumnHeader col in objectListViewAuftrag.Columns) x += col.Width; // x ist jetzt die Position direkt rechts von der letzten Spalte (relativ zu client origin)
+
+ this.dGArtikel.Location = new Point(this.objectListViewAuftrag.Left + x, this.dGArtikel.Location.Y);
+ if (this.dGArtikel.Rows.Count > 0) { this.dGArtikel.Visible = true; timer1.Start(); }
+ else this.dGArtikel.Visible = false;
+ }
+ }
///
/// Vor Beginn der Editierung wird Wert gespeichert um nach der Editierung vergleichen und eventuell speichern zu können.
///
@@ -1196,9 +1184,10 @@ namespace Deckungsbeitrag
}
private void dGArtikel_VisibleChanged(object sender, EventArgs e)
{
- if (dGArtikel.Visible) timer1.Start();
+ if (dGArtikel.Visible) { Load_Gridview(this.auftrag); timer1.Start(); }
else timer1.Stop();
}
+ #endregion
#region Statistik
private void buttonStats_Click(object sender, EventArgs e)
@@ -1276,6 +1265,7 @@ namespace Deckungsbeitrag
}
}
//INSTALL-REMINDER: Spalte Abteilungen in Auftrag muss in Wirl_DB_17012023 eingefügt werden.
+//CHANGES: Es wird der zuständige Fahrer angezeigt. ToolTip zeigt den Grund falls vorhanden(Bei Sonderzuteilung).
//CHANGES: Geschäftaufträge werden in neuem Tab angezeigt.
//CHANGES: Kundeneingabe mit ? fügt einmaligen Kundenname als ZusatzInfo hinzu und wählt Kunde BAR DIVERSE 2320000
//CHANGES: Highlightfarbe bleibt auch wenn unfocused. (Farbe ändern?)
diff --git a/AA-Forms/FormKundeVW.cs b/AA-Forms/FormKundeVW.cs
index 021fab1..3d64b6e 100644
--- a/AA-Forms/FormKundeVW.cs
+++ b/AA-Forms/FormKundeVW.cs
@@ -1,6 +1,7 @@
using AForge.Video.DirectShow;
using BrightIdeasSoftware;
using DatenDB;
+using Deckungsbeitrag.AA_Klassen;
using Spire.Barcode;
using System;
using System.Collections.Generic;
@@ -39,6 +40,7 @@ namespace Deckungsbeitrag
private bool formloading = false;
private bool aufgabeChanged = false;
private bool serviceChanged = false;
+ private bool lieferrhythmusChanged = false;
public FormKundeVW()
{
@@ -66,7 +68,7 @@ namespace Deckungsbeitrag
labelAnzahlChars.Text = textBoxAnmerkung.TextLength.ToString() + "/" + textBoxAnmerkung.MaxLength.ToString();
this.labelAnzahlChars.Location = new Point(this.textBoxAnmerkung.Right - this.labelAnzahlChars.Width, this.labelAnzahlChars.Location.Y);
- this.tabControlKunde.Location = new Point(this.textBoxSuchtext.Right + 10, 11);
+ this.tabControlKunde.Location = new Point(this.textBoxAnmerkung.Right + 10, 11);
ComboBox_Laden();
@@ -84,12 +86,18 @@ namespace Deckungsbeitrag
List list = Kunde.GetServiceDistinct();
this.comboBoxService.DataSource = list;
- //Aufgaben Liste erstellen und mit ComboBox verknüpfen.
+ // Aufgaben Liste erstellen und mit ComboBox verknüpfen.
List aufgabenlist1 = Aufgabe.GetList(2);
this.comboBoxAufgabe.DataSource = aufgabenlist1;
this.comboBoxAufgabe.DisplayMember = "Bezeichnung";
this.comboBoxAufgabe.SelectedIndex = -1;
this.comboBoxAufgabe.Enabled = false;
+
+ // Lieferrhythmus Liste mit ComboBox verknüpfen.
+ this.comboBoxLieferrhythmus.DataSource = new BindingSource(Lieferrhythmen.AnzeigeNamen, null);
+ this.comboBoxLieferrhythmus.DisplayMember = "Key";
+ this.comboBoxLieferrhythmus.ValueMember = "Value";
+
}
private void DatenLesen()
{
@@ -158,15 +166,20 @@ namespace Deckungsbeitrag
this.textBoxSuchtext.Text = this.kunde.Suchtext;
this.textBoxAnmerkung.Text = this.kunde.Anmerkung;
- // ComboBox für Aufgabe wird geladen
+ // ComboBox-Item für Aufgabe wird gewählt und Button Entfernen aktiviert
foreach (Aufgabe auf in comboBoxAufgabe.Items) if (auf.AufgabeID == this.kunde.Aufgabe) this.comboBoxAufgabe.SelectedItem = auf;
if (this.comboBoxAufgabe.SelectedItem != null) this.buttonAufgEnt.Enabled = true;
+
+ // ComboBox-Item für Service wird gewählt
if (!string.IsNullOrWhiteSpace(this.kunde.Service))
{
foreach (string s in comboBoxService.Items) if (s == this.kunde.Service) this.comboBoxService.SelectedItem = s;
}
+ // ComboBox-Item für Lieferrhythmus wird gewählt
+ this.comboBoxLieferrhythmus.SelectedValue = (Liefertage)this.kunde.LieferRhythmus;
+
// numericUpDown für AufgabeCount befüllen
this.numericUpDownAufgabeCount.Value = (decimal)this.kunde.AufgabeCount;
@@ -483,7 +496,7 @@ namespace Deckungsbeitrag
if (this.comboBoxAufgabe.SelectedItem == null) { this.kunde.Aufgabe = null; this.kunde.AufgabeCount = null; }
else { this.kunde.Aufgabe = ((Aufgabe)this.comboBoxAufgabe.SelectedItem).AufgabeID; this.kunde.AufgabeCount = (int)numericUpDownAufgabeCount.Value; }
- this.kunde.Save();
+ aufgabeChanged = true;
}
}
@@ -515,6 +528,11 @@ namespace Deckungsbeitrag
if ((formloading)) return;
serviceChanged = true;
}
+ private void comboBoxLieferrhythmus_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if ((formloading)) return;
+ lieferrhythmusChanged = true;
+ }
///
/// FormClosing: Wenn Form wird geschlossen, Kontrolle ob Änderungen gemacht wurden.
@@ -525,16 +543,12 @@ namespace Deckungsbeitrag
{
if (anmerkungChanged) textBoxAnmerkung_Leave(this, null);
if (this.comboBoxAufgabe.SelectedItem != null && this.numericUpDownAufgabeCount.Value == 0) { meldung.GetFehler(this, $"Du hast für deine Aufgabe noch keine Auftraganzahl eingegeben. Hole das bitte jetzt nach."); e.Cancel = true; return; }
- if (aufgabeChanged) numericUpDownAufgabeCount_Leave(this, null);
- if (serviceChanged)
- {
- if (this.comboBoxService.Enabled == true)
- {
- this.kunde.Service = this.comboBoxService.SelectedValue.ToString();
- this.kunde.Save();
- }
+ if (aufgabeChanged) { numericUpDownAufgabeCount_Leave(this, null); }
+ if (serviceChanged) { if (this.comboBoxService.Enabled == true) this.kunde.Service = this.comboBoxService.SelectedValue.ToString(); }
+ if (lieferrhythmusChanged) this.kunde.LieferRhythmus = (int)this.comboBoxLieferrhythmus.SelectedValue;
- }
+ this.kunde.Save();
}
+
}
}
diff --git a/AA-Forms/FormKundeVW.designer.cs b/AA-Forms/FormKundeVW.designer.cs
index a922dd8..165fa37 100644
--- a/AA-Forms/FormKundeVW.designer.cs
+++ b/AA-Forms/FormKundeVW.designer.cs
@@ -97,6 +97,8 @@ namespace Deckungsbeitrag
this.label4 = new System.Windows.Forms.Label();
this.labelAnzahlChars = new System.Windows.Forms.Label();
this.numericUpDownAufgabeCount = new System.Windows.Forms.NumericUpDown();
+ this.comboBoxLieferrhythmus = new System.Windows.Forms.ComboBox();
+ this.label5 = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout();
this.tabControlKunde.SuspendLayout();
this.tabPageVorschau.SuspendLayout();
@@ -122,7 +124,7 @@ namespace Deckungsbeitrag
this.textBoxKndNr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxKndNr.Location = new System.Drawing.Point(13, 99);
this.textBoxKndNr.Name = "textBoxKndNr";
- this.textBoxKndNr.Size = new System.Drawing.Size(104, 26);
+ this.textBoxKndNr.Size = new System.Drawing.Size(102, 26);
this.textBoxKndNr.TabIndex = 0;
//
// labelKundeNummer
@@ -153,7 +155,7 @@ namespace Deckungsbeitrag
this.textBoxKundeName.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxKundeName.Location = new System.Drawing.Point(13, 151);
this.textBoxKundeName.Name = "textBoxKundeName";
- this.textBoxKundeName.Size = new System.Drawing.Size(352, 26);
+ this.textBoxKundeName.Size = new System.Drawing.Size(263, 26);
this.textBoxKundeName.TabIndex = 4;
//
// textBoxStraße
@@ -267,7 +269,7 @@ namespace Deckungsbeitrag
this.textBoxSuchtext.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxSuchtext.Location = new System.Drawing.Point(122, 99);
this.textBoxSuchtext.Name = "textBoxSuchtext";
- this.textBoxSuchtext.Size = new System.Drawing.Size(243, 26);
+ this.textBoxSuchtext.Size = new System.Drawing.Size(154, 26);
this.textBoxSuchtext.TabIndex = 38;
//
// label1
@@ -286,7 +288,7 @@ namespace Deckungsbeitrag
this.comboBoxAufgabe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxAufgabe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.comboBoxAufgabe.FormattingEnabled = true;
- this.comboBoxAufgabe.Location = new System.Drawing.Point(13, 417);
+ this.comboBoxAufgabe.Location = new System.Drawing.Point(13, 479);
this.comboBoxAufgabe.Name = "comboBoxAufgabe";
this.comboBoxAufgabe.Size = new System.Drawing.Size(263, 28);
this.comboBoxAufgabe.TabIndex = 41;
@@ -298,7 +300,7 @@ namespace Deckungsbeitrag
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(9, 394);
+ this.label2.Location = new System.Drawing.Point(9, 456);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(123, 20);
this.label2.TabIndex = 42;
@@ -721,7 +723,7 @@ namespace Deckungsbeitrag
// buttonAufgEnt
//
this.buttonAufgEnt.Image = global::Deckungsbeitrag.Properties.Resources.Close_red_16x;
- this.buttonAufgEnt.Location = new System.Drawing.Point(337, 417);
+ this.buttonAufgEnt.Location = new System.Drawing.Point(337, 479);
this.buttonAufgEnt.Name = "buttonAufgEnt";
this.buttonAufgEnt.Size = new System.Drawing.Size(28, 28);
this.buttonAufgEnt.TabIndex = 43;
@@ -730,12 +732,11 @@ namespace Deckungsbeitrag
//
// pictureBoxQRCode
//
- this.pictureBoxQRCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.pictureBoxQRCode.BackColor = System.Drawing.Color.Transparent;
this.pictureBoxQRCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pictureBoxQRCode.Location = new System.Drawing.Point(13, 613);
+ this.pictureBoxQRCode.Location = new System.Drawing.Point(284, 76);
this.pictureBoxQRCode.Name = "pictureBoxQRCode";
- this.pictureBoxQRCode.Size = new System.Drawing.Size(350, 87);
+ this.pictureBoxQRCode.Size = new System.Drawing.Size(81, 101);
this.pictureBoxQRCode.TabIndex = 27;
this.pictureBoxQRCode.TabStop = false;
//
@@ -743,11 +744,11 @@ namespace Deckungsbeitrag
//
this.textBoxAnmerkung.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
- this.textBoxAnmerkung.Location = new System.Drawing.Point(13, 471);
+ this.textBoxAnmerkung.Location = new System.Drawing.Point(13, 533);
this.textBoxAnmerkung.MaxLength = 200;
this.textBoxAnmerkung.Multiline = true;
this.textBoxAnmerkung.Name = "textBoxAnmerkung";
- this.textBoxAnmerkung.Size = new System.Drawing.Size(352, 136);
+ this.textBoxAnmerkung.Size = new System.Drawing.Size(352, 160);
this.textBoxAnmerkung.TabIndex = 50;
this.textBoxAnmerkung.TextChanged += new System.EventHandler(this.textBoxAnmerkung_TextChanged);
this.textBoxAnmerkung.Leave += new System.EventHandler(this.textBoxAnmerkung_Leave);
@@ -757,7 +758,7 @@ namespace Deckungsbeitrag
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.ForeColor = System.Drawing.Color.White;
- this.label4.Location = new System.Drawing.Point(9, 448);
+ this.label4.Location = new System.Drawing.Point(9, 510);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(109, 20);
this.label4.TabIndex = 51;
@@ -768,7 +769,7 @@ namespace Deckungsbeitrag
this.labelAnzahlChars.AutoSize = true;
this.labelAnzahlChars.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelAnzahlChars.ForeColor = System.Drawing.Color.White;
- this.labelAnzahlChars.Location = new System.Drawing.Point(312, 451);
+ this.labelAnzahlChars.Location = new System.Drawing.Point(312, 513);
this.labelAnzahlChars.Name = "labelAnzahlChars";
this.labelAnzahlChars.Size = new System.Drawing.Size(53, 16);
this.labelAnzahlChars.TabIndex = 52;
@@ -777,7 +778,7 @@ namespace Deckungsbeitrag
// numericUpDownAufgabeCount
//
this.numericUpDownAufgabeCount.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.numericUpDownAufgabeCount.Location = new System.Drawing.Point(282, 417);
+ this.numericUpDownAufgabeCount.Location = new System.Drawing.Point(282, 479);
this.numericUpDownAufgabeCount.Maximum = new decimal(new int[] {
99,
0,
@@ -789,12 +790,36 @@ namespace Deckungsbeitrag
this.numericUpDownAufgabeCount.ValueChanged += new System.EventHandler(this.numericUpDownAufgabeCount_ValueChanged);
this.numericUpDownAufgabeCount.Leave += new System.EventHandler(this.numericUpDownAufgabeCount_Leave);
//
+ // comboBoxLieferrhythmus
+ //
+ this.comboBoxLieferrhythmus.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.comboBoxLieferrhythmus.FormattingEnabled = true;
+ this.comboBoxLieferrhythmus.Location = new System.Drawing.Point(13, 422);
+ this.comboBoxLieferrhythmus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.comboBoxLieferrhythmus.Name = "comboBoxLieferrhythmus";
+ this.comboBoxLieferrhythmus.Size = new System.Drawing.Size(352, 28);
+ this.comboBoxLieferrhythmus.TabIndex = 55;
+ this.comboBoxLieferrhythmus.SelectedIndexChanged += new System.EventHandler(this.comboBoxLieferrhythmus_SelectedIndexChanged);
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ 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.Color.White;
+ this.label5.Location = new System.Drawing.Point(9, 397);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(114, 20);
+ this.label5.TabIndex = 54;
+ this.label5.Text = "Lieferrhythmus";
+ //
// FormKundeVW
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.ClientSize = new System.Drawing.Size(1318, 761);
+ this.Controls.Add(this.comboBoxLieferrhythmus);
+ this.Controls.Add(this.label5);
this.Controls.Add(this.numericUpDownAufgabeCount);
this.Controls.Add(this.labelAnzahlChars);
this.Controls.Add(this.label4);
@@ -912,6 +937,8 @@ namespace Deckungsbeitrag
private BrightIdeasSoftware.ObjectListView olvJahresumsatz;
private System.Windows.Forms.Label labelAnzahlChars;
private System.Windows.Forms.NumericUpDown numericUpDownAufgabeCount;
+ private System.Windows.Forms.ComboBox comboBoxLieferrhythmus;
+ private System.Windows.Forms.Label label5;
}
}
diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs
index 16ac2d2..2349863 100644
--- a/AA-Forms/FormMain.Designer.cs
+++ b/AA-Forms/FormMain.Designer.cs
@@ -66,7 +66,6 @@ namespace Deckungsbeitrag
this.rBFertig = new System.Windows.Forms.RadioButton();
this.rBVorbereitet = new System.Windows.Forms.RadioButton();
this.rBAlle = new System.Windows.Forms.RadioButton();
- this.buttonAufAbruf = new System.Windows.Forms.Button();
this.buttonAusgeliefert = new System.Windows.Forms.Button();
this.groupBoxScannTest = new System.Windows.Forms.GroupBox();
this.textBoxScannTest = new System.Windows.Forms.TextBox();
@@ -85,9 +84,10 @@ namespace Deckungsbeitrag
this.tSBHilfe = new System.Windows.Forms.ToolStripButton();
this.toolStripButtonImport = new System.Windows.Forms.ToolStripButton();
this.tSBEinstellung = new System.Windows.Forms.ToolStripButton();
- this.toolStripBeenden = new System.Windows.Forms.ToolStripButton();
- this.pictureBoxScannTest = new System.Windows.Forms.PictureBox();
this.tSBTourenplanung = new System.Windows.Forms.ToolStripButton();
+ this.toolStripBeenden = new System.Windows.Forms.ToolStripButton();
+ this.buttonAufAbruf = new System.Windows.Forms.Button();
+ this.pictureBoxScannTest = new System.Windows.Forms.PictureBox();
this.toolStripMenu.SuspendLayout();
this.panelMain.SuspendLayout();
this.groupBoxStatistik.SuspendLayout();
@@ -593,6 +593,7 @@ namespace Deckungsbeitrag
this.objectListViewAuftrag.CellEditUseWholeCell = false;
this.objectListViewAuftrag.CheckBoxes = true;
this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default;
+ this.objectListViewAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.objectListViewAuftrag.FullRowSelect = true;
this.objectListViewAuftrag.GridLines = true;
this.objectListViewAuftrag.HideSelection = false;
@@ -617,7 +618,6 @@ namespace Deckungsbeitrag
this.rBAufAbruf.TabStop = true;
this.rBAufAbruf.Text = "Auf Abruf";
this.rBAufAbruf.UseVisualStyleBackColor = true;
- this.rBAufAbruf.Visible = false;
this.rBAufAbruf.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
//
// rBAusgeliefert
@@ -632,7 +632,6 @@ namespace Deckungsbeitrag
this.rBAusgeliefert.TabStop = true;
this.rBAusgeliefert.Text = "Ausgeliefert";
this.rBAusgeliefert.UseVisualStyleBackColor = true;
- this.rBAusgeliefert.Visible = false;
this.rBAusgeliefert.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
//
// rBFertig
@@ -647,7 +646,6 @@ namespace Deckungsbeitrag
this.rBFertig.TabStop = true;
this.rBFertig.Text = "Fertig";
this.rBFertig.UseVisualStyleBackColor = true;
- this.rBFertig.Visible = false;
this.rBFertig.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
//
// rBVorbereitet
@@ -662,7 +660,6 @@ namespace Deckungsbeitrag
this.rBVorbereitet.TabStop = true;
this.rBVorbereitet.Text = "Vorbereitet";
this.rBVorbereitet.UseVisualStyleBackColor = true;
- this.rBVorbereitet.Visible = false;
this.rBVorbereitet.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
//
// rBAlle
@@ -677,29 +674,8 @@ namespace Deckungsbeitrag
this.rBAlle.TabStop = true;
this.rBAlle.Text = "Alle";
this.rBAlle.UseVisualStyleBackColor = true;
- this.rBAlle.Visible = false;
this.rBAlle.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
//
- // buttonAufAbruf
- //
- this.buttonAufAbruf.BackColor = System.Drawing.Color.Red;
- this.buttonAufAbruf.FlatAppearance.BorderColor = System.Drawing.Color.Red;
- this.buttonAufAbruf.FlatAppearance.BorderSize = 0;
- this.buttonAufAbruf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.buttonAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.buttonAufAbruf.ForeColor = System.Drawing.Color.White;
- this.buttonAufAbruf.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.buttonAufAbruf.Location = new System.Drawing.Point(10, 215);
- this.buttonAufAbruf.Margin = new System.Windows.Forms.Padding(2);
- this.buttonAufAbruf.Name = "buttonAufAbruf";
- this.buttonAufAbruf.Size = new System.Drawing.Size(150, 41);
- this.buttonAufAbruf.TabIndex = 56;
- this.buttonAufAbruf.Text = "AufAbruf";
- this.buttonAufAbruf.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
- this.buttonAufAbruf.UseVisualStyleBackColor = false;
- this.buttonAufAbruf.Visible = false;
- this.buttonAufAbruf.Click += new System.EventHandler(this.buttonAufAbruf_Click);
- //
// buttonAusgeliefert
//
this.buttonAusgeliefert.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
@@ -1017,6 +993,26 @@ namespace Deckungsbeitrag
this.tSBEinstellung.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.tSBEinstellung.Click += new System.EventHandler(this.tSBEinstellung_Click);
//
+ // tSBTourenplanung
+ //
+ this.tSBTourenplanung.AutoSize = false;
+ this.tSBTourenplanung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
+ this.tSBTourenplanung.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.tSBTourenplanung.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tSBTourenplanung.ForeColor = System.Drawing.Color.White;
+ this.tSBTourenplanung.Image = ((System.Drawing.Image)(resources.GetObject("tSBTourenplanung.Image")));
+ this.tSBTourenplanung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.tSBTourenplanung.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tSBTourenplanung.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tSBTourenplanung.Name = "tSBTourenplanung";
+ this.tSBTourenplanung.Size = new System.Drawing.Size(180, 40);
+ this.tSBTourenplanung.Text = "TOURENPLANUNG";
+ this.tSBTourenplanung.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.tSBTourenplanung.Click += new System.EventHandler(this.tSBTourenplanung_Click);
+ this.tSBTourenplanung.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter);
+ this.tSBTourenplanung.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave);
+ this.tSBTourenplanung.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint);
+ //
// toolStripBeenden
//
this.toolStripBeenden.AutoSize = false;
@@ -1037,6 +1033,26 @@ namespace Deckungsbeitrag
this.toolStripBeenden.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave);
this.toolStripBeenden.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint);
//
+ // buttonAufAbruf
+ //
+ this.buttonAufAbruf.BackColor = System.Drawing.Color.Red;
+ this.buttonAufAbruf.FlatAppearance.BorderColor = System.Drawing.Color.Red;
+ this.buttonAufAbruf.FlatAppearance.BorderSize = 0;
+ this.buttonAufAbruf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.buttonAufAbruf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.buttonAufAbruf.ForeColor = System.Drawing.Color.White;
+ this.buttonAufAbruf.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+ this.buttonAufAbruf.Location = new System.Drawing.Point(10, 215);
+ this.buttonAufAbruf.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonAufAbruf.Name = "buttonAufAbruf";
+ this.buttonAufAbruf.Size = new System.Drawing.Size(150, 41);
+ this.buttonAufAbruf.TabIndex = 56;
+ this.buttonAufAbruf.Text = "AufAbruf";
+ this.buttonAufAbruf.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+ this.buttonAufAbruf.UseVisualStyleBackColor = false;
+ this.buttonAufAbruf.Visible = false;
+ this.buttonAufAbruf.Click += new System.EventHandler(this.buttonAufAbruf_Click);
+ //
// pictureBoxScannTest
//
this.pictureBoxScannTest.Location = new System.Drawing.Point(6, 10);
@@ -1047,26 +1063,6 @@ namespace Deckungsbeitrag
this.pictureBoxScannTest.TabStop = false;
this.pictureBoxScannTest.Visible = false;
//
- // tSBTourenplanung
- //
- this.tSBTourenplanung.AutoSize = false;
- this.tSBTourenplanung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
- this.tSBTourenplanung.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
- this.tSBTourenplanung.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tSBTourenplanung.ForeColor = System.Drawing.Color.White;
- this.tSBTourenplanung.Image = ((System.Drawing.Image)(resources.GetObject("tSBTourenplanung.Image")));
- this.tSBTourenplanung.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.tSBTourenplanung.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.tSBTourenplanung.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.tSBTourenplanung.Name = "tSBTourenplanung";
- this.tSBTourenplanung.Size = new System.Drawing.Size(180, 40);
- this.tSBTourenplanung.Text = "TOURENPLANUNG";
- this.tSBTourenplanung.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.tSBTourenplanung.Click += new System.EventHandler(this.tSBTourenplanung_Click);
- this.tSBTourenplanung.MouseEnter += new System.EventHandler(this.toolStrip_MouseEnter);
- this.tSBTourenplanung.MouseLeave += new System.EventHandler(this.toolStrip_MouseLeave);
- this.tSBTourenplanung.Paint += new System.Windows.Forms.PaintEventHandler(this.get_Border_Paint);
- //
// FormMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/AA-Forms/FormMain.cs b/AA-Forms/FormMain.cs
index ea3ca67..ce4e78c 100644
--- a/AA-Forms/FormMain.cs
+++ b/AA-Forms/FormMain.cs
@@ -2,13 +2,16 @@
using DatenDB;
using Deckungsbeitrag.AA_Forms;
using Deckungsbeitrag.Properties;
+using Npgsql;
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.Runtime;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
@@ -29,7 +32,7 @@ namespace Deckungsbeitrag
private Point newLocation;
private Size _fixedSize;
private bool _handlingResize;
- private ImageList imagelist = new ImageList();
+ private readonly UserSettingsManager _settings = new UserSettingsManager();
public FormMain()
@@ -48,6 +51,8 @@ namespace Deckungsbeitrag
{
this.benutzer = benutzer;
+ this.groupBoxUpdate.Enabled = false;
+
// AKTIVE ELEMENTE JE BENUTZER ROLLE
switch (benutzer.Rolle)
{
@@ -68,8 +73,8 @@ namespace Deckungsbeitrag
foreach(Control ctr in this.panelMain.Controls)
{
// Ausgewählte Buttons bleiben aktiv.
- if (ctr.Text == "Neuer Auftrag") ctr.Enabled = ctr.Visible = true;
- else ctr.Enabled = ctr.Visible = false;
+ if (ctr.Name.Contains("Auftrag")) ctr.Enabled = true;
+ else ctr.Enabled = false;
}
break;
case BenutzerRolle.Admin:
@@ -89,9 +94,8 @@ namespace Deckungsbeitrag
private void FormMain_Load(object sender, EventArgs e)
{
- imagelist.Images.Add(Resources.Exclamation_Red);
- imagelist.Images.Add(Resources.InformationSymbol_16x);
- imagelist.ImageSize = new Size(16, 16);
+ _settings.Load();
+
this.WindowState = FormWindowState.Maximized;
this.MaximizedBounds = Screen.PrimaryScreen.WorkingArea;
@@ -191,21 +195,30 @@ namespace Deckungsbeitrag
}
private void tSBAuftragVW_Click(object sender, EventArgs e)
{
- if (!this.objectListViewAuftrag.Visible)
+ this.Cursor = Cursors.WaitCursor;
+
+ if (!this.groupBoxAuftrag.Visible)
{
if (benutzer.Rolle == BenutzerRolle.Fahrer) this.rBFertig.Checked = true;
else this.rBAlle.Checked = true;
- this.rBAlle.Visible = this.rBAusgeliefert.Visible = this.rBFertig.Visible = this.rBVorbereitet.Visible = this.rBAufAbruf.Visible = true;
- this.groupBoxAuftrag.Visible = true;
- this.groupBoxStatistik.Visible = this.groupBoxUpdate.Visible = this.buttonNeueAufgabe.Visible = this.buttonNeueAufgabe.Enabled = this.buttonNeuerAuftrag.Visible = this.buttonNeuerAuftrag.Enabled = this.buttonNeuerUser.Visible = this.buttonNeuerUser.Enabled = false;
- this.objectListViewAuftrag.Enabled = this.objectListViewAuftrag.Visible = true;
- }
- else
- {
- this.groupBoxAuftrag.Visible = this.buttonAufAbruf.Visible = this.buttonAusgeliefert.Visible = this.rBAlle.Visible = this.rBAusgeliefert.Visible = this.rBFertig.Visible = this.rBVorbereitet.Visible = this.rBAufAbruf.Visible = this.objectListViewAuftrag.Enabled = this.objectListViewAuftrag.Visible = false;
- this.groupBoxStatistik.Visible = this.buttonNeuerAuftrag.Visible = this.buttonNeueAufgabe.Visible = this.buttonNeueAufgabe.Enabled = this.buttonNeuerAuftrag.Enabled = this.buttonNeuerUser.Enabled = this.buttonNeuerUser.Visible = true;
- }
- }
+
+ // Groupbox einblenden wenn OLV noch nicht sichtbar ist.
+ foreach (GroupBox gb in this.panelMain.Controls.OfType()) gb.Visible = gb.Name.Contains("Auftrag") ? true : false;
+
+ // PanelMain Buttons ausblenden.
+ foreach (Button btn in this.panelMain.Controls.OfType