AuftragInfo implementiert. Rechtsclick in Expedit implementiert. Neue Inventur in KundenVW Design erstellt. (Speichern einer Inventur muss noch erfolgen)

This commit is contained in:
Kilian Wirl 2026-05-14 15:43:56 +02:00
parent 2b179cd47b
commit 58f97db2ad
33 changed files with 2279 additions and 926 deletions

View File

@ -95,6 +95,7 @@
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonOK.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
this.buttonOK.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.buttonOK.FlatAppearance.BorderSize = 0;
this.buttonOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
@ -110,12 +111,14 @@
this.buttonOK.UseVisualStyleBackColor = false;
this.buttonOK.Click += new System.EventHandler(this.ButtonOK_Click);
//
// CustomMessageBox
// CustomInputBox
//
this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.CancelButton = this.buttonAbbrechen;
this.ClientSize = new System.Drawing.Size(467, 230);
this.Controls.Add(this.buttonAbbrechen);
this.Controls.Add(this.buttonOK);
@ -123,7 +126,7 @@
this.Controls.Add(this.labelFrage);
this.Controls.Add(this.textBoxText);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Name = "CustomMessageBox";
this.Name = "CustomInputBox";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "CustomMessageBox";
this.ResumeLayout(false);

View File

@ -26,6 +26,7 @@ namespace Deckungsbeitrag.AA_Forms
public CustomInputBox(string Frage, string Title, string Eingabe, string numeric) : this()
{
if (numeric == "isNumeric") this.isNumeric = true;
if (numeric == "isAlpha") this.isNumeric = false;
this.labelFrage.Text = Frage;
this.labelEingabe.Text = Eingabe + ":";
this.Text = Title;
@ -36,7 +37,7 @@ namespace Deckungsbeitrag.AA_Forms
private void TextBoxText_Click(object sender, EventArgs e)
{
this.textBoxText.Clear();
if (Program.istTouch)
if (Program.istTouch & Screen.PrimaryScreen.WorkingArea.Width > 0 & Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{
@ -85,6 +86,10 @@ namespace Deckungsbeitrag.AA_Forms
this.textBoxText.SelectAll();
}
}
else
{
this.text = textBoxText.Text;
}
}
}
}

View File

@ -44,12 +44,13 @@
legend1.Name = "Legend1";
this.chart1.Legends.Add(legend1);
this.chart1.Location = new System.Drawing.Point(0, 0);
this.chart1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.chart1.Name = "chart1";
series1.ChartArea = "ChartArea1";
series1.Legend = "Legend1";
series1.Name = "Series1";
this.chart1.Series.Add(series1);
this.chart1.Size = new System.Drawing.Size(585, 413);
this.chart1.Size = new System.Drawing.Size(878, 635);
this.chart1.TabIndex = 0;
this.chart1.Text = "chart1";
//
@ -58,9 +59,10 @@
this.checkBox1.AutoSize = true;
this.checkBox1.Checked = true;
this.checkBox1.CheckState = System.Windows.Forms.CheckState.Indeterminate;
this.checkBox1.Location = new System.Drawing.Point(163, 472);
this.checkBox1.Location = new System.Drawing.Point(244, 726);
this.checkBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.checkBox1.Name = "checkBox1";
this.checkBox1.Size = new System.Drawing.Size(80, 17);
this.checkBox1.Size = new System.Drawing.Size(113, 24);
this.checkBox1.TabIndex = 1;
this.checkBox1.Text = "checkBox1";
this.checkBox1.ThreeState = true;
@ -68,11 +70,12 @@
//
// FehlmengeChart
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(585, 582);
this.ClientSize = new System.Drawing.Size(878, 895);
this.Controls.Add(this.checkBox1);
this.Controls.Add(this.chart1);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "FehlmengeChart";
this.Text = "FehlmengeChart";
this.Load += new System.EventHandler(this.FehlmengeChart_Load);

View File

@ -28,6 +28,5 @@ namespace Deckungsbeitrag.AA_Forms
var daten = await KundeArtikel.LoadArtikelDatenAsync(kunde);
chart1 = Funktionen.Load_FehlmengeChart(daten, chart1);
}
}
}

View File

@ -53,6 +53,7 @@
this.label4 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.oLVArtikel = new BrightIdeasSoftware.ObjectListView();
this.buttonKundeInfo = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxMinus)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxDirtMinus)).BeginInit();
@ -133,8 +134,7 @@
//
this.textBoxZusatz.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.textBoxZusatz.Enabled = false;
this.textBoxZusatz.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxZusatz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxZusatz.Location = new System.Drawing.Point(21, 437);
this.textBoxZusatz.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.textBoxZusatz.Multiline = true;
@ -181,7 +181,7 @@
//
this.pictureBoxPlus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.pictureBoxPlus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxPlus.Image")));
this.pictureBoxPlus.Location = new System.Drawing.Point(222, 347);
this.pictureBoxPlus.Location = new System.Drawing.Point(221, 347);
this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pictureBoxPlus.Name = "pictureBoxPlus";
this.pictureBoxPlus.Size = new System.Drawing.Size(51, 50);
@ -219,7 +219,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.ForeColor = System.Drawing.Color.White;
this.label6.Location = new System.Drawing.Point(350, 324);
this.label6.Location = new System.Drawing.Point(349, 324);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(86, 20);
this.label6.TabIndex = 32;
@ -230,7 +230,7 @@
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label7.ForeColor = System.Drawing.Color.White;
this.label7.Location = new System.Drawing.Point(14, 199);
this.label7.Location = new System.Drawing.Point(13, 199);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(75, 25);
this.label7.TabIndex = 37;
@ -241,7 +241,7 @@
this.label10.AutoSize = true;
this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label10.ForeColor = System.Drawing.Color.White;
this.label10.Location = new System.Drawing.Point(14, 256);
this.label10.Location = new System.Drawing.Point(13, 256);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(83, 25);
this.label10.TabIndex = 39;
@ -252,7 +252,7 @@
this.comboBoxPriority.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.comboBoxPriority.FormattingEnabled = true;
this.comboBoxPriority.Location = new System.Drawing.Point(121, 249);
this.comboBoxPriority.Margin = new System.Windows.Forms.Padding(4);
this.comboBoxPriority.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.comboBoxPriority.Name = "comboBoxPriority";
this.comboBoxPriority.Size = new System.Drawing.Size(348, 37);
this.comboBoxPriority.TabIndex = 41;
@ -263,7 +263,7 @@
this.comboBoxFahrer.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.comboBoxFahrer.FormattingEnabled = true;
this.comboBoxFahrer.Location = new System.Drawing.Point(121, 192);
this.comboBoxFahrer.Margin = new System.Windows.Forms.Padding(4);
this.comboBoxFahrer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.comboBoxFahrer.Name = "comboBoxFahrer";
this.comboBoxFahrer.Size = new System.Drawing.Size(348, 37);
this.comboBoxFahrer.TabIndex = 42;
@ -300,7 +300,7 @@
this.labelContDirt.BackColor = System.Drawing.Color.White;
this.labelContDirt.Font = new System.Drawing.Font("Microsoft Sans Serif", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelContDirt.ForeColor = System.Drawing.Color.Black;
this.labelContDirt.Location = new System.Drawing.Point(370, 347);
this.labelContDirt.Location = new System.Drawing.Point(371, 347);
this.labelContDirt.Name = "labelContDirt";
this.labelContDirt.Size = new System.Drawing.Size(51, 50);
this.labelContDirt.TabIndex = 43;
@ -323,7 +323,7 @@
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(14, 98);
this.label4.Location = new System.Drawing.Point(13, 98);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(79, 25);
this.label4.TabIndex = 47;
@ -352,8 +352,8 @@
this.oLVArtikel.FullRowSelect = true;
this.oLVArtikel.GridLines = true;
this.oLVArtikel.HideSelection = false;
this.oLVArtikel.Location = new System.Drawing.Point(494, 78);
this.oLVArtikel.Margin = new System.Windows.Forms.Padding(4);
this.oLVArtikel.Location = new System.Drawing.Point(493, 78);
this.oLVArtikel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.oLVArtikel.Name = "oLVArtikel";
this.oLVArtikel.ShowImagesOnSubItems = true;
this.oLVArtikel.Size = new System.Drawing.Size(601, 521);
@ -366,12 +366,32 @@
this.oLVArtikel.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.OLVArtikel_ItemChecked);
this.oLVArtikel.SizeChanged += new System.EventHandler(this.OLVArtikel_SizeChanged);
//
// buttonKundeInfo
//
this.buttonKundeInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonKundeInfo.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.buttonKundeInfo.FlatAppearance.BorderSize = 3;
this.buttonKundeInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonKundeInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonKundeInfo.ForeColor = System.Drawing.Color.White;
this.buttonKundeInfo.Location = new System.Drawing.Point(21, 620);
this.buttonKundeInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.buttonKundeInfo.MinimumSize = new System.Drawing.Size(51, 50);
this.buttonKundeInfo.Name = "buttonKundeInfo";
this.buttonKundeInfo.Size = new System.Drawing.Size(51, 50);
this.buttonKundeInfo.TabIndex = 50;
this.buttonKundeInfo.Text = "i";
this.buttonKundeInfo.UseVisualStyleBackColor = true;
this.buttonKundeInfo.Click += new System.EventHandler(this.ButtonKundeInfo_CLick);
//
// FormAuftragDetail
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
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(1113, 686);
this.Controls.Add(this.buttonKundeInfo);
this.Controls.Add(this.oLVArtikel);
this.Controls.Add(this.label8);
this.Controls.Add(this.label4);
@ -397,11 +417,14 @@
this.Controls.Add(this.labelKundeName);
this.Controls.Add(this.dTPLiefertag);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.HelpButton = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FormAuftragDetail";
this.Text = "Auftrag Detail";
this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.FormAuftragDetail_HelpButtonClicked);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormAuftragDetail_FormClosing);
this.Load += new System.EventHandler(this.FormAuftragDetail_Load);
this.Shown += new System.EventHandler(this.FormAuftragDetail_Shown);
@ -442,5 +465,6 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label8;
private BrightIdeasSoftware.ObjectListView oLVArtikel;
private System.Windows.Forms.Button buttonKundeInfo;
}
}

View File

@ -33,6 +33,8 @@ namespace Deckungsbeitrag
private int diff = 0;
int[] bestand; // Reklamation/Fehlmenge/Standveränderung/Inventurausgleich
bool etikettgedruckt = false;
bool zahlenChanged = false;
bool infoOpen = false;
//WENN AUFTRAG SPEICHERN
@ -67,7 +69,6 @@ namespace Deckungsbeitrag
}
}
public FormAuftragDetail()
{
InitializeComponent();
@ -102,16 +103,39 @@ namespace Deckungsbeitrag
this.comboBoxPriority.SelectedValueChanged += ComboBox_SelectedValueChanged;
this.comboBoxFahrer.SelectedValueChanged += ComboBox_SelectedValueChanged;
if (this.auftrag.Typ != AuftragTyp.Inventur || (this.auftrag.Typ == AuftragTyp.Inventur & this.auftrag.Status == AuftragStatus.Herrichten)) Load_OLV();
switch (this.auftrag.Typ)
{
case AuftragTyp.Inventur:
{
if (this.auftrag.Status == AuftragStatus.Herrichten) Load_OLV();
else
{
if (this.auftrag.Status == AuftragStatus.Warten) buttonFertig.Visible = false;
if (this.auftrag.Status == AuftragStatus.Warten)
{
buttonFertig.Visible = false; //TODO: Speichern der Inventur prüfen wenn Button nicht Visible ist.
Load_UCInventur(this.auftrag);
}
}
}
break;
case AuftragTyp.SOLL_Erhoehung: Load_OLV();
break;
case AuftragTyp.IST_Erhoehung: Load_OLV();
break;
case AuftragTyp.SOLL_Verminderung: Load_OLV();
break;
case AuftragTyp.Regelmäßig: Load_OLV();
break;
case AuftragTyp.Laufzettel: Load_Laufzettel();
break;
default:
break;
}
this.ClientSize = new Size(this.oLVArtikel.Right + 10, this.ClientSize.Height);
//WENN STATUS VORBEREITET BUTTON FERTIG ENABLEN
if (auftrag.Status == AuftragStatus.Vorbereitet) { buttonFertig.Enabled = true; buttonFertig.BackColor = Color.FromArgb(0, 192, 0); Toclose = true; }
if (this.oLVArtikel.Visible)
if (this.oLVArtikel.Items.Count == this.oLVArtikel.CheckedItems.Count) Toclose = true;
}
private void Load_UCInventur(Auftrag _auftrag)
@ -134,7 +158,25 @@ namespace Deckungsbeitrag
uci.SizeChangedForParent += () => { DoResize(); };
this.Controls.Add(uci);
}
private void Load_OLV()
{
Generator.GenerateColumns(this.oLVArtikel, typeof(AuftragArtikel), true);
this.artikelList = AuftragArtikel.GetList(auftrag.AuftragID);
this.oLVArtikel.SetObjects(this.artikelList);
this.oLVArtikel = Funktionen.Columns_Resize(null, this.oLVArtikel).olv;
// Wenn alle Artikel Checked sind TOCLOSE auslösen.
OLVArtikel_ItemChecked(this.oLVArtikel, null);
}
private void Load_Laufzettel()
{
this.oLVArtikel.Visible = false;
this.label1.Location = this.oLVArtikel.Location;
this.textBoxZusatz.Location = new Point(this.label1.Left, this.label1.Bottom);
this.textBoxZusatz.Size = new Size(this.oLVArtikel.Width, this.oLVArtikel.Height - 20);
}
private void DoResize()
{
if (uci != null)
@ -150,20 +192,6 @@ namespace Deckungsbeitrag
}
if (fb != null) fb.Location = new Point(this.ClientSize.Width - fb.Width - 7, 0);
}
private void Load_OLV()
{
Generator.GenerateColumns(this.oLVArtikel, typeof(AuftragArtikel), true);
this.artikelList = AuftragArtikel.GetList(auftrag.AuftragID);
this.oLVArtikel.SetObjects(this.artikelList);
this.oLVArtikel = Funktionen.Columns_Resize(null, this.oLVArtikel).olv;
// Wenn alle Artikel Checked sind TOCLOSE auslösen.
OLVArtikel_ItemChecked(this.oLVArtikel, null);
}
private void LadeComboBoxen()
{
this.comboBoxFahrer.SelectedValueChanged -= ComboBox_SelectedValueChanged;
@ -203,7 +231,7 @@ namespace Deckungsbeitrag
AuftragArtikel aufart = AuftragArtikel.GetArtikel(kvp.Key);
aufart.Anzahl = (int)kvp.Value;
if (aufart.Anzahl == 0) aufart.Erledigt = true;
else aufart.Erledigt = false;
else { aufart.Erledigt = false; Toclose = false; }
aufart.Save();
}
@ -326,8 +354,8 @@ namespace Deckungsbeitrag
//AUFTRAG ABSCHLIESSEN
private void ButtonFertig_Click(object sender, EventArgs e)
{
EtikettDrucken();
if (Tosave && etikettgedruckt) AuftragSpeichern();
if (zahlenChanged) EtikettDrucken();
if (Tosave && etikettgedruckt || Tosave && !zahlenChanged) AuftragSpeichern();
else Toclose = false;
if (Toclose)
{
@ -396,8 +424,7 @@ namespace Deckungsbeitrag
}
else
{
auftrag.Erledigt = DateTime.Now;
auftrag.ErledigtVon = (int)benutzer.BenutzerID;
//TODO: NICHT AUFTRAG FERTIG WENN NICHT ALLE ZAHLEN 0
auftrag.Status = AuftragStatus.Fertig;
}
auftrag.Save();
@ -543,8 +570,17 @@ namespace Deckungsbeitrag
}
else
{
this.oLVArtikel.Height = this.textBoxZusatz.Bottom - this.oLVArtikel.Top;
this.ClientSize = new Size(oLVArtikel.Right + 10, oLVArtikel.Bottom + buttonAbbrechen.Height + 25);
int width = 0;
foreach (OLVColumn col in this.oLVArtikel.Columns) width += col.Width;
if (this.oLVArtikel.Scrollable) width += Program.scrollBar;
this.oLVArtikel.Width = width;
this.oLVArtikel.Height = textBoxZusatz.Bottom;
//AdjustHeightToFitAll(this.oLVArtikel);
this.buttonAbbrechen.Location = new Point(this.buttonAbbrechen.Left, this.oLVArtikel.Bottom + 15);
this.buttonFertig.Location = new Point(this.buttonFertig.Left, this.oLVArtikel.Bottom + 15);
this.buttonKundeInfo.Location = new Point(20, this.buttonAbbrechen.Top);
if (this.oLVArtikel.Visible) this.ClientSize = new Size(oLVArtikel.Right + 10, buttonAbbrechen.Bottom + 10);
else this.ClientSize = new Size(textBoxZusatz.Right + 10, pictureBoxDirtPlus.Bottom + 10 + buttonAbbrechen.Height + 20);
}
if (fb != null) fb.Location = new Point(this.ClientSize.Width - fb.Width - 7, 0);
@ -553,7 +589,23 @@ namespace Deckungsbeitrag
this.Width--;
}
//if (oLVArtikel != null) this.ClientSize = new Size(oLVArtikel.Right + 10, oLVArtikel.Bottom + buttonAbbrechen.Height + 25);
}
private void AdjustHeightToFitAll(ObjectListView olv)
{
//TODO: HEIGHT SO EINSTELLEN, DASS ALLE ITEMS SICHTBAR SIND.
if (olv.Items.Count == 0)
{
olv.Visible = false;
//olv.Height = olv.HeaderControl?.ClientRectangle.Height ?? 0;
return;
}
int rowHeight = olv.RowHeightEffective; // Standard oder gesetzt
int headerHeight = olv.HeaderControl?.ClientRectangle.Height ?? 0;
int totalHeight = headerHeight + (olv.Items.Count * rowHeight);
// Optional: Header berücksichtigen, wenn View=Details
olv.Height = totalHeight;
}
private void ChangeAnzahl(int newValue, int oldvalue, AuftragArtikel auftragArtikel)
{
@ -584,6 +636,9 @@ namespace Deckungsbeitrag
}
}
else dictionary.Add((int)kndart.KundeArtikelID, bestand);
zahlenChanged = true;
//WriteToCSV(kndart);
this.ResumeLayout();
this.Cursor = Cursors.Default;
@ -721,6 +776,28 @@ namespace Deckungsbeitrag
}
}
}
private void ButtonKundeInfo_CLick(object sender, EventArgs e)
{
FormKundeVW kundeVW = new FormKundeVW(this.kunde);
kundeVW.ShowDialog();
}
private void FormAuftragDetail_HelpButtonClicked(object sender, CancelEventArgs e)
{
Control[] ctr = this.Controls.Find("info", false);
if (ctr.Length == 1) this.Controls.Remove(ctr[0]); infoOpen = false;
if (ctr.Length > 1) foreach (Control control in ctr) this.Controls.Remove(control);
if (ctr.Length == 0)
{
UCAuftragInfo info = new UCAuftragInfo(this.auftrag);
info.Name = "info";
this.Controls.Add(info);
info.Location = new Point(20, 20);
info.BringToFront();
}
e.Cancel = true;
}
}
}
//CHANGES: 1. Es wird ab sofort nur ein Button zum Speichern und Abschließen bereitgestellt. System entscheidet was getan wird.

View File

@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
@ -39,11 +40,26 @@
this.buttonSWS_Drucken = new System.Windows.Forms.Button();
this.chartFehlmenge = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.groupBoxKndInfo = new System.Windows.Forms.GroupBox();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.labelAnmerkung = new System.Windows.Forms.Label();
this.labelAufgabe = new System.Windows.Forms.Label();
this.labelZusatz = new System.Windows.Forms.Label();
this.buttonTourenListe = new System.Windows.Forms.Button();
this.buttonStats = new System.Windows.Forms.Button();
this.buttonEinstellung = new System.Windows.Forms.Button();
this.tabPageRampe = new System.Windows.Forms.TabPage();
this.objectListViewRampe = new BrightIdeasSoftware.ObjectListView();
this.contextMenuStripExpedit = new System.Windows.Forms.ContextMenuStrip(this.components);
this.bearbeitenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.liefertagToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.containerSauberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.containerSchmutzigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tourToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.aufgabeErledigtToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.auftragVerschiebenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.auftragLöschenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.auftraginfoAnsehenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tabPageSonder = new System.Windows.Forms.TabPage();
this.objectListViewSonder = new BrightIdeasSoftware.ObjectListView();
this.tabPageGeschaeft = new System.Windows.Forms.TabPage();
@ -54,14 +70,13 @@
this.tabPageVorbereitet = new System.Windows.Forms.TabPage();
this.objectListViewVorbereitet = new BrightIdeasSoftware.ObjectListView();
this.buttonNW = new System.Windows.Forms.Button();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.labelAnmerkung = new System.Windows.Forms.Label();
this.labelAufgabe = new System.Windows.Forms.Label();
this.labelZusatz = new System.Windows.Forms.Label();
this.buttonEtikettenDrucken = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.chartFehlmenge)).BeginInit();
this.groupBoxKndInfo.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.tabPageRampe.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.objectListViewRampe)).BeginInit();
this.contextMenuStripExpedit.SuspendLayout();
this.tabPageSonder.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.objectListViewSonder)).BeginInit();
this.tabPageGeschaeft.SuspendLayout();
@ -71,7 +86,6 @@
this.tabControlAuftragList.SuspendLayout();
this.tabPageVorbereitet.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.objectListViewVorbereitet)).BeginInit();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// buttonNeuerAuftrag
@ -83,7 +97,7 @@
this.buttonNeuerAuftrag.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonNeuerAuftrag.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonNeuerAuftrag.ForeColor = System.Drawing.Color.Black;
this.buttonNeuerAuftrag.Location = new System.Drawing.Point(712, 650);
this.buttonNeuerAuftrag.Location = new System.Drawing.Point(788, 650);
this.buttonNeuerAuftrag.Margin = new System.Windows.Forms.Padding(2);
this.buttonNeuerAuftrag.Name = "buttonNeuerAuftrag";
this.buttonNeuerAuftrag.Size = new System.Drawing.Size(200, 41);
@ -133,7 +147,7 @@
this.buttonSWS_Drucken.FlatAppearance.BorderSize = 0;
this.buttonSWS_Drucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonSWS_Drucken.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonSWS_Drucken.Location = new System.Drawing.Point(916, 650);
this.buttonSWS_Drucken.Location = new System.Drawing.Point(1196, 650);
this.buttonSWS_Drucken.Margin = new System.Windows.Forms.Padding(2);
this.buttonSWS_Drucken.Name = "buttonSWS_Drucken";
this.buttonSWS_Drucken.Size = new System.Drawing.Size(200, 41);
@ -156,7 +170,7 @@
this.chartFehlmenge.ChartAreas.Add(chartArea1);
legend1.Name = "Legend1";
this.chartFehlmenge.Legends.Add(legend1);
this.chartFehlmenge.Location = new System.Drawing.Point(916, 43);
this.chartFehlmenge.Location = new System.Drawing.Point(1196, 43);
this.chartFehlmenge.Name = "chartFehlmenge";
series1.ChartArea = "ChartArea1";
series1.Legend = "Legend1";
@ -177,7 +191,7 @@
this.groupBoxKndInfo.Controls.Add(this.flowLayoutPanel1);
this.groupBoxKndInfo.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBoxKndInfo.ForeColor = System.Drawing.Color.Red;
this.groupBoxKndInfo.Location = new System.Drawing.Point(916, 452);
this.groupBoxKndInfo.Location = new System.Drawing.Point(1196, 452);
this.groupBoxKndInfo.Name = "groupBoxKndInfo";
this.groupBoxKndInfo.Size = new System.Drawing.Size(293, 183);
this.groupBoxKndInfo.TabIndex = 65;
@ -187,300 +201,6 @@
this.groupBoxKndInfo.VisibleChanged += new System.EventHandler(this.GroupBoxKndInfo_VisibleChanged);
this.groupBoxKndInfo.Paint += new System.Windows.Forms.PaintEventHandler(this.GroupBoxKndInfo_Paint);
//
// buttonTourenListe
//
this.buttonTourenListe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonTourenListe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.buttonTourenListe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
this.buttonTourenListe.FlatAppearance.BorderSize = 0;
this.buttonTourenListe.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonTourenListe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonTourenListe.ForeColor = System.Drawing.Color.Black;
this.buttonTourenListe.Location = new System.Drawing.Point(488, 649);
this.buttonTourenListe.Margin = new System.Windows.Forms.Padding(2);
this.buttonTourenListe.Name = "buttonTourenListe";
this.buttonTourenListe.Size = new System.Drawing.Size(200, 41);
this.buttonTourenListe.TabIndex = 66;
this.buttonTourenListe.Text = "Tourenliste Drucken";
this.buttonTourenListe.UseVisualStyleBackColor = false;
this.buttonTourenListe.Click += new System.EventHandler(this.ButtonTourenListe_Click);
//
// buttonStats
//
this.buttonStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStats.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.buttonStats.FlatAppearance.BorderSize = 3;
this.buttonStats.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonStats.Image = global::Deckungsbeitrag.Properties.Resources.StatisticsWarning_16x;
this.buttonStats.Location = new System.Drawing.Point(1121, 650);
this.buttonStats.Name = "buttonStats";
this.buttonStats.Size = new System.Drawing.Size(41, 41);
this.buttonStats.TabIndex = 46;
this.buttonStats.UseVisualStyleBackColor = true;
this.buttonStats.Click += new System.EventHandler(this.ButtonStats_Click);
//
// buttonEinstellung
//
this.buttonEinstellung.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEinstellung.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.buttonEinstellung.FlatAppearance.BorderSize = 3;
this.buttonEinstellung.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonEinstellung.Image = global::Deckungsbeitrag.Properties.Resources.Monaco_Settings_16x;
this.buttonEinstellung.Location = new System.Drawing.Point(1168, 650);
this.buttonEinstellung.Name = "buttonEinstellung";
this.buttonEinstellung.Size = new System.Drawing.Size(41, 41);
this.buttonEinstellung.TabIndex = 45;
this.buttonEinstellung.UseVisualStyleBackColor = true;
this.buttonEinstellung.Click += new System.EventHandler(this.ButtonEinstellung_Click);
//
// tabPageRampe
//
this.tabPageRampe.Controls.Add(this.objectListViewRampe);
this.tabPageRampe.Location = new System.Drawing.Point(4, 39);
this.tabPageRampe.Name = "tabPageRampe";
this.tabPageRampe.Size = new System.Drawing.Size(890, 579);
this.tabPageRampe.TabIndex = 3;
this.tabPageRampe.Text = "Rampe";
this.tabPageRampe.UseVisualStyleBackColor = true;
//
// objectListViewRampe
//
this.objectListViewRampe.AllowColumnReorder = true;
this.objectListViewRampe.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewRampe.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewRampe.CellEditUseWholeCell = false;
this.objectListViewRampe.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewRampe.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewRampe.FullRowSelect = true;
this.objectListViewRampe.GridLines = true;
this.objectListViewRampe.HideSelection = false;
this.objectListViewRampe.Location = new System.Drawing.Point(0, 0);
this.objectListViewRampe.Name = "objectListViewRampe";
this.objectListViewRampe.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewRampe.Size = new System.Drawing.Size(890, 579);
this.objectListViewRampe.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewRampe.TabIndex = 2;
this.objectListViewRampe.TintSortColumn = true;
this.objectListViewRampe.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewRampe.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewRampe.UseAlternatingBackColors = true;
this.objectListViewRampe.UseCellFormatEvents = true;
this.objectListViewRampe.UseCompatibleStateImageBehavior = false;
this.objectListViewRampe.UseFiltering = true;
this.objectListViewRampe.UseHotControls = false;
this.objectListViewRampe.UseHyperlinks = true;
this.objectListViewRampe.View = System.Windows.Forms.View.Details;
this.objectListViewRampe.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewRampe_CellEditStarting);
//
// tabPageSonder
//
this.tabPageSonder.Controls.Add(this.objectListViewSonder);
this.tabPageSonder.Location = new System.Drawing.Point(4, 39);
this.tabPageSonder.Name = "tabPageSonder";
this.tabPageSonder.Padding = new System.Windows.Forms.Padding(3);
this.tabPageSonder.Size = new System.Drawing.Size(890, 579);
this.tabPageSonder.TabIndex = 1;
this.tabPageSonder.Text = "Sonderaufträge";
this.tabPageSonder.UseVisualStyleBackColor = true;
//
// objectListViewSonder
//
this.objectListViewSonder.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewSonder.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewSonder.CellEditUseWholeCell = false;
this.objectListViewSonder.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewSonder.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewSonder.FullRowSelect = true;
this.objectListViewSonder.GridLines = true;
this.objectListViewSonder.HideSelection = false;
this.objectListViewSonder.Location = new System.Drawing.Point(3, 3);
this.objectListViewSonder.Name = "objectListViewSonder";
this.objectListViewSonder.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewSonder.Size = new System.Drawing.Size(884, 573);
this.objectListViewSonder.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewSonder.TabIndex = 2;
this.objectListViewSonder.TintSortColumn = true;
this.objectListViewSonder.UseAlternatingBackColors = true;
this.objectListViewSonder.UseCellFormatEvents = true;
this.objectListViewSonder.UseCompatibleStateImageBehavior = false;
this.objectListViewSonder.UseHotControls = false;
this.objectListViewSonder.View = System.Windows.Forms.View.Details;
this.objectListViewSonder.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewSonder.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewSonder.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewSonder.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewSonder.CellRightClick += new System.EventHandler<BrightIdeasSoftware.CellRightClickEventArgs>(this.ObjectListViewAuftrag_CellRightClick);
this.objectListViewSonder.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
//
// tabPageGeschaeft
//
this.tabPageGeschaeft.Controls.Add(this.objectListViewGeschaeft);
this.tabPageGeschaeft.Location = new System.Drawing.Point(4, 39);
this.tabPageGeschaeft.Name = "tabPageGeschaeft";
this.tabPageGeschaeft.Padding = new System.Windows.Forms.Padding(3);
this.tabPageGeschaeft.Size = new System.Drawing.Size(890, 579);
this.tabPageGeschaeft.TabIndex = 2;
this.tabPageGeschaeft.Text = "Geschäft";
this.tabPageGeschaeft.UseVisualStyleBackColor = true;
//
// objectListViewGeschaeft
//
this.objectListViewGeschaeft.AllowColumnReorder = true;
this.objectListViewGeschaeft.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewGeschaeft.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewGeschaeft.CellEditUseWholeCell = false;
this.objectListViewGeschaeft.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewGeschaeft.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewGeschaeft.FullRowSelect = true;
this.objectListViewGeschaeft.GridLines = true;
this.objectListViewGeschaeft.HideSelection = false;
this.objectListViewGeschaeft.Location = new System.Drawing.Point(3, 3);
this.objectListViewGeschaeft.Name = "objectListViewGeschaeft";
this.objectListViewGeschaeft.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewGeschaeft.Size = new System.Drawing.Size(884, 573);
this.objectListViewGeschaeft.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewGeschaeft.TabIndex = 2;
this.objectListViewGeschaeft.TintSortColumn = true;
this.objectListViewGeschaeft.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewGeschaeft.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewGeschaeft.UseAlternatingBackColors = true;
this.objectListViewGeschaeft.UseCellFormatEvents = true;
this.objectListViewGeschaeft.UseCompatibleStateImageBehavior = false;
this.objectListViewGeschaeft.UseFiltering = true;
this.objectListViewGeschaeft.UseHotControls = false;
this.objectListViewGeschaeft.UseHyperlinks = true;
this.objectListViewGeschaeft.View = System.Windows.Forms.View.Details;
this.objectListViewGeschaeft.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewGeschaeft.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewGeschaeft.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewGeschaeft.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewGeschaeft.CellRightClick += new System.EventHandler<BrightIdeasSoftware.CellRightClickEventArgs>(this.ObjectListViewAuftrag_CellRightClick);
this.objectListViewGeschaeft.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
//
// tabPageAll
//
this.tabPageAll.Controls.Add(this.objectListViewAuftrag);
this.tabPageAll.Location = new System.Drawing.Point(4, 39);
this.tabPageAll.Name = "tabPageAll";
this.tabPageAll.Padding = new System.Windows.Forms.Padding(3);
this.tabPageAll.Size = new System.Drawing.Size(890, 579);
this.tabPageAll.TabIndex = 0;
this.tabPageAll.Text = "Aufträge heute";
this.tabPageAll.UseVisualStyleBackColor = true;
//
// objectListViewAuftrag
//
this.objectListViewAuftrag.AllowColumnReorder = true;
this.objectListViewAuftrag.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewAuftrag.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewAuftrag.CellEditUseWholeCell = false;
this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewAuftrag.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewAuftrag.FullRowSelect = true;
this.objectListViewAuftrag.GridLines = true;
this.objectListViewAuftrag.HideSelection = false;
this.objectListViewAuftrag.Location = new System.Drawing.Point(3, 3);
this.objectListViewAuftrag.Name = "objectListViewAuftrag";
this.objectListViewAuftrag.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewAuftrag.Size = new System.Drawing.Size(884, 573);
this.objectListViewAuftrag.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewAuftrag.TabIndex = 1;
this.objectListViewAuftrag.TintSortColumn = true;
this.objectListViewAuftrag.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewAuftrag.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewAuftrag.UseAlternatingBackColors = true;
this.objectListViewAuftrag.UseCellFormatEvents = true;
this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false;
this.objectListViewAuftrag.UseFiltering = true;
this.objectListViewAuftrag.UseHotControls = false;
this.objectListViewAuftrag.UseHyperlinks = true;
this.objectListViewAuftrag.View = System.Windows.Forms.View.Details;
this.objectListViewAuftrag.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewAuftrag.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewAuftrag.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewAuftrag.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewAuftrag.CellRightClick += new System.EventHandler<BrightIdeasSoftware.CellRightClickEventArgs>(this.ObjectListViewAuftrag_CellRightClick);
this.objectListViewAuftrag.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
//
// tabControlAuftragList
//
this.tabControlAuftragList.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.tabControlAuftragList.Controls.Add(this.tabPageAll);
this.tabControlAuftragList.Controls.Add(this.tabPageGeschaeft);
this.tabControlAuftragList.Controls.Add(this.tabPageSonder);
this.tabControlAuftragList.Controls.Add(this.tabPageRampe);
this.tabControlAuftragList.Controls.Add(this.tabPageVorbereitet);
this.tabControlAuftragList.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControlAuftragList.Location = new System.Drawing.Point(4, 17);
this.tabControlAuftragList.Name = "tabControlAuftragList";
this.tabControlAuftragList.SelectedIndex = 0;
this.tabControlAuftragList.Size = new System.Drawing.Size(898, 622);
this.tabControlAuftragList.TabIndex = 0;
this.tabControlAuftragList.Visible = false;
this.tabControlAuftragList.SelectedIndexChanged += new System.EventHandler(this.TabControlAuftragList_SelectedIndexChanged);
this.tabControlAuftragList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TabControlAuftragList_MouseDown);
//
// tabPageVorbereitet
//
this.tabPageVorbereitet.Controls.Add(this.objectListViewVorbereitet);
this.tabPageVorbereitet.Location = new System.Drawing.Point(4, 39);
this.tabPageVorbereitet.Name = "tabPageVorbereitet";
this.tabPageVorbereitet.Size = new System.Drawing.Size(890, 579);
this.tabPageVorbereitet.TabIndex = 4;
this.tabPageVorbereitet.Text = "Vorbereitet";
this.tabPageVorbereitet.UseVisualStyleBackColor = true;
//
// objectListViewVorbereitet
//
this.objectListViewVorbereitet.AllowColumnReorder = true;
this.objectListViewVorbereitet.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewVorbereitet.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewVorbereitet.CellEditUseWholeCell = false;
this.objectListViewVorbereitet.CheckBoxes = true;
this.objectListViewVorbereitet.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewVorbereitet.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewVorbereitet.FullRowSelect = true;
this.objectListViewVorbereitet.GridLines = true;
this.objectListViewVorbereitet.HideSelection = false;
this.objectListViewVorbereitet.Location = new System.Drawing.Point(0, 0);
this.objectListViewVorbereitet.Name = "objectListViewVorbereitet";
this.objectListViewVorbereitet.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewVorbereitet.Size = new System.Drawing.Size(890, 579);
this.objectListViewVorbereitet.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewVorbereitet.TabIndex = 2;
this.objectListViewVorbereitet.TintSortColumn = true;
this.objectListViewVorbereitet.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewVorbereitet.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewVorbereitet.UseAlternatingBackColors = true;
this.objectListViewVorbereitet.UseCellFormatEvents = true;
this.objectListViewVorbereitet.UseCompatibleStateImageBehavior = false;
this.objectListViewVorbereitet.UseFiltering = true;
this.objectListViewVorbereitet.UseHyperlinks = true;
this.objectListViewVorbereitet.View = System.Windows.Forms.View.Details;
this.objectListViewVorbereitet.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewVorbereitet.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewVorbereitet.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewVorbereitet.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewVorbereitet.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
//
// 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(69, 41);
this.buttonNW.TabIndex = 67;
this.buttonNW.Text = "NW";
this.buttonNW.UseVisualStyleBackColor = true;
this.buttonNW.Click += new System.EventHandler(this.ButtonNW_Click);
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Controls.Add(this.labelAnmerkung);
@ -524,11 +244,427 @@
this.labelZusatz.TabIndex = 4;
this.labelZusatz.Text = "label4";
//
// buttonTourenListe
//
this.buttonTourenListe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.buttonTourenListe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.buttonTourenListe.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
this.buttonTourenListe.FlatAppearance.BorderSize = 0;
this.buttonTourenListe.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonTourenListe.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonTourenListe.ForeColor = System.Drawing.Color.Black;
this.buttonTourenListe.Location = new System.Drawing.Point(488, 649);
this.buttonTourenListe.Margin = new System.Windows.Forms.Padding(2);
this.buttonTourenListe.Name = "buttonTourenListe";
this.buttonTourenListe.Size = new System.Drawing.Size(200, 41);
this.buttonTourenListe.TabIndex = 66;
this.buttonTourenListe.Text = "Tourenliste Drucken";
this.buttonTourenListe.UseVisualStyleBackColor = false;
this.buttonTourenListe.Visible = false;
this.buttonTourenListe.Click += new System.EventHandler(this.ButtonTourenListe_Click);
//
// buttonStats
//
this.buttonStats.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonStats.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.buttonStats.FlatAppearance.BorderSize = 3;
this.buttonStats.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonStats.Image = global::Deckungsbeitrag.Properties.Resources.StatisticsWarning_16x;
this.buttonStats.Location = new System.Drawing.Point(1401, 650);
this.buttonStats.Name = "buttonStats";
this.buttonStats.Size = new System.Drawing.Size(41, 41);
this.buttonStats.TabIndex = 46;
this.buttonStats.UseVisualStyleBackColor = true;
this.buttonStats.Click += new System.EventHandler(this.ButtonStats_Click);
//
// buttonEinstellung
//
this.buttonEinstellung.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEinstellung.FlatAppearance.BorderColor = System.Drawing.Color.White;
this.buttonEinstellung.FlatAppearance.BorderSize = 3;
this.buttonEinstellung.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonEinstellung.Image = global::Deckungsbeitrag.Properties.Resources.Monaco_Settings_16x;
this.buttonEinstellung.Location = new System.Drawing.Point(1448, 650);
this.buttonEinstellung.Name = "buttonEinstellung";
this.buttonEinstellung.Size = new System.Drawing.Size(41, 41);
this.buttonEinstellung.TabIndex = 45;
this.buttonEinstellung.UseVisualStyleBackColor = true;
this.buttonEinstellung.Click += new System.EventHandler(this.ButtonEinstellung_Click);
//
// tabPageRampe
//
this.tabPageRampe.Controls.Add(this.objectListViewRampe);
this.tabPageRampe.Location = new System.Drawing.Point(4, 39);
this.tabPageRampe.Name = "tabPageRampe";
this.tabPageRampe.Size = new System.Drawing.Size(1170, 579);
this.tabPageRampe.TabIndex = 3;
this.tabPageRampe.Text = "Rampe";
this.tabPageRampe.UseVisualStyleBackColor = true;
//
// objectListViewRampe
//
this.objectListViewRampe.AllowColumnReorder = true;
this.objectListViewRampe.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewRampe.CellEditUseWholeCell = false;
this.objectListViewRampe.ContextMenuStrip = this.contextMenuStripExpedit;
this.objectListViewRampe.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewRampe.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewRampe.FullRowSelect = true;
this.objectListViewRampe.GridLines = true;
this.objectListViewRampe.HideSelection = false;
this.objectListViewRampe.Location = new System.Drawing.Point(0, 0);
this.objectListViewRampe.Name = "objectListViewRampe";
this.objectListViewRampe.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewRampe.Size = new System.Drawing.Size(1170, 579);
this.objectListViewRampe.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewRampe.TabIndex = 2;
this.objectListViewRampe.TintSortColumn = true;
this.objectListViewRampe.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewRampe.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewRampe.UseAlternatingBackColors = true;
this.objectListViewRampe.UseCellFormatEvents = true;
this.objectListViewRampe.UseCompatibleStateImageBehavior = false;
this.objectListViewRampe.UseFiltering = true;
this.objectListViewRampe.UseHotControls = false;
this.objectListViewRampe.UseHyperlinks = true;
this.objectListViewRampe.View = System.Windows.Forms.View.Details;
this.objectListViewRampe.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewRampe.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
//
// contextMenuStripExpedit
//
this.contextMenuStripExpedit.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStripExpedit.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.bearbeitenToolStripMenuItem,
this.auftraginfoAnsehenToolStripMenuItem,
this.aufgabeErledigtToolStripMenuItem,
this.auftragVerschiebenToolStripMenuItem,
this.auftragLöschenToolStripMenuItem});
this.contextMenuStripExpedit.Name = "contextMenuStripExpedit";
this.contextMenuStripExpedit.Size = new System.Drawing.Size(240, 134);
this.contextMenuStripExpedit.Opening += new System.ComponentModel.CancelEventHandler(this.ContextMenuStripExpedit_Opening);
//
// bearbeitenToolStripMenuItem
//
this.bearbeitenToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.liefertagToolStripMenuItem,
this.statusToolStripMenuItem,
this.containerSauberToolStripMenuItem,
this.containerSchmutzigToolStripMenuItem,
this.tourToolStripMenuItem});
this.bearbeitenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.PenOne_16x;
this.bearbeitenToolStripMenuItem.Name = "bearbeitenToolStripMenuItem";
this.bearbeitenToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.bearbeitenToolStripMenuItem.Text = "Bearbeiten";
this.bearbeitenToolStripMenuItem.DropDownOpening += new System.EventHandler(this.ContextMenuStripBearbeiten_DropDownOpening);
//
// liefertagToolStripMenuItem
//
this.liefertagToolStripMenuItem.AccessibleName = "Liefertag";
this.liefertagToolStripMenuItem.Name = "liefertagToolStripMenuItem";
this.liefertagToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.liefertagToolStripMenuItem.Text = "Liefertag";
this.liefertagToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
//
// statusToolStripMenuItem
//
this.statusToolStripMenuItem.AccessibleName = "Status";
this.statusToolStripMenuItem.Name = "statusToolStripMenuItem";
this.statusToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.statusToolStripMenuItem.Text = "Status";
this.statusToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
//
// containerSauberToolStripMenuItem
//
this.containerSauberToolStripMenuItem.AccessibleName = "ContainerClean";
this.containerSauberToolStripMenuItem.Name = "containerSauberToolStripMenuItem";
this.containerSauberToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.containerSauberToolStripMenuItem.Text = "Container Sauber";
this.containerSauberToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
//
// containerSchmutzigToolStripMenuItem
//
this.containerSchmutzigToolStripMenuItem.AccessibleName = "ContainerDirt";
this.containerSchmutzigToolStripMenuItem.Name = "containerSchmutzigToolStripMenuItem";
this.containerSchmutzigToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.containerSchmutzigToolStripMenuItem.Text = "Container schmutzig";
this.containerSchmutzigToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
//
// tourToolStripMenuItem
//
this.tourToolStripMenuItem.AccessibleName = "Tour";
this.tourToolStripMenuItem.Name = "tourToolStripMenuItem";
this.tourToolStripMenuItem.Size = new System.Drawing.Size(227, 26);
this.tourToolStripMenuItem.Text = "Tour";
this.tourToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripBearbeiten_Click);
//
// aufgabeErledigtToolStripMenuItem
//
this.aufgabeErledigtToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.Checkmark_blue_16x;
this.aufgabeErledigtToolStripMenuItem.Name = "aufgabeErledigtToolStripMenuItem";
this.aufgabeErledigtToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.aufgabeErledigtToolStripMenuItem.Text = "Aufgabe erledigt";
this.aufgabeErledigtToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAufgabeErledigt_Click);
//
// auftragVerschiebenToolStripMenuItem
//
this.auftragVerschiebenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("auftragVerschiebenToolStripMenuItem.Image")));
this.auftragVerschiebenToolStripMenuItem.Name = "auftragVerschiebenToolStripMenuItem";
this.auftragVerschiebenToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.auftragVerschiebenToolStripMenuItem.Text = "In Aufträge Verschieben";
this.auftragVerschiebenToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAuftragVerschieben_Click);
//
// auftragLöschenToolStripMenuItem
//
this.auftragLöschenToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("auftragLöschenToolStripMenuItem.Image")));
this.auftragLöschenToolStripMenuItem.Name = "auftragLöschenToolStripMenuItem";
this.auftragLöschenToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.auftragLöschenToolStripMenuItem.Text = "Auftrag Löschen";
this.auftragLöschenToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAuftragDelete_Click);
//
// auftraginfoAnsehenToolStripMenuItem
//
this.auftraginfoAnsehenToolStripMenuItem.Image = global::Deckungsbeitrag.Properties.Resources.InformationSymbol_16x;
this.auftraginfoAnsehenToolStripMenuItem.Name = "auftraginfoAnsehenToolStripMenuItem";
this.auftraginfoAnsehenToolStripMenuItem.Size = new System.Drawing.Size(239, 26);
this.auftraginfoAnsehenToolStripMenuItem.Text = "Auftraginfo ansehen";
this.auftraginfoAnsehenToolStripMenuItem.Click += new System.EventHandler(this.ContextMenuStripAuftragInfo_Click);
//
// tabPageSonder
//
this.tabPageSonder.Controls.Add(this.objectListViewSonder);
this.tabPageSonder.Location = new System.Drawing.Point(4, 39);
this.tabPageSonder.Name = "tabPageSonder";
this.tabPageSonder.Padding = new System.Windows.Forms.Padding(3);
this.tabPageSonder.Size = new System.Drawing.Size(1170, 579);
this.tabPageSonder.TabIndex = 1;
this.tabPageSonder.Text = "Sonderaufträge";
this.tabPageSonder.UseVisualStyleBackColor = true;
//
// objectListViewSonder
//
this.objectListViewSonder.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewSonder.CellEditActivation = BrightIdeasSoftware.ObjectListView.CellEditActivateMode.DoubleClick;
this.objectListViewSonder.CellEditUseWholeCell = false;
this.objectListViewSonder.ContextMenuStrip = this.contextMenuStripExpedit;
this.objectListViewSonder.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewSonder.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewSonder.FullRowSelect = true;
this.objectListViewSonder.GridLines = true;
this.objectListViewSonder.HideSelection = false;
this.objectListViewSonder.Location = new System.Drawing.Point(3, 3);
this.objectListViewSonder.Name = "objectListViewSonder";
this.objectListViewSonder.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewSonder.Size = new System.Drawing.Size(1164, 573);
this.objectListViewSonder.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewSonder.TabIndex = 2;
this.objectListViewSonder.TintSortColumn = true;
this.objectListViewSonder.UseAlternatingBackColors = true;
this.objectListViewSonder.UseCellFormatEvents = true;
this.objectListViewSonder.UseCompatibleStateImageBehavior = false;
this.objectListViewSonder.UseHotControls = false;
this.objectListViewSonder.View = System.Windows.Forms.View.Details;
this.objectListViewSonder.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewSonder.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewSonder.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewSonder.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewSonder.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
this.objectListViewSonder.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
//
// tabPageGeschaeft
//
this.tabPageGeschaeft.Controls.Add(this.objectListViewGeschaeft);
this.tabPageGeschaeft.Location = new System.Drawing.Point(4, 39);
this.tabPageGeschaeft.Name = "tabPageGeschaeft";
this.tabPageGeschaeft.Padding = new System.Windows.Forms.Padding(3);
this.tabPageGeschaeft.Size = new System.Drawing.Size(1170, 579);
this.tabPageGeschaeft.TabIndex = 2;
this.tabPageGeschaeft.Text = "Geschäft";
this.tabPageGeschaeft.UseVisualStyleBackColor = true;
//
// objectListViewGeschaeft
//
this.objectListViewGeschaeft.AllowColumnReorder = true;
this.objectListViewGeschaeft.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewGeschaeft.CellEditUseWholeCell = false;
this.objectListViewGeschaeft.ContextMenuStrip = this.contextMenuStripExpedit;
this.objectListViewGeschaeft.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewGeschaeft.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewGeschaeft.FullRowSelect = true;
this.objectListViewGeschaeft.GridLines = true;
this.objectListViewGeschaeft.HideSelection = false;
this.objectListViewGeschaeft.Location = new System.Drawing.Point(3, 3);
this.objectListViewGeschaeft.Name = "objectListViewGeschaeft";
this.objectListViewGeschaeft.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewGeschaeft.Size = new System.Drawing.Size(1164, 573);
this.objectListViewGeschaeft.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewGeschaeft.TabIndex = 2;
this.objectListViewGeschaeft.TintSortColumn = true;
this.objectListViewGeschaeft.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewGeschaeft.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewGeschaeft.UseAlternatingBackColors = true;
this.objectListViewGeschaeft.UseCellFormatEvents = true;
this.objectListViewGeschaeft.UseCompatibleStateImageBehavior = false;
this.objectListViewGeschaeft.UseFiltering = true;
this.objectListViewGeschaeft.UseHotControls = false;
this.objectListViewGeschaeft.UseHyperlinks = true;
this.objectListViewGeschaeft.View = System.Windows.Forms.View.Details;
this.objectListViewGeschaeft.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewGeschaeft.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewGeschaeft.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewGeschaeft.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewGeschaeft.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
this.objectListViewGeschaeft.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
//
// tabPageAll
//
this.tabPageAll.Controls.Add(this.objectListViewAuftrag);
this.tabPageAll.Location = new System.Drawing.Point(4, 39);
this.tabPageAll.Name = "tabPageAll";
this.tabPageAll.Padding = new System.Windows.Forms.Padding(3);
this.tabPageAll.Size = new System.Drawing.Size(1170, 579);
this.tabPageAll.TabIndex = 0;
this.tabPageAll.Text = "Aufträge heute";
this.tabPageAll.UseVisualStyleBackColor = true;
//
// objectListViewAuftrag
//
this.objectListViewAuftrag.AllowColumnReorder = true;
this.objectListViewAuftrag.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewAuftrag.CellEditUseWholeCell = false;
this.objectListViewAuftrag.ContextMenuStrip = this.contextMenuStripExpedit;
this.objectListViewAuftrag.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewAuftrag.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewAuftrag.FullRowSelect = true;
this.objectListViewAuftrag.GridLines = true;
this.objectListViewAuftrag.HideSelection = false;
this.objectListViewAuftrag.Location = new System.Drawing.Point(3, 3);
this.objectListViewAuftrag.Name = "objectListViewAuftrag";
this.objectListViewAuftrag.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewAuftrag.Size = new System.Drawing.Size(1164, 573);
this.objectListViewAuftrag.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewAuftrag.TabIndex = 1;
this.objectListViewAuftrag.TintSortColumn = true;
this.objectListViewAuftrag.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewAuftrag.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewAuftrag.UseAlternatingBackColors = true;
this.objectListViewAuftrag.UseCellFormatEvents = true;
this.objectListViewAuftrag.UseCompatibleStateImageBehavior = false;
this.objectListViewAuftrag.UseFiltering = true;
this.objectListViewAuftrag.UseHotControls = false;
this.objectListViewAuftrag.UseHyperlinks = true;
this.objectListViewAuftrag.View = System.Windows.Forms.View.Details;
this.objectListViewAuftrag.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewAuftrag.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewAuftrag.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewAuftrag.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewAuftrag.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
this.objectListViewAuftrag.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
//
// tabControlAuftragList
//
this.tabControlAuftragList.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.tabControlAuftragList.Controls.Add(this.tabPageAll);
this.tabControlAuftragList.Controls.Add(this.tabPageGeschaeft);
this.tabControlAuftragList.Controls.Add(this.tabPageSonder);
this.tabControlAuftragList.Controls.Add(this.tabPageRampe);
this.tabControlAuftragList.Controls.Add(this.tabPageVorbereitet);
this.tabControlAuftragList.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControlAuftragList.Location = new System.Drawing.Point(4, 17);
this.tabControlAuftragList.Name = "tabControlAuftragList";
this.tabControlAuftragList.SelectedIndex = 0;
this.tabControlAuftragList.Size = new System.Drawing.Size(1178, 622);
this.tabControlAuftragList.TabIndex = 0;
this.tabControlAuftragList.Visible = false;
this.tabControlAuftragList.SelectedIndexChanged += new System.EventHandler(this.TabControlAuftragList_SelectedIndexChanged);
this.tabControlAuftragList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TabControlAuftragList_MouseDown);
//
// tabPageVorbereitet
//
this.tabPageVorbereitet.Controls.Add(this.objectListViewVorbereitet);
this.tabPageVorbereitet.Location = new System.Drawing.Point(4, 39);
this.tabPageVorbereitet.Name = "tabPageVorbereitet";
this.tabPageVorbereitet.Size = new System.Drawing.Size(1170, 579);
this.tabPageVorbereitet.TabIndex = 4;
this.tabPageVorbereitet.Text = "Vorbereitet";
this.tabPageVorbereitet.UseVisualStyleBackColor = true;
//
// objectListViewVorbereitet
//
this.objectListViewVorbereitet.AllowColumnReorder = true;
this.objectListViewVorbereitet.AlternateRowBackColor = System.Drawing.Color.LightBlue;
this.objectListViewVorbereitet.CellEditUseWholeCell = false;
this.objectListViewVorbereitet.CheckBoxes = true;
this.objectListViewVorbereitet.ContextMenuStrip = this.contextMenuStripExpedit;
this.objectListViewVorbereitet.Cursor = System.Windows.Forms.Cursors.Default;
this.objectListViewVorbereitet.Dock = System.Windows.Forms.DockStyle.Fill;
this.objectListViewVorbereitet.FullRowSelect = true;
this.objectListViewVorbereitet.GridLines = true;
this.objectListViewVorbereitet.HideSelection = false;
this.objectListViewVorbereitet.Location = new System.Drawing.Point(0, 0);
this.objectListViewVorbereitet.Name = "objectListViewVorbereitet";
this.objectListViewVorbereitet.SelectColumnsOnRightClickBehaviour = BrightIdeasSoftware.ObjectListView.ColumnSelectBehaviour.Submenu;
this.objectListViewVorbereitet.Size = new System.Drawing.Size(1170, 579);
this.objectListViewVorbereitet.Sorting = System.Windows.Forms.SortOrder.Ascending;
this.objectListViewVorbereitet.TabIndex = 2;
this.objectListViewVorbereitet.TintSortColumn = true;
this.objectListViewVorbereitet.UnfocusedSelectedBackColor = System.Drawing.SystemColors.Highlight;
this.objectListViewVorbereitet.UnfocusedSelectedForeColor = System.Drawing.SystemColors.HighlightText;
this.objectListViewVorbereitet.UseAlternatingBackColors = true;
this.objectListViewVorbereitet.UseCellFormatEvents = true;
this.objectListViewVorbereitet.UseCompatibleStateImageBehavior = false;
this.objectListViewVorbereitet.UseFiltering = true;
this.objectListViewVorbereitet.UseHyperlinks = true;
this.objectListViewVorbereitet.View = System.Windows.Forms.View.Details;
this.objectListViewVorbereitet.ButtonClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_ButtonClick);
this.objectListViewVorbereitet.CellEditFinished += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditFinished);
this.objectListViewVorbereitet.CellEditStarting += new BrightIdeasSoftware.CellEditEventHandler(this.ObjectListViewAuftrag_CellEditStarting);
this.objectListViewVorbereitet.CellClick += new System.EventHandler<BrightIdeasSoftware.CellClickEventArgs>(this.ObjectListViewAuftrag_CellClick);
this.objectListViewVorbereitet.FormatCell += new System.EventHandler<BrightIdeasSoftware.FormatCellEventArgs>(this.ObjectListViewAuftrag_FormatCell);
this.objectListViewVorbereitet.DoubleClick += new System.EventHandler(this.ObjectListView_DoubleClick);
//
// 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(69, 41);
this.buttonNW.TabIndex = 67;
this.buttonNW.Text = "NW";
this.buttonNW.UseVisualStyleBackColor = true;
this.buttonNW.Click += new System.EventHandler(this.ButtonNW_Click);
//
// buttonEtikettenDrucken
//
this.buttonEtikettenDrucken.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonEtikettenDrucken.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.buttonEtikettenDrucken.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.buttonEtikettenDrucken.FlatAppearance.BorderSize = 0;
this.buttonEtikettenDrucken.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonEtikettenDrucken.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonEtikettenDrucken.ForeColor = System.Drawing.Color.Black;
this.buttonEtikettenDrucken.Location = new System.Drawing.Point(992, 650);
this.buttonEtikettenDrucken.Margin = new System.Windows.Forms.Padding(2);
this.buttonEtikettenDrucken.Name = "buttonEtikettenDrucken";
this.buttonEtikettenDrucken.Size = new System.Drawing.Size(200, 41);
this.buttonEtikettenDrucken.TabIndex = 68;
this.buttonEtikettenDrucken.Text = "Etiketten Drucken";
this.buttonEtikettenDrucken.UseVisualStyleBackColor = false;
this.buttonEtikettenDrucken.Click += new System.EventHandler(this.ButtonEtikettenDrucken_Click);
//
// FormExpedit
//
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(1221, 703);
this.ClientSize = new System.Drawing.Size(1501, 703);
this.Controls.Add(this.buttonEtikettenDrucken);
this.Controls.Add(this.buttonNW);
this.Controls.Add(this.buttonTourenListe);
this.Controls.Add(this.groupBoxKndInfo);
@ -555,8 +691,11 @@
this.Resize += new System.EventHandler(this.FormExpedit_Resize);
((System.ComponentModel.ISupportInitialize)(this.chartFehlmenge)).EndInit();
this.groupBoxKndInfo.ResumeLayout(false);
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.tabPageRampe.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.objectListViewRampe)).EndInit();
this.contextMenuStripExpedit.ResumeLayout(false);
this.tabPageSonder.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.objectListViewSonder)).EndInit();
this.tabPageGeschaeft.ResumeLayout(false);
@ -566,8 +705,6 @@
this.tabControlAuftragList.ResumeLayout(false);
this.tabPageVorbereitet.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.objectListViewVorbereitet)).EndInit();
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
}
@ -598,5 +735,17 @@
private System.Windows.Forms.Label labelAnmerkung;
private System.Windows.Forms.Label labelAufgabe;
private System.Windows.Forms.Label labelZusatz;
private System.Windows.Forms.Button buttonEtikettenDrucken;
private System.Windows.Forms.ContextMenuStrip contextMenuStripExpedit;
private System.Windows.Forms.ToolStripMenuItem auftragVerschiebenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem bearbeitenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem liefertagToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem statusToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem containerSauberToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem containerSchmutzigToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem tourToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem aufgabeErledigtToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem auftragLöschenToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem auftraginfoAnsehenToolStripMenuItem;
}
}

View File

@ -68,6 +68,7 @@ namespace Deckungsbeitrag
this.Text += " Version: " + Assembly.GetExecutingAssembly().GetName().Version.ToString();
this.benutzer = benutzer;
this.Text += " Benutzer: " + benutzer.Vorname + " " + benutzer.Nachname;
this.StartPosition = FormStartPosition.CenterScreen;
this.tabControlAuftragList.Visible = true;
}
@ -272,8 +273,131 @@ namespace Deckungsbeitrag
FormShowUserControl showGroupBox = new FormShowUserControl("Statistik", this.benutzer);
showGroupBox.ShowDialog();
}
private void ButtonEtikettenDrucken_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
if (olv.SelectedItems.Count == 0 || olv.SelectedItems.Count > 1) return;
View_Auftrag_Expedit view = (View_Auftrag_Expedit)olv.SelectedItem.RowObject;
Auftrag auftrag = Auftrag.GetAuftrag(view.AuftragID);
this.UseWaitCursor = true;
HandleEtikettClick(auftrag);
Neuladen_OLV(olv);
this.UseWaitCursor = false;
}
private void ButtonNW_Click(object sender, EventArgs e)
{
FormArtikelVW artikelVW = new FormArtikelVW(this.benutzer);
artikelVW.ShowDialog();
}
private void ContextMenuStripBearbeiten_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
ToolStripItem item = (ToolStripItem)sender;
string aspect = item.AccessibleName;
var col = olv.AllColumns.OfType<BrightIdeasSoftware.OLVColumn>().First(x => x.AspectName == aspect);
if (this.benutzer.Rolle == BenutzerRolle.Admin) col.IsEditable = true;
if (olv.SelectedItem != null)
{
int idx = olv.AllColumns.IndexOf(col);
olv.StartCellEdit(olv.SelectedItem, idx);
}
}
private void ContextMenuStripAufgabeErledigt_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
// Überprüfung ob Click auf einem Item war.
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
Kunde _kunde = Kunde.GetKunde(null, _auftrag.KundeID, null);
string name;
if (string.IsNullOrWhiteSpace(_kunde.Suchtext)) name = _kunde.KundeName;
else name = _kunde.Suchtext;
if (_auftrag.AufgabeID == null) return;
Aufgabe _aufgabe = Aufgabe.GetAufgabe(null, _auftrag.AufgabeID);
if (meldung.GetFrage(this, $"Hast du beim Kunden {name} die Aufgabe {_aufgabe.Bezeichnung} erledigt?", false) == DialogResult.Yes)
{
Aufgabe_erledigt(_auftrag, _kunde, name);
}
}
private void ContextMenuStripAuftragVerschieben_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
if (!olv.Name.Contains("Rampe")) return;
// Überprüfung ob Click auf einem Item war.
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
if (_auftrag == null) return;
_auftrag.Status = AuftragStatus.Gewaschen;
_auftrag.Save();
Neuladen_OLV(olv);
}
private void ContextMenuStripAuftragDelete_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
// Überprüfung ob Click auf einem Item war.
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
if (_auftrag == null) return;
string knd = ((View_Auftrag_Expedit)olv.SelectedObject).KundeName;
if (MessageBox.Show($"Möchtest du den Auftrag von {knd} mit Liefertag am {_auftrag.Liefertag} wirklich löschen?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) return;
else
{
_auftrag.Delete();
Neuladen_OLV(olv);
}
}
private void ContextMenuStripAuftragInfo_Click(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
// Überprüfung ob Click auf einem Item war.
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
if (_auftrag == null) return;
FormShowUserControl showUserControl = new FormShowUserControl("AuftragInfo", this.benutzer, _auftrag);
showUserControl.Show();
}
#endregion
private void ContextMenuStripBearbeiten_DropDownOpening(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
ToolStripMenuItem tsi = (ToolStripMenuItem)sender;
foreach (ToolStripDropDownItem item in tsi.DropDownItems)
{
string aspect = item.AccessibleName;
var col = olv.AllColumns.OfType<BrightIdeasSoftware.OLVColumn>().First(x => x.AspectName == aspect);
if (col.IsEditable) item.Enabled = true;
else item.Enabled = false;
}
}
private void ContextMenuStripExpedit_Opening(object sender, System.ComponentModel.CancelEventArgs e)
{
ObjectListView olv = (ObjectListView)this.tabControlAuftragList.SelectedTab.Controls[0];
olv.CellEditFinished += ObjectListViewAuftrag_CellEditFinished;
if (olv.SelectedObject == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
// Überprüfen ob ObjectListView Rampe ist.
if (!olv.Name.Contains("Rampe")) this.auftragVerschiebenToolStripMenuItem.Enabled = false;
// Überprüfen ob Auftrag eine Aufgabe hat.
if (_auftrag.AufgabeID == null) this.aufgabeErledigtToolStripMenuItem.Enabled = false;
// Überprüfen ob User Admin ist.
if (this.benutzer.Rolle != BenutzerRolle.Admin & this.benutzer.Rolle != BenutzerRolle.Master) this.auftragLöschenToolStripMenuItem.Enabled = false;
}
#region ObjectListView-Events
@ -361,6 +485,7 @@ namespace Deckungsbeitrag
if (!(rowObject is View_Auftrag_Expedit a)) return -1;
return string.IsNullOrEmpty(a.Zusatz) ? -1 : 1;
};
}
// --- Schmutzig / Sauber ---
@ -379,17 +504,6 @@ namespace Deckungsbeitrag
cleanCol.MinimumWidth = cleanCol.MaximumWidth = 80; // Bugfix: nicht dirtCol.MaximumWidth
}
// --- Etikett-Button ---
var druckenCol = Find("Etikett");
if (druckenCol != null)
{
druckenCol.IsButton = true;
druckenCol.ButtonSizing = OLVColumn.ButtonSizingMode.CellBounds;
druckenCol.HeaderImageKey = "print";
druckenCol.ShowTextInHeader = false;
druckenCol.MinimumWidth = druckenCol.MaximumWidth = 80;
}
// --- Abschließen-Button ---
var fertigCol = Find("Abschließen");
if (fertigCol != null)
@ -401,11 +515,31 @@ namespace Deckungsbeitrag
fertigCol.MinimumWidth = fertigCol.MaximumWidth = 80;
}
// --- Tour-Column ---
var tourCol = Find("Tour");
if (tourCol != null)
foreach (OLVColumn col in columns)
{
if (this.benutzer.Rolle != BenutzerRolle.Expedit || this.benutzer.Rolle != BenutzerRolle.Frottee) tourCol.IsEditable = true;
switch (this.benutzer.Rolle)
{
case BenutzerRolle.Verwaltung:
break;
case BenutzerRolle.Fahrer:
break;
case BenutzerRolle.Admin: if (col.AspectName is "ContainerDirt" || col.AspectName is "Liefertag" || col.AspectName is "ContainerClean" || col.AspectName is "Status" || col.AspectName is "Tour") col.IsEditable = true;
break;
case BenutzerRolle.Waschstrasse:
break;
case BenutzerRolle.Master:
break;
case BenutzerRolle.Expedit: if (col.AspectName is "ContainerClean" || col.AspectName is "Liefertag" || col.AspectName is "Tour") col.IsEditable = true;
break;
case BenutzerRolle.Frottee:
break;
case BenutzerRolle.Flach:
break;
default:
break;
}
}
}
private void Olv_CellToolTipShowing(object sender, ToolTipShowingEventArgs e)
@ -427,9 +561,10 @@ namespace Deckungsbeitrag
if (e.Column.Text == "Kunde" && e.Model is View_Auftrag_Expedit expeditKunde)
{
var auftrag = Auftrag.GetAuftrag(expeditKunde.AuftragID);
var kunde = Kunde.GetKunde(null, auftrag.KundeID, null);
var kunde = Kunde.GetKunde(null, expeditKunde.KundeID, null);
if (!string.IsNullOrWhiteSpace(kunde?.Anmerkung))
e.Text = kunde.Anmerkung;
else e.Text = auftrag.ZusatzInfo;
return;
}
@ -540,72 +675,6 @@ namespace Deckungsbeitrag
olv.Focus();
}
private async void ObjectListViewAuftrag_CellRightClick(object sender, CellRightClickEventArgs e)
{
ObjectListView olv = (ObjectListView)sender;
// Überprüfung ob Click auf einem Item war.
if (e.Model == null) return;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.Model).AuftragID);
Kunde _kunde = Kunde.GetKunde(null, _auftrag.KundeID, null);
string name;
if (string.IsNullOrWhiteSpace(_kunde.Suchtext)) name = _kunde.KundeName;
else name = _kunde.Suchtext;
// Überprüfung welche Spalte geclickt wurde.
switch (e.Column.Text)
{
case "Abschließen":
// Wenn Click in Gruppe Vorbereitet dann ignorieren.
if (e.Item.Group.Header == "Vorbereitet") return;
if (meldung.GetFrage(this, $"Für den Auftrag wurden keine Etiketten gedruckt, ohne Etikettendruck als Vorbereitet markieren?", false) == DialogResult.Yes)
{
// Wenn Aufgabe hinterlegt ist wir nachgefragt ob diese erledigt wurde.
if (_auftrag.AufgabeID != null)
{
// Wenn NEIN wird der Click abgebrochen.
if (meldung.GetAchtung(this, $"Bei dem ausgewählten Auftrag ist die Aufgabe {Aufgabe.GetAufgabe(null, _auftrag.AufgabeID).Bezeichnung} zu erledigen. Hast du die Aufgabe erledigt? ", false) == DialogResult.No) return;
else Aufgabe_erledigt(_auftrag, _kunde, name);
}
// Wenn TextBox für saubere Container 0 ist wird der Click abgebrochen.
if (_auftrag.ContainerClean == 0) { meldung.GetFehler(this, "Du kannst den Auftrag nicht als vorbereitet markieren. Wähle zuerst die Anzahl der sauberen Container."); return; }
// Auftrag wird bearbeitet und gespeichert.
_auftrag.Status = AuftragStatus.Vorbereitet;
_auftrag.Save();
olv.RefreshObject(e);
if (olv.Name.Contains("Geschaeft")) { await GetAuftraegeAsync(ListenArt.Geschäftliste); OLV_SetObjects(olv, listAuftragGeschaeft); }
if (olv.Name.Contains("Auftrag")) { await GetAuftraegeAsync(ListenArt.Auftragliste); OLV_SetObjects(olv, listAuftragToday); }
if (olv.Name.Contains("Rampe")) { await GetAuftraegeAsync(ListenArt.Rampenliste); OLV_SetObjects(olv, listRampe); }
if (olv.Name.Contains("Vorbereitet")) { await GetAuftraegeAsync(ListenArt.Vorbereitetliste); OLV_SetObjects(olv, listVorbereitet); }
if (olv.Name.Contains("Sonder")) { await GetAuftraegeAsync(ListenArt.Sonderliste); OLV_SetObjects(olv, listSonderAuftrag); }
}
break;
case "Aufgabe":
if (_auftrag.AufgabeID == null) return;
Aufgabe _aufgabe = Aufgabe.GetAufgabe(null, ((Auftrag)e.Model).AufgabeID);
if (meldung.GetFrage(this, $"Hast du beim Kunden {name} die Aufgabe {_aufgabe.Bezeichnung} erledigt und möchtest sie als erledigt markieren?", false) == DialogResult.Yes)
{
Aufgabe_erledigt(_auftrag, _kunde, name);
}
break;
default:
if (_auftrag.Typ == AuftragTyp.Regelmäßig || _auftrag.Typ == AuftragTyp.SOLL_Erhoehung || _auftrag.Typ == AuftragTyp.SOLL_Verminderung || _auftrag.Typ == AuftragTyp.Inventur || _auftrag.Typ == AuftragTyp.IST_Erhoehung)
{
FormAuftragDetail auftragDetail = new FormAuftragDetail(_auftrag, this.benutzer);
if (auftragDetail.ShowDialog() == DialogResult.OK)
{
Neuladen_OLV(olv);
}
}
break;
}
}
private void ObjectListViewAuftrag_ButtonClick(object sender, CellClickEventArgs e)
{
var olv = (ObjectListView)sender;
@ -633,6 +702,34 @@ namespace Deckungsbeitrag
this.UseWaitCursor = false;
}
}
private void ObjectListView_DoubleClick(object sender, EventArgs e)
{
ObjectListView olv = (ObjectListView)sender;
olv.CellEditFinished -= ObjectListViewAuftrag_CellEditFinished;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)olv.SelectedObject).AuftragID);
Kunde _kunde = Kunde.GetKunde(null, _auftrag.KundeID, null);
// Wenn NICHT erfasster Kunde dann nichts öffnen.
if (_kunde.KundeNummer == "2320000") return;
if (_auftrag.Typ is AuftragTyp.Standart || _auftrag.Typ is AuftragTyp.Geschäft || _auftrag.Typ is AuftragTyp.AufAbruf || olv.Name.Contains("Vorbereitet"))
{
if (_auftrag == null) return;
FormKundeVW kndVW = new FormKundeVW(_kunde, this.benutzer);
kndVW.ShowDialog();
return;
}
else
{
FormAuftragDetail auftragDetail = new FormAuftragDetail(_auftrag, this.benutzer);
if (auftragDetail.ShowDialog() == DialogResult.OK)
{
Neuladen_OLV(olv);
}
return;
}
}
/// <summary>
/// Behandelt den Fall, dass der Button in der Spalte Abschliessen geclickt wurde
@ -793,9 +890,14 @@ namespace Deckungsbeitrag
var aufgabe = Aufgabe.GetAufgabe(null, auftrag.AufgabeID);
var text = $"Bei dem ausgewählten Auftrag ist die Aufgabe {aufgabe.Bezeichnung} zu erledigen. Hast du die Aufgabe erledigt? ";
if (meldung.GetAchtung(this, text, false) == DialogResult.No)
return;
if (meldung.GetAchtung(this, text, false) == DialogResult.No) return;
else
{
this.auftrag.Erledigt = DateTime.Now;
this.auftrag.ErledigtVon = (int)this.benutzer.BenutzerID;
}
}
PrepareContainerCleanForEtikett();
@ -970,6 +1072,12 @@ namespace Deckungsbeitrag
}
Save_Auftrag(this.auftrag, false);
Neuladen_OLV(olv);
//DONE: ZEILE MARKIEREN?
olv.SelectedObject = e.RowObject;
olv.EnsureModelVisible(e.RowObject);
olv.Focus();
}
/// <summary>
@ -982,57 +1090,17 @@ namespace Deckungsbeitrag
ObjectListView olv = (ObjectListView)sender;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.RowObject).AuftragID);
if (e.Column.AspectName == "KundeName")
{
if (_auftrag == null) return;
Kunde _kunde = Kunde.GetKunde(null, _auftrag.KundeID, null);
FormKundeVW kndVW = new FormKundeVW(_kunde, this.benutzer);
kndVW.ShowDialog();
olv.RefreshObject(olv.SelectedObject);
e.Cancel = true;
return;
}
if (meldung.GetFrage(this, $"Möchtest du die gewählte Zelle wirklich bearbeiten?", false) == DialogResult.No) { e.Cancel = true; return; }
if (e.Column.AspectName == "Tour")
{
Saison saison = Saison.GetAktivSaison();
List<Tour> list = Tour.GetSaisonListe(saison);
var row = (View_Auftrag_Expedit)e.RowObject;
var aktuelleTour = list.Find(x => x.TourID == row.TourID);
ComboBox touren = new ComboBox
{
Bounds = e.CellBounds,
DropDownStyle = ComboBoxStyle.DropDownList,
DisplayMember = "Bezeichnung",
DataSource = list,
};
e.Control = touren;
}
if (e.Control is NumericUpDown num) num.Select(0, int.MaxValue);
}
/// <summary>
/// Satt Edit wird der Kunde als gewaschen markiert.
/// Solange Waschstraße nicht involviert, muss Expedit so die Aufträge in Aufträge heute bringen.
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ObjectListViewRampe_CellEditStarting(object sender, CellEditEventArgs e)
if (e.Control is ComboBox cb)
{
ObjectListView olv = (ObjectListView)sender;
Auftrag _auftrag = Auftrag.GetAuftrag(((View_Auftrag_Expedit)e.RowObject).AuftragID);
if (_auftrag == null) return;
_auftrag.Status = AuftragStatus.Gewaschen;
_auftrag.Save();
Neuladen_OLV(olv);
e.Cancel = true;
if (e.Value == null) return;
if (cb.Created)
cb.SelectedValue = e.Value;
else
this.BeginInvoke(new MethodInvoker(delegate {
cb.SelectedValue = e.Value;
}));
}
}
#endregion
@ -1069,7 +1137,7 @@ namespace Deckungsbeitrag
case BenutzerRolle.Expedit:
break;
case BenutzerRolle.Frottee:
this.buttonNeuerAuftrag.Visible = this.buttonSWS_Drucken.Visible = false;
this.buttonEtikettenDrucken.Visible = this.buttonNeuerAuftrag.Visible = this.buttonSWS_Drucken.Visible = false;
this.buttonStats.Visible = this.buttonEinstellung.Visible = false; // buttonReklamation einblenden wenn Frottee-Expedit auch Reklamation bearbeitet.
foreach(TabPage tab in this.tabControlAuftragList.TabPages)
{
@ -1097,18 +1165,17 @@ namespace Deckungsbeitrag
/// <returns>Task zu FormLoad</returns>
private async Task GetAuftraegeAsync(ListenArt? liste)
{
if (this.benutzer.Rolle != BenutzerRolle.Frottee)
{
if (liste == null || liste == ListenArt.Auftragliste) listAuftragToday = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Vorbereitet, minStatusFilter: AuftragStatus.Gewaschen);
if (liste == null || liste == ListenArt.Auftragliste) listAuftragToday = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Gewaschen, datum: DateTime.Today.Date.AddDays(2));
if (liste == null || liste == ListenArt.Geschäftliste) listAuftragGeschaeft = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Fertig, minStatusFilter: AuftragStatus.Abgeholt, typFilter: AuftragTyp.Geschäft);
if (liste == null || liste == ListenArt.Vorbereitetliste) listVorbereitet = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Vorbereitet, minTypFilter: AuftragTyp.Geschäft);
if (liste == null || liste == ListenArt.Vorbereitetliste) listVorbereitet = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Vorbereitet, minTypFilter: AuftragTyp.Standart);
if (liste == null || liste == ListenArt.Sonderliste) listSonderAuftrag = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Fertig, minStatusFilter: AuftragStatus.Herrichten, minTypFilter: AuftragTyp.Inventur);
if (liste == null || liste == ListenArt.Rampenliste) listRampe = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Abgeholt, typFilter: AuftragTyp.Standart);
}
else
{
if (liste == null || liste == ListenArt.Auftragliste) listAuftragToday = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Vorbereitet, minStatusFilter: AuftragStatus.Gewaschen, frottee: true);
if (liste == null || liste == ListenArt.Auftragliste) listAuftragToday = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Gewaschen, frottee: true, datum: DateTime.Today.Date.AddDays(2));
if (liste == null || liste == ListenArt.Sonderliste) listSonderAuftrag = await View_Auftrag_Expedit.GetAuftragExpeditAsync(statusFilter: AuftragStatus.Fertig, minStatusFilter: AuftragStatus.Herrichten, typFilter: AuftragTyp.Laufzettel, minTypFilter: AuftragTyp.Inventur, frottee: true);
}
@ -1331,13 +1398,10 @@ namespace Deckungsbeitrag
//this.Close(); // Onboarding beendet
}
}
private void ButtonNW_Click(object sender, EventArgs e)
{
FormArtikelVW artikelVW = new FormArtikelVW(this.benutzer);
artikelVW.ShowDialog();
}
}
}
//TODO: Lösung zum Löschen von Aufträgen überlegen. (Kevin fragen)
//CHANGES: Im Tab Vorbereitet wird beim Ändern der sauberen Containeranzahl gefragt ob die Etiketten neu gedruckt werden sollen.
//CHANGES: Im Tab Rampe wird bei DoppelClick der Auftrag als gewaschen markiert und im Tab Aufträge heute sichtbar.
//CHANGES: Wenn ein anderer Fahrer ausgewählt wird, wird auch die Priority laut dem Fahrer geändert.

View File

@ -117,7 +117,29 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuStripExpedit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>12, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="auftragVerschiebenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAM9JREFUOE/tjzsKwkAURbMDXYp7sdUduAKr1FZaKoJglw0IaVIYCGk0hYIg/sUo
GDIxym2fvECGGH/RysKBUwxv7rlvFCVxABTcYyDsyY4AdJKztwdAHoAo1Q3KlbuUWbL3AtIHK4lmTiNB
ZgmHlGL7ISzhAgCM4C3TeV49fiDhb7CgpY/JHWo061XJW9g8U9N5Fqgc2lpNuoQ+VVqmDIfhmQJxIv+w
oaVRuysC4MgtuGXdb5A1mkeSuPkVnLsRxJIs4aeCT/gLfk3g8OULnCtkuKFJ0hCsUgAAAABJRU5ErkJg
gg==
</value>
</data>
<data name="auftragLöschenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vwAADr8BOAVTJAAAALlJREFUOE+tkrERwjAMRbMAa1CnpHZNwQgUbMBEdFBmhCxjoIrdqBX3fZFPFsEO
HMU7y+f8Z8mXjpm7GkTUE1GYQV3s8QE3COP5xAB1ePg47Hd5nwTOuUVwFp93RuCy3aSQ1FgLQZhigQiI
6KglEkYneYSGoJe2RSDtrxLo27HqcZpvAIbbNQchE+GbwHagmbxPIv0mzREsMtL8bxwQRv2TQNN8A01V
8OlGy9cCG7D8T7DEakENG7C8AEMBEFYEw8flAAAAAElFTkSuQmCC
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAAAAAAAEAIAC5FQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAAAFv

View File

@ -1,6 +1,7 @@
using AForge.Video.DirectShow;
using BrightIdeasSoftware;
using DatenDB;
using Deckungsbeitrag.AA_Forms;
using Deckungsbeitrag.AA_Klassen;
using Spire.Barcode;
using System;
@ -34,6 +35,7 @@ namespace Deckungsbeitrag
int beforeedit = 0;
private bool formloading = false;
private bool _tosave = false;
private DataGridView.HitTestInfo _hitInfo;
public FormKundeVW()
{
@ -80,6 +82,10 @@ namespace Deckungsbeitrag
formloading = false;
}
private void FormKundeVW_Shown(object sender, EventArgs e)
{
this.tabControlKunde.Width = this.ClientSize.Width - tabControlKunde.Left - 10;
}
private void ComboBox_Laden()
{
@ -146,6 +152,7 @@ namespace Deckungsbeitrag
int reihung = 1;
foreach(Sortiment sort in sortimentListe.FindAll(Sortiment => Sortiment.KundeNummer == sortNr))
{
if (sort.ArtName.Contains("*EK")) continue;
KundeArtikel item = new KundeArtikel
{
ArtikelNR = sort.ArtNr,
@ -158,6 +165,7 @@ namespace Deckungsbeitrag
reihung++;
}
if (standListe.Count == 0) this.tabControlKunde.Controls.Remove(tabPageArtikel);
standListe = standListe.OrderBy(x => x.Reihung).ToList();
//GridView mit der jeweiligen Liste füllen.
@ -219,7 +227,6 @@ namespace Deckungsbeitrag
OLV_Load();
Chart_Load();
}
private void CompareToSortiment()
{
int reihung = 1;
@ -227,6 +234,7 @@ namespace Deckungsbeitrag
Kunde _kunde = Kunde.GetKunde(null, this.standListe[0].KundeID, null);
foreach (Sortiment sort in sortimentListe.FindAll(Sortiment => Sortiment.KundeNummer == _kunde.KundeNummer))
{
if (sort.ArtName.Contains("*EK")) continue;
KundeArtikel kndart = this.standListe.Find(s => s.ArtikelNR == sort.ArtNr);
kndart.ArtikelID = Artikel.GetArtikelID(sort.ArtNr);
kndart.Reihung = reihung;
@ -429,7 +437,12 @@ namespace Deckungsbeitrag
}
if (int.Parse(row.Cells[6].Value.ToString()) != 0)
{
item.Korrektur = int.Parse(row.Cells[6].Value.ToString());
item.Reklamation = int.Parse(row.Cells[6].Value.ToString());
item.ReklamationBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString();
}
if (int.Parse(row.Cells[7].Value.ToString()) != 0)
{
item.Korrektur = int.Parse(row.Cells[7].Value.ToString());
item.KorrekturBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString();
}
if (item.Save() == 1) saved++;
@ -456,7 +469,12 @@ namespace Deckungsbeitrag
}
if (int.Parse(row.Cells[6].Value.ToString()) != 0)
{
item.Korrektur = int.Parse(row.Cells[6].Value.ToString());
item.Reklamation = int.Parse(row.Cells[6].Value.ToString());
item.ReklamationBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString();
}
if (int.Parse(row.Cells[7].Value.ToString()) != 0)
{
item.Korrektur = int.Parse(row.Cells[7].Value.ToString());
item.KorrekturBearbeitet = this.benutzer.BenutzerName + " am " + DateTime.Now.ToString();
}
if (item.Save() == 1) saved++;
@ -602,5 +620,192 @@ namespace Deckungsbeitrag
this.kunde.HatNachwaesche = this.checkBoxNW.Checked;
_tosave = true;
}
#region INVENTUR Tab
private void TabControlKunde_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.tabControlKunde.SelectedTab.Text == "Inventuren")
{
this.tabControlInventur.Cursor = Cursors.WaitCursor;
this.tabControlInventur.SuspendLayout();
GetInventurColumns();
GetRowHeader();
GetOLVItems();
this.tabControlInventur.ResumeLayout();
this.tabControlInventur.Cursor = Cursors.Default;
}
}
private void GetRowHeader()
{
string[] rows = new string[] { "IST-Stand", "SOLL-Stand", "INV-Ausgleich", "Reklamation", "Nachwäsche", "Schwund" };
this.dGVZahlen.Rows.Clear();
this.dGVZahlen.Rows.Add(rows.Length - 1);
foreach (DataGridViewRow row in this.dGVZahlen.Rows)
{
row.HeaderCell.Value = rows[row.Index];
row.ReadOnly = true;
switch (row.HeaderCell.Value.ToString())
{
case var t when t == "INV-Ausgleich":
row.HeaderCell.Style.BackColor = row.DefaultCellStyle.BackColor = Color.Green;
row.HeaderCell.Style.Font = row.DefaultCellStyle.Font = new Font(dGVZahlen.Font, FontStyle.Bold);
row.HeaderCell.Style.ForeColor = row.DefaultCellStyle.ForeColor = Color.White;
break;
case var t when t == "Schwund":
row.HeaderCell.Style.BackColor = row.DefaultCellStyle.BackColor = Color.Red;
row.HeaderCell.Style.Font = row.DefaultCellStyle.Font = new Font(dGVZahlen.Font, FontStyle.Bold);
row.HeaderCell.Style.ForeColor = row.DefaultCellStyle.ForeColor = Color.White;
break;
case var t when t == "IST-Stand":
row.HeaderCell.Style.Font = row.DefaultCellStyle.Font = new Font(dGVZahlen.Font, FontStyle.Bold);
break;
default:
break;
}
}
this.dGVZahlen.AutoResizeRowHeadersWidth(DataGridViewRowHeadersWidthSizeMode.AutoSizeToAllHeaders);
}
private void GetOLVItems()
{
foreach (DataGridViewColumn col in this.dGVZahlen.Columns)
{
KundeArtikel kndart = col.Tag as KundeArtikel;
foreach (DataGridViewRow row in this.dGVZahlen.Rows)
{
if (row.HeaderCell.Value?.ToString() == "SOLL-Stand") row.Cells[col.Index].Value = kndart.Stand;
if (row.HeaderCell.Value?.ToString() == "Reklamation") row.Cells[col.Index].Value = kndart.Reklamation;
if (row.HeaderCell.Value?.ToString() == "Nachwäsche") row.Cells[col.Index].Value = kndart.Fehlmenge;
}
}
}
private void GetInventurColumns()
{
this.dGVZahlen.Columns.Clear();
DataGridViewColumn col;
foreach (KundeArtikel kndart in this.standListe)
{
string text = Artikel.GetShort(kndart.ArtikelID, null);
//string text = kndart.ArtikelName;
col = new DataGridViewTextBoxColumn
{
HeaderText = text,
Name = "col_" + text,
Tag = kndart,
ReadOnly = false,
SortMode = DataGridViewColumnSortMode.NotSortable
};
this.dGVZahlen.Columns.Add(col);
}
// Alle Spaltenbreiten an den Zellinhalt anpassen
this.dGVZahlen.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
// Alle Zeilenhöhen an Zellinhalt anpassen
this.dGVZahlen.AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells;
}
private void PictureBoxPlus_Click(object sender, EventArgs e)
{
string text;
CustomInputBox input = new CustomInputBox("Möchtest du der Tabelle eine Zeile hinzufügen?", "ZÄHLPUNKT HINZUFÜGEN", "Name", "isAlpha");
if (input.ShowDialog() == DialogResult.OK)
{
text = input.text;
}
else return;
// Neue Zeile mit Daten erstellen
DataGridViewRow newRow = new DataGridViewRow();
newRow.CreateCells(this.dGVZahlen);
newRow.HeaderCell.Value = text;
// An Position 2 einfügen (vor bestehender Zeile 2)
this.dGVZahlen.Rows.Insert(0, newRow);
}
private void DeleteRowToolStripMenuItem_Click(object sender, EventArgs e)
{
if (_hitInfo.RowIndex >= 0 && _hitInfo.ColumnIndex >= 0)
{
int row = _hitInfo.RowIndex;
int col = _hitInfo.ColumnIndex;
string wert = dGVZahlen.Rows[row].Cells[col].Value?.ToString();
if (MessageBox.Show($"Möchtest du die Zeile {row + 1} wirklich löschen?", "FRAGE", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { this.dGVZahlen.Rows.RemoveAt(row); foreach (DataGridViewColumn column in this.dGVZahlen.Columns) DoCalculation(column.Index); }
else return;
}
}
private void DGVZahlen_MouseDown(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
{
_hitInfo = dGVZahlen.HitTest(e.X, e.Y);
contextMenuStripGridView.Show(dGVZahlen, e.Location);
}
}
private void DoCalculation(int colIndex)
{
int istStand = 0; int sollStand = 0; int reklamation = 0; int nachwaesche = 0; int invAusgleich = 0;
int istIndex = FindRowByHeaderText("IST-Stand");
foreach (DataGridViewRow row in dGVZahlen.Rows)
{
if (row.Index < istIndex) istStand += int.Parse(row.Cells[colIndex].Value.ToString());
switch (row.HeaderCell.Value.ToString())
{
case var t when t == "SOLL-Stand":
sollStand = (int)row.Cells[colIndex].Value;
break;
case var t when t == "INV-Ausgleich":
row.Cells[colIndex].Value = invAusgleich = sollStand - istStand;
break;
case var t when t == "Schwund":
row.Cells[colIndex].Value = invAusgleich - reklamation - nachwaesche;
break;
case var t when t == "IST-Stand":
int rowIndex = row.Index;
row.Cells[colIndex].Value = istStand;
break;
case var t when t == "Reklamation":
reklamation = (int)row.Cells[colIndex].Value;
break;
case var t when t == "Nachwäsche":
nachwaesche = (int)row.Cells[colIndex].Value;
break;
default:
break;
}
}
}
private void dGVZahlen_CellEndEdit(object sender, DataGridViewCellEventArgs e)
{
DoCalculation(e.ColumnIndex);
}
public int FindRowByHeaderText(string headerText)
{
foreach (DataGridViewRow row in dGVZahlen.Rows)
{
if (!row.IsNewRow && row.HeaderCell.Value != null &&
row.HeaderCell.Value.ToString() == headerText)
{
return row.Index;
}
}
return -1; // Nicht gefunden
}
private void contextMenuStripGridView_Opening(object sender, CancelEventArgs e)
{
if (_hitInfo.RowIndex >= 0 && _hitInfo.ColumnIndex >= 0)
{
int row = _hitInfo.RowIndex;
int col = _hitInfo.ColumnIndex;
if (dGVZahlen.Rows[row].ReadOnly) deleteRowToolStripMenuItem.Enabled = false;
else deleteRowToolStripMenuItem.Enabled = true;
}
}
#endregion
}
}

View File

@ -30,15 +30,15 @@ namespace Deckungsbeitrag
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea13 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend13 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series13 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea14 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend14 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series14 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea15 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend15 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series15 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormKundeVW));
this.textBoxKndNr = new System.Windows.Forms.TextBox();
this.labelKundeNummer = new System.Windows.Forms.Label();
@ -88,6 +88,22 @@ namespace Deckungsbeitrag
this.StandBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.FehlmengeBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.KorrekturBearbeitet = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.tabPageInventur = new System.Windows.Forms.TabPage();
this.tabControlInventur = new System.Windows.Forms.TabControl();
this.tabPageNeueInventur = new System.Windows.Forms.TabPage();
this.dGVZahlen = new System.Windows.Forms.DataGridView();
this.contextMenuStripGridView = new System.Windows.Forms.ContextMenuStrip(this.components);
this.deleteRowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.panelButtons = new System.Windows.Forms.Panel();
this.buttonFreigeben = new System.Windows.Forms.Button();
this.buttonAbbrechen = new System.Windows.Forms.Button();
this.panelDaten = new System.Windows.Forms.Panel();
this.labelAddRow = new System.Windows.Forms.Label();
this.pictureBoxPlus = new System.Windows.Forms.PictureBox();
this.labelLiefertag = new System.Windows.Forms.Label();
this.labelInventur = new System.Windows.Forms.Label();
this.dateTimePickerLiefertag = new System.Windows.Forms.DateTimePicker();
this.dateTimePickerInventur = new System.Windows.Forms.DateTimePicker();
this.buttonNextKunde = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
this.comboBoxService = new System.Windows.Forms.ComboBox();
@ -117,6 +133,14 @@ namespace Deckungsbeitrag
((System.ComponentModel.ISupportInitialize)(this.olvJahresumsatz)).BeginInit();
this.tabPageArtikel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).BeginInit();
this.tabPageInventur.SuspendLayout();
this.tabControlInventur.SuspendLayout();
this.tabPageNeueInventur.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dGVZahlen)).BeginInit();
this.contextMenuStripGridView.SuspendLayout();
this.panelButtons.SuspendLayout();
this.panelDaten.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownAufgabeCount)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQRCode)).BeginInit();
this.SuspendLayout();
@ -336,6 +360,7 @@ namespace Deckungsbeitrag
this.tabControlKunde.Controls.Add(this.tabPageVorschau);
this.tabControlKunde.Controls.Add(this.tabPageUmsatz);
this.tabControlKunde.Controls.Add(this.tabPageArtikel);
this.tabControlKunde.Controls.Add(this.tabPageInventur);
this.tabControlKunde.Enabled = false;
this.tabControlKunde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tabControlKunde.Location = new System.Drawing.Point(372, 17);
@ -344,6 +369,7 @@ namespace Deckungsbeitrag
this.tabControlKunde.SelectedIndex = 0;
this.tabControlKunde.Size = new System.Drawing.Size(1009, 772);
this.tabControlKunde.TabIndex = 44;
this.tabControlKunde.SelectedIndexChanged += new System.EventHandler(this.TabControlKunde_SelectedIndexChanged);
//
// tabPageVorschau
//
@ -419,16 +445,16 @@ namespace Deckungsbeitrag
//
// chartMonatsumsatz
//
chartArea1.Name = "ChartArea1";
this.chartMonatsumsatz.ChartAreas.Add(chartArea1);
legend1.Name = "Legend1";
this.chartMonatsumsatz.Legends.Add(legend1);
chartArea13.Name = "ChartArea1";
this.chartMonatsumsatz.ChartAreas.Add(chartArea13);
legend13.Name = "Legend1";
this.chartMonatsumsatz.Legends.Add(legend13);
this.chartMonatsumsatz.Location = new System.Drawing.Point(619, 309);
this.chartMonatsumsatz.Name = "chartMonatsumsatz";
series1.ChartArea = "ChartArea1";
series1.Legend = "Legend1";
series1.Name = "Series1";
this.chartMonatsumsatz.Series.Add(series1);
series13.ChartArea = "ChartArea1";
series13.Legend = "Legend1";
series13.Name = "Series1";
this.chartMonatsumsatz.Series.Add(series13);
this.chartMonatsumsatz.Size = new System.Drawing.Size(299, 312);
this.chartMonatsumsatz.TabIndex = 45;
this.chartMonatsumsatz.Text = "chart1";
@ -475,16 +501,16 @@ namespace Deckungsbeitrag
//
// chartQuartalsumsatz
//
chartArea2.Name = "ChartArea1";
this.chartQuartalsumsatz.ChartAreas.Add(chartArea2);
legend2.Name = "Legend1";
this.chartQuartalsumsatz.Legends.Add(legend2);
chartArea14.Name = "ChartArea1";
this.chartQuartalsumsatz.ChartAreas.Add(chartArea14);
legend14.Name = "Legend1";
this.chartQuartalsumsatz.Legends.Add(legend14);
this.chartQuartalsumsatz.Location = new System.Drawing.Point(313, 309);
this.chartQuartalsumsatz.Name = "chartQuartalsumsatz";
series2.ChartArea = "ChartArea1";
series2.Legend = "Legend1";
series2.Name = "Series1";
this.chartQuartalsumsatz.Series.Add(series2);
series14.ChartArea = "ChartArea1";
series14.Legend = "Legend1";
series14.Name = "Series1";
this.chartQuartalsumsatz.Series.Add(series14);
this.chartQuartalsumsatz.Size = new System.Drawing.Size(300, 312);
this.chartQuartalsumsatz.TabIndex = 42;
this.chartQuartalsumsatz.Text = "chart1";
@ -531,16 +557,16 @@ namespace Deckungsbeitrag
//
// chartJahresumsatz
//
chartArea3.Name = "ChartArea1";
this.chartJahresumsatz.ChartAreas.Add(chartArea3);
legend3.Name = "Legend1";
this.chartJahresumsatz.Legends.Add(legend3);
chartArea15.Name = "ChartArea1";
this.chartJahresumsatz.ChartAreas.Add(chartArea15);
legend15.Name = "Legend1";
this.chartJahresumsatz.Legends.Add(legend15);
this.chartJahresumsatz.Location = new System.Drawing.Point(7, 309);
this.chartJahresumsatz.Name = "chartJahresumsatz";
series3.ChartArea = "ChartArea1";
series3.Legend = "Legend1";
series3.Name = "Series1";
this.chartJahresumsatz.Series.Add(series3);
series15.ChartArea = "ChartArea1";
series15.Legend = "Legend1";
series15.Name = "Series1";
this.chartJahresumsatz.Series.Add(series15);
this.chartJahresumsatz.Size = new System.Drawing.Size(300, 312);
this.chartJahresumsatz.TabIndex = 39;
this.chartJahresumsatz.Text = "chart1";
@ -709,6 +735,197 @@ namespace Deckungsbeitrag
this.KorrekturBearbeitet.Name = "KorrekturBearbeitet";
this.KorrekturBearbeitet.Width = 125;
//
// tabPageInventur
//
this.tabPageInventur.Controls.Add(this.tabControlInventur);
this.tabPageInventur.Location = new System.Drawing.Point(4, 34);
this.tabPageInventur.Name = "tabPageInventur";
this.tabPageInventur.Size = new System.Drawing.Size(1001, 734);
this.tabPageInventur.TabIndex = 3;
this.tabPageInventur.Text = "Inventuren";
this.tabPageInventur.UseVisualStyleBackColor = true;
//
// tabControlInventur
//
this.tabControlInventur.Controls.Add(this.tabPageNeueInventur);
this.tabControlInventur.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControlInventur.Location = new System.Drawing.Point(0, 0);
this.tabControlInventur.Name = "tabControlInventur";
this.tabControlInventur.SelectedIndex = 0;
this.tabControlInventur.Size = new System.Drawing.Size(1001, 734);
this.tabControlInventur.TabIndex = 0;
//
// tabPageNeueInventur
//
this.tabPageNeueInventur.BackColor = System.Drawing.Color.LightSteelBlue;
this.tabPageNeueInventur.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.tabPageNeueInventur.Controls.Add(this.dGVZahlen);
this.tabPageNeueInventur.Controls.Add(this.panelButtons);
this.tabPageNeueInventur.Controls.Add(this.panelDaten);
this.tabPageNeueInventur.Location = new System.Drawing.Point(4, 34);
this.tabPageNeueInventur.Name = "tabPageNeueInventur";
this.tabPageNeueInventur.Padding = new System.Windows.Forms.Padding(3);
this.tabPageNeueInventur.Size = new System.Drawing.Size(993, 696);
this.tabPageNeueInventur.TabIndex = 0;
this.tabPageNeueInventur.Text = "Neue Inventur";
//
// dGVZahlen
//
this.dGVZahlen.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.dGVZahlen.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dGVZahlen.ContextMenuStrip = this.contextMenuStripGridView;
this.dGVZahlen.EnableHeadersVisualStyles = false;
this.dGVZahlen.Location = new System.Drawing.Point(6, 109);
this.dGVZahlen.Name = "dGVZahlen";
this.dGVZahlen.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
this.dGVZahlen.RowHeadersWidth = 51;
this.dGVZahlen.RowTemplate.Height = 24;
this.dGVZahlen.Size = new System.Drawing.Size(977, 524);
this.dGVZahlen.TabIndex = 3;
this.dGVZahlen.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dGVZahlen_CellEndEdit);
this.dGVZahlen.MouseDown += new System.Windows.Forms.MouseEventHandler(this.DGVZahlen_MouseDown);
//
// contextMenuStripGridView
//
this.contextMenuStripGridView.ImageScalingSize = new System.Drawing.Size(20, 20);
this.contextMenuStripGridView.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.deleteRowToolStripMenuItem});
this.contextMenuStripGridView.Name = "contextMenuStripGridView";
this.contextMenuStripGridView.Size = new System.Drawing.Size(173, 30);
this.contextMenuStripGridView.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStripGridView_Opening);
//
// deleteRowToolStripMenuItem
//
this.deleteRowToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("deleteRowToolStripMenuItem.Image")));
this.deleteRowToolStripMenuItem.Name = "deleteRowToolStripMenuItem";
this.deleteRowToolStripMenuItem.Size = new System.Drawing.Size(172, 26);
this.deleteRowToolStripMenuItem.Text = "Zeile Löschen";
this.deleteRowToolStripMenuItem.Click += new System.EventHandler(this.DeleteRowToolStripMenuItem_Click);
//
// panelButtons
//
this.panelButtons.Controls.Add(this.buttonFreigeben);
this.panelButtons.Controls.Add(this.buttonAbbrechen);
this.panelButtons.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panelButtons.Location = new System.Drawing.Point(3, 639);
this.panelButtons.Name = "panelButtons";
this.panelButtons.Padding = new System.Windows.Forms.Padding(5);
this.panelButtons.Size = new System.Drawing.Size(983, 50);
this.panelButtons.TabIndex = 2;
//
// buttonFreigeben
//
this.buttonFreigeben.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonFreigeben.BackColor = System.Drawing.Color.Gray;
this.buttonFreigeben.CausesValidation = false;
this.buttonFreigeben.Enabled = false;
this.buttonFreigeben.FlatAppearance.BorderSize = 0;
this.buttonFreigeben.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonFreigeben.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonFreigeben.ForeColor = System.Drawing.Color.Black;
this.buttonFreigeben.Location = new System.Drawing.Point(473, 5);
this.buttonFreigeben.Margin = new System.Windows.Forms.Padding(0);
this.buttonFreigeben.Name = "buttonFreigeben";
this.buttonFreigeben.Size = new System.Drawing.Size(250, 40);
this.buttonFreigeben.TabIndex = 43;
this.buttonFreigeben.Text = "Speichern/Freigeben";
this.buttonFreigeben.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.buttonFreigeben.UseVisualStyleBackColor = false;
//
// buttonAbbrechen
//
this.buttonAbbrechen.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonAbbrechen.BackColor = System.Drawing.Color.Red;
this.buttonAbbrechen.FlatAppearance.BorderSize = 0;
this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonAbbrechen.ForeColor = System.Drawing.Color.Black;
this.buttonAbbrechen.Location = new System.Drawing.Point(728, 5);
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.buttonAbbrechen.Name = "buttonAbbrechen";
this.buttonAbbrechen.Size = new System.Drawing.Size(250, 40);
this.buttonAbbrechen.TabIndex = 42;
this.buttonAbbrechen.Text = "Abbrechen";
this.buttonAbbrechen.UseVisualStyleBackColor = false;
//
// panelDaten
//
this.panelDaten.Controls.Add(this.labelAddRow);
this.panelDaten.Controls.Add(this.pictureBoxPlus);
this.panelDaten.Controls.Add(this.labelLiefertag);
this.panelDaten.Controls.Add(this.labelInventur);
this.panelDaten.Controls.Add(this.dateTimePickerLiefertag);
this.panelDaten.Controls.Add(this.dateTimePickerInventur);
this.panelDaten.Dock = System.Windows.Forms.DockStyle.Top;
this.panelDaten.Location = new System.Drawing.Point(3, 3);
this.panelDaten.Name = "panelDaten";
this.panelDaten.Size = new System.Drawing.Size(983, 100);
this.panelDaten.TabIndex = 1;
//
// labelAddRow
//
this.labelAddRow.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.labelAddRow.AutoSize = true;
this.labelAddRow.Location = new System.Drawing.Point(765, 63);
this.labelAddRow.Name = "labelAddRow";
this.labelAddRow.Size = new System.Drawing.Size(161, 25);
this.labelAddRow.TabIndex = 42;
this.labelAddRow.Text = "Zeile hinzufügen:";
//
// pictureBoxPlus
//
this.pictureBoxPlus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.pictureBoxPlus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
this.pictureBoxPlus.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxPlus.Image")));
this.pictureBoxPlus.Location = new System.Drawing.Point(939, 52);
this.pictureBoxPlus.Margin = new System.Windows.Forms.Padding(10);
this.pictureBoxPlus.Name = "pictureBoxPlus";
this.pictureBoxPlus.Size = new System.Drawing.Size(34, 38);
this.pictureBoxPlus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBoxPlus.TabIndex = 41;
this.pictureBoxPlus.TabStop = false;
this.pictureBoxPlus.Click += new System.EventHandler(this.PictureBoxPlus_Click);
//
// labelLiefertag
//
this.labelLiefertag.AutoSize = true;
this.labelLiefertag.Location = new System.Drawing.Point(18, 63);
this.labelLiefertag.Name = "labelLiefertag";
this.labelLiefertag.Size = new System.Drawing.Size(93, 25);
this.labelLiefertag.TabIndex = 3;
this.labelLiefertag.Text = "Liefertag:";
//
// labelInventur
//
this.labelInventur.AutoSize = true;
this.labelInventur.Location = new System.Drawing.Point(18, 13);
this.labelInventur.Name = "labelInventur";
this.labelInventur.Size = new System.Drawing.Size(142, 25);
this.labelInventur.TabIndex = 2;
this.labelInventur.Text = "Inventurdatum:";
//
// dateTimePickerLiefertag
//
this.dateTimePickerLiefertag.Checked = false;
this.dateTimePickerLiefertag.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dateTimePickerLiefertag.Location = new System.Drawing.Point(166, 60);
this.dateTimePickerLiefertag.Name = "dateTimePickerLiefertag";
this.dateTimePickerLiefertag.ShowCheckBox = true;
this.dateTimePickerLiefertag.Size = new System.Drawing.Size(200, 30);
this.dateTimePickerLiefertag.TabIndex = 1;
//
// dateTimePickerInventur
//
this.dateTimePickerInventur.Checked = false;
this.dateTimePickerInventur.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dateTimePickerInventur.Location = new System.Drawing.Point(166, 11);
this.dateTimePickerInventur.Name = "dateTimePickerInventur";
this.dateTimePickerInventur.ShowCheckBox = true;
this.dateTimePickerInventur.Size = new System.Drawing.Size(200, 30);
this.dateTimePickerInventur.TabIndex = 0;
//
// buttonNextKunde
//
this.buttonNextKunde.BackColor = System.Drawing.Color.Turquoise;
@ -945,6 +1162,7 @@ namespace Deckungsbeitrag
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormKundeVW_FormClosing);
this.Load += new System.EventHandler(this.KundeDaten_Load);
this.Shown += new System.EventHandler(this.FormKundeVW_Shown);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.KundeDaten_KeyDown);
this.contextMenuStrip1.ResumeLayout(false);
this.tabControlKunde.ResumeLayout(false);
@ -960,6 +1178,15 @@ namespace Deckungsbeitrag
((System.ComponentModel.ISupportInitialize)(this.olvJahresumsatz)).EndInit();
this.tabPageArtikel.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dGArtikel)).EndInit();
this.tabPageInventur.ResumeLayout(false);
this.tabControlInventur.ResumeLayout(false);
this.tabPageNeueInventur.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dGVZahlen)).EndInit();
this.contextMenuStripGridView.ResumeLayout(false);
this.panelButtons.ResumeLayout(false);
this.panelDaten.ResumeLayout(false);
this.panelDaten.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxPlus)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numericUpDownAufgabeCount)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBoxQRCode)).EndInit();
this.ResumeLayout(false);
@ -1032,6 +1259,22 @@ namespace Deckungsbeitrag
private System.Windows.Forms.DataGridViewTextBoxColumn FehlmengeBearbeitet;
private System.Windows.Forms.DataGridViewTextBoxColumn KorrekturBearbeitet;
private System.Windows.Forms.CheckBox checkBoxNW;
private System.Windows.Forms.TabPage tabPageInventur;
private System.Windows.Forms.TabControl tabControlInventur;
private System.Windows.Forms.TabPage tabPageNeueInventur;
private System.Windows.Forms.Panel panelDaten;
private System.Windows.Forms.Label labelInventur;
private System.Windows.Forms.DateTimePicker dateTimePickerLiefertag;
private System.Windows.Forms.DateTimePicker dateTimePickerInventur;
private System.Windows.Forms.Label labelLiefertag;
private System.Windows.Forms.Panel panelButtons;
private System.Windows.Forms.Button buttonAbbrechen;
private System.Windows.Forms.Button buttonFreigeben;
private System.Windows.Forms.Label labelAddRow;
private System.Windows.Forms.PictureBox pictureBoxPlus;
private System.Windows.Forms.DataGridView dGVZahlen;
private System.Windows.Forms.ContextMenuStrip contextMenuStripGridView;
private System.Windows.Forms.ToolStripMenuItem deleteRowToolStripMenuItem;
}
}

View File

@ -120,6 +120,9 @@
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>430, 17</value>
</metadata>
<metadata name="contextMenuStripGridView.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>615, 17</value>
</metadata>
<metadata name="KundeArtikelID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@ -153,10 +156,59 @@
<metadata name="KorrekturBearbeitet.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="KundeArtikelID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="KundeID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ArtikelNR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="ArtikelName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Stand.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Fehlmenge.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Reklamation.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Korrektur.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="StandBearbeitet.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="FehlmengeBearbeitet.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="KorrekturBearbeitet.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="deleteRowToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
wgAADsIBFShKgAAAALlJREFUOE+tkrERwjAMRbMAa1CnpHZNwQgUbMBEdFBmhCxjoIrdqBX3fZFPFsEO
HMU7y+f8Z8mXjpm7GkTUE1GYQV3s8QE3COP5xAB1ePg47Hd5nwTOuUVwFp93RuCy3aSQ1FgLQZhigQiI
6KglEkYneYSGoJe2RSDtrxLo27HqcZpvAIbbNQchE+GbwHagmbxPIv0mzREsMtL8bxwQRv2TQNN8A01V
8OlGy9cCG7D8T7DEakENG7C8AEMBEFYEw8flAAAAAElFTkSuQmCC
</value>
</data>
<data name="pictureBoxPlus.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
vAAADrwBlbxySQAAAFZJREFUOE+9kEEKACEMxHxb//+eXruwbGEwHhwKK+QSaqSuqloTIFwgXCBcKL6T
maW0xzyEBCLixQroqxpo9vljoC/u/BcYrTD+RA0o1wEXCBcIFwiXB07Nzd/k/DvRAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>38</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAAAAAAAEAIAC5FQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAAAFv

View File

@ -134,7 +134,7 @@ namespace Deckungsbeitrag
kunde = (Kunde)listViewKunde.Items[0].Tag;
this.DialogResult = DialogResult.OK;
this.Close();
return;
}
this.buttonNeuerAuftrag.Visible = this.buttonNeuerAuftrag.Enabled = false;
}
@ -508,7 +508,7 @@ namespace Deckungsbeitrag
}
private void TextBoxKunde_Click(object sender, EventArgs e)
{
if (Program.istTouch)
if (Program.istTouch & Screen.PrimaryScreen.WorkingArea.Width > 0 & Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{

View File

@ -66,8 +66,8 @@ namespace Deckungsbeitrag
MessageBox.Show(lex.Message, "Registrieren", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
this.buttonRegistrieren.Visible = true;
this.buttonAnmelden.Enabled = false;
this.groupBox1.Height = 146;
this.Height = 265;
this.groupBox1.Height = this.textBoxPwdWh.Bottom + 20;
this.Height = 300;
this.labelPwdWh.Visible = true;
this.textBoxPwdWh.Visible = true;
break;
@ -148,15 +148,15 @@ namespace Deckungsbeitrag
private void FormLogin_Shown(object sender, EventArgs e)
{
StartPosition = FormStartPosition.CenterScreen;
this.Location = new Point((Screen.PrimaryScreen.WorkingArea.Width - this.Width) / 2, ((Screen.PrimaryScreen.WorkingArea.Height / 2) - this.Height) / 2);
}
private void TextBoxBenutzer_Enter(object sender, EventArgs e)
{
this.textBoxBenutzer.SelectAll();
this.textBoxBenutzer.Focus();
if (Program.istTouch)
if (Program.istTouch && Screen.PrimaryScreen.WorkingArea.Width > 0 && Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{
@ -170,14 +170,14 @@ namespace Deckungsbeitrag
keyboard.Show();
}
}
}
private void TextBoxPasswort_Enter(object sender, EventArgs e)
{
this.textBoxPasswort.SelectAll();
this.textBoxPasswort.Focus();
if (Program.istTouch)
if (Program.istTouch && Screen.PrimaryScreen.WorkingArea.Width > 0 && Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{
@ -191,27 +191,27 @@ namespace Deckungsbeitrag
keyboard.Show();
}
}
}
private void TextBox_Leave(object sender, EventArgs e)
{
this.buttonAnmelden.Focus();
//this.buttonAnmelden.Focus();
}
private void TextBoxPwdWh_Enter(object sender, EventArgs e)
{
this.textBoxPasswort.Focus();
if (Program.istTouch)
this.textBoxPwdWh.SelectAll();
if (Program.istTouch && Screen.PrimaryScreen.WorkingArea.Width > 0 && Screen.PrimaryScreen.WorkingArea.Width < 2000)
{
if (keyboard == null || keyboard.IsDisposed)
{
keyboard = new QwertzKeyboard(textBoxPasswort, "isNumeric");
keyboard = new QwertzKeyboard(textBoxPwdWh, "isNumeric");
keyboard.Show();
}
else
{
keyboard.Close();
keyboard = new QwertzKeyboard(textBoxPasswort, "isNumeric");
keyboard = new QwertzKeyboard(textBoxPwdWh, "isNumeric");
keyboard.Show();
}
}

View File

@ -45,8 +45,6 @@ namespace Deckungsbeitrag
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox1.Controls.Add(this.textBoxPwdWh);
this.groupBox1.Controls.Add(this.labelPwdWh);
this.groupBox1.Controls.Add(this.textBoxPasswort);
@ -55,11 +53,11 @@ namespace Deckungsbeitrag
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.groupBox1.ForeColor = System.Drawing.Color.White;
this.groupBox1.Location = new System.Drawing.Point(24, 26);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Location = new System.Drawing.Point(27, 32);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
this.groupBox1.Size = new System.Drawing.Size(617, 126);
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.groupBox1.Size = new System.Drawing.Size(694, 158);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Login-Daten";
@ -67,10 +65,10 @@ namespace Deckungsbeitrag
// textBoxPwdWh
//
this.textBoxPwdWh.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxPwdWh.Location = new System.Drawing.Point(247, 135);
this.textBoxPwdWh.Margin = new System.Windows.Forms.Padding(4);
this.textBoxPwdWh.Location = new System.Drawing.Point(278, 169);
this.textBoxPwdWh.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBoxPwdWh.Name = "textBoxPwdWh";
this.textBoxPwdWh.Size = new System.Drawing.Size(351, 30);
this.textBoxPwdWh.Size = new System.Drawing.Size(394, 26);
this.textBoxPwdWh.TabIndex = 5;
this.textBoxPwdWh.UseSystemPasswordChar = true;
this.textBoxPwdWh.Enter += new System.EventHandler(this.TextBoxPwdWh_Enter);
@ -80,20 +78,20 @@ namespace Deckungsbeitrag
this.labelPwdWh.AutoSize = true;
this.labelPwdWh.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.labelPwdWh.ForeColor = System.Drawing.Color.White;
this.labelPwdWh.Location = new System.Drawing.Point(35, 139);
this.labelPwdWh.Location = new System.Drawing.Point(39, 174);
this.labelPwdWh.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelPwdWh.Name = "labelPwdWh";
this.labelPwdWh.Size = new System.Drawing.Size(187, 25);
this.labelPwdWh.Size = new System.Drawing.Size(153, 20);
this.labelPwdWh.TabIndex = 4;
this.labelPwdWh.Text = "Passwort bestätigen";
//
// textBoxPasswort
//
this.textBoxPasswort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxPasswort.Location = new System.Drawing.Point(247, 76);
this.textBoxPasswort.Margin = new System.Windows.Forms.Padding(4);
this.textBoxPasswort.Location = new System.Drawing.Point(278, 95);
this.textBoxPasswort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBoxPasswort.Name = "textBoxPasswort";
this.textBoxPasswort.Size = new System.Drawing.Size(351, 30);
this.textBoxPasswort.Size = new System.Drawing.Size(394, 26);
this.textBoxPasswort.TabIndex = 3;
this.textBoxPasswort.UseSystemPasswordChar = true;
this.textBoxPasswort.Enter += new System.EventHandler(this.TextBoxPasswort_Enter);
@ -104,20 +102,20 @@ 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(140, 80);
this.label2.Location = new System.Drawing.Point(158, 100);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(92, 25);
this.label2.Size = new System.Drawing.Size(74, 20);
this.label2.TabIndex = 2;
this.label2.Text = "Passwort";
//
// textBoxBenutzer
//
this.textBoxBenutzer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.textBoxBenutzer.Location = new System.Drawing.Point(247, 37);
this.textBoxBenutzer.Margin = new System.Windows.Forms.Padding(4);
this.textBoxBenutzer.Location = new System.Drawing.Point(278, 46);
this.textBoxBenutzer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBoxBenutzer.Name = "textBoxBenutzer";
this.textBoxBenutzer.Size = new System.Drawing.Size(351, 30);
this.textBoxBenutzer.Size = new System.Drawing.Size(394, 26);
this.textBoxBenutzer.TabIndex = 1;
this.textBoxBenutzer.Enter += new System.EventHandler(this.TextBoxBenutzer_Enter);
this.textBoxBenutzer.Leave += new System.EventHandler(this.TextBoxBenutzer_Leave);
@ -127,10 +125,10 @@ namespace Deckungsbeitrag
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.White;
this.label1.Location = new System.Drawing.Point(140, 41);
this.label1.Location = new System.Drawing.Point(158, 51);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(90, 25);
this.label1.Size = new System.Drawing.Size(74, 20);
this.label1.TabIndex = 0;
this.label1.Text = "Benutzer";
//
@ -143,11 +141,11 @@ namespace Deckungsbeitrag
this.buttonAnmelden.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonAnmelden.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonAnmelden.ForeColor = System.Drawing.Color.White;
this.buttonAnmelden.Location = new System.Drawing.Point(440, 173);
this.buttonAnmelden.Margin = new System.Windows.Forms.Padding(4);
this.buttonAnmelden.Location = new System.Drawing.Point(495, 216);
this.buttonAnmelden.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.buttonAnmelden.Name = "buttonAnmelden";
this.buttonAnmelden.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.buttonAnmelden.Size = new System.Drawing.Size(200, 50);
this.buttonAnmelden.Size = new System.Drawing.Size(225, 62);
this.buttonAnmelden.TabIndex = 1;
this.buttonAnmelden.Text = "Anmelden";
this.buttonAnmelden.UseVisualStyleBackColor = false;
@ -163,10 +161,10 @@ namespace Deckungsbeitrag
this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonAbbrechen.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonAbbrechen.ForeColor = System.Drawing.Color.White;
this.buttonAbbrechen.Location = new System.Drawing.Point(232, 173);
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(4);
this.buttonAbbrechen.Location = new System.Drawing.Point(261, 216);
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.buttonAbbrechen.Name = "buttonAbbrechen";
this.buttonAbbrechen.Size = new System.Drawing.Size(200, 50);
this.buttonAbbrechen.Size = new System.Drawing.Size(225, 62);
this.buttonAbbrechen.TabIndex = 2;
this.buttonAbbrechen.Text = "Abbrechen";
this.buttonAbbrechen.UseVisualStyleBackColor = false;
@ -180,10 +178,10 @@ namespace Deckungsbeitrag
this.buttonRegistrieren.FlatAppearance.BorderSize = 0;
this.buttonRegistrieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonRegistrieren.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.buttonRegistrieren.Location = new System.Drawing.Point(24, 174);
this.buttonRegistrieren.Margin = new System.Windows.Forms.Padding(4);
this.buttonRegistrieren.Location = new System.Drawing.Point(27, 218);
this.buttonRegistrieren.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.buttonRegistrieren.Name = "buttonRegistrieren";
this.buttonRegistrieren.Size = new System.Drawing.Size(200, 50);
this.buttonRegistrieren.Size = new System.Drawing.Size(225, 62);
this.buttonRegistrieren.TabIndex = 3;
this.buttonRegistrieren.Text = "Registrieren";
this.buttonRegistrieren.UseVisualStyleBackColor = false;
@ -192,11 +190,11 @@ namespace Deckungsbeitrag
// FormLogin
//
this.AcceptButton = this.buttonAnmelden;
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
this.CancelButton = this.buttonAbbrechen;
this.ClientSize = new System.Drawing.Size(656, 238);
this.ClientSize = new System.Drawing.Size(738, 298);
this.Controls.Add(this.buttonRegistrieren);
this.Controls.Add(this.buttonAbbrechen);
this.Controls.Add(this.buttonAnmelden);
@ -204,7 +202,7 @@ namespace Deckungsbeitrag
this.ForeColor = System.Drawing.SystemColors.ControlText;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "FormLogin";

View File

@ -376,8 +376,6 @@ namespace Deckungsbeitrag
Auftrag a = (Auftrag)item.RowObject;
a.ArbeiterID = this.benutzer.BenutzerID;
a.Erledigt = DateTime.Now;
a.ErledigtVon = this.benutzer.BenutzerID;
a.Status = AuftragStatus.Ausgeliefert;
if (a.Save()[0] == 1)

View File

@ -242,8 +242,9 @@ namespace Deckungsbeitrag
this.comboBoxFahrer.DisplayMember = "Bezeichnung";
this.comboBoxFahrer.ValueMember = "TourID";
this.comboBoxFahrer.DropDownWidth = GetDropDownWidth(this.comboBoxFahrer);
// ComboBox-Auswahl vordefinieren.
if (this.benutzer.Rolle == BenutzerRolle.Fahrer)
if (this.benutzer.Rolle == BenutzerRolle.Fahrer || (this.benutzer.Rolle == BenutzerRolle.Expedit && this.auftragtyp != AuftragTyp.Geschäft))
{
this.comboBoxFahrer.SelectedValue = tour.TourID;
}
@ -487,12 +488,14 @@ namespace Deckungsbeitrag
break;
}
if (Auftrag.FindeAuftrag(true).Gefunden) //TODO: Aufträge zusammenführen wenn gleicher Kunde und Liefertag.
if (Auftrag.FindeAuftrag(true).Gefunden & Kunde.GetKunde(null, Auftrag.KundeID, null).KundeNummer != "2320000") //TODO: Aufträge zusammenführen wenn gleicher Kunde und Liefertag.
{
if (meldung.AuftragVorhanden(Auftrag) == DialogResult.Yes)
{
if (benutzer.Rolle == BenutzerRolle.Verwaltung || benutzer.Rolle == BenutzerRolle.Admin) Auftrag.Status = AuftragStatus.Herrichten;
else Auftrag.Status = AuftragStatus.Abgeholt;
Auftrag.Save();
}
else { this.Auftrag = new Auftrag(); FormNeuerAuftrag_Load(this, e); return; }
}
@ -595,8 +598,8 @@ namespace Deckungsbeitrag
if (!string.IsNullOrWhiteSpace(textBoxText.Text)) zusatz = textBoxText.Text;
// Wenn Kundennummer ist Div.Barzahler(in FormListe wenn mit ? am Anfang) wird individueller Kundename eingetrage
// Wenn Fahrerwechsel durchgeführt wird Grund eingetragen
if (knd.KundeNummer == "2320000") zusatz += string.IsNullOrWhiteSpace(knd.Suchtext) ? "Kunde: " + knd.KundeName : "Kunde: " + knd.Suchtext;
else if (!string.IsNullOrWhiteSpace(eingabe)) zusatz += "Fahrerwechsel: " + eingabe;
if (knd.KundeNummer == "2320000") zusatz += string.IsNullOrWhiteSpace(knd.Suchtext) ? ";Kunde: " + knd.KundeName : ";Kunde: " + knd.Suchtext;
else if (!string.IsNullOrWhiteSpace(eingabe)) zusatz += ";Fahrerwechsel: " + eingabe;
Tour selectedTour = this.comboBoxFahrer.SelectedIndex == -1 ? null : (Tour)this.comboBoxFahrer.SelectedItem;

View File

@ -16,6 +16,7 @@ namespace Deckungsbeitrag.AA_Forms
public partial class FormShowUserControl : Form
{
private Benutzer benutzer;
private Auftrag auftrag;
private UserControl uc;
public List<Auftrag> auftragliste;
private string gb;
@ -48,9 +49,9 @@ namespace Deckungsbeitrag.AA_Forms
this.benutzer = user;
this.Text = gb;
}
public FormShowUserControl(string groupBox, Benutzer user, List<Auftrag> auftragListe) : this(groupBox, user)
public FormShowUserControl(string groupBox, Benutzer user, Auftrag _auftrag) : this(groupBox, user)
{
this.auftragliste = auftragListe;
this.auftrag = _auftrag;
}
public FormShowUserControl(string groupBox, Benutzer user, Kunde kunde) : this(groupBox, user)
@ -94,6 +95,12 @@ namespace Deckungsbeitrag.AA_Forms
this.Controls.Add(uc);
}
break;
case var t when t == "AuftragInfo":
{
uc = new UCAuftragInfo(this.auftrag);
this.Controls.Add(uc);
}
break;
default:
break;
}

View File

@ -839,6 +839,20 @@ namespace DatenDB
DatenbankConnection.GetConnection().Close();
return result;
}
public int Delete()
{
DatenbankConnection.GetConnection().Open();
int result = 0;
using (NpgsqlCommand command = new NpgsqlCommand())
{
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"DELETE from {TABLE} WHERE auftrag_id = {this.AuftragID}";
result = command.ExecuteNonQuery();
}
DatenbankConnection.GetConnection().Close();
return result;
}
public static DateTime NaechsterLiefertag()
{
DateTime heute = DateTime.Today;

View File

@ -41,7 +41,7 @@ namespace DatenDB
AuftragArtikel result = new AuftragArtikel();
NpgsqlCommand command = new NpgsqlCommand();
command.Connection = DatenbankConnection.GetConnection();
command.CommandText = $"SELECT * from {TABLE} where auftrag_artikel_id = {aufartid}";
command.CommandText = $"SELECT {COLUMNS} from {TABLE} where auftrag_artikel_id = {aufartid}";
NpgsqlDataReader reader = command.ExecuteReader();
while (reader.Read()) result = new AuftragArtikel(reader, 1);
reader.Close();

View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -53,6 +54,43 @@ namespace Deckungsbeitrag.AA_Klassen
public int[] ContAnzahl { get; set; } = new int[3];
}
public class AuftragInfo
{
public static List<AuftragInfo> LadeInfos(Auftrag auftrag)
{
string _connectionString = ConfigurationManager.AppSettings["ConnectionString"];
var result = new List<AuftragInfo>();
using (var conn = new NpgsqlConnection(_connectionString))
using (var cmd = new NpgsqlCommand($"SELECT auftrag_status_id, auftrag_id, benutzer_id, auftrag_status, status_changed FROM kundenverwaltung.auftrag_status WHERE auftrag_id = {auftrag.AuftragID} ORDER BY auftrag_id, status_changed ASC", conn))
{
conn.Open();
using (var reader = cmd.ExecuteReader())
{
while (reader.Read())
{
result.Add(new AuftragInfo
{
StatusID = reader.GetInt32(0),
AuftragID = reader.GetInt32(1),
BenutzerID= reader.GetInt32(2),
Status = (AuftragStatus)reader.GetInt16(3),
Datum = reader.GetDateTime(4),
});
}
}
}
return result;
}
public int? StatusID { get; set; }
public int? AuftragID { get; set; }
public int? BenutzerID { get; set; }
public AuftragStatus Status { get; set; }
public DateTime Datum { get; set; }
}
/// <summary>
/// DB-View für Nachwäsche, NW2Müll und NW2Sauber Statistik. Tageseinträge von nw_artikel werden addiert/subtrahiert.
/// </summary>
@ -112,6 +150,7 @@ namespace Deckungsbeitrag.AA_Klassen
/// <param name="typFilter">Kleiner als Typ</param>
/// <param name="minTypFilter">Größer/Gleich Typ</param>
/// <param name="frottee">true wenn Frottee-Expedit</param>
/// <param name="datum">null wenn kein Max. Datum</param>
/// <param name="conn"></param>
/// <returns></returns>
public static async Task<List<View_Auftrag_Expedit>> GetAuftragExpeditAsync(
@ -120,6 +159,7 @@ namespace Deckungsbeitrag.AA_Klassen
AuftragTyp? typFilter = null,
AuftragTyp? minTypFilter = null,
bool? frottee = null,
DateTime? datum = null,
NpgsqlConnection conn = null)
{
string _connectionString = ConfigurationManager.AppSettings["ConnectionString"];
@ -146,11 +186,20 @@ namespace Deckungsbeitrag.AA_Klassen
parameters.Add(new NpgsqlParameter("@min_status", (int)minStatusFilter.Value));
}
else
{
if (datum.HasValue)
{
conditions.Add("status = @status OR status = @status2");
parameters.Add(new NpgsqlParameter("@status", (int)statusFilter.Value));
parameters.Add(new NpgsqlParameter("@status2", (int)AuftragStatus.Herrichten));
}
else
{
conditions.Add("status = @status");
parameters.Add(new NpgsqlParameter("@status", (int)statusFilter.Value));
}
}
}
// Typ-Filter
if (typFilter.HasValue)
@ -171,15 +220,27 @@ namespace Deckungsbeitrag.AA_Klassen
{
if (minTypFilter.HasValue)
{
conditions.Add("typ > @typ");
conditions.Add("typ >= @typ");
parameters.Add(new NpgsqlParameter("@typ", (int)minTypFilter.Value));
}
else
{
//conditions.Add("typ <= @typ OR typ > @typ");
//parameters.Add(new NpgsqlParameter("@typ", (int)AuftragTyp.Standart));
}
}
// Frottee-Filter
if (frottee.HasValue && frottee.Value)
conditions.Add($"frottee_status < 2");
// Datum-Filter
if (datum.HasValue)
{
conditions.Add($"liefertag <= @liefertag");
parameters.Add(new NpgsqlParameter("@liefertag", datum.Value));
}
if (conditions.Count > 0)
command.CommandText += " AND " + string.Join(" AND ", conditions);
@ -246,17 +307,17 @@ namespace Deckungsbeitrag.AA_Klassen
[OLVIgnore]public RegRhythmen Rhythmus { get; set; }
[OLVIgnore]private DateTime? Gedruckt { get; set; }
[OLVIgnore]public string Zusatz { get; set; }
[OLVColumn("Liefertag", AspectToStringFormat = "{0:ddd dd.MM}", DisplayIndex = 10)]public DateTime? Liefertag { get; set; }
[OLVColumn("Status", DisplayIndex = 40)]public AuftragStatus Status { get; set; }
[OLVColumn("Schmutzig", DisplayIndex = 20, TextAlign = HorizontalAlignment.Center)]public int ContainerDirt { get; set; }
[OLVColumn("Sauber", DisplayIndex = 30, TextAlign = HorizontalAlignment.Center)]public int ContainerClean { get; set; }
[OLVColumn("Liefertag", AspectToStringFormat = "{0:ddd dd.MM}", DisplayIndex = 10, IsEditable = false)]public DateTime? Liefertag { get; set; }
[OLVColumn("Status", DisplayIndex = 40, IsEditable = false)]public AuftragStatus Status { get; set; } //DONE: STATUS NICHT EDITIERBAR!
[OLVColumn("Schmutzig", DisplayIndex = 20, TextAlign = HorizontalAlignment.Center, IsEditable = false)]public int ContainerDirt { get; set; }
[OLVColumn("Sauber", DisplayIndex = 30, TextAlign = HorizontalAlignment.Center, IsEditable = false)]public int ContainerClean { get; set; }
[OLVColumn("Typ", DisplayIndex = 50, IsEditable = false)]public AuftragTyp Typ { get; set; }
[OLVColumn("Priority", DisplayIndex = 15)]public Priority Priority { get; set; }
[OLVColumn("Priority", DisplayIndex = 15, IsEditable = false)]public Priority Priority { get; set; }
// Join-Felder aus Table kunde & benutzer
[OLVColumn("Aufgabe", DisplayIndex = 55)]public string AufgabeBezeichnung { get; set; }
[OLVColumn("Kunde", DisplayIndex = 0)]public string KundeName { get; set; }
[OLVColumn("Aufgabe", DisplayIndex = 55, IsEditable = false)]public string AufgabeBezeichnung { get; set; }
[OLVColumn("Kunde", DisplayIndex = 0, IsEditable = false)]public string KundeName { get; set; }
[OLVColumn("Tour", DisplayIndex = 70, IsEditable = false)]public string Tour { get; set; }
// **3 Status-Spalten statt 12 Flags**
@ -274,30 +335,30 @@ namespace Deckungsbeitrag.AA_Klassen
};
// **String Anzeigen von Properties**
[OLVColumn("FR", DisplayIndex = 60, TextAlign = HorizontalAlignment.Center)]public string FrotteeAnzeige
[OLVColumn("FR", DisplayIndex = 60, TextAlign = HorizontalAlignment.Center, IsEditable = false)]public string FrotteeAnzeige
{
get { return StatusAnzeigen.TryGetValue(FrotteeStatus, out string text) ? text : "?"; }
}
[OLVColumn("KT", DisplayIndex = 61, TextAlign = HorizontalAlignment.Center)]public string KleinteileAnzeige
[OLVColumn("KT", DisplayIndex = 61, TextAlign = HorizontalAlignment.Center, IsEditable = false)]public string KleinteileAnzeige
{
get { return StatusAnzeigen.TryGetValue(KleinteileStatus, out string text) ? text : "?"; }
}
[OLVColumn("GT", DisplayIndex = 62, TextAlign = HorizontalAlignment.Center)]public string GrossteileAnzeige
[OLVColumn("GT", DisplayIndex = 62, TextAlign = HorizontalAlignment.Center, IsEditable = false)]public string GrossteileAnzeige
{
get { return StatusAnzeigen.TryGetValue(GrossteileStatus, out string text) ? text : "?"; }
}
[OLVColumn("Etikett", DisplayIndex = 80, TextAlign = HorizontalAlignment.Center)]public string DruckenAnzeige
{
get
{
// Wenn NICHT gedruckt (null oder MinValue) → Druck-Symbol
if (!Gedruckt.HasValue)
return "🖨";
//[OLVColumn("Etikett", DisplayIndex = 80, TextAlign = HorizontalAlignment.Center)]public string DruckenAnzeige
//{
// get
// {
// // Wenn NICHT gedruckt (null oder MinValue) → Druck-Symbol
// if (!Gedruckt.HasValue)
// return "🖨";
// Gedruckt → Datum oder leer
return string.Empty;
}
}
// // Gedruckt → Datum oder leer
// return string.Empty;
// }
//}
[OLVColumn("Abschließen", DisplayIndex = 90, TextAlign = HorizontalAlignment.Center)]public string AbschliessenAnzeige
{
get
@ -346,7 +407,19 @@ namespace Deckungsbeitrag.AA_Klassen
ordinal = reader.GetOrdinal("kunde_name");
}
name = reader.IsDBNull(ordinal) ? null : reader.GetString(ordinal);
if (name == "BAR DIVERSE") ordinal = reader.GetOrdinal("zusatz");
if (name == "BAR DIVERSE")
{
ordinal = reader.GetOrdinal("zusatz");
string zusatz = reader.IsDBNull(ordinal) ? string.Empty : reader.GetString(ordinal);
if (zusatz.Contains(";Kunde:"))
{
string text = ";Kunde: ";
int index = zusatz.LastIndexOf(text) + text.Length;
int lastindex = zusatz.IndexOf(';', index);
name = zusatz.Substring(index, lastindex < 0 ? zusatz.Length - index : lastindex).Trim();
}
}
}
break;
case var t when t == "fahrer":
@ -386,4 +459,5 @@ namespace Deckungsbeitrag.AA_Klassen
else return reader.GetDateTime(ordinal);
}
}
}

View File

@ -1106,7 +1106,8 @@ namespace Deckungsbeitrag
//Etikett-Text
g.DrawString($"{kunde.KundeNummer}", font2, Brushes.Black, startpoint);
nextposition += (int)height_font2;
g.DrawString($"{kunde.Suchtext.Substring(0, 10)}", font2, Brushes.Black, einzug, nextposition);
int length = kunde.Suchtext.Length < 10 ? kunde.Suchtext.Length : 10;
g.DrawString($"{kunde.Suchtext.Substring(0, length)}", font2, Brushes.Black, einzug, nextposition);
nextposition += (int)height_font2;
g.DrawString($"{DateTime.Today.Date:dd.MM.yyyy}", font2, Brushes.Black, einzug, nextposition);
nextposition += (int)height_font2;

View File

@ -113,7 +113,7 @@ namespace Deckungsbeitrag
private static readonly string savePath = ConfigurationManager.AppSettings["DateiSavePfad"];
private static readonly bool istest = false;
public static bool istTouch = TouchHelper.IsTouchDeviceReady();
public static int scrollBar = 25;
/// <summary>
/// Der Haupteinstiegspunkt für die Anwendung.

View File

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

View File

@ -34,37 +34,7 @@
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -76,7 +46,37 @@
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -124,31 +124,7 @@
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_8A953E0634B8757038749C9F77062056"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -160,7 +136,31 @@
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"OwnerKey" = "8:_8A953E0634B8757038749C9F77062056"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -214,13 +214,13 @@
"Entry"
{
"MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -268,19 +268,7 @@
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -292,7 +280,19 @@
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_8A953E0634B8757038749C9F77062056"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -346,37 +346,7 @@
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -388,7 +358,37 @@
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -400,7 +400,7 @@
"Entry"
{
"MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -412,7 +412,7 @@
"Entry"
{
"MsmKey" = "8:_C2D67A4770D262B66069252CF1E903CF"
"OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -436,187 +436,37 @@
"Entry"
{
"MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E637243CDA02D043DD2BAED063790F80"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8A953E0634B8757038749C9F77062056"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33"
"MsmKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE"
"OwnerKey" = "8:_AD2C2F4AADC342899908C708EB4F4A72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C"
"OwnerKey" = "8:_848FCB2438E4DBC274C4D124CEB9562C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -628,7 +478,157 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_848FCB2438E4DBC274C4D124CEB9562C"
"OwnerKey" = "8:_65845AF9470C67B4E2216A46EFF4246C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_D3E738B1E9D7C3C737CDD91DCC4DC37B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A41FC3BFD0E1CE905FCB1693E99348B8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C92C21BE3984A4EC1BCD3A988C56652E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_2DE2024BE0845063AAE50C820ED805AE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BDDC042CD8ACEF57F35D002490214D33"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_125834DE4128EDE3F82BFC1A45B2ACD9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_EF6D58F917144384701E1DBDFB979BD8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_65AC8F9F13B5E0ADCA662A6618010328"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4E92FDDD15B89BB89053E8A65FA73EAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8E444A9D7B7F9420CF44964B1EAE9AAA"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_99A1851DAB14095B2C6FFF6100D312B7"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_1B916DE951F447CD3C62E7AEBE228A3F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C2D67A4770D262B66069252CF1E903CF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8A953E0634B8757038749C9F77062056"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_17ABCA3C569C9181F3FE3A46B8638164"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0B016AD02A79C43C243D615B3AD40570"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4C0EEC06451FEA61E39F79681578838C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E637243CDA02D043DD2BAED063790F80"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_C025D526FF076AA8036CB8B1A2BD888E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_70C791195E1E3B637AE8CB0DE5BB4EFB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0014568666DC36A67BD4258FEDAE4805"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_8208B2126E1B253A2E427D55D4E5F13A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A2FA7AC58F6A16AB132434F8A00EA507"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6A4E9AB7C92A8099AD635862468BFCBE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5CDE0A18B0E8657CBCF9143673DB464A"
"MsmSig" = "8:_UNDEFINED"
}
}
@ -733,6 +733,11 @@
"AssemblyAsmDisplayName" = "8:AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_0014568666DC36A67BD4258FEDAE4805"
{
"Name" = "8:AForge.Video.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:AForge.Video.dll"
"TargetName" = "8:"
@ -759,6 +764,11 @@
"AssemblyAsmDisplayName" = "8:System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_0B016AD02A79C43C243D615B3AD40570"
{
"Name" = "8:System.Memory.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Memory.dll"
"TargetName" = "8:"
@ -785,6 +795,11 @@
"AssemblyAsmDisplayName" = "8:Npgsql, Version=4.1.14.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_125834DE4128EDE3F82BFC1A45B2ACD9"
{
"Name" = "8:Npgsql.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Npgsql.dll"
"TargetName" = "8:"
@ -811,6 +826,11 @@
"AssemblyAsmDisplayName" = "8:zxing.presentation, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_16723AF5DFDEF26FC6A07BEB7D389737"
{
"Name" = "8:zxing.presentation.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:zxing.presentation.dll"
"TargetName" = "8:"
@ -837,6 +857,11 @@
"AssemblyAsmDisplayName" = "8:HarfBuzzSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_17ABCA3C569C9181F3FE3A46B8638164"
{
"Name" = "8:HarfBuzzSharp.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:HarfBuzzSharp.dll"
"TargetName" = "8:"
@ -863,6 +888,11 @@
"AssemblyAsmDisplayName" = "8:Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_1B916DE951F447CD3C62E7AEBE228A3F"
{
"Name" = "8:Microsoft.Bcl.HashCode.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Microsoft.Bcl.HashCode.dll"
"TargetName" = "8:"
@ -889,6 +919,11 @@
"AssemblyAsmDisplayName" = "8:Spire.Barcode, Version=7.4.1.0, Culture=neutral, PublicKeyToken=663f351905198cb3, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_2DE2024BE0845063AAE50C820ED805AE"
{
"Name" = "8:Spire.Barcode.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Spire.Barcode.dll"
"TargetName" = "8:"
@ -935,6 +970,11 @@
"AssemblyAsmDisplayName" = "8:System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_4C0EEC06451FEA61E39F79681578838C"
{
"Name" = "8:System.Runtime.CompilerServices.Unsafe.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Runtime.CompilerServices.Unsafe.dll"
"TargetName" = "8:"
@ -961,6 +1001,11 @@
"AssemblyAsmDisplayName" = "8:System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_4E92FDDD15B89BB89053E8A65FA73EAA"
{
"Name" = "8:System.Text.Encodings.Web.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Text.Encodings.Web.dll"
"TargetName" = "8:"
@ -1007,6 +1052,11 @@
"AssemblyAsmDisplayName" = "8:System.Net.Sockets, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_5CDE0A18B0E8657CBCF9143673DB464A"
{
"Name" = "8:System.Net.Sockets.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Sockets.dll"
"TargetName" = "8:"
@ -1033,6 +1083,11 @@
"AssemblyAsmDisplayName" = "8:zxing, Version=0.16.11.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_65845AF9470C67B4E2216A46EFF4246C"
{
"Name" = "8:zxing.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:zxing.dll"
"TargetName" = "8:"
@ -1059,6 +1114,11 @@
"AssemblyAsmDisplayName" = "8:System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_65AC8F9F13B5E0ADCA662A6618010328"
{
"Name" = "8:System.ValueTuple.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.ValueTuple.dll"
"TargetName" = "8:"
@ -1085,6 +1145,11 @@
"AssemblyAsmDisplayName" = "8:System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_6A4E9AB7C92A8099AD635862468BFCBE"
{
"Name" = "8:System.Runtime.InteropServices.RuntimeInformation.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Runtime.InteropServices.RuntimeInformation.dll"
"TargetName" = "8:"
@ -1111,6 +1176,11 @@
"AssemblyAsmDisplayName" = "8:AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_70C791195E1E3B637AE8CB0DE5BB4EFB"
{
"Name" = "8:AForge.Video.DirectShow.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:AForge.Video.DirectShow.dll"
"TargetName" = "8:"
@ -1137,6 +1207,11 @@
"AssemblyAsmDisplayName" = "8:AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8208B2126E1B253A2E427D55D4E5F13A"
{
"Name" = "8:AForge.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:AForge.dll"
"TargetName" = "8:"
@ -1160,9 +1235,14 @@
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:VirtualKeyboard, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"
"AssemblyAsmDisplayName" = "8:VirtualKeyboard, Version=1.0.1.9, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_848FCB2438E4DBC274C4D124CEB9562C"
{
"Name" = "8:VirtualKeyboard.exe"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:VirtualKeyboard.exe"
"TargetName" = "8:"
@ -1189,6 +1269,11 @@
"AssemblyAsmDisplayName" = "8:System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8A953E0634B8757038749C9F77062056"
{
"Name" = "8:System.Threading.Tasks.Extensions.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Threading.Tasks.Extensions.dll"
"TargetName" = "8:"
@ -1215,6 +1300,11 @@
"AssemblyAsmDisplayName" = "8:System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_8E444A9D7B7F9420CF44964B1EAE9AAA"
{
"Name" = "8:System.IO.Pipelines.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.IO.Pipelines.dll"
"TargetName" = "8:"
@ -1241,6 +1331,11 @@
"AssemblyAsmDisplayName" = "8:Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_99A1851DAB14095B2C6FFF6100D312B7"
{
"Name" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Microsoft.Extensions.Logging.Abstractions.dll"
"TargetName" = "8:"
@ -1267,6 +1362,11 @@
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_A2FA7AC58F6A16AB132434F8A00EA507"
{
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Http.dll"
"TargetName" = "8:"
@ -1293,6 +1393,11 @@
"AssemblyAsmDisplayName" = "8:System.Diagnostics.DiagnosticSource, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_A41FC3BFD0E1CE905FCB1693E99348B8"
{
"Name" = "8:System.Diagnostics.DiagnosticSource.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Diagnostics.DiagnosticSource.dll"
"TargetName" = "8:"
@ -1319,6 +1424,11 @@
"AssemblyAsmDisplayName" = "8:ObjectListView, Version=2.9.3.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_BDDC042CD8ACEF57F35D002490214D33"
{
"Name" = "8:ObjectListView.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:ObjectListView.dll"
"TargetName" = "8:"
@ -1345,6 +1455,11 @@
"AssemblyAsmDisplayName" = "8:System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_C025D526FF076AA8036CB8B1A2BD888E"
{
"Name" = "8:System.Buffers.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Buffers.dll"
"TargetName" = "8:"
@ -1371,6 +1486,11 @@
"AssemblyAsmDisplayName" = "8:Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_C2D67A4770D262B66069252CF1E903CF"
{
"Name" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Microsoft.Bcl.AsyncInterfaces.dll"
"TargetName" = "8:"
@ -1397,6 +1517,11 @@
"AssemblyAsmDisplayName" = "8:System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_C92C21BE3984A4EC1BCD3A988C56652E"
{
"Name" = "8:System.Collections.Immutable.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Collections.Immutable.dll"
"TargetName" = "8:"
@ -1423,6 +1548,11 @@
"AssemblyAsmDisplayName" = "8:System.Threading.Channels, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_D3E738B1E9D7C3C737CDD91DCC4DC37B"
{
"Name" = "8:System.Threading.Channels.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Threading.Channels.dll"
"TargetName" = "8:"
@ -1449,6 +1579,11 @@
"AssemblyAsmDisplayName" = "8:System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_E637243CDA02D043DD2BAED063790F80"
{
"Name" = "8:System.Numerics.Vectors.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Numerics.Vectors.dll"
"TargetName" = "8:"
@ -1475,6 +1610,11 @@
"AssemblyAsmDisplayName" = "8:System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_EF6D58F917144384701E1DBDFB979BD8"
{
"Name" = "8:System.Text.Json.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Text.Json.dll"
"TargetName" = "8:"
@ -1550,15 +1690,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:SetupVerwaltung"
"ProductCode" = "8:{A52B48F7-18F7-4B26-87AF-63C7BADA67C1}"
"PackageCode" = "8:{A8177456-8491-4BFE-ADEF-5DA58C61D3D4}"
"ProductCode" = "8:{049D8565-9755-44F0-BC9C-88DC9765C35C}"
"PackageCode" = "8:{C2847EAC-1B66-4CEA-A9AC-60AACF7C2FC2}"
"UpgradeCode" = "8:{2DC7CE56-8D1C-42EB-B326-2E887EBB7F5A}"
"AspNetVersion" = "8:"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.08"
"ProductVersion" = "8:1.1.17"
"Manufacturer" = "8:Kilian Wirl GmbH"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"

50
UserControls/UCAuftragInfo.Designer.cs generated Normal file
View File

@ -0,0 +1,50 @@
namespace Deckungsbeitrag.UserControls
{
partial class UCAuftragInfo
{
/// <summary>
/// Erforderliche Designervariable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Verwendete Ressourcen bereinigen.
/// </summary>
/// <param name="disposing">True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Vom Komponenten-Designer generierter Code
/// <summary>
/// Erforderliche Methode für die Designerunterstützung.
/// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// UCAuftragInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.Name = "UCAuftragInfo";
this.Padding = new System.Windows.Forms.Padding(20);
this.Size = new System.Drawing.Size(40, 40);
this.Load += new System.EventHandler(this.UCAuftragInfo_Load);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.UCAuftragInfo_Paint);
this.ResumeLayout(false);
}
#endregion
}
}

View File

@ -0,0 +1,116 @@
using DatenDB;
using Deckungsbeitrag.AA_Klassen;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace Deckungsbeitrag.UserControls
{
public partial class UCAuftragInfo : UserControl
{
private readonly Auftrag auftrag;
private List<AuftragInfo> Statis;
private int x = 20;
private int y = 20;
List<string> infoListe = new List<string>();
public UCAuftragInfo()
{
InitializeComponent();
}
public UCAuftragInfo(Auftrag _auftrag) : this()
{
this.auftrag = _auftrag;
}
private void UCAuftragInfo_Load(object sender, EventArgs e)
{
this.BackColor = Program.Wirlblau;
GetInfoListe();
foreach(string s in this.infoListe)
{
Label lbl = GetLabel();
lbl.Text = s;
this.Controls.Add(lbl);
lbl.Location = new Point(x, y);
y += lbl.Height;
}
}
private void GetInfoListe()
{
string info = string.Empty;
Benutzer benutzer;
if (auftrag.Erstellt != null)
{
benutzer = Benutzer.GetBenutzer(null, auftrag.ErstelltVon);
info = $"Erstellt von {benutzer.Vorname} {benutzer.Nachname} am/um {this.auftrag.Erstellt}";
infoListe.Add(info);
}
if (auftrag.Gedruckt != null)
{
benutzer = Benutzer.GetBenutzer(null, auftrag.GedrucktVon);
info = $"Gedruckt von {benutzer.Vorname} {benutzer.Nachname} am/um {this.auftrag.Gedruckt}";
infoListe.Add(info);
}
if (auftrag.Erledigt != null)
{
benutzer = Benutzer.GetBenutzer(null, auftrag.ErledigtVon);
info = $"Aufgabe Erledigt von {benutzer.Vorname} {benutzer.Nachname} am/um {this.auftrag.Erledigt}";
infoListe.Add(info);
}
int i = 1;
Statis = AuftragInfo.LadeInfos(this.auftrag);
foreach (AuftragInfo aufinfo in Statis)
{
benutzer = Benutzer.GetBenutzer(null, aufinfo.BenutzerID);
info = $"{i}.Statusänderung von {benutzer.Vorname} {benutzer.Nachname} am/um {aufinfo.Datum} zu {aufinfo.Status}";
infoListe.Add(info);
i++;
}
}
private Label GetLabel()
{
Label lbl = new Label
{
Font = new Font("Microsoft Sans Serif", 12, FontStyle.Regular),
ForeColor = Color.Black,
AutoSize = true,
BackColor = Color.Transparent
};
return lbl;
}
private void Paint_Boarder(Size size, PaintEventArgs e)
{
e.Graphics.Clear(SystemColors.ControlDark);
Pen pen = new Pen(Color.Red, 6);
Rectangle rect = new Rectangle(1, 2, size.Width - 5, size.Height - 6);
e.Graphics.DrawRectangle(pen, rect);
}
private void UCAuftragInfo_Paint(object sender, PaintEventArgs e)
{
Paint_Boarder(this.Size, e);
}
}
}

View File

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

View File

@ -489,7 +489,7 @@ namespace Deckungsbeitrag.UserControls
if (e.ColumnIndex >= 7 || e.ColumnIndex == 2)
{
row.Cells[5].Value = sollstand - fehlmenge - iststand;
row.Cells[6].Value = artikelListe[e.RowIndex].Korrektur = sollstand - iststand - fehlmenge; //DONE: INV-Ausgleich (Korrektur) = Sollstand - Iststand (Bei Kunde & Lieferungen) - fehlmenge (Reklamation & Nachwäsche)
row.Cells[6].Value = artikelListe[e.RowIndex].Korrektur = sollstand - iststand; //DONE: INV-Ausgleich (Korrektur) = Sollstand - Iststand (Bei Kunde & Lieferungen)
}
}
else return;

View File

@ -370,6 +370,12 @@
<Compile Include="UserControls\UCArtikel.Designer.cs">
<DependentUpon>UCArtikel.cs</DependentUpon>
</Compile>
<Compile Include="UserControls\UCAuftragInfo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserControls\UCAuftragInfo.Designer.cs">
<DependentUpon>UCAuftragInfo.cs</DependentUpon>
</Compile>
<Compile Include="UserControls\UCAuftragListe.cs">
<SubType>UserControl</SubType>
</Compile>
@ -526,6 +532,9 @@
<EmbeddedResource Include="UserControls\UCArtikel.resx">
<DependentUpon>UCArtikel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControls\UCAuftragInfo.resx">
<DependentUpon>UCAuftragInfo.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControls\UCAuftragListe.resx">
<DependentUpon>UCAuftragListe.cs</DependentUpon>
</EmbeddedResource>

View File

@ -1,11 +1,11 @@
=====================================
NEUIGKEITEN - Version 1.1.0.8
NEUIGKEITEN - Version 1.1.1.7
=====================================
Build-Info:
- Build-Typ: Release Build
- Erledigte TODOs: 7
- Offene TODOs: 18
- Erledigte TODOs: 9
- Offene TODOs: 22
- Install-Reminders: 0
- Changes: 31
@ -71,5 +71,5 @@ Build-Info:
Keine Install-Reminder vorhanden ✅
Installation: 05.05.2026 15:38
Installation: 14.05.2026 15:42
=====================================

View File

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

View File

@ -15,7 +15,7 @@ namespace VirtualKeyboard
public partial class QwertzKeyboard : Form
{
private TextBox targetTextBox;
private Button okBtn;
//private Button okBtn;
private bool isNumeric = false;
private bool isCalc = false;
private bool isShift = false;
@ -35,20 +35,6 @@ namespace VirtualKeyboard
"⇧<yxcvbnm,.-⇧", // Hauptbuchstaben 3 (Y statt Z, versetzt)
" _ " // Untere Reihe: Shift (breit), Enter (hoch), Space (sehr breit)
};
// NumPad-Positionen: Standard-Rechner-Layout
// Zeile 1: 7 8 9 /
// Zeile 2: 4 5 6 *
// Zeile 3: 1 2 3 -
// Zeile 4: 0 00 , +
// Rechts: OK
//string[] numpadLayout = {
// "⌫/*-",
// "789+",
// "456",
// "123↵",
// "0," // 0 breit, Komma, Plus
// };
// Numeric-Reihen
private string[] numpadLayout;
public QwertzKeyboard(TextBox target, string numeric)
@ -70,6 +56,7 @@ namespace VirtualKeyboard
isNumeric = isCalc = false;
InitializeKeyboard();
}
this.targetTextBox = target;
this.FormBorderStyle = FormBorderStyle.None;
this.BackColor = Color.FromArgb(1,53,101);
@ -222,12 +209,10 @@ namespace VirtualKeyboard
{
this.Close();
}
private void Tab_Click(object sender, EventArgs e)
{
if (targetTextBox.Parent?.SelectNextControl(targetTextBox, true, true, true, true) == true) this.Close();
}
private void Key_Click(object sender, EventArgs e)
{
Button btn = sender as Button;
@ -253,12 +238,6 @@ namespace VirtualKeyboard
//targetTextBox.Focus();
//targetTextBox.SelectionStart = targetTextBox.Text.Length;
}
private void ToggleMode_Click()
{
isNumeric = !isNumeric;
}
private void Shift_Click(object sender, EventArgs e)
{
Button shiftBtn = (Button)sender;
@ -266,7 +245,6 @@ namespace VirtualKeyboard
shiftBtn.BackColor = isShift ? Color.Yellow : Color.FromArgb(240, 240, 240);
UpdateLayout();
}
private void UpdateLayout()
{
@ -289,7 +267,6 @@ namespace VirtualKeyboard
this.Refresh();
targetTextBox.Focus();
}
protected override void OnShown(EventArgs e)
{
base.OnShown(e);