From 90e9191e4c977480a54aa597ded91ce96290ebc7 Mon Sep 17 00:00:00 2001 From: Husky Date: Mon, 30 Jul 2018 13:37:31 +0200 Subject: [PATCH] Besatzung wird jetzt angezeigt --- KlassenBIB/InlinerSanierung.cs | 2 +- KlassenBIB/Sanieren.cs | 4 + SanSystem/Properties/AssemblyInfo.cs | 4 +- SanSystem/UCInliner.Designer.cs | 112 ++++++++++++++++----------- SanSystem/UCInliner.cs | 2 + 5 files changed, 76 insertions(+), 48 deletions(-) diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs index 9a95c62..b2ee6b1 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/InlinerSanierung.cs @@ -126,7 +126,7 @@ namespace KlassenBIB grunddaten["KL_mech_true"] = this.VorbereitetMechanisch ? "X": ""; grunddaten["KL_rob_true"] = this.VorbereitetRoboter ? "X": ""; grunddaten["KL_HD_date"] = this.Datum.ToShortDateString(); - grunddaten["KL_Besatzung"] = ""; + grunddaten["KL_Besatzung"] = this.Besatzung; grunddaten["liner_laenge"] = LaengeGesamt; grunddaten["Charge_Liner"] = this.LinerChargenummer; grunddaten["Charge_Harz"] = this.HarzChargenummer; diff --git a/KlassenBIB/Sanieren.cs b/KlassenBIB/Sanieren.cs index 2ea664f..141ac23 100644 --- a/KlassenBIB/Sanieren.cs +++ b/KlassenBIB/Sanieren.cs @@ -18,6 +18,10 @@ namespace KlassenBIB /// /// /// + public string Besatzung { get; set; } + /// + /// + /// public Guid Guid { get => guid; set => guid = value; } /// /// diff --git a/SanSystem/Properties/AssemblyInfo.cs b/SanSystem/Properties/AssemblyInfo.cs index 077e938..a98950d 100644 --- a/SanSystem/Properties/AssemblyInfo.cs +++ b/SanSystem/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.0.3")] +[assembly: AssemblyFileVersion("1.0.0.3")] diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs index adce504..9dc13f1 100644 --- a/SanSystem/UCInliner.Designer.cs +++ b/SanSystem/UCInliner.Designer.cs @@ -30,6 +30,10 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.cb_mech = new System.Windows.Forms.CheckBox(); + this.cb_roboter = new System.Windows.Forms.CheckBox(); + this.cb_hd = new System.Windows.Forms.CheckBox(); this.btn_create_protokol = new System.Windows.Forms.Button(); this.ftpProgress = new System.Windows.Forms.ProgressBar(); this.btn_transfer_ftp = new System.Windows.Forms.Button(); @@ -47,14 +51,12 @@ this.cb_stvo = new System.Windows.Forms.CheckBox(); this.cb_wasserhaltung = new System.Windows.Forms.CheckBox(); this.cb_genehmigung = new System.Windows.Forms.CheckBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.cb_hd = new System.Windows.Forms.CheckBox(); - this.cb_roboter = new System.Windows.Forms.CheckBox(); - this.cb_mech = new System.Windows.Forms.CheckBox(); + this.label2 = new System.Windows.Forms.Label(); + this.txt_besatzung = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage2.SuspendLayout(); - this.groupBox3.SuspendLayout(); this.groupBox1.SuspendLayout(); + this.groupBox3.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -73,6 +75,8 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.txt_besatzung); + this.tabPage2.Controls.Add(this.label2); this.tabPage2.Controls.Add(this.groupBox1); this.tabPage2.Controls.Add(this.btn_create_protokol); this.tabPage2.Controls.Add(this.ftpProgress); @@ -95,6 +99,48 @@ this.tabPage2.Text = "Vorraussetzungen"; this.tabPage2.UseVisualStyleBackColor = true; // + // groupBox1 + // + this.groupBox1.Controls.Add(this.cb_mech); + this.groupBox1.Controls.Add(this.cb_roboter); + this.groupBox1.Controls.Add(this.cb_hd); + this.groupBox1.Location = new System.Drawing.Point(13, 198); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(357, 125); + this.groupBox1.TabIndex = 35; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Leitung wurde vorbereitet mit"; + // + // cb_mech + // + this.cb_mech.AutoSize = true; + this.cb_mech.Location = new System.Drawing.Point(6, 90); + this.cb_mech.Name = "cb_mech"; + this.cb_mech.Size = new System.Drawing.Size(140, 29); + this.cb_mech.TabIndex = 2; + this.cb_mech.Text = "Mechanisch"; + this.cb_mech.UseVisualStyleBackColor = true; + // + // cb_roboter + // + this.cb_roboter.AutoSize = true; + this.cb_roboter.Location = new System.Drawing.Point(6, 60); + this.cb_roboter.Name = "cb_roboter"; + this.cb_roboter.Size = new System.Drawing.Size(102, 29); + this.cb_roboter.TabIndex = 1; + this.cb_roboter.Text = "Roboter"; + this.cb_roboter.UseVisualStyleBackColor = true; + // + // cb_hd + // + this.cb_hd.AutoSize = true; + this.cb_hd.Location = new System.Drawing.Point(6, 29); + this.cb_hd.Name = "cb_hd"; + this.cb_hd.Size = new System.Drawing.Size(67, 29); + this.cb_hd.TabIndex = 0; + this.cb_hd.Text = "HD "; + this.cb_hd.UseVisualStyleBackColor = true; + // // btn_create_protokol // this.btn_create_protokol.Location = new System.Drawing.Point(626, 484); @@ -266,47 +312,21 @@ this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; this.cb_genehmigung.UseVisualStyleBackColor = true; // - // groupBox1 + // label2 // - this.groupBox1.Controls.Add(this.cb_mech); - this.groupBox1.Controls.Add(this.cb_roboter); - this.groupBox1.Controls.Add(this.cb_hd); - this.groupBox1.Location = new System.Drawing.Point(13, 198); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(357, 125); - this.groupBox1.TabIndex = 35; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Leitung wurde vorbereitet mit"; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(515, 204); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(105, 25); + this.label2.TabIndex = 36; + this.label2.Text = "Besatzung"; // - // cb_hd + // txt_besatzung // - this.cb_hd.AutoSize = true; - this.cb_hd.Location = new System.Drawing.Point(6, 29); - this.cb_hd.Name = "cb_hd"; - this.cb_hd.Size = new System.Drawing.Size(67, 29); - this.cb_hd.TabIndex = 0; - this.cb_hd.Text = "HD "; - this.cb_hd.UseVisualStyleBackColor = true; - // - // cb_roboter - // - this.cb_roboter.AutoSize = true; - this.cb_roboter.Location = new System.Drawing.Point(6, 60); - this.cb_roboter.Name = "cb_roboter"; - this.cb_roboter.Size = new System.Drawing.Size(102, 29); - this.cb_roboter.TabIndex = 1; - this.cb_roboter.Text = "Roboter"; - this.cb_roboter.UseVisualStyleBackColor = true; - // - // cb_mech - // - this.cb_mech.AutoSize = true; - this.cb_mech.Location = new System.Drawing.Point(6, 90); - this.cb_mech.Name = "cb_mech"; - this.cb_mech.Size = new System.Drawing.Size(140, 29); - this.cb_mech.TabIndex = 2; - this.cb_mech.Text = "Mechanisch"; - this.cb_mech.UseVisualStyleBackColor = true; + this.txt_besatzung.Location = new System.Drawing.Point(658, 199); + this.txt_besatzung.Name = "txt_besatzung"; + this.txt_besatzung.Size = new System.Drawing.Size(296, 30); + this.txt_besatzung.TabIndex = 37; // // UCInliner // @@ -321,10 +341,10 @@ this.tabControl1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); this.ResumeLayout(false); } @@ -354,5 +374,7 @@ private System.Windows.Forms.CheckBox cb_mech; private System.Windows.Forms.CheckBox cb_roboter; private System.Windows.Forms.CheckBox cb_hd; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox txt_besatzung; } } diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index 4728792..2b59205 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -71,7 +71,9 @@ namespace SanSystem txt_temp_aussen.DataBindings.Clear(); txt_temp_kanal.DataBindings.Clear(); cbb_wetter.DataBindings.Clear(); + txt_besatzung.DataBindings.Clear(); + txt_besatzung.DataBindings.Add(new Binding("Text", inliner, "Besatzung")); cb_fertig.DataBindings.Add(new Binding("Checked", inliner, "fertig")); cbb_wetter.DataBindings.Add(new Binding("Text", inliner, "Wetter")); if (inliner.Datum != null)