VirtualKeyboard in FormListe und FormNeuerAuftrag implementiert.
This commit is contained in:
parent
25233a57e6
commit
624e157edd
@ -1,6 +1,6 @@
|
|||||||
namespace Deckungsbeitrag.AA_Forms
|
namespace Deckungsbeitrag.AA_Forms
|
||||||
{
|
{
|
||||||
partial class CustomMessageBox
|
partial class CustomInputBox
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Required designer variable.
|
/// Required designer variable.
|
||||||
@ -11,7 +11,7 @@ using VirtualKeyboard;
|
|||||||
|
|
||||||
namespace Deckungsbeitrag.AA_Forms
|
namespace Deckungsbeitrag.AA_Forms
|
||||||
{
|
{
|
||||||
public partial class CustomMessageBox : Form
|
public partial class CustomInputBox : Form
|
||||||
{
|
{
|
||||||
private QwertzKeyboard keyboard;
|
private QwertzKeyboard keyboard;
|
||||||
private readonly bool isNumeric;
|
private readonly bool isNumeric;
|
||||||
@ -19,11 +19,11 @@ namespace Deckungsbeitrag.AA_Forms
|
|||||||
private readonly string title;
|
private readonly string title;
|
||||||
private readonly string eingabe;
|
private readonly string eingabe;
|
||||||
public string text;
|
public string text;
|
||||||
public CustomMessageBox()
|
public CustomInputBox()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
public CustomMessageBox(string Frage, string Title, string Eingabe, string numeric) : this()
|
public CustomInputBox(string Frage, string Title, string Eingabe, string numeric) : this()
|
||||||
{
|
{
|
||||||
if (numeric == "isNumeric") this.isNumeric = true;
|
if (numeric == "isNumeric") this.isNumeric = true;
|
||||||
this.labelFrage.Text = Frage;
|
this.labelFrage.Text = Frage;
|
||||||
@ -54,20 +54,6 @@ namespace Deckungsbeitrag.AA_Forms
|
|||||||
private void TextBoxText_Enter(object sender, EventArgs e)
|
private void TextBoxText_Enter(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.textBoxText.SelectAll();
|
this.textBoxText.SelectAll();
|
||||||
//if (TouchHelper.IsTouchDeviceReady())
|
|
||||||
//{
|
|
||||||
// if (keyboard == null || keyboard.IsDisposed)
|
|
||||||
// {
|
|
||||||
// keyboard = new QwertzKeyboard(textBoxText, "isNumeric");
|
|
||||||
// keyboard.Show();
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// keyboard.Close();
|
|
||||||
// keyboard = new QwertzKeyboard(textBoxText, "isNumeric");
|
|
||||||
// keyboard.Show();
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonAbbrechen_Click(object sender, EventArgs e)
|
private void ButtonAbbrechen_Click(object sender, EventArgs e)
|
||||||
1
AA-Forms/FormListe.Designer.cs
generated
1
AA-Forms/FormListe.Designer.cs
generated
@ -97,6 +97,7 @@ namespace Deckungsbeitrag
|
|||||||
this.textBoxKunde.Size = new System.Drawing.Size(159, 30);
|
this.textBoxKunde.Size = new System.Drawing.Size(159, 30);
|
||||||
this.textBoxKunde.TabIndex = 0;
|
this.textBoxKunde.TabIndex = 0;
|
||||||
this.textBoxKunde.Text = "Hier eingeben";
|
this.textBoxKunde.Text = "Hier eingeben";
|
||||||
|
this.textBoxKunde.Click += new System.EventHandler(this.TextBoxKunde_Click);
|
||||||
this.textBoxKunde.TextChanged += new System.EventHandler(this.TextBoxKunde_TextChanged);
|
this.textBoxKunde.TextChanged += new System.EventHandler(this.TextBoxKunde_TextChanged);
|
||||||
this.textBoxKunde.Enter += new System.EventHandler(this.TextBoxKunde_Enter);
|
this.textBoxKunde.Enter += new System.EventHandler(this.TextBoxKunde_Enter);
|
||||||
this.textBoxKunde.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ListViewKunde_KeyDown);
|
this.textBoxKunde.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ListViewKunde_KeyDown);
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
using DatenDB;
|
using AForge.Video;
|
||||||
|
using AForge.Video.DirectShow;
|
||||||
|
using DatenDB;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
@ -10,8 +12,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using AForge.Video;
|
using VirtualKeyboard;
|
||||||
using AForge.Video.DirectShow;
|
|
||||||
using ZXing;
|
using ZXing;
|
||||||
|
|
||||||
namespace Deckungsbeitrag
|
namespace Deckungsbeitrag
|
||||||
@ -41,6 +42,8 @@ namespace Deckungsbeitrag
|
|||||||
readonly string auftrag_col = "Kunde,Liefertag,Container";
|
readonly string auftrag_col = "Kunde,Liefertag,Container";
|
||||||
public Timer timer;
|
public Timer timer;
|
||||||
private readonly string kndService;
|
private readonly string kndService;
|
||||||
|
private QwertzKeyboard keyboard;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#region Form-Konstruktor
|
#region Form-Konstruktor
|
||||||
@ -503,7 +506,26 @@ namespace Deckungsbeitrag
|
|||||||
|
|
||||||
private void FormListe_FormClosing(object sender, FormClosingEventArgs e)
|
private void FormListe_FormClosing(object sender, FormClosingEventArgs e)
|
||||||
{
|
{
|
||||||
|
if (keyboard != null) keyboard.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TextBoxKunde_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (TouchHelper.IsTouchDeviceReady())
|
||||||
|
{
|
||||||
|
if (keyboard == null || keyboard.IsDisposed)
|
||||||
|
{
|
||||||
|
keyboard = new QwertzKeyboard(textBoxKunde, "isAlpha");
|
||||||
|
if (keyboard.ShowDialog() == DialogResult.OK) this.ActiveControl.Focus();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
keyboard.Close();
|
||||||
|
keyboard = new QwertzKeyboard(textBoxKunde, "isAlpha");
|
||||||
|
if (keyboard.ShowDialog() == DialogResult.OK) this.ActiveControl.Focus();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ namespace Deckungsbeitrag
|
|||||||
public partial class FormLogin : Form
|
public partial class FormLogin : Form
|
||||||
{
|
{
|
||||||
string progFiles = @"C:\Program Files\Common Files\Microsoft Shared\ink";
|
string progFiles = @"C:\Program Files\Common Files\Microsoft Shared\ink";
|
||||||
QwertzKeyboard keyboard;
|
private QwertzKeyboard keyboard;
|
||||||
private OnboardingSchritt onBoardingArt;
|
private OnboardingSchritt onBoardingArt;
|
||||||
public Benutzer Person { get; set; }
|
public Benutzer Person { get; set; }
|
||||||
|
|
||||||
@ -31,9 +31,9 @@ namespace Deckungsbeitrag
|
|||||||
this.Text += Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
this.Text += Assembly.GetExecutingAssembly().GetName().Version.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonAnmelden_Click(object sender, EventArgs e)
|
private void ButtonAnmelden_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if(string.IsNullOrWhiteSpace(this.textBoxPasswort.Text)) textBoxBenutzer_Leave(sender, e);
|
if(string.IsNullOrWhiteSpace(this.textBoxPasswort.Text)) TextBoxBenutzer_Leave(sender, e);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
MD5 md5 = MD5.Create();
|
MD5 md5 = MD5.Create();
|
||||||
@ -83,16 +83,18 @@ namespace Deckungsbeitrag
|
|||||||
{
|
{
|
||||||
MessageBox.Show(ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
|
MessageBox.Show(ex.Message, "Fehler", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
|
||||||
}
|
}
|
||||||
|
if (keyboard != null) keyboard.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonAbbrechen_Click(object sender, EventArgs e)
|
private void ButtonAbbrechen_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.DialogResult = DialogResult.Cancel;
|
if (keyboard != null) keyboard.Close();
|
||||||
|
|
||||||
|
this.DialogResult = DialogResult.Cancel;
|
||||||
this.Close();
|
this.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buttonRegistrieren_Click(object sender, EventArgs e)
|
private void ButtonRegistrieren_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (!String.IsNullOrEmpty(this.textBoxBenutzer.Text) && !String.IsNullOrEmpty(this.textBoxPasswort.Text) && this.textBoxPasswort.Text == this.textBoxPwdWh.Text)
|
if (!String.IsNullOrEmpty(this.textBoxBenutzer.Text) && !String.IsNullOrEmpty(this.textBoxPasswort.Text) && this.textBoxPasswort.Text == this.textBoxPwdWh.Text)
|
||||||
{
|
{
|
||||||
@ -124,7 +126,7 @@ namespace Deckungsbeitrag
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void textBoxBenutzer_Leave(object sender, EventArgs e)
|
private void TextBoxBenutzer_Leave(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (textBoxBenutzer.Text.Contains(";"))
|
if (textBoxBenutzer.Text.Contains(";"))
|
||||||
{
|
{
|
||||||
@ -148,7 +150,7 @@ namespace Deckungsbeitrag
|
|||||||
StartPosition = FormStartPosition.CenterScreen;
|
StartPosition = FormStartPosition.CenterScreen;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void textBoxBenutzer_Enter(object sender, EventArgs e)
|
private void TextBoxBenutzer_Enter(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.textBoxBenutzer.SelectAll();
|
this.textBoxBenutzer.SelectAll();
|
||||||
|
|
||||||
@ -169,7 +171,7 @@ namespace Deckungsbeitrag
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void textBoxPasswort_Enter(object sender, EventArgs e)
|
private void TextBoxPasswort_Enter(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (TouchHelper.IsTouchDeviceReady())
|
if (TouchHelper.IsTouchDeviceReady())
|
||||||
{
|
{
|
||||||
@ -187,9 +189,27 @@ namespace Deckungsbeitrag
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
private void textBox_Leave(object sender, EventArgs e)
|
private void TextBox_Leave(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
this.buttonAnmelden.Focus();
|
this.buttonAnmelden.Focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void TextBoxPwdWh_Enter(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (TouchHelper.IsTouchDeviceReady())
|
||||||
|
{
|
||||||
|
if (keyboard == null || keyboard.IsDisposed)
|
||||||
|
{
|
||||||
|
keyboard = new QwertzKeyboard(textBoxPasswort, "isNumeric");
|
||||||
|
keyboard.Show();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
keyboard.Close();
|
||||||
|
keyboard = new QwertzKeyboard(textBoxPasswort, "isNumeric");
|
||||||
|
keyboard.Show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
81
AA-Forms/FormLogin.designer.cs
generated
81
AA-Forms/FormLogin.designer.cs
generated
@ -45,6 +45,8 @@ namespace Deckungsbeitrag
|
|||||||
//
|
//
|
||||||
// groupBox1
|
// 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.textBoxPwdWh);
|
||||||
this.groupBox1.Controls.Add(this.labelPwdWh);
|
this.groupBox1.Controls.Add(this.labelPwdWh);
|
||||||
this.groupBox1.Controls.Add(this.textBoxPasswort);
|
this.groupBox1.Controls.Add(this.textBoxPasswort);
|
||||||
@ -53,11 +55,11 @@ namespace Deckungsbeitrag
|
|||||||
this.groupBox1.Controls.Add(this.label1);
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.groupBox1.Location = new System.Drawing.Point(27, 32);
|
this.groupBox1.Location = new System.Drawing.Point(24, 26);
|
||||||
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.groupBox1.Name = "groupBox1";
|
this.groupBox1.Name = "groupBox1";
|
||||||
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
|
||||||
this.groupBox1.Size = new System.Drawing.Size(694, 154);
|
this.groupBox1.Size = new System.Drawing.Size(617, 126);
|
||||||
this.groupBox1.TabIndex = 0;
|
this.groupBox1.TabIndex = 0;
|
||||||
this.groupBox1.TabStop = false;
|
this.groupBox1.TabStop = false;
|
||||||
this.groupBox1.Text = "Login-Daten";
|
this.groupBox1.Text = "Login-Daten";
|
||||||
@ -65,69 +67,70 @@ namespace Deckungsbeitrag
|
|||||||
// textBoxPwdWh
|
// textBoxPwdWh
|
||||||
//
|
//
|
||||||
this.textBoxPwdWh.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
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(278, 169);
|
this.textBoxPwdWh.Location = new System.Drawing.Point(247, 135);
|
||||||
this.textBoxPwdWh.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.textBoxPwdWh.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.textBoxPwdWh.Name = "textBoxPwdWh";
|
this.textBoxPwdWh.Name = "textBoxPwdWh";
|
||||||
this.textBoxPwdWh.Size = new System.Drawing.Size(394, 35);
|
this.textBoxPwdWh.Size = new System.Drawing.Size(351, 30);
|
||||||
this.textBoxPwdWh.TabIndex = 5;
|
this.textBoxPwdWh.TabIndex = 5;
|
||||||
this.textBoxPwdWh.UseSystemPasswordChar = true;
|
this.textBoxPwdWh.UseSystemPasswordChar = true;
|
||||||
|
this.textBoxPwdWh.Enter += new System.EventHandler(this.TextBoxPwdWh_Enter);
|
||||||
//
|
//
|
||||||
// labelPwdWh
|
// labelPwdWh
|
||||||
//
|
//
|
||||||
this.labelPwdWh.AutoSize = true;
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.labelPwdWh.Location = new System.Drawing.Point(39, 174);
|
this.labelPwdWh.Location = new System.Drawing.Point(35, 139);
|
||||||
this.labelPwdWh.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
this.labelPwdWh.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
this.labelPwdWh.Name = "labelPwdWh";
|
this.labelPwdWh.Name = "labelPwdWh";
|
||||||
this.labelPwdWh.Size = new System.Drawing.Size(230, 29);
|
this.labelPwdWh.Size = new System.Drawing.Size(187, 25);
|
||||||
this.labelPwdWh.TabIndex = 4;
|
this.labelPwdWh.TabIndex = 4;
|
||||||
this.labelPwdWh.Text = "Passwort bestätigen";
|
this.labelPwdWh.Text = "Passwort bestätigen";
|
||||||
//
|
//
|
||||||
// textBoxPasswort
|
// textBoxPasswort
|
||||||
//
|
//
|
||||||
this.textBoxPasswort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
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(278, 95);
|
this.textBoxPasswort.Location = new System.Drawing.Point(247, 76);
|
||||||
this.textBoxPasswort.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.textBoxPasswort.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.textBoxPasswort.Name = "textBoxPasswort";
|
this.textBoxPasswort.Name = "textBoxPasswort";
|
||||||
this.textBoxPasswort.Size = new System.Drawing.Size(394, 35);
|
this.textBoxPasswort.Size = new System.Drawing.Size(351, 30);
|
||||||
this.textBoxPasswort.TabIndex = 3;
|
this.textBoxPasswort.TabIndex = 3;
|
||||||
this.textBoxPasswort.UseSystemPasswordChar = true;
|
this.textBoxPasswort.UseSystemPasswordChar = true;
|
||||||
this.textBoxPasswort.Enter += new System.EventHandler(this.textBoxPasswort_Enter);
|
this.textBoxPasswort.Enter += new System.EventHandler(this.TextBoxPasswort_Enter);
|
||||||
this.textBoxPasswort.Leave += new System.EventHandler(this.textBox_Leave);
|
this.textBoxPasswort.Leave += new System.EventHandler(this.TextBox_Leave);
|
||||||
//
|
//
|
||||||
// label2
|
// label2
|
||||||
//
|
//
|
||||||
this.label2.AutoSize = true;
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.label2.Location = new System.Drawing.Point(158, 100);
|
this.label2.Location = new System.Drawing.Point(140, 80);
|
||||||
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
this.label2.Name = "label2";
|
this.label2.Name = "label2";
|
||||||
this.label2.Size = new System.Drawing.Size(112, 29);
|
this.label2.Size = new System.Drawing.Size(92, 25);
|
||||||
this.label2.TabIndex = 2;
|
this.label2.TabIndex = 2;
|
||||||
this.label2.Text = "Passwort";
|
this.label2.Text = "Passwort";
|
||||||
//
|
//
|
||||||
// textBoxBenutzer
|
// textBoxBenutzer
|
||||||
//
|
//
|
||||||
this.textBoxBenutzer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
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(278, 46);
|
this.textBoxBenutzer.Location = new System.Drawing.Point(247, 37);
|
||||||
this.textBoxBenutzer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.textBoxBenutzer.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.textBoxBenutzer.Name = "textBoxBenutzer";
|
this.textBoxBenutzer.Name = "textBoxBenutzer";
|
||||||
this.textBoxBenutzer.Size = new System.Drawing.Size(394, 35);
|
this.textBoxBenutzer.Size = new System.Drawing.Size(351, 30);
|
||||||
this.textBoxBenutzer.TabIndex = 1;
|
this.textBoxBenutzer.TabIndex = 1;
|
||||||
this.textBoxBenutzer.Enter += new System.EventHandler(this.textBoxBenutzer_Enter);
|
this.textBoxBenutzer.Enter += new System.EventHandler(this.TextBoxBenutzer_Enter);
|
||||||
this.textBoxBenutzer.Leave += new System.EventHandler(this.textBoxBenutzer_Leave);
|
this.textBoxBenutzer.Leave += new System.EventHandler(this.TextBoxBenutzer_Leave);
|
||||||
//
|
//
|
||||||
// label1
|
// label1
|
||||||
//
|
//
|
||||||
this.label1.AutoSize = true;
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.label1.Location = new System.Drawing.Point(158, 51);
|
this.label1.Location = new System.Drawing.Point(140, 41);
|
||||||
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
|
||||||
this.label1.Name = "label1";
|
this.label1.Name = "label1";
|
||||||
this.label1.Size = new System.Drawing.Size(108, 29);
|
this.label1.Size = new System.Drawing.Size(90, 25);
|
||||||
this.label1.TabIndex = 0;
|
this.label1.TabIndex = 0;
|
||||||
this.label1.Text = "Benutzer";
|
this.label1.Text = "Benutzer";
|
||||||
//
|
//
|
||||||
@ -140,15 +143,15 @@ namespace Deckungsbeitrag
|
|||||||
this.buttonAnmelden.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.buttonAnmelden.Location = new System.Drawing.Point(495, 212);
|
this.buttonAnmelden.Location = new System.Drawing.Point(440, 173);
|
||||||
this.buttonAnmelden.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.buttonAnmelden.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.buttonAnmelden.Name = "buttonAnmelden";
|
this.buttonAnmelden.Name = "buttonAnmelden";
|
||||||
this.buttonAnmelden.Padding = new System.Windows.Forms.Padding(3);
|
this.buttonAnmelden.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
|
||||||
this.buttonAnmelden.Size = new System.Drawing.Size(225, 63);
|
this.buttonAnmelden.Size = new System.Drawing.Size(200, 50);
|
||||||
this.buttonAnmelden.TabIndex = 1;
|
this.buttonAnmelden.TabIndex = 1;
|
||||||
this.buttonAnmelden.Text = "Anmelden";
|
this.buttonAnmelden.Text = "Anmelden";
|
||||||
this.buttonAnmelden.UseVisualStyleBackColor = false;
|
this.buttonAnmelden.UseVisualStyleBackColor = false;
|
||||||
this.buttonAnmelden.Click += new System.EventHandler(this.buttonAnmelden_Click);
|
this.buttonAnmelden.Click += new System.EventHandler(this.ButtonAnmelden_Click);
|
||||||
//
|
//
|
||||||
// buttonAbbrechen
|
// buttonAbbrechen
|
||||||
//
|
//
|
||||||
@ -160,14 +163,14 @@ namespace Deckungsbeitrag
|
|||||||
this.buttonAbbrechen.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
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.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.ForeColor = System.Drawing.Color.White;
|
||||||
this.buttonAbbrechen.Location = new System.Drawing.Point(261, 212);
|
this.buttonAbbrechen.Location = new System.Drawing.Point(232, 173);
|
||||||
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.buttonAbbrechen.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.buttonAbbrechen.Name = "buttonAbbrechen";
|
this.buttonAbbrechen.Name = "buttonAbbrechen";
|
||||||
this.buttonAbbrechen.Size = new System.Drawing.Size(225, 63);
|
this.buttonAbbrechen.Size = new System.Drawing.Size(200, 50);
|
||||||
this.buttonAbbrechen.TabIndex = 2;
|
this.buttonAbbrechen.TabIndex = 2;
|
||||||
this.buttonAbbrechen.Text = "Abbrechen";
|
this.buttonAbbrechen.Text = "Abbrechen";
|
||||||
this.buttonAbbrechen.UseVisualStyleBackColor = false;
|
this.buttonAbbrechen.UseVisualStyleBackColor = false;
|
||||||
this.buttonAbbrechen.Click += new System.EventHandler(this.buttonAbbrechen_Click);
|
this.buttonAbbrechen.Click += new System.EventHandler(this.ButtonAbbrechen_Click);
|
||||||
//
|
//
|
||||||
// buttonRegistrieren
|
// buttonRegistrieren
|
||||||
//
|
//
|
||||||
@ -177,23 +180,23 @@ namespace Deckungsbeitrag
|
|||||||
this.buttonRegistrieren.FlatAppearance.BorderSize = 0;
|
this.buttonRegistrieren.FlatAppearance.BorderSize = 0;
|
||||||
this.buttonRegistrieren.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
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.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(27, 214);
|
this.buttonRegistrieren.Location = new System.Drawing.Point(24, 174);
|
||||||
this.buttonRegistrieren.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.buttonRegistrieren.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.buttonRegistrieren.Name = "buttonRegistrieren";
|
this.buttonRegistrieren.Name = "buttonRegistrieren";
|
||||||
this.buttonRegistrieren.Size = new System.Drawing.Size(225, 63);
|
this.buttonRegistrieren.Size = new System.Drawing.Size(200, 50);
|
||||||
this.buttonRegistrieren.TabIndex = 3;
|
this.buttonRegistrieren.TabIndex = 3;
|
||||||
this.buttonRegistrieren.Text = "Registrieren";
|
this.buttonRegistrieren.Text = "Registrieren";
|
||||||
this.buttonRegistrieren.UseVisualStyleBackColor = false;
|
this.buttonRegistrieren.UseVisualStyleBackColor = false;
|
||||||
this.buttonRegistrieren.Click += new System.EventHandler(this.buttonRegistrieren_Click);
|
this.buttonRegistrieren.Click += new System.EventHandler(this.ButtonRegistrieren_Click);
|
||||||
//
|
//
|
||||||
// FormLogin
|
// FormLogin
|
||||||
//
|
//
|
||||||
this.AcceptButton = this.buttonAnmelden;
|
this.AcceptButton = this.buttonAnmelden;
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
|
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(1)))), ((int)(((byte)(53)))), ((int)(((byte)(101)))));
|
||||||
this.CancelButton = this.buttonAbbrechen;
|
this.CancelButton = this.buttonAbbrechen;
|
||||||
this.ClientSize = new System.Drawing.Size(738, 294);
|
this.ClientSize = new System.Drawing.Size(656, 238);
|
||||||
this.Controls.Add(this.buttonRegistrieren);
|
this.Controls.Add(this.buttonRegistrieren);
|
||||||
this.Controls.Add(this.buttonAbbrechen);
|
this.Controls.Add(this.buttonAbbrechen);
|
||||||
this.Controls.Add(this.buttonAnmelden);
|
this.Controls.Add(this.buttonAnmelden);
|
||||||
@ -201,7 +204,7 @@ namespace Deckungsbeitrag
|
|||||||
this.ForeColor = System.Drawing.SystemColors.ControlText;
|
this.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||||
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
|
this.Margin = new System.Windows.Forms.Padding(4);
|
||||||
this.MaximizeBox = false;
|
this.MaximizeBox = false;
|
||||||
this.MinimizeBox = false;
|
this.MinimizeBox = false;
|
||||||
this.Name = "FormLogin";
|
this.Name = "FormLogin";
|
||||||
|
|||||||
@ -311,7 +311,7 @@ namespace Deckungsbeitrag
|
|||||||
}
|
}
|
||||||
private void TSBScannTest_Click(object sender, EventArgs e)
|
private void TSBScannTest_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
CustomMessageBox messageBox = new CustomMessageBox("Nenne mir eine Zahl und tippe sie unten ein", "TEST", "Anzahl", "isNumeric");
|
CustomInputBox messageBox = new CustomInputBox("Nenne mir eine Zahl und tippe sie unten ein", "TEST", "Anzahl", "isNumeric");
|
||||||
messageBox.Show();
|
messageBox.Show();
|
||||||
}
|
}
|
||||||
private void TSBArtikelVW_Click(object sender, EventArgs e)
|
private void TSBArtikelVW_Click(object sender, EventArgs e)
|
||||||
|
|||||||
@ -112,7 +112,7 @@ namespace Deckungsbeitrag
|
|||||||
if (!GetKunde(kndService)) { CloseForm(DialogResult.Cancel); return; }
|
if (!GetKunde(kndService)) { CloseForm(DialogResult.Cancel); return; }
|
||||||
|
|
||||||
// Containeranzahl laden
|
// Containeranzahl laden
|
||||||
CustomMessageBox messageBox = new CustomMessageBox($"Wieviel Container hast du beim Kunde {kundeName} abgeholt?", "CONTAINERANZAHL", "Containeranzahl", "isNumeric");
|
CustomInputBox messageBox = new CustomInputBox($"Wieviel Container hast du beim Kunde {kundeName} abgeholt?", "CONTAINERANZAHL", "Containeranzahl", "isNumeric");
|
||||||
if (messageBox.ShowDialog() == DialogResult.OK)
|
if (messageBox.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
this.textBoxCont.Text = messageBox.text.ToString();
|
this.textBoxCont.Text = messageBox.text.ToString();
|
||||||
@ -333,17 +333,17 @@ namespace Deckungsbeitrag
|
|||||||
}
|
}
|
||||||
private void ComboBoxArtikel_SelectedIndexChanged(object sender, EventArgs e)
|
private void ComboBoxArtikel_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
int index = 0;
|
|
||||||
int artAnzahl = 1;
|
int artAnzahl = 1;
|
||||||
string anzahl = string.Empty;
|
string anzahl = string.Empty;
|
||||||
UCArtikel uca;
|
UCArtikel uca;
|
||||||
var art = this.comboBoxArtikel.SelectedItem;
|
var art = this.comboBoxArtikel.SelectedItem;
|
||||||
do
|
|
||||||
|
CustomInputBox inputBox = new CustomInputBox("Wieviel Stück sollen geliefert oder eingezogen werden?", "ARTIKELANZAHL", "Anzahl", "isNumeric");
|
||||||
|
if (inputBox.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
if (index > 0) if (MessageBox.Show("Bitte nur ganze Zahlen eingeben.", "ACHTUNG", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.Cancel) return;
|
anzahl = inputBox.text;
|
||||||
anzahl = Interaction.InputBox($"Wieviel Stück sollen geliefert oder eingezogen werden?\n\nStück:", "Artikelanzahl", "");
|
}
|
||||||
index++;
|
else return;
|
||||||
} while (!int.TryParse(anzahl, out artAnzahl));
|
|
||||||
|
|
||||||
if (art is Artikel artikel) uca = new UCArtikel(artikel, artAnzahl);
|
if (art is Artikel artikel) uca = new UCArtikel(artikel, artAnzahl);
|
||||||
else uca = new UCArtikel((KundeArtikel)art, artAnzahl);
|
else uca = new UCArtikel((KundeArtikel)art, artAnzahl);
|
||||||
@ -360,6 +360,7 @@ namespace Deckungsbeitrag
|
|||||||
if (meldung.GetFrage(this, "Möchtest du den Auftrag wirklich einer anderen Tour zuteilen?", false) == DialogResult.No) { ((ComboBox)sender).SelectedIndex = -1; e.Cancel = true; }
|
if (meldung.GetFrage(this, "Möchtest du den Auftrag wirklich einer anderen Tour zuteilen?", false) == DialogResult.No) { ((ComboBox)sender).SelectedIndex = -1; e.Cancel = true; }
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//TODO: CustomInputBox einrichten.
|
||||||
eingabe = Interaction.InputBox("Warum möchtest du den Auftrag einem anderen Fahrer zuteilen?\n\nGrund:", "Sonderzuteilung", "");
|
eingabe = Interaction.InputBox("Warum möchtest du den Auftrag einem anderen Fahrer zuteilen?\n\nGrund:", "Sonderzuteilung", "");
|
||||||
if (string.IsNullOrWhiteSpace(eingabe)) e.Cancel = true;
|
if (string.IsNullOrWhiteSpace(eingabe)) e.Cancel = true;
|
||||||
}
|
}
|
||||||
@ -526,21 +527,23 @@ namespace Deckungsbeitrag
|
|||||||
}
|
}
|
||||||
private void PictureBoxAddArtikel_Click(object sender, EventArgs e)
|
private void PictureBoxAddArtikel_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
int index = 0;
|
|
||||||
int artAnzahl = 1;
|
int artAnzahl = 1;
|
||||||
string artname = string.Empty;
|
string artname = string.Empty;
|
||||||
string anzahl = string.Empty;
|
string anzahl = string.Empty;
|
||||||
UCArtikel uca;
|
UCArtikel uca;
|
||||||
|
|
||||||
artname = Interaction.InputBox($"Möchtest du einen individuellen Artikel eingeben?\n\nArtikelname:", "ARTIKELNAME WÄHLEN", "");
|
CustomInputBox inputBox = new CustomInputBox("Möchtest du einen individuellen Artikel eingeben?", "ARTIKELNAME", "Artikelname", "isAlpha");
|
||||||
|
if (inputBox.ShowDialog() == DialogResult.OK) artname = inputBox.text;
|
||||||
|
else return;
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(artname))
|
if (!string.IsNullOrWhiteSpace(artname))
|
||||||
{
|
{
|
||||||
do
|
inputBox = new CustomInputBox("Wieviel Stück sollen geliefert oder eingezogen werden?", "ARTIKELANZAHL", "Anzahl", "isNumeric");
|
||||||
|
if (inputBox.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
if (index > 0) if (MessageBox.Show("Bitte nur ganze Zahlen eingeben.", "ACHTUNG", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.Cancel) return;
|
anzahl = inputBox.text;
|
||||||
anzahl = Interaction.InputBox($"Wieviel Stück sollen geliefert werden?\n\nStück:", "Artikelanzahl", "");
|
}
|
||||||
index++;
|
else return;
|
||||||
} while (!int.TryParse(anzahl, out artAnzahl));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var art = new Artikel()
|
var art = new Artikel()
|
||||||
|
|||||||
@ -157,11 +157,11 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="AA-Forms\CustomMessageBox.cs">
|
<Compile Include="AA-Forms\CustomInputBox.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="AA-Forms\CustomMessageBox.Designer.cs">
|
<Compile Include="AA-Forms\CustomInputBox.Designer.cs">
|
||||||
<DependentUpon>CustomMessageBox.cs</DependentUpon>
|
<DependentUpon>CustomInputBox.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="AA-Forms\FehlmengeChart.cs">
|
<Compile Include="AA-Forms\FehlmengeChart.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
@ -434,8 +434,8 @@
|
|||||||
<DependentUpon>UCTourenplan.cs</DependentUpon>
|
<DependentUpon>UCTourenplan.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="UserSettingsManager.cs" />
|
<Compile Include="UserSettingsManager.cs" />
|
||||||
<EmbeddedResource Include="AA-Forms\CustomMessageBox.resx">
|
<EmbeddedResource Include="AA-Forms\CustomInputBox.resx">
|
||||||
<DependentUpon>CustomMessageBox.cs</DependentUpon>
|
<DependentUpon>CustomInputBox.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="AA-Forms\FehlmengeChart.resx">
|
<EmbeddedResource Include="AA-Forms\FehlmengeChart.resx">
|
||||||
<DependentUpon>FehlmengeChart.cs</DependentUpon>
|
<DependentUpon>FehlmengeChart.cs</DependentUpon>
|
||||||
|
|||||||
@ -5,7 +5,7 @@ NEUIGKEITEN - Version 1.1.0.7
|
|||||||
Build-Info:
|
Build-Info:
|
||||||
- Build-Typ: Release Build
|
- Build-Typ: Release Build
|
||||||
- Erledigte TODOs: 6
|
- Erledigte TODOs: 6
|
||||||
- Offene TODOs: 24
|
- Offene TODOs: 25
|
||||||
- Install-Reminders: 1
|
- Install-Reminders: 1
|
||||||
- Changes: 29
|
- Changes: 29
|
||||||
|
|
||||||
@ -70,5 +70,5 @@ Build-Info:
|
|||||||
=== ⚙️ INSTALL-REMINDER (1) ===
|
=== ⚙️ INSTALL-REMINDER (1) ===
|
||||||
- ⚙️ DB anpassen. (Priority in Auftrag etc.) [Auftrag.cs]
|
- ⚙️ DB anpassen. (Priority in Auftrag etc.) [Auftrag.cs]
|
||||||
|
|
||||||
Installation: 29.04.2026 17:06
|
Installation: 29.04.2026 17:53
|
||||||
=====================================
|
=====================================
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user