diff --git a/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.Designer.cs b/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.Designer.cs index c73a870..1b97d78 100644 --- a/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.Designer.cs +++ b/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.Designer.cs @@ -41,23 +41,23 @@ txtName = new DevExpress.XtraEditors.TextEdit(); txtModell = new DevExpress.XtraEditors.TextEdit(); txtSeriennummer = new DevExpress.XtraEditors.TextEdit(); - txtBezeichnung = new DevExpress.XtraEditors.TextEdit(); lueHersteller = new DevExpress.XtraEditors.LookUpEdit(); btnWerkzeugHinzufügen = new DevExpress.XtraEditors.SimpleButton(); labelControl3 = new DevExpress.XtraEditors.LabelControl(); sePreisProTag = new DevExpress.XtraEditors.SpinEdit(); sePreisProWochenende = new DevExpress.XtraEditors.SpinEdit(); sePreisProWoche = new DevExpress.XtraEditors.SpinEdit(); + meBezeichnung = new DevExpress.XtraEditors.MemoEdit(); tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)seKaution.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtName.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtModell.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtSeriennummer.Properties).BeginInit(); - ((System.ComponentModel.ISupportInitialize)txtBezeichnung.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)lueHersteller.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)sePreisProTag.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)sePreisProWochenende.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)sePreisProWoche.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)meBezeichnung.Properties).BeginInit(); SuspendLayout(); // // tableLayoutPanel1 @@ -83,28 +83,29 @@ tableLayoutPanel1.Controls.Add(txtName, 1, 0); tableLayoutPanel1.Controls.Add(txtModell, 1, 2); tableLayoutPanel1.Controls.Add(txtSeriennummer, 1, 3); - tableLayoutPanel1.Controls.Add(txtBezeichnung, 1, 4); tableLayoutPanel1.Controls.Add(lueHersteller, 1, 1); - tableLayoutPanel1.Controls.Add(btnWerkzeugHinzufügen, 2, 6); + tableLayoutPanel1.Controls.Add(btnWerkzeugHinzufügen, 2, 8); tableLayoutPanel1.Controls.Add(labelControl3, 0, 1); tableLayoutPanel1.Controls.Add(sePreisProTag, 5, 0); tableLayoutPanel1.Controls.Add(sePreisProWochenende, 5, 1); tableLayoutPanel1.Controls.Add(sePreisProWoche, 5, 2); + tableLayoutPanel1.Controls.Add(meBezeichnung, 1, 4); tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(6); tableLayoutPanel1.Name = "tableLayoutPanel1"; tableLayoutPanel1.RowCount = 10; - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); - tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); + tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 64F)); tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - tableLayoutPanel1.Size = new System.Drawing.Size(800, 450); + tableLayoutPanel1.Size = new System.Drawing.Size(1486, 960); tableLayoutPanel1.TabIndex = 0; // // seKaution @@ -112,83 +113,92 @@ tableLayoutPanel1.SetColumnSpan(seKaution, 2); seKaution.Dock = System.Windows.Forms.DockStyle.Fill; seKaution.EditValue = new decimal(new int[] { 0, 0, 0, 0 }); - seKaution.Location = new System.Drawing.Point(466, 93); + seKaution.Location = new System.Drawing.Point(865, 198); + seKaution.Margin = new System.Windows.Forms.Padding(6); seKaution.Name = "seKaution"; seKaution.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); seKaution.Properties.MaskSettings.Set("mask", "c2"); seKaution.Properties.UseMaskAsDisplayFormat = true; - seKaution.Size = new System.Drawing.Size(201, 20); + seKaution.Size = new System.Drawing.Size(374, 40); seKaution.TabIndex = 26; // // labelControl1 // labelControl1.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl1.Location = new System.Drawing.Point(3, 8); + labelControl1.Location = new System.Drawing.Point(6, 19); + labelControl1.Margin = new System.Windows.Forms.Padding(6); labelControl1.Name = "labelControl1"; - labelControl1.Size = new System.Drawing.Size(31, 13); + labelControl1.Size = new System.Drawing.Size(61, 25); labelControl1.TabIndex = 0; labelControl1.Text = "Name:"; // // labelControl6 // labelControl6.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl6.Location = new System.Drawing.Point(335, 8); + labelControl6.Location = new System.Drawing.Point(622, 19); + labelControl6.Margin = new System.Windows.Forms.Padding(6); labelControl6.Name = "labelControl6"; - labelControl6.Size = new System.Drawing.Size(67, 13); + labelControl6.Size = new System.Drawing.Size(132, 25); labelControl6.TabIndex = 5; labelControl6.Text = "Preis pro Tag:"; // // labelControl7 // labelControl7.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl7.Location = new System.Drawing.Point(335, 38); + labelControl7.Location = new System.Drawing.Point(622, 83); + labelControl7.Margin = new System.Windows.Forms.Padding(6); labelControl7.Name = "labelControl7"; - labelControl7.Size = new System.Drawing.Size(112, 13); + labelControl7.Size = new System.Drawing.Size(218, 25); labelControl7.TabIndex = 6; labelControl7.Text = "Preis pro Wochenende:"; // // labelControl8 // labelControl8.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl8.Location = new System.Drawing.Point(335, 68); + labelControl8.Location = new System.Drawing.Point(622, 147); + labelControl8.Margin = new System.Windows.Forms.Padding(6); labelControl8.Name = "labelControl8"; - labelControl8.Size = new System.Drawing.Size(82, 13); + labelControl8.Size = new System.Drawing.Size(160, 25); labelControl8.TabIndex = 7; labelControl8.Text = "Preis pro Woche:"; // // labelControl9 // labelControl9.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl9.Location = new System.Drawing.Point(335, 98); + labelControl9.Location = new System.Drawing.Point(622, 211); + labelControl9.Margin = new System.Windows.Forms.Padding(6); labelControl9.Name = "labelControl9"; - labelControl9.Size = new System.Drawing.Size(40, 13); + labelControl9.Size = new System.Drawing.Size(77, 25); labelControl9.TabIndex = 8; labelControl9.Text = "Kaution:"; // // labelControl4 // labelControl4.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl4.Location = new System.Drawing.Point(3, 68); + labelControl4.Location = new System.Drawing.Point(6, 147); + labelControl4.Margin = new System.Windows.Forms.Padding(6); labelControl4.Name = "labelControl4"; - labelControl4.Size = new System.Drawing.Size(34, 13); + labelControl4.Size = new System.Drawing.Size(67, 25); labelControl4.TabIndex = 3; labelControl4.Text = "Modell:"; // // labelControl5 // labelControl5.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl5.Location = new System.Drawing.Point(3, 98); + labelControl5.Location = new System.Drawing.Point(6, 211); + labelControl5.Margin = new System.Windows.Forms.Padding(6); labelControl5.Name = "labelControl5"; - labelControl5.Size = new System.Drawing.Size(72, 13); + labelControl5.Size = new System.Drawing.Size(145, 25); labelControl5.TabIndex = 4; labelControl5.Text = "Seriennummer:"; // // labelControl2 // labelControl2.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl2.Location = new System.Drawing.Point(3, 128); + labelControl2.Location = new System.Drawing.Point(6, 275); + labelControl2.Margin = new System.Windows.Forms.Padding(6); labelControl2.Name = "labelControl2"; - labelControl2.Size = new System.Drawing.Size(64, 13); + labelControl2.Size = new System.Drawing.Size(126, 25); labelControl2.TabIndex = 1; labelControl2.Text = "Bezeichnung:"; // @@ -196,55 +206,51 @@ // tableLayoutPanel1.SetColumnSpan(txtName, 3); txtName.Dock = System.Windows.Forms.DockStyle.Fill; - txtName.Location = new System.Drawing.Point(86, 3); + txtName.Location = new System.Drawing.Point(160, 6); + txtName.Margin = new System.Windows.Forms.Padding(6); txtName.Name = "txtName"; - txtName.Size = new System.Drawing.Size(243, 20); + txtName.Size = new System.Drawing.Size(450, 40); txtName.TabIndex = 9; // // txtModell // tableLayoutPanel1.SetColumnSpan(txtModell, 3); txtModell.Dock = System.Windows.Forms.DockStyle.Fill; - txtModell.Location = new System.Drawing.Point(86, 63); + txtModell.Location = new System.Drawing.Point(160, 134); + txtModell.Margin = new System.Windows.Forms.Padding(6); txtModell.Name = "txtModell"; - txtModell.Size = new System.Drawing.Size(243, 20); + txtModell.Size = new System.Drawing.Size(450, 40); txtModell.TabIndex = 10; // // txtSeriennummer // tableLayoutPanel1.SetColumnSpan(txtSeriennummer, 3); txtSeriennummer.Dock = System.Windows.Forms.DockStyle.Fill; - txtSeriennummer.Location = new System.Drawing.Point(86, 93); + txtSeriennummer.Location = new System.Drawing.Point(160, 198); + txtSeriennummer.Margin = new System.Windows.Forms.Padding(6); txtSeriennummer.Name = "txtSeriennummer"; - txtSeriennummer.Size = new System.Drawing.Size(243, 20); + txtSeriennummer.Size = new System.Drawing.Size(450, 40); txtSeriennummer.TabIndex = 11; // - // txtBezeichnung - // - tableLayoutPanel1.SetColumnSpan(txtBezeichnung, 6); - txtBezeichnung.Dock = System.Windows.Forms.DockStyle.Fill; - txtBezeichnung.Location = new System.Drawing.Point(86, 123); - txtBezeichnung.Name = "txtBezeichnung"; - txtBezeichnung.Size = new System.Drawing.Size(581, 20); - txtBezeichnung.TabIndex = 12; - // // lueHersteller // tableLayoutPanel1.SetColumnSpan(lueHersteller, 3); lueHersteller.Dock = System.Windows.Forms.DockStyle.Fill; - lueHersteller.Location = new System.Drawing.Point(86, 33); + lueHersteller.Location = new System.Drawing.Point(160, 70); + lueHersteller.Margin = new System.Windows.Forms.Padding(6); lueHersteller.Name = "lueHersteller"; lueHersteller.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); - lueHersteller.Size = new System.Drawing.Size(243, 20); + lueHersteller.Size = new System.Drawing.Size(450, 40); lueHersteller.TabIndex = 17; // // btnWerkzeugHinzufügen // tableLayoutPanel1.SetColumnSpan(btnWerkzeugHinzufügen, 2); btnWerkzeugHinzufügen.Dock = System.Windows.Forms.DockStyle.Fill; - btnWerkzeugHinzufügen.Location = new System.Drawing.Point(169, 183); + btnWerkzeugHinzufügen.Location = new System.Drawing.Point(314, 518); + btnWerkzeugHinzufügen.Margin = new System.Windows.Forms.Padding(6); btnWerkzeugHinzufügen.Name = "btnWerkzeugHinzufügen"; - btnWerkzeugHinzufügen.Size = new System.Drawing.Size(160, 24); + btnWerkzeugHinzufügen.Size = new System.Drawing.Size(296, 52); btnWerkzeugHinzufügen.TabIndex = 18; btnWerkzeugHinzufügen.Text = "Werkzeug hinzufügen"; btnWerkzeugHinzufügen.Click += btnWerkzeugHinzufügen_Click; @@ -252,9 +258,10 @@ // labelControl3 // labelControl3.Anchor = System.Windows.Forms.AnchorStyles.Left; - labelControl3.Location = new System.Drawing.Point(3, 38); + labelControl3.Location = new System.Drawing.Point(6, 83); + labelControl3.Margin = new System.Windows.Forms.Padding(6); labelControl3.Name = "labelControl3"; - labelControl3.Size = new System.Drawing.Size(50, 13); + labelControl3.Size = new System.Drawing.Size(96, 25); labelControl3.TabIndex = 22; labelControl3.Text = "Hersteller:"; // @@ -263,12 +270,13 @@ tableLayoutPanel1.SetColumnSpan(sePreisProTag, 2); sePreisProTag.Dock = System.Windows.Forms.DockStyle.Fill; sePreisProTag.EditValue = new decimal(new int[] { 0, 0, 0, 0 }); - sePreisProTag.Location = new System.Drawing.Point(466, 3); + sePreisProTag.Location = new System.Drawing.Point(865, 6); + sePreisProTag.Margin = new System.Windows.Forms.Padding(6); sePreisProTag.Name = "sePreisProTag"; sePreisProTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); sePreisProTag.Properties.MaskSettings.Set("mask", "c2"); sePreisProTag.Properties.UseMaskAsDisplayFormat = true; - sePreisProTag.Size = new System.Drawing.Size(201, 20); + sePreisProTag.Size = new System.Drawing.Size(374, 40); sePreisProTag.TabIndex = 23; // // sePreisProWochenende @@ -276,12 +284,13 @@ tableLayoutPanel1.SetColumnSpan(sePreisProWochenende, 2); sePreisProWochenende.Dock = System.Windows.Forms.DockStyle.Fill; sePreisProWochenende.EditValue = new decimal(new int[] { 0, 0, 0, 0 }); - sePreisProWochenende.Location = new System.Drawing.Point(466, 33); + sePreisProWochenende.Location = new System.Drawing.Point(865, 70); + sePreisProWochenende.Margin = new System.Windows.Forms.Padding(6); sePreisProWochenende.Name = "sePreisProWochenende"; sePreisProWochenende.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); sePreisProWochenende.Properties.MaskSettings.Set("mask", "c2"); sePreisProWochenende.Properties.UseMaskAsDisplayFormat = true; - sePreisProWochenende.Size = new System.Drawing.Size(201, 20); + sePreisProWochenende.Size = new System.Drawing.Size(374, 40); sePreisProWochenende.TabIndex = 24; // // sePreisProWoche @@ -289,20 +298,32 @@ tableLayoutPanel1.SetColumnSpan(sePreisProWoche, 2); sePreisProWoche.Dock = System.Windows.Forms.DockStyle.Fill; sePreisProWoche.EditValue = new decimal(new int[] { 0, 0, 0, 0 }); - sePreisProWoche.Location = new System.Drawing.Point(466, 63); + sePreisProWoche.Location = new System.Drawing.Point(865, 134); + sePreisProWoche.Margin = new System.Windows.Forms.Padding(6); sePreisProWoche.Name = "sePreisProWoche"; sePreisProWoche.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); sePreisProWoche.Properties.MaskSettings.Set("mask", "c2"); sePreisProWoche.Properties.UseMaskAsDisplayFormat = true; - sePreisProWoche.Size = new System.Drawing.Size(201, 20); + sePreisProWoche.Size = new System.Drawing.Size(374, 40); sePreisProWoche.TabIndex = 25; // + // meBezeichnung + // + tableLayoutPanel1.SetColumnSpan(meBezeichnung, 6); + meBezeichnung.Dock = System.Windows.Forms.DockStyle.Fill; + meBezeichnung.Location = new System.Drawing.Point(157, 259); + meBezeichnung.Name = "meBezeichnung"; + tableLayoutPanel1.SetRowSpan(meBezeichnung, 4); + meBezeichnung.Size = new System.Drawing.Size(1085, 250); + meBezeichnung.TabIndex = 27; + // // FrmWerkzeugeHinzufügen // - AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleDimensions = new System.Drawing.SizeF(13F, 32F); AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - ClientSize = new System.Drawing.Size(800, 450); + ClientSize = new System.Drawing.Size(1486, 960); Controls.Add(tableLayoutPanel1); + Margin = new System.Windows.Forms.Padding(6); Name = "FrmWerkzeugeHinzufügen"; ShowIcon = false; ShowInTaskbar = false; @@ -314,11 +335,11 @@ ((System.ComponentModel.ISupportInitialize)txtName.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtModell.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtSeriennummer.Properties).EndInit(); - ((System.ComponentModel.ISupportInitialize)txtBezeichnung.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)lueHersteller.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)sePreisProTag.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)sePreisProWochenende.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)sePreisProWoche.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)meBezeichnung.Properties).EndInit(); ResumeLayout(false); } @@ -336,7 +357,6 @@ private DevExpress.XtraEditors.TextEdit txtName; private DevExpress.XtraEditors.TextEdit txtModell; private DevExpress.XtraEditors.TextEdit txtSeriennummer; - private DevExpress.XtraEditors.TextEdit txtBezeichnung; private DevExpress.XtraEditors.LookUpEdit lueHersteller; private DevExpress.XtraEditors.SimpleButton btnWerkzeugHinzufügen; private DevExpress.XtraEditors.LabelControl labelControl3; @@ -344,5 +364,6 @@ private DevExpress.XtraEditors.SpinEdit sePreisProTag; private DevExpress.XtraEditors.SpinEdit sePreisProWochenende; private DevExpress.XtraEditors.SpinEdit sePreisProWoche; + private DevExpress.XtraEditors.MemoEdit meBezeichnung; } } \ No newline at end of file diff --git a/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.cs b/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.cs index d0d7648..2379acc 100644 --- a/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.cs +++ b/Werkzeugverleih/Formen/Werkzeuge/FrmWerkzeugeHinzufügen.cs @@ -62,10 +62,11 @@ namespace Werkzeugverleih.Formen.Werkzeuge string name = txtName.Text; int manufacturer_id = Convert.ToInt32(lueHersteller.EditValue); string model = txtModell.Text; + string description = meBezeichnung.Text; - // Hol den 'decimal'-Wert aus den SpinEdits, multipliziere mit 100 und konvertiere zu int. - // Dies ist der sichere und richtige Weg! - int daily_price_cents = Convert.ToInt32(sePreisProTag.Value * 100); + // Hol den 'decimal'-Wert aus den SpinEdits, multipliziere mit 100 und konvertiere zu int. + // Dies ist der sichere und richtige Weg! + int daily_price_cents = Convert.ToInt32(sePreisProTag.Value * 100); int weekend_price_cents = Convert.ToInt32(sePreisProWochenende.Value * 100); int weekly_price_cents = Convert.ToInt32(sePreisProWoche.Value * 100); int deposit_cents = Convert.ToInt32(seKaution.Value * 100);