diff --git a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs index 8ba084e..ed69894 100644 --- a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs +++ b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs @@ -26,5 +26,6 @@ namespace KlassenBIB public string Bediener { get; set; } public double HarzTemperatur { get; set; } public double Vakuum { get; set; } + public string HarzTyp { get; set; } } } diff --git a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs index 35fc620..32618c7 100644 --- a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs +++ b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs @@ -9,9 +9,8 @@ namespace KlassenBIB public class WerkseitigImprägniert : AbstractImprägnier { - public string Imprägniernummer { get; set; } public bool LagerungKorrekt { get; set; } - public int LängeCode { get; set; } + public string LängeCode { get; set; } } } diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 466de40..b02c8b6 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -137,6 +137,12 @@ frmImprägnierBerichtEdit.cs + + Form + + + frmImprägnierBerichtList.cs + Form @@ -235,6 +241,9 @@ frmImprägnierBerichtEdit.cs + + frmImprägnierBerichtList.cs + frmKalibrierungFestlegung.cs diff --git a/SanSystem/frmImprägnierBerichtEdit.Designer.cs b/SanSystem/frmImprägnierBerichtEdit.Designer.cs index ebf9762..182bc51 100644 --- a/SanSystem/frmImprägnierBerichtEdit.Designer.cs +++ b/SanSystem/frmImprägnierBerichtEdit.Designer.cs @@ -36,28 +36,30 @@ this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.txt_harzmenge = new System.Windows.Forms.TextBox(); + this.txt_harzTemperatur = new System.Windows.Forms.TextBox(); + this.txt_mischungtyp = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label8 = new System.Windows.Forms.Label(); + this.textBox9 = new System.Windows.Forms.TextBox(); + this.textBox8 = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBox11 = new System.Windows.Forms.TextBox(); + this.textBox10 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); - this.textBox8 = new System.Windows.Forms.TextBox(); - this.textBox9 = new System.Windows.Forms.TextBox(); - this.textBox10 = new System.Windows.Forms.TextBox(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.textBox13 = new System.Windows.Forms.TextBox(); + this.txt_imprägniernr = new System.Windows.Forms.TextBox(); + this.txt_vakuum = new System.Windows.Forms.TextBox(); + this.txt_schlauchnummer = new System.Windows.Forms.TextBox(); + this.txt_wanddicke = new System.Windows.Forms.TextBox(); + this.txt_walzenabstand = new System.Windows.Forms.TextBox(); + this.txt_bediener = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); + this.label14 = new System.Windows.Forms.Label(); + this.txt_laengeCode = new System.Windows.Forms.TextBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -135,9 +137,9 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.textBox7); - this.groupBox1.Controls.Add(this.textBox12); - this.groupBox1.Controls.Add(this.textBox6); + this.groupBox1.Controls.Add(this.txt_harzmenge); + this.groupBox1.Controls.Add(this.txt_harzTemperatur); + this.groupBox1.Controls.Add(this.txt_mischungtyp); this.groupBox1.Controls.Add(this.label6); this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.label12); @@ -149,6 +151,40 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Mischung"; // + // txt_harzmenge + // + this.txt_harzmenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_harzmenge.Location = new System.Drawing.Point(192, 65); + this.txt_harzmenge.Name = "txt_harzmenge"; + this.txt_harzmenge.Size = new System.Drawing.Size(150, 30); + this.txt_harzmenge.TabIndex = 8; + // + // txt_harzTemperatur + // + this.txt_harzTemperatur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_harzTemperatur.Location = new System.Drawing.Point(192, 101); + this.txt_harzTemperatur.Name = "txt_harzTemperatur"; + this.txt_harzTemperatur.Size = new System.Drawing.Size(150, 30); + this.txt_harzTemperatur.TabIndex = 17; + // + // txt_mischungtyp + // + this.txt_mischungtyp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_mischungtyp.Location = new System.Drawing.Point(192, 29); + this.txt_mischungtyp.Name = "txt_mischungtyp"; + this.txt_mischungtyp.Size = new System.Drawing.Size(150, 30); + this.txt_mischungtyp.TabIndex = 7; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(11, 104); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(159, 25); + this.label12.TabIndex = 10; + this.label12.Text = "Harz Temperatur"; + // // groupBox2 // this.groupBox2.Controls.Add(this.textBox9); @@ -163,15 +199,21 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "Imprägnier Anfang"; // - // label8 + // textBox9 // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label8.Location = new System.Drawing.Point(15, 44); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(69, 25); - this.label8.TabIndex = 0; - this.label8.Text = "Datum"; + this.textBox9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox9.Location = new System.Drawing.Point(117, 79); + this.textBox9.Name = "textBox9"; + this.textBox9.Size = new System.Drawing.Size(192, 30); + this.textBox9.TabIndex = 3; + // + // textBox8 + // + this.textBox8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox8.Location = new System.Drawing.Point(117, 43); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(192, 30); + this.textBox8.TabIndex = 2; // // label9 // @@ -183,6 +225,16 @@ this.label9.TabIndex = 1; this.label9.Text = "Uhrzeit"; // + // label8 + // + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label8.Location = new System.Drawing.Point(15, 44); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(69, 25); + this.label8.TabIndex = 0; + this.label8.Text = "Datum"; + // // groupBox3 // this.groupBox3.Controls.Add(this.textBox11); @@ -197,6 +249,22 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "Imprägnier Ende"; // + // textBox11 + // + this.textBox11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox11.Location = new System.Drawing.Point(117, 64); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(192, 30); + this.textBox11.TabIndex = 3; + // + // textBox10 + // + this.textBox10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox10.Location = new System.Drawing.Point(117, 28); + this.textBox10.Name = "textBox10"; + this.textBox10.Size = new System.Drawing.Size(192, 30); + this.textBox10.TabIndex = 2; + // // label10 // this.label10.AutoSize = true; @@ -217,129 +285,63 @@ this.label11.TabIndex = 0; this.label11.Text = "Datum"; // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(11, 104); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(159, 25); - this.label12.TabIndex = 10; - this.label12.Text = "Harz Temperatur"; - // // label13 // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(14, 396); + this.label13.Location = new System.Drawing.Point(14, 458); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(90, 25); this.label13.TabIndex = 11; this.label13.Text = "Bediener"; // - // textBox1 + // txt_imprägniernr // - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.Location = new System.Drawing.Point(215, 6); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(219, 30); - this.textBox1.TabIndex = 12; + this.txt_imprägniernr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_imprägniernr.Location = new System.Drawing.Point(215, 6); + this.txt_imprägniernr.Name = "txt_imprägniernr"; + this.txt_imprägniernr.Size = new System.Drawing.Size(219, 30); + this.txt_imprägniernr.TabIndex = 12; // - // textBox2 + // txt_vakuum // - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.Location = new System.Drawing.Point(215, 42); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(219, 30); - this.textBox2.TabIndex = 13; + this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_vakuum.Location = new System.Drawing.Point(215, 42); + this.txt_vakuum.Name = "txt_vakuum"; + this.txt_vakuum.Size = new System.Drawing.Size(219, 30); + this.txt_vakuum.TabIndex = 13; // - // textBox3 + // txt_schlauchnummer // - this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox3.Location = new System.Drawing.Point(215, 78); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(219, 30); - this.textBox3.TabIndex = 14; + this.txt_schlauchnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_schlauchnummer.Location = new System.Drawing.Point(215, 78); + this.txt_schlauchnummer.Name = "txt_schlauchnummer"; + this.txt_schlauchnummer.Size = new System.Drawing.Size(219, 30); + this.txt_schlauchnummer.TabIndex = 14; // - // textBox4 + // txt_wanddicke // - this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox4.Location = new System.Drawing.Point(215, 114); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(219, 30); - this.textBox4.TabIndex = 15; + this.txt_wanddicke.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_wanddicke.Location = new System.Drawing.Point(215, 114); + this.txt_wanddicke.Name = "txt_wanddicke"; + this.txt_wanddicke.Size = new System.Drawing.Size(219, 30); + this.txt_wanddicke.TabIndex = 15; // - // textBox5 + // txt_walzenabstand // - this.textBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox5.Location = new System.Drawing.Point(215, 150); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(219, 30); - this.textBox5.TabIndex = 16; + this.txt_walzenabstand.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_walzenabstand.Location = new System.Drawing.Point(215, 150); + this.txt_walzenabstand.Name = "txt_walzenabstand"; + this.txt_walzenabstand.Size = new System.Drawing.Size(219, 30); + this.txt_walzenabstand.TabIndex = 16; // - // textBox6 + // txt_bediener // - this.textBox6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox6.Location = new System.Drawing.Point(192, 29); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(150, 30); - this.textBox6.TabIndex = 7; - // - // textBox7 - // - this.textBox7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox7.Location = new System.Drawing.Point(192, 65); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(150, 30); - this.textBox7.TabIndex = 8; - // - // textBox8 - // - this.textBox8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox8.Location = new System.Drawing.Point(117, 43); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(192, 30); - this.textBox8.TabIndex = 2; - // - // textBox9 - // - this.textBox9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox9.Location = new System.Drawing.Point(117, 79); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(192, 30); - this.textBox9.TabIndex = 3; - // - // textBox10 - // - this.textBox10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox10.Location = new System.Drawing.Point(117, 28); - this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(192, 30); - this.textBox10.TabIndex = 2; - // - // textBox11 - // - this.textBox11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox11.Location = new System.Drawing.Point(117, 64); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(192, 30); - this.textBox11.TabIndex = 3; - // - // textBox12 - // - this.textBox12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox12.Location = new System.Drawing.Point(192, 101); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(150, 30); - this.textBox12.TabIndex = 17; - // - // textBox13 - // - this.textBox13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox13.Location = new System.Drawing.Point(215, 396); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(219, 30); - this.textBox13.TabIndex = 18; + this.txt_bediener.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_bediener.Location = new System.Drawing.Point(215, 458); + this.txt_bediener.Name = "txt_bediener"; + this.txt_bediener.Size = new System.Drawing.Size(219, 30); + this.txt_bediener.TabIndex = 18; // // button1 // @@ -350,18 +352,38 @@ this.button1.Text = "button1"; this.button1.UseVisualStyleBackColor = true; // + // label14 + // + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label14.Location = new System.Drawing.Point(14, 411); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(122, 25); + this.label14.TabIndex = 20; + this.label14.Text = "Länge-Code"; + // + // txt_laengeCode + // + this.txt_laengeCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_laengeCode.Location = new System.Drawing.Point(215, 411); + this.txt_laengeCode.Name = "txt_laengeCode"; + this.txt_laengeCode.Size = new System.Drawing.Size(219, 30); + this.txt_laengeCode.TabIndex = 21; + // // frmImprägnierBerichtEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1056, 468); + this.ClientSize = new System.Drawing.Size(1056, 558); + this.Controls.Add(this.txt_laengeCode); + this.Controls.Add(this.label14); this.Controls.Add(this.button1); - this.Controls.Add(this.textBox13); - this.Controls.Add(this.textBox5); - this.Controls.Add(this.textBox4); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.txt_bediener); + this.Controls.Add(this.txt_walzenabstand); + this.Controls.Add(this.txt_wanddicke); + this.Controls.Add(this.txt_schlauchnummer); + this.Controls.Add(this.txt_vakuum); + this.Controls.Add(this.txt_imprägniernr); this.Controls.Add(this.label13); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); @@ -402,19 +424,21 @@ private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; - private System.Windows.Forms.TextBox textBox7; - private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.TextBox txt_harzmenge; + private System.Windows.Forms.TextBox txt_mischungtyp; private System.Windows.Forms.TextBox textBox9; private System.Windows.Forms.TextBox textBox8; private System.Windows.Forms.TextBox textBox11; private System.Windows.Forms.TextBox textBox10; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox12; - private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.TextBox txt_imprägniernr; + private System.Windows.Forms.TextBox txt_vakuum; + private System.Windows.Forms.TextBox txt_schlauchnummer; + private System.Windows.Forms.TextBox txt_wanddicke; + private System.Windows.Forms.TextBox txt_walzenabstand; + private System.Windows.Forms.TextBox txt_harzTemperatur; + private System.Windows.Forms.TextBox txt_bediener; private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox txt_laengeCode; } } \ No newline at end of file diff --git a/SanSystem/frmImprägnierBerichtEdit.cs b/SanSystem/frmImprägnierBerichtEdit.cs index f15cf5c..a89bc31 100644 --- a/SanSystem/frmImprägnierBerichtEdit.cs +++ b/SanSystem/frmImprägnierBerichtEdit.cs @@ -1,4 +1,5 @@ -using System; +using KlassenBIB; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,21 @@ namespace SanSystem { public partial class frmImprägnierBerichtEdit : Form { - public frmImprägnierBerichtEdit() + WerkseitigImprägniert werkseitigImprägniert = null; + public frmImprägnierBerichtEdit(WerkseitigImprägniert werkseitigImprägniert) { InitializeComponent(); + this.werkseitigImprägniert = werkseitigImprägniert; + + txt_imprägniernr.DataBindings.Add("Text", werkseitigImprägniert, "Imprägniernummer"); + txt_laengeCode.DataBindings.Add("Text", werkseitigImprägniert, "LängeCode"); + txt_schlauchnummer.DataBindings.Add("Text", werkseitigImprägniert, "Schlauchnummer"); + txt_wanddicke.DataBindings.Add("Text", werkseitigImprägniert, "Wanddicke"); + txt_harzmenge.DataBindings.Add("Text", werkseitigImprägniert, "Harzmenge"); + txt_harzTemperatur.DataBindings.Add("Text", werkseitigImprägniert, "HarzTemperatur"); + txt_bediener.DataBindings.Add("Text", werkseitigImprägniert, "Bediener"); + txt_mischungtyp.DataBindings.Add("Text", werkseitigImprägniert, "HarzTyp"); + } } } diff --git a/SanSystem/frmImprägnierBerichtList.Designer.cs b/SanSystem/frmImprägnierBerichtList.Designer.cs new file mode 100644 index 0000000..30a8c3c --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.Designer.cs @@ -0,0 +1,73 @@ +namespace SanSystem +{ + partial class frmImprägnierBerichtList + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.lst_imprägnierBerichtNr = new System.Windows.Forms.ListBox(); + this.btn_add = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // lst_imprägnierBerichtNr + // + this.lst_imprägnierBerichtNr.FormattingEnabled = true; + this.lst_imprägnierBerichtNr.ItemHeight = 16; + this.lst_imprägnierBerichtNr.Location = new System.Drawing.Point(12, 12); + this.lst_imprägnierBerichtNr.Name = "lst_imprägnierBerichtNr"; + this.lst_imprägnierBerichtNr.Size = new System.Drawing.Size(700, 276); + this.lst_imprägnierBerichtNr.TabIndex = 0; + this.lst_imprägnierBerichtNr.DoubleClick += new System.EventHandler(this.Lst_imprägnierBerichtNr_DoubleClick); + // + // btn_add + // + this.btn_add.Location = new System.Drawing.Point(60, 315); + this.btn_add.Name = "btn_add"; + this.btn_add.Size = new System.Drawing.Size(296, 74); + this.btn_add.TabIndex = 1; + this.btn_add.Text = "Neue Hinzufügen"; + this.btn_add.UseVisualStyleBackColor = true; + this.btn_add.Click += new System.EventHandler(this.Btn_add_Click); + // + // frmImprägnierBerichtList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.btn_add); + this.Controls.Add(this.lst_imprägnierBerichtNr); + this.Name = "frmImprägnierBerichtList"; + this.Text = "frmImprägnierBerichtList"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ListBox lst_imprägnierBerichtNr; + private System.Windows.Forms.Button btn_add; + } +} \ No newline at end of file diff --git a/SanSystem/frmImprägnierBerichtList.cs b/SanSystem/frmImprägnierBerichtList.cs new file mode 100644 index 0000000..c09044e --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.cs @@ -0,0 +1,48 @@ +using KlassenBIB; +using KlassenBIB.Collections; +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; + +namespace SanSystem +{ + public partial class frmImprägnierBerichtList : Form + { + public frmImprägnierBerichtList() + { + InitializeComponent(); + lst_imprägnierBerichtNr.DataSource = null; + List imprägnierberichte = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Select(x => x.Imprägniernummer).ToList(); + lst_imprägnierBerichtNr.DataSource = imprägnierberichte; + } + + private void Btn_add_Click(object sender, EventArgs e) + { + WerkseitigImprägniert werkseitigImprägnierts = new WerkseitigImprägniert(); + Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Add(werkseitigImprägnierts); + } + + private void Lst_imprägnierBerichtNr_DoubleClick(object sender, EventArgs e) + { + if ((sender as ListBox).SelectedItem == null) return; + string selectedImprägnierung = (sender as ListBox).SelectedItem.ToString(); + if (selectedImprägnierung == null) return; + WerkseitigImprägniert imprägnierung = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Find(x => x.Imprägniernummer.Equals(selectedImprägnierung)); + if (imprägnierung == null) return; + + frmImprägnierBerichtEdit frmImprägnierBerichtEdit = new frmImprägnierBerichtEdit(imprägnierung); + frmImprägnierBerichtEdit.ShowDialog(); + /*frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName); + frmObjekteList.MdiParent = this.MdiParent; + //frmObjekteList.FormClosed += FrmObjekt_FormClosed; + frmObjekteList.Show(); + */ + } + } +} diff --git a/SanSystem/frmImprägnierBerichtList.resx b/SanSystem/frmImprägnierBerichtList.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index 057c032..4fd7d6c 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -39,9 +39,11 @@ this.auftraggeberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel(); - this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.imprägnierberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -54,7 +56,9 @@ this.projektToolStripMenuItem, this.speichernToolStripMenuItem, this.massenstatistikToolStripMenuItem, - this.projektordnerÖffnenToolStripMenuItem}); + this.projektordnerÖffnenToolStripMenuItem, + this.toolStripMenuItem1, + this.imprägnierberichteToolStripMenuItem}); this.mainmenu.Location = new System.Drawing.Point(0, 0); this.mainmenu.Name = "mainmenu"; this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); @@ -115,6 +119,18 @@ this.massenstatistikToolStripMenuItem.Text = "Massenstatistik"; this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click); // + // projektordnerÖffnenToolStripMenuItem + // + this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem"; + this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32); + this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen"; + this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 32); + // // statusStrip1 // this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); @@ -133,12 +149,12 @@ this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20); this.toolStripStatus_projekt_Label.Text = "Projekt"; // - // projektordnerÖffnenToolStripMenuItem + // imprägnierberichteToolStripMenuItem // - this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem"; - this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32); - this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen"; - this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click); + this.imprägnierberichteToolStripMenuItem.Name = "imprägnierberichteToolStripMenuItem"; + this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(193, 32); + this.imprägnierberichteToolStripMenuItem.Text = "Imprägnierberichte"; + this.imprägnierberichteToolStripMenuItem.Click += new System.EventHandler(this.ImprägnierberichteToolStripMenuItem_Click); // // frmMain // @@ -176,6 +192,8 @@ private System.Windows.Forms.ToolStripMenuItem stammdatenImportierenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem auftraggeberToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem projektordnerÖffnenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem imprägnierberichteToolStripMenuItem; } } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 770d4f9..3bd6276 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -187,5 +187,11 @@ namespace SanSystem MessageBox.Show("Es ist ein fehler aufgetreten beim öffnen vom Baustellenordner " + ex.Message); } } + + private void ImprägnierberichteToolStripMenuItem_Click(object sender, EventArgs e) + { + frmImprägnierBerichtList frmImprägnierBerichtList = new frmImprägnierBerichtList(); + frmImprägnierBerichtList.ShowDialog(); + } } }