diff --git a/AA-Forms/FormExpedit.cs b/AA-Forms/FormExpedit.cs index bd2204d..e4bb746 100644 --- a/AA-Forms/FormExpedit.cs +++ b/AA-Forms/FormExpedit.cs @@ -229,7 +229,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; @@ -264,7 +264,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(); } diff --git a/AA-Forms/FormMain.Designer.cs b/AA-Forms/FormMain.Designer.cs index 29635f3..0bcf726 100644 --- a/AA-Forms/FormMain.Designer.cs +++ b/AA-Forms/FormMain.Designer.cs @@ -500,7 +500,7 @@ namespace Deckungsbeitrag // // buttonTestInventur // - this.buttonTestInventur.BackColor = System.Drawing.Color.Turquoise; + 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; @@ -508,12 +508,12 @@ namespace Deckungsbeitrag 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(357, 80); + 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 = "Test Inventur"; + this.buttonTestInventur.Text = "Div. Tests"; this.buttonTestInventur.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.buttonTestInventur.UseVisualStyleBackColor = false; this.buttonTestInventur.Visible = false; @@ -574,7 +574,7 @@ namespace Deckungsbeitrag this.rBAufAbruf.Location = new System.Drawing.Point(59, 167); this.rBAufAbruf.Margin = new System.Windows.Forms.Padding(4); this.rBAufAbruf.Name = "rBAufAbruf"; - this.rBAufAbruf.Size = new System.Drawing.Size(95, 24); + this.rBAufAbruf.Size = new System.Drawing.Size(115, 29); this.rBAufAbruf.TabIndex = 57; this.rBAufAbruf.TabStop = true; this.rBAufAbruf.Text = "Auf Abruf"; @@ -589,7 +589,7 @@ namespace Deckungsbeitrag this.rBAusgeliefert.Location = new System.Drawing.Point(36, 130); this.rBAusgeliefert.Margin = new System.Windows.Forms.Padding(4); this.rBAusgeliefert.Name = "rBAusgeliefert"; - this.rBAusgeliefert.Size = new System.Drawing.Size(112, 24); + this.rBAusgeliefert.Size = new System.Drawing.Size(136, 29); this.rBAusgeliefert.TabIndex = 54; this.rBAusgeliefert.TabStop = true; this.rBAusgeliefert.Text = "Ausgeliefert"; @@ -604,7 +604,7 @@ namespace Deckungsbeitrag this.rBFertig.Location = new System.Drawing.Point(95, 94); this.rBFertig.Margin = new System.Windows.Forms.Padding(4); this.rBFertig.Name = "rBFertig"; - this.rBFertig.Size = new System.Drawing.Size(68, 24); + this.rBFertig.Size = new System.Drawing.Size(82, 29); this.rBFertig.TabIndex = 53; this.rBFertig.TabStop = true; this.rBFertig.Text = "Fertig"; @@ -619,7 +619,7 @@ namespace Deckungsbeitrag this.rBVorbereitet.Location = new System.Drawing.Point(44, 57); this.rBVorbereitet.Margin = new System.Windows.Forms.Padding(4); this.rBVorbereitet.Name = "rBVorbereitet"; - this.rBVorbereitet.Size = new System.Drawing.Size(106, 24); + this.rBVorbereitet.Size = new System.Drawing.Size(128, 29); this.rBVorbereitet.TabIndex = 52; this.rBVorbereitet.TabStop = true; this.rBVorbereitet.Text = "Vorbereitet"; @@ -634,7 +634,7 @@ namespace Deckungsbeitrag this.rBAlle.Location = new System.Drawing.Point(115, 20); this.rBAlle.Margin = new System.Windows.Forms.Padding(4); this.rBAlle.Name = "rBAlle"; - this.rBAlle.Size = new System.Drawing.Size(53, 24); + this.rBAlle.Size = new System.Drawing.Size(66, 29); this.rBAlle.TabIndex = 51; this.rBAlle.TabStop = true; this.rBAlle.Text = "Alle"; @@ -839,10 +839,10 @@ 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(427, 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(44, 37); + this.label14.Size = new System.Drawing.Size(54, 37); this.label14.TabIndex = 29; this.label14.Text = "0,00"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -853,10 +853,10 @@ namespace Deckungsbeitrag this.label13.Dock = System.Windows.Forms.DockStyle.Right; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label13.ForeColor = System.Drawing.SystemColors.ControlText; - this.label13.Location = new System.Drawing.Point(204, 222); + this.label13.Location = new System.Drawing.Point(244, 222); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(44, 37); + this.label13.Size = new System.Drawing.Size(54, 37); this.label13.TabIndex = 28; this.label13.Text = "0,00"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -867,10 +867,10 @@ namespace Deckungsbeitrag this.labelContGes.Dock = System.Windows.Forms.DockStyle.Left; this.labelContGes.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContGes.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContGes.Location = new System.Drawing.Point(137, 222); + this.labelContGes.Location = new System.Drawing.Point(164, 222); this.labelContGes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContGes.Name = "labelContGes"; - this.labelContGes.Size = new System.Drawing.Size(59, 37); + this.labelContGes.Size = new System.Drawing.Size(72, 37); this.labelContGes.TabIndex = 27; this.labelContGes.Text = "Zahl 5"; this.labelContGes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -884,7 +884,7 @@ namespace Deckungsbeitrag this.label9.Location = new System.Drawing.Point(4, 222); this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(72, 37); + this.label9.Size = new System.Drawing.Size(86, 37); this.label9.TabIndex = 25; this.label9.Text = "Gesamt"; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -895,10 +895,10 @@ 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(431, 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(40, 37); + this.label5.Size = new System.Drawing.Size(50, 37); this.label5.TabIndex = 23; this.label5.Text = "0,00"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -909,10 +909,10 @@ namespace Deckungsbeitrag this.label4.Dock = System.Windows.Forms.DockStyle.Right; 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.SystemColors.ControlText; - this.label4.Location = new System.Drawing.Point(208, 185); + this.label4.Location = new System.Drawing.Point(248, 185); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(40, 37); + this.label4.Size = new System.Drawing.Size(50, 37); this.label4.TabIndex = 22; this.label4.Text = "0,00"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -923,10 +923,10 @@ namespace Deckungsbeitrag this.labelContZahl5.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl5.Location = new System.Drawing.Point(137, 185); + this.labelContZahl5.Location = new System.Drawing.Point(164, 185); this.labelContZahl5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl5.Name = "labelContZahl5"; - this.labelContZahl5.Size = new System.Drawing.Size(53, 37); + this.labelContZahl5.Size = new System.Drawing.Size(66, 37); this.labelContZahl5.TabIndex = 21; this.labelContZahl5.Text = "Zahl 5"; this.labelContZahl5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -940,7 +940,7 @@ namespace Deckungsbeitrag this.label2.Location = new System.Drawing.Point(4, 185); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(90, 37); + this.label2.Size = new System.Drawing.Size(107, 37); this.label2.TabIndex = 20; this.label2.Text = "Cont Rest"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -951,10 +951,10 @@ 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(431, 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(40, 37); + this.labelZeit52.Size = new System.Drawing.Size(50, 37); this.labelZeit52.TabIndex = 19; this.labelZeit52.Text = "0,00"; this.labelZeit52.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -965,10 +965,10 @@ 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(431, 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(40, 37); + this.labelZeit42.Size = new System.Drawing.Size(50, 37); this.labelZeit42.TabIndex = 18; this.labelZeit42.Text = "0,00"; this.labelZeit42.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -979,10 +979,10 @@ 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(431, 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(40, 37); + this.labelZeit32.Size = new System.Drawing.Size(50, 37); this.labelZeit32.TabIndex = 17; this.labelZeit32.Text = "0,00"; this.labelZeit32.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -993,10 +993,10 @@ 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(431, 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(40, 37); + this.labelZeit22.Size = new System.Drawing.Size(50, 37); this.labelZeit22.TabIndex = 16; this.labelZeit22.Text = "0,00"; this.labelZeit22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1007,10 +1007,10 @@ namespace Deckungsbeitrag this.labelZeit12.Dock = System.Windows.Forms.DockStyle.Fill; this.labelZeit12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit12.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit12.Location = new System.Drawing.Point(256, 0); + 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(215, 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; @@ -1021,10 +1021,10 @@ namespace Deckungsbeitrag this.labelZeit5.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit5.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit5.Location = new System.Drawing.Point(208, 148); + this.labelZeit5.Location = new System.Drawing.Point(248, 148); this.labelZeit5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit5.Name = "labelZeit5"; - this.labelZeit5.Size = new System.Drawing.Size(40, 37); + this.labelZeit5.Size = new System.Drawing.Size(50, 37); this.labelZeit5.TabIndex = 14; this.labelZeit5.Text = "0,00"; this.labelZeit5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1035,10 +1035,10 @@ namespace Deckungsbeitrag this.labelZeit4.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit4.Location = new System.Drawing.Point(208, 111); + this.labelZeit4.Location = new System.Drawing.Point(248, 111); this.labelZeit4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit4.Name = "labelZeit4"; - this.labelZeit4.Size = new System.Drawing.Size(40, 37); + this.labelZeit4.Size = new System.Drawing.Size(50, 37); this.labelZeit4.TabIndex = 13; this.labelZeit4.Text = "0,00"; this.labelZeit4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1049,10 +1049,10 @@ namespace Deckungsbeitrag this.labelZeit3.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit3.Location = new System.Drawing.Point(208, 74); + this.labelZeit3.Location = new System.Drawing.Point(248, 74); this.labelZeit3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit3.Name = "labelZeit3"; - this.labelZeit3.Size = new System.Drawing.Size(40, 37); + this.labelZeit3.Size = new System.Drawing.Size(50, 37); this.labelZeit3.TabIndex = 12; this.labelZeit3.Text = "0,00"; this.labelZeit3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1063,10 +1063,10 @@ namespace Deckungsbeitrag this.labelZeit2.Dock = System.Windows.Forms.DockStyle.Right; this.labelZeit2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit2.Location = new System.Drawing.Point(208, 37); + this.labelZeit2.Location = new System.Drawing.Point(248, 37); this.labelZeit2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit2.Name = "labelZeit2"; - this.labelZeit2.Size = new System.Drawing.Size(40, 37); + this.labelZeit2.Size = new System.Drawing.Size(50, 37); this.labelZeit2.TabIndex = 11; this.labelZeit2.Text = "0,00"; this.labelZeit2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1077,10 +1077,10 @@ namespace Deckungsbeitrag this.labelZeit1.Dock = System.Windows.Forms.DockStyle.Fill; this.labelZeit1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelZeit1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelZeit1.Location = new System.Drawing.Point(204, 0); + this.labelZeit1.Location = new System.Drawing.Point(244, 0); this.labelZeit1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelZeit1.Name = "labelZeit1"; - this.labelZeit1.Size = new System.Drawing.Size(44, 37); + this.labelZeit1.Size = new System.Drawing.Size(54, 37); this.labelZeit1.TabIndex = 10; this.labelZeit1.Text = "1"; this.labelZeit1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1091,10 +1091,10 @@ namespace Deckungsbeitrag this.labelContZahl4.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl4.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl4.Location = new System.Drawing.Point(137, 148); + this.labelContZahl4.Location = new System.Drawing.Point(164, 148); this.labelContZahl4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl4.Name = "labelContZahl4"; - this.labelContZahl4.Size = new System.Drawing.Size(53, 37); + this.labelContZahl4.Size = new System.Drawing.Size(66, 37); this.labelContZahl4.TabIndex = 9; this.labelContZahl4.Text = "Zahl 5"; this.labelContZahl4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1108,7 +1108,7 @@ namespace Deckungsbeitrag this.label1.Location = new System.Drawing.Point(4, 148); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(118, 37); + this.label1.Size = new System.Drawing.Size(143, 37); this.label1.TabIndex = 8; this.label1.Text = "Cont heute+3"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1119,10 +1119,10 @@ namespace Deckungsbeitrag this.labelContZahl3.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl3.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl3.Location = new System.Drawing.Point(137, 111); + this.labelContZahl3.Location = new System.Drawing.Point(164, 111); this.labelContZahl3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl3.Name = "labelContZahl3"; - this.labelContZahl3.Size = new System.Drawing.Size(53, 37); + this.labelContZahl3.Size = new System.Drawing.Size(66, 37); this.labelContZahl3.TabIndex = 7; this.labelContZahl3.Text = "Zahl 4"; this.labelContZahl3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1136,7 +1136,7 @@ namespace Deckungsbeitrag this.label6.Location = new System.Drawing.Point(4, 111); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(118, 37); + this.label6.Size = new System.Drawing.Size(143, 37); this.label6.TabIndex = 6; this.label6.Text = "Cont heute+2"; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1147,10 +1147,10 @@ namespace Deckungsbeitrag this.labelContZahl2.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl2.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl2.Location = new System.Drawing.Point(137, 74); + this.labelContZahl2.Location = new System.Drawing.Point(164, 74); this.labelContZahl2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl2.Name = "labelContZahl2"; - this.labelContZahl2.Size = new System.Drawing.Size(53, 37); + this.labelContZahl2.Size = new System.Drawing.Size(66, 37); this.labelContZahl2.TabIndex = 5; this.labelContZahl2.Text = "Zahl 3"; this.labelContZahl2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1164,7 +1164,7 @@ namespace Deckungsbeitrag this.label8.Location = new System.Drawing.Point(4, 74); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(118, 37); + this.label8.Size = new System.Drawing.Size(143, 37); this.label8.TabIndex = 4; this.label8.Text = "Cont heute+1"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1175,10 +1175,10 @@ namespace Deckungsbeitrag this.labelContZahl1.Dock = System.Windows.Forms.DockStyle.Left; this.labelContZahl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelContZahl1.ForeColor = System.Drawing.SystemColors.ControlText; - this.labelContZahl1.Location = new System.Drawing.Point(137, 37); + this.labelContZahl1.Location = new System.Drawing.Point(164, 37); this.labelContZahl1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelContZahl1.Name = "labelContZahl1"; - this.labelContZahl1.Size = new System.Drawing.Size(53, 37); + this.labelContZahl1.Size = new System.Drawing.Size(66, 37); this.labelContZahl1.TabIndex = 3; this.labelContZahl1.Text = "Zahl 2"; this.labelContZahl1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1192,7 +1192,7 @@ namespace Deckungsbeitrag this.label10.Location = new System.Drawing.Point(4, 37); this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(98, 37); + this.label10.Size = new System.Drawing.Size(118, 37); this.label10.TabIndex = 2; this.label10.Text = "Cont heute"; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1206,7 +1206,7 @@ namespace Deckungsbeitrag this.label12.Location = new System.Drawing.Point(4, 0); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(125, 37); + this.label12.Size = new System.Drawing.Size(152, 37); this.label12.TabIndex = 0; this.label12.Text = "Waschstraßen"; this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1216,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"; @@ -1236,7 +1236,7 @@ namespace Deckungsbeitrag this.comboBoxSaison.Location = new System.Drawing.Point(11, 23); this.comboBoxSaison.Margin = new System.Windows.Forms.Padding(4); this.comboBoxSaison.Name = "comboBoxSaison"; - this.comboBoxSaison.Size = new System.Drawing.Size(352, 28); + this.comboBoxSaison.Size = new System.Drawing.Size(352, 33); this.comboBoxSaison.TabIndex = 66; this.comboBoxSaison.SelectedIndexChanged += new System.EventHandler(this.comboBoxSaison_SelectedIndexChanged); // @@ -1375,14 +1375,14 @@ namespace Deckungsbeitrag this.tableLayoutPanelUpdate.Controls.Add(this.labelKundenDatum, 1, 0); this.tableLayoutPanelUpdate.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelUpdate.ForeColor = System.Drawing.Color.Black; - this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(4, 23); + this.tableLayoutPanelUpdate.Location = new System.Drawing.Point(4, 19); this.tableLayoutPanelUpdate.Margin = new System.Windows.Forms.Padding(4); this.tableLayoutPanelUpdate.Name = "tableLayoutPanelUpdate"; this.tableLayoutPanelUpdate.RowCount = 3; this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); this.tableLayoutPanelUpdate.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(783, 108); + this.tableLayoutPanelUpdate.Size = new System.Drawing.Size(783, 112); this.tableLayoutPanelUpdate.TabIndex = 0; // // labelSoftwareDatum @@ -1390,10 +1390,10 @@ namespace Deckungsbeitrag this.labelSoftwareDatum.AutoSize = true; this.labelSoftwareDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelSoftwareDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelSoftwareDatum.Location = new System.Drawing.Point(83, 72); + this.labelSoftwareDatum.Location = new System.Drawing.Point(101, 74); this.labelSoftwareDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelSoftwareDatum.Name = "labelSoftwareDatum"; - this.labelSoftwareDatum.Size = new System.Drawing.Size(696, 36); + this.labelSoftwareDatum.Size = new System.Drawing.Size(678, 38); this.labelSoftwareDatum.TabIndex = 7; this.labelSoftwareDatum.Text = "label17"; this.labelSoftwareDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1403,10 +1403,10 @@ namespace Deckungsbeitrag this.labelArtikelDatum.AutoSize = true; this.labelArtikelDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelArtikelDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelArtikelDatum.Location = new System.Drawing.Point(83, 36); + this.labelArtikelDatum.Location = new System.Drawing.Point(101, 37); this.labelArtikelDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelArtikelDatum.Name = "labelArtikelDatum"; - this.labelArtikelDatum.Size = new System.Drawing.Size(696, 36); + this.labelArtikelDatum.Size = new System.Drawing.Size(678, 37); this.labelArtikelDatum.TabIndex = 6; this.labelArtikelDatum.Text = "label15"; this.labelArtikelDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1416,10 +1416,10 @@ namespace Deckungsbeitrag this.label16.AutoSize = true; this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(4, 72); + this.label16.Location = new System.Drawing.Point(4, 74); this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(71, 36); + this.label16.Size = new System.Drawing.Size(89, 38); this.label16.TabIndex = 4; this.label16.Text = "Software:"; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1429,10 +1429,10 @@ namespace Deckungsbeitrag this.label11.AutoSize = true; this.label11.Dock = System.Windows.Forms.DockStyle.Fill; this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(4, 36); + this.label11.Location = new System.Drawing.Point(4, 37); this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(71, 36); + this.label11.Size = new System.Drawing.Size(89, 37); this.label11.TabIndex = 2; this.label11.Text = "Artikel:"; this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1445,7 +1445,7 @@ namespace Deckungsbeitrag this.label3.Location = new System.Drawing.Point(4, 0); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(71, 36); + this.label3.Size = new System.Drawing.Size(89, 37); this.label3.TabIndex = 0; this.label3.Text = "Kunden:"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1455,10 +1455,10 @@ namespace Deckungsbeitrag this.labelKundenDatum.AutoSize = true; this.labelKundenDatum.Dock = System.Windows.Forms.DockStyle.Fill; this.labelKundenDatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelKundenDatum.Location = new System.Drawing.Point(83, 0); + this.labelKundenDatum.Location = new System.Drawing.Point(101, 0); this.labelKundenDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelKundenDatum.Name = "labelKundenDatum"; - this.labelKundenDatum.Size = new System.Drawing.Size(696, 36); + this.labelKundenDatum.Size = new System.Drawing.Size(678, 37); this.labelKundenDatum.TabIndex = 5; this.labelKundenDatum.Text = "label7"; this.labelKundenDatum.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1497,7 +1497,7 @@ namespace Deckungsbeitrag this.textBoxScannTest.Location = new System.Drawing.Point(8, 217); this.textBoxScannTest.Margin = new System.Windows.Forms.Padding(4); this.textBoxScannTest.Name = "textBoxScannTest"; - this.textBoxScannTest.Size = new System.Drawing.Size(171, 26); + this.textBoxScannTest.Size = new System.Drawing.Size(171, 30); this.textBoxScannTest.TabIndex = 13; this.textBoxScannTest.TextChanged += new System.EventHandler(this.textBoxScannTest_TextChanged); // @@ -1519,7 +1519,7 @@ namespace Deckungsbeitrag this.labelScannTest.Location = new System.Drawing.Point(8, 288); this.labelScannTest.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelScannTest.Name = "labelScannTest"; - this.labelScannTest.Size = new System.Drawing.Size(60, 24); + this.labelScannTest.Size = new System.Drawing.Size(79, 29); this.labelScannTest.TabIndex = 11; this.labelScannTest.Text = "label1"; // diff --git a/AA-Forms/FormMain.cs b/AA-Forms/FormMain.cs index eb39663..06859b0 100644 --- a/AA-Forms/FormMain.cs +++ b/AA-Forms/FormMain.cs @@ -37,8 +37,8 @@ namespace Deckungsbeitrag #region Properties private Benutzer benutzer = null; - private Meldungen meldung = new Meldungen(); - private bool open = false; + private Meldungen meldung = new Meldungen(); + private bool open = false; private bool isDragging = false; private Point dragStartPoint; private Point newLocation; @@ -384,7 +384,22 @@ namespace Deckungsbeitrag } private void buttonNeueInventur_Click(object sender, EventArgs e) { - FormNeuerAuftrag neuerAuftrag = new FormNeuerAuftrag(this.benutzer, AuftragTyp.Inventur); neuerAuftrag.ShowDialog(); + onBoardingArt = OnboardingSchritt.NeueInventur; + ZeigeOnboarding(); + + Kunde kunde = null; + FormListe liste = new FormListe(null, (int)Listentyp.Reklamationliste, "Miete"); + if (liste.ShowDialog() == DialogResult.OK) + { + 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); + } } /// @@ -1444,23 +1459,10 @@ namespace Deckungsbeitrag private void buttonTestInventur_Click(object sender, EventArgs e) { - onBoardingArt = OnboardingSchritt.NeueInventur; - ZeigeOnboarding(); - - Kunde kunde = null; - FormListe liste = new FormListe(null, (int)Listentyp.Reklamationliste, "Miete"); - if (liste.ShowDialog() == DialogResult.OK) - { - 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); - } - + FormShowUserControl showUserControl = new FormShowUserControl("Tourenplan", this.benutzer); + showUserControl.ShowDialog(); + var data = showUserControl.lieferDaten; + MessageBox.Show($"{data.datum} {data.text}", "Test", MessageBoxButtons.OK); } } } diff --git a/AA-Forms/FormMain.resx b/AA-Forms/FormMain.resx index 39c5225..cf40d7c 100644 --- a/AA-Forms/FormMain.resx +++ b/AA-Forms/FormMain.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -135,7 +135,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -146,7 +146,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -157,7 +157,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 ukspqFrrORPnH3UNRYTVJ8C+HUm/AYxAcd8CGGUaaQRYikR71BKANtXuMmBk1/VebVMWoDZpm28L6IN6 afQmMGV3A9pTYJcFcEj76dd7EaAX+ebuXbw2E3cbfftvjPBKL5kAAAAASUVORK5CYII= @@ -165,7 +165,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAB7SURBVDhPnZBBDoAgDAR5W///F/XCVaIJyXZcEG2yB5p2 ukspqFrrORPnH3UNRYTVJ8C+HUm/AYxAcd8CGGUaaQRYikR71BKANtXuMmBk1/VebVMWoDZpm28L6IN6 afQmMGV3A9pTYJcFcEj76dd7EaAX+ebuXbw2E3cbfftvjPBKL5kAAAAASUVORK5CYII= @@ -173,7 +173,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -184,7 +184,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL K5WtGpmnmIhaegrBvM8vP9P0q5xzIcn9UJHRe88ahojZOVcBQxCc/lcSmSpJdBo8axYC8JEsNYAeRO+J GIBEhFgpGsARGV+sPmcC3q9PVQihpJRqmlOANm/bnfcIQn0CxRi51wXIdb7MddpyXZpeF4AJSLTWPROg Ic/HXtb1xqK1NotRdPgVzsRG/IFGJf4vZOpFEVHH2lgAAAAASUVORK5CYII= @@ -193,7 +193,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACxSURBVDhPnZI9DsMgDIVzNo7SzM2czqm4EKfgHm0WhrYL K5WtGpmnmIhaegrBvM8vP9P0q5xzIcn9UJHRe88ahojZOVcBQxCc/lcSmSpJdBo8axYC8JEsNYAeRO+J GIBEhFgpGsARGV+sPmcC3q9PVQihpJRqmlOANm/bnfcIQn0CxRi51wXIdb7MddpyXZpeF4AJSLTWPROg Ic/HXtb1xqK1NotRdPgVzsRG/IFGJf4vZOpFEVHH2lgAAAAASUVORK5CYII= @@ -418,7 +418,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -429,7 +429,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -440,7 +440,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEgSURBVDhPlZMxToVAEIY5gmeCY5D4SBShs3kF4Ro03seW kgYsrGgkBgyzP43J6r95PHcBETeZzP6zsx9kZtbzPM8TkftxHF8BaBFpAJwYP7R4ua5rHcexDoJAp2mq m6bRAG6XuZuLX+bloih4yfgkScx+z64ACt/3nUPqPXMAIvLynz9YAViwrRoopR6uST+5a8Dl4IlBpZQ5 rKrqU0SenaQ9wDAMyPNcZ1mm27Y1nppxO28TQFGWpY6iyPgwDB1tJ/8KWFbZtq7rTDLnwgZM03S3om7t @@ -451,7 +451,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIFSURBVDhPpZLtS1NhGMbPPxJmmlYSgqHiKzGU1EDxg4iK YKyG2WBogqMYJQOtCEVRFBGdTBCJfRnkS4VaaWNT5sqx1BUxRXxDHYxAJLvkusEeBaPAB+5z4Jzn+t3X /aLhnEfjo8m+dCoa+7/C3O2Hqe0zDC+8KG+cRZHZhdzaaWTVTCLDMIY0vfM04Nfh77/G/sEhwpEDbO3t I7TxE8urEVy99fT/AL5gWDLrTB/hnF4XsW0khCu5ln8DmJliT2AXrcNBsU1gj/MH4nMeKwBrPktM28xM @@ -466,7 +466,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd @@ -477,7 +477,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd @@ -488,7 +488,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi + YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEMSURBVDhPrZMxjoNADEVzpD1CRE9PzwW2pkpDzwEo0tEi DkBPT09BSbORsCkneqM1yUxQtNLG0pdG/va3x+M5nT5p27adVbVVVRehhYvjA1PVapomV5alS9PUJUni wRkfHDFxnjeIcRx9cJZlrmkaNwyDB2d8cIcitAZhleZ5vonIBT/gjK+qKtf3PQI/67p+PVdvSaQKgQH5 ayLyvSzLXiQQYUgQXdc5qh0kXwBJds08zx/FEGBY3Pdo0vB1Xe8oisLHm8hnBP57hX2ILxN+iARDDIYd diff --git a/AA-Forms/FormNeuerAuftrag.cs b/AA-Forms/FormNeuerAuftrag.cs index 526ba01..7b538c6 100644 --- a/AA-Forms/FormNeuerAuftrag.cs +++ b/AA-Forms/FormNeuerAuftrag.cs @@ -19,6 +19,7 @@ using System.Windows.Forms.VisualStyles; using System.Text.Json; using System.Reflection; using Deckungsbeitrag.UserControls; +using Deckungsbeitrag.AA_Forms; 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 @@ -96,18 +99,31 @@ 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) + + //TODO: UCTourenplan einbauen und Daten übernehmen... + FormShowUserControl showUserControl = new FormShowUserControl("Tourenplan", this.benutzer); + if (showUserControl.ShowDialog() == DialogResult.OK) { - datum = datum.AddDays(1); - if (datum.DayOfWeek != DayOfWeek.Saturday && datum.DayOfWeek != DayOfWeek.Sunday) - { - tage--; - } + var data = showUserControl.lieferDaten; + nextLiefertag = data.datum; + touren = data.touren; + tour = data.text; + } + else + { + meldung.GetInfo(this, "Achtung Liefertag kann falsch sein, da Zwischensaison ist.", false); + DateTime datum = DateTime.Today; + int tage = 2; + while (tage > 0) + { + datum = datum.AddDays(1); + if (datum.DayOfWeek != DayOfWeek.Saturday && datum.DayOfWeek != DayOfWeek.Sunday) + { + tage--; + } + } + nextLiefertag = datum; } - nextLiefertag = datum; } } @@ -175,12 +191,20 @@ namespace Deckungsbeitrag } private void comboBoxFahrer_Load() { - List benutzerliste = Benutzer.GetFahrerList(); - this.comboBoxFahrer.DataSource = benutzerliste; - this.comboBoxFahrer.DisplayMember = "BenutzerName"; + if (touren == null) + { + List benutzerliste = Benutzer.GetFahrerList(); + this.comboBoxFahrer.DataSource = benutzerliste; + this.comboBoxFahrer.DisplayMember = "BenutzerName"; - if (this.benutzer.Rolle == BenutzerRolle.Fahrer) this.comboBoxFahrer.SelectedItem = this.benutzer; - else this.comboBoxFahrer.SelectedIndex = -1; + if (this.benutzer.Rolle == BenutzerRolle.Fahrer) this.comboBoxFahrer.SelectedItem = this.benutzer; + else this.comboBoxFahrer.SelectedIndex = -1; + } + else + { + this.comboBoxFahrer.DataSource = touren; + this.comboBoxFahrer.SelectedText = tour; + } } /// 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 61% rename from AA-Forms/FormShowGroupBox.cs rename to AA-Forms/FormShowUserControl.cs index 37e84a7..adcdd58 100644 --- a/AA-Forms/FormShowGroupBox.cs +++ b/AA-Forms/FormShowUserControl.cs @@ -13,7 +13,7 @@ using System.Windows.Forms; namespace Deckungsbeitrag.AA_Forms { - public partial class FormShowGroupBox : Form + public partial class FormShowUserControl : Form { private Benutzer benutzer; private UCAuftragSuchen ucas; @@ -23,6 +23,7 @@ namespace Deckungsbeitrag.AA_Forms public List auftragliste; private string gb; private bool toclose = false; + public (DateTime datum, string text, string[] touren) lieferDaten; public bool _toclose { @@ -39,22 +40,22 @@ 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) + private void FormShowUserControl_Load(object sender, EventArgs e) { switch (this.gb) { @@ -71,22 +72,37 @@ 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) { + var form = sender as Form; if (this.benutzer.Rolle == BenutzerRolle.Expedit) this.DialogResult = DialogResult.OK; + else + { + 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/App.config b/App.config index a3ca776..6484ec4 100644 --- a/App.config +++ b/App.config @@ -6,7 +6,7 @@ - + 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..d1c8007 --- /dev/null +++ b/UserControls/UCTourenplan.Designer.cs @@ -0,0 +1,616 @@ +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, 45F)); + this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLPTourenplan.RowStyles.Add(new System.Windows.Forms.RowStyle(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(1280, 715); + this.tableLPTourenplan.TabIndex = 0; + // + // button25 + // + this.button25.Dock = System.Windows.Forms.DockStyle.Fill; + this.button25.Location = new System.Drawing.Point(1048, 583); + this.button25.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button25.Name = "button25"; + this.button25.Size = new System.Drawing.Size(229, 130); + this.button25.TabIndex = 57; + this.button25.Text = "button25"; + this.button25.UseVisualStyleBackColor = true; + this.button25.Click += new System.EventHandler(this.Button_Click); + // + // button24 + // + this.button24.Dock = System.Windows.Forms.DockStyle.Fill; + this.button24.Location = new System.Drawing.Point(815, 583); + this.button24.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button24.Name = "button24"; + this.button24.Size = new System.Drawing.Size(227, 130); + this.button24.TabIndex = 56; + this.button24.Text = "button24"; + this.button24.UseVisualStyleBackColor = true; + this.button24.Click += new System.EventHandler(this.Button_Click); + // + // button23 + // + this.button23.Dock = System.Windows.Forms.DockStyle.Fill; + this.button23.Location = new System.Drawing.Point(582, 583); + this.button23.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button23.Name = "button23"; + this.button23.Size = new System.Drawing.Size(227, 130); + this.button23.TabIndex = 55; + this.button23.Text = "button23"; + this.button23.UseVisualStyleBackColor = true; + this.button23.Click += new System.EventHandler(this.Button_Click); + // + // button22 + // + this.button22.Dock = System.Windows.Forms.DockStyle.Fill; + this.button22.Location = new System.Drawing.Point(349, 583); + this.button22.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button22.Name = "button22"; + this.button22.Size = new System.Drawing.Size(227, 130); + this.button22.TabIndex = 54; + this.button22.Text = "button22"; + this.button22.UseVisualStyleBackColor = true; + this.button22.Click += new System.EventHandler(this.Button_Click); + // + // button21 + // + this.button21.Dock = System.Windows.Forms.DockStyle.Fill; + this.button21.Location = new System.Drawing.Point(116, 583); + this.button21.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button21.Name = "button21"; + this.button21.Size = new System.Drawing.Size(227, 130); + this.button21.TabIndex = 53; + this.button21.Text = "button21"; + this.button21.UseVisualStyleBackColor = true; + this.button21.Click += new System.EventHandler(this.Button_Click); + // + // button20 + // + this.button20.Dock = System.Windows.Forms.DockStyle.Fill; + this.button20.Location = new System.Drawing.Point(1048, 449); + this.button20.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button20.Name = "button20"; + this.button20.Size = new System.Drawing.Size(229, 130); + this.button20.TabIndex = 52; + this.button20.Text = "button20"; + this.button20.UseVisualStyleBackColor = true; + this.button20.Click += new System.EventHandler(this.Button_Click); + // + // button19 + // + this.button19.Dock = System.Windows.Forms.DockStyle.Fill; + this.button19.Location = new System.Drawing.Point(815, 449); + this.button19.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button19.Name = "button19"; + this.button19.Size = new System.Drawing.Size(227, 130); + this.button19.TabIndex = 51; + this.button19.Text = "button19"; + this.button19.UseVisualStyleBackColor = true; + this.button19.Click += new System.EventHandler(this.Button_Click); + // + // button18 + // + this.button18.Dock = System.Windows.Forms.DockStyle.Fill; + this.button18.Location = new System.Drawing.Point(582, 449); + this.button18.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button18.Name = "button18"; + this.button18.Size = new System.Drawing.Size(227, 130); + this.button18.TabIndex = 50; + this.button18.Text = "button18"; + this.button18.UseVisualStyleBackColor = true; + this.button18.Click += new System.EventHandler(this.Button_Click); + // + // button17 + // + this.button17.Dock = System.Windows.Forms.DockStyle.Fill; + this.button17.Location = new System.Drawing.Point(349, 449); + this.button17.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button17.Name = "button17"; + this.button17.Size = new System.Drawing.Size(227, 130); + this.button17.TabIndex = 49; + this.button17.Text = "button17"; + this.button17.UseVisualStyleBackColor = true; + this.button17.Click += new System.EventHandler(this.Button_Click); + // + // button16 + // + this.button16.Dock = System.Windows.Forms.DockStyle.Fill; + this.button16.Location = new System.Drawing.Point(116, 449); + this.button16.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button16.Name = "button16"; + this.button16.Size = new System.Drawing.Size(227, 130); + this.button16.TabIndex = 48; + this.button16.Text = "button16"; + this.button16.UseVisualStyleBackColor = true; + this.button16.Click += new System.EventHandler(this.Button_Click); + // + // button15 + // + this.button15.Dock = System.Windows.Forms.DockStyle.Fill; + this.button15.Location = new System.Drawing.Point(1048, 315); + this.button15.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button15.Name = "button15"; + this.button15.Size = new System.Drawing.Size(229, 130); + this.button15.TabIndex = 47; + this.button15.Text = "button15"; + this.button15.UseVisualStyleBackColor = true; + this.button15.Click += new System.EventHandler(this.Button_Click); + // + // button14 + // + this.button14.Dock = System.Windows.Forms.DockStyle.Fill; + this.button14.Location = new System.Drawing.Point(815, 315); + this.button14.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button14.Name = "button14"; + this.button14.Size = new System.Drawing.Size(227, 130); + this.button14.TabIndex = 46; + this.button14.Text = "button14"; + this.button14.UseVisualStyleBackColor = true; + this.button14.Click += new System.EventHandler(this.Button_Click); + // + // button13 + // + this.button13.Dock = System.Windows.Forms.DockStyle.Fill; + this.button13.Location = new System.Drawing.Point(582, 315); + this.button13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button13.Name = "button13"; + this.button13.Size = new System.Drawing.Size(227, 130); + this.button13.TabIndex = 45; + this.button13.Text = "button13"; + this.button13.UseVisualStyleBackColor = true; + this.button13.Click += new System.EventHandler(this.Button_Click); + // + // button12 + // + this.button12.Dock = System.Windows.Forms.DockStyle.Fill; + this.button12.Location = new System.Drawing.Point(349, 315); + this.button12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button12.Name = "button12"; + this.button12.Size = new System.Drawing.Size(227, 130); + this.button12.TabIndex = 44; + this.button12.Text = "button12"; + this.button12.UseVisualStyleBackColor = true; + this.button12.Click += new System.EventHandler(this.Button_Click); + // + // button11 + // + this.button11.Dock = System.Windows.Forms.DockStyle.Fill; + this.button11.Location = new System.Drawing.Point(116, 315); + this.button11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button11.Name = "button11"; + this.button11.Size = new System.Drawing.Size(227, 130); + this.button11.TabIndex = 43; + this.button11.Text = "button11"; + this.button11.UseVisualStyleBackColor = true; + this.button11.Click += new System.EventHandler(this.Button_Click); + // + // button10 + // + this.button10.Dock = System.Windows.Forms.DockStyle.Fill; + this.button10.Location = new System.Drawing.Point(1048, 181); + this.button10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button10.Name = "button10"; + this.button10.Size = new System.Drawing.Size(229, 130); + this.button10.TabIndex = 42; + this.button10.Text = "button10"; + this.button10.UseVisualStyleBackColor = true; + this.button10.Click += new System.EventHandler(this.Button_Click); + // + // button9 + // + this.button9.Dock = System.Windows.Forms.DockStyle.Fill; + this.button9.Location = new System.Drawing.Point(815, 181); + this.button9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button9.Name = "button9"; + this.button9.Size = new System.Drawing.Size(227, 130); + this.button9.TabIndex = 41; + this.button9.Text = "button9"; + this.button9.UseVisualStyleBackColor = true; + this.button9.Click += new System.EventHandler(this.Button_Click); + // + // button8 + // + this.button8.Dock = System.Windows.Forms.DockStyle.Fill; + this.button8.Location = new System.Drawing.Point(582, 181); + this.button8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(227, 130); + this.button8.TabIndex = 40; + this.button8.Text = "button8"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.Button_Click); + // + // button7 + // + this.button7.Dock = System.Windows.Forms.DockStyle.Fill; + this.button7.Location = new System.Drawing.Point(349, 181); + this.button7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(227, 130); + this.button7.TabIndex = 39; + this.button7.Text = "button7"; + this.button7.UseVisualStyleBackColor = true; + this.button7.Click += new System.EventHandler(this.Button_Click); + // + // button6 + // + this.button6.Dock = System.Windows.Forms.DockStyle.Fill; + this.button6.Location = new System.Drawing.Point(116, 181); + this.button6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(227, 130); + this.button6.TabIndex = 38; + this.button6.Text = "button6"; + this.button6.UseVisualStyleBackColor = true; + this.button6.Click += new System.EventHandler(this.Button_Click); + // + // button5 + // + this.button5.Dock = System.Windows.Forms.DockStyle.Fill; + this.button5.Location = new System.Drawing.Point(1048, 47); + this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(229, 130); + this.button5.TabIndex = 37; + this.button5.Text = "button5"; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.Button_Click); + // + // button4 + // + this.button4.Dock = System.Windows.Forms.DockStyle.Fill; + this.button4.Location = new System.Drawing.Point(815, 47); + this.button4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(227, 130); + this.button4.TabIndex = 36; + this.button4.Text = "button4"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button_Click); + // + // button3 + // + this.button3.Dock = System.Windows.Forms.DockStyle.Fill; + this.button3.Location = new System.Drawing.Point(582, 47); + this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(227, 130); + this.button3.TabIndex = 35; + this.button3.Text = "button3"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button_Click); + // + // button2 + // + this.button2.Dock = System.Windows.Forms.DockStyle.Fill; + this.button2.Location = new System.Drawing.Point(349, 47); + this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(227, 130); + this.button2.TabIndex = 34; + this.button2.Text = "button2"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.Button_Click); + // + // label25 + // + this.label25.AutoSize = true; + 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, 581); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(107, 134); + this.label25.TabIndex = 31; + this.label25.Text = "Tour1"; + this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label19 + // + this.label19.AutoSize = true; + 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, 447); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(107, 134); + this.label19.TabIndex = 25; + this.label19.Text = "Tour1"; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label13 + // + this.label13.AutoSize = true; + 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, 313); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(107, 134); + this.label13.TabIndex = 19; + this.label13.Text = "Tour1"; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label7 + // + this.label7.AutoSize = true; + 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, 179); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(107, 134); + 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(1048, 0); + this.labelFR.Name = "labelFR"; + this.labelFR.Size = new System.Drawing.Size(229, 45); + 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(815, 0); + this.labelDO.Name = "labelDO"; + this.labelDO.Size = new System.Drawing.Size(227, 45); + 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(582, 0); + this.labelMI.Name = "labelMI"; + this.labelMI.Size = new System.Drawing.Size(227, 45); + 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(349, 0); + this.labelDI.Name = "labelDI"; + this.labelDI.Size = new System.Drawing.Size(227, 45); + 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(116, 0); + this.labelMO.Name = "labelMO"; + this.labelMO.Size = new System.Drawing.Size(227, 45); + this.labelMO.TabIndex = 0; + this.labelMO.Text = "MO"; + this.labelMO.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // labelTour1 + // + this.labelTour1.AutoSize = true; + 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, 45); + this.labelTour1.Name = "labelTour1"; + this.labelTour1.Size = new System.Drawing.Size(107, 134); + this.labelTour1.TabIndex = 6; + this.labelTour1.Text = "Tour1"; + this.labelTour1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Fill; + this.button1.Location = new System.Drawing.Point(116, 47); + this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(227, 130); + this.button1.TabIndex = 32; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + 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(107, 45); + this.labelZusatz.TabIndex = 33; + this.labelZusatz.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // UCTourenplan + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ActiveCaption; + 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(1280, 715); + 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..c7530bf --- /dev/null +++ b/UserControls/UCTourenplan.cs @@ -0,0 +1,134 @@ +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); + + 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 5968d67..9f8c320 100644 --- a/Verwaltung.csproj +++ b/Verwaltung.csproj @@ -190,11 +190,11 @@ FormNeuerBenutzer.cs - + Form - - FormShowGroupBox.cs + + FormShowUserControl.cs Form @@ -458,6 +458,12 @@ UCTabPageLKW.cs + + UserControl + + + UCTourenplan.cs + FehlmengeChart.cs @@ -534,8 +540,8 @@ FormProgrammauswahl.cs - - FormShowGroupBox.cs + + FormShowUserControl.cs FormTourenplanung.cs @@ -587,6 +593,9 @@ UCTabPageLKW.cs + + UCTourenplan.cs + SettingsSingleFileGenerator diff --git a/Verwaltung_ReadMe.txt b/Verwaltung_ReadMe.txt index 875e4dd..09d4b21 100644 --- a/Verwaltung_ReadMe.txt +++ b/Verwaltung_ReadMe.txt @@ -5,7 +5,7 @@ NEUIGKEITEN - Version 1.0.9.2 Build-Info: - Build-Typ: Release Build - Erledigte TODOs: 19 -- Offene TODOs: 43 +- Offene TODOs: 44 - Install-Reminders: 4 - Changes: 15 @@ -56,7 +56,7 @@ Build-Info: - ✅ : Wenn RegAuftrag wird als augeliefert markiert, wird dieser automatisch neu erstellt laut hinterlegtem Rhythmus. [FormMain.cs] -=== 🔄 OFFENE TODOs (43) === +=== 🔄 OFFENE TODOs (44) === - 🔄 !!ÜBERLEGE!! DB-Query für Kundenanzahl und Containeranzahl Abgleich. (Aufträge haben TourID hinterlegt. So sollte alles vergleichbar sein.) [Tour.cs] - 🔄 !!ÜBERLEGE!! Tour Start und Ende automatisch erfassen. [Tour.cs] - 🔄 Alle Icons in einer Spalte anzeigen? I für Anmerkung und ! für Aufgabe?? [FormExpedit.cs] @@ -92,6 +92,7 @@ Build-Info: - 🔄 Speichern etc. durchgehen und adaptieren [FormAuftragDetail.cs] - 🔄 Standverminderung und Standerhöhung mit einem Aufruf (Standveränderung?) Bei Verminderung -Zahlen sonst Plus. [FormAuftragDetail.cs] - 🔄 TourenListe Entwurf muss überarbeitet werden. [FormNeuerAuftrag.cs] +- 🔄 UCTourenplan einbauen und Daten übernehmen... [FormNeuerAuftrag.cs] - 🔄 Umbau in Switch. [FormWSVerfolgung.cs] - 🔄 UserSetting Properties eintragen und in EinstellungsScreen abrufen. [UserSettingsManager.cs] - 🔄 Warum der falsche Path? Immer mit \\ [UCFeedback.cs] @@ -101,5 +102,5 @@ Build-Info: - 🔄 Wenn Nachwäsche oder Müllwäsche alle Artikel anzeigen. [FormFehlmengeCount.cs] - 🔄 Zuweisung zu Fahrer muss geklärt werden. [Funktionen.cs] -Installation: 14.04.2026 15:40 +Installation: 15.04.2026 17:23 =====================================