diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs
index 748b7b0..6f82e82 100644
--- a/KlassenBIB/InlinerSanierung.cs
+++ b/KlassenBIB/InlinerSanierung.cs
@@ -78,12 +78,9 @@ namespace KlassenBIB
{ "KL_Wetter","" },
{ "Temp_Aussen","" },
{ "KL_Temp_Kanal","" },
- { "KL_Gen_true","" },
- { "KL_Gen_false","" },
- { "KL_WH_true","" },
- { "KL_WH_false", "" },
- { "KL_STVO_true","" },
- { "KL_STVO_false","" },
+ { "KL_Gen","" },
+ { "KL_WH","" },
+ { "KL_STVO","" },
{ "KL_HD_true","" },
{ "KL_mech_true","" },
{ "KL_rob_true","" },
@@ -122,15 +119,12 @@ namespace KlassenBIB
grunddaten["KL_Wetter"] = this.Wetter;
grunddaten["Temp_Aussen"] = this.TempAusen;
grunddaten["KL_Temp_Kanal"] = this.TempKanal;
- grunddaten["KL_Gen_true"] = this.GenehmigungVorhanden ? "X" : "" ;
- grunddaten["KL_Gen_false"] = this.GenehmigungVorhanden ? "": "X";
- grunddaten["KL_WH_true"] = this.WasserhaltungEingerichtet ? "X" : "";
- grunddaten["KL_WH_false"] = this.WasserhaltungEingerichtet ? " ":"X" ;
- grunddaten["KL_STVO_true"] = this.STVOAbsicherung ? "X" : "";
- grunddaten["KL_STVO_false"] = this.STVOAbsicherung ? "":"X";
- grunddaten["KL_HD_true"] = "";
- grunddaten["KL_mech_true"] = "";
- grunddaten["KL_rob_true"] = "";
+ grunddaten["KL_Gen"] = this.GenehmigungVorhanden ? "ja" : "nein";
+ grunddaten["KL_WH"] = this.WasserhaltungEingerichtet ? "ja" : "nein";
+ grunddaten["KL_STVO"] = this.STVOAbsicherung ? "ja" : "nein";
+ grunddaten["KL_HD_true"] = this.HDReinigung ? "X" : "";
+ 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["liner_laenge"] = LaengeGesamt;
diff --git a/KlassenBIB/Sanierung.cs b/KlassenBIB/Sanierung.cs
index f11ade8..c99d0b2 100644
--- a/KlassenBIB/Sanierung.cs
+++ b/KlassenBIB/Sanierung.cs
@@ -26,6 +26,8 @@ namespace KlassenBIB
bool wasserhaltungEingerichtet;
bool sTVOAbsicherung;
bool hDReinigung;
+ bool vorbereitetMechanisch;
+ bool vorbereitetRoboter;
DateTime hDReinigungDatum;
//DateTime sanierungsDatum;
Inspektionsobjekt inspektionsobjekt;
@@ -109,6 +111,15 @@ namespace KlassenBIB
return string.Format("{0}-{1}", Inspektionsobjekt.VonPunkt, Inspektionsobjekt.BisPunkt);
}
}
+ ///
+ ///
+ ///
+ public bool VorbereitetMechanisch { get => vorbereitetMechanisch; set => vorbereitetMechanisch = value; }
+ ///
+ ///
+ ///
+ public bool VorbereitetRoboter { get => vorbereitetRoboter; set => vorbereitetRoboter = value; }
+
//public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; }
///
///
diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs
index 2358a21..adce504 100644
--- a/SanSystem/UCInliner.Designer.cs
+++ b/SanSystem/UCInliner.Designer.cs
@@ -44,15 +44,17 @@
this.txt_temp_aussen = new System.Windows.Forms.TextBox();
this.label23 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.cb_lb_vorbereitung = new System.Windows.Forms.CheckedListBox();
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.tabControl1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox3.SuspendLayout();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
@@ -71,6 +73,7 @@
//
// tabPage2
//
+ this.tabPage2.Controls.Add(this.groupBox1);
this.tabPage2.Controls.Add(this.btn_create_protokol);
this.tabPage2.Controls.Add(this.ftpProgress);
this.tabPage2.Controls.Add(this.btn_transfer_ftp);
@@ -80,9 +83,6 @@
this.tabPage2.Controls.Add(this.cbb_wetter);
this.tabPage2.Controls.Add(this.label24);
this.tabPage2.Controls.Add(this.groupBox3);
- this.tabPage2.Controls.Add(this.label8);
- this.tabPage2.Controls.Add(this.label7);
- this.tabPage2.Controls.Add(this.cb_lb_vorbereitung);
this.tabPage2.Controls.Add(this.cb_stvo);
this.tabPage2.Controls.Add(this.cb_wasserhaltung);
this.tabPage2.Controls.Add(this.cb_genehmigung);
@@ -230,42 +230,6 @@
this.label22.TabIndex = 0;
this.label22.Text = "Aussen";
//
- // 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(468, 221);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(107, 25);
- this.label8.TabIndex = 6;
- this.label8.Text = "Vorbereitet";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(8, 221);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(164, 25);
- this.label7.TabIndex = 5;
- this.label7.Text = "Leitung wurde mit";
- //
- // cb_lb_vorbereitung
- //
- this.cb_lb_vorbereitung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.cb_lb_vorbereitung.FormattingEnabled = true;
- this.cb_lb_vorbereitung.Items.AddRange(new object[] {
- "HD - Reinigung",
- "Mechanisch",
- "Roboter"});
- this.cb_lb_vorbereitung.Location = new System.Drawing.Point(218, 221);
- this.cb_lb_vorbereitung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.cb_lb_vorbereitung.Name = "cb_lb_vorbereitung";
- this.cb_lb_vorbereitung.Size = new System.Drawing.Size(211, 79);
- this.cb_lb_vorbereitung.TabIndex = 19;
- //
// cb_stvo
//
this.cb_stvo.AutoSize = true;
@@ -302,6 +266,48 @@
this.cb_genehmigung.Text = "Genehmigung wurde eingeholt";
this.cb_genehmigung.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_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;
+ //
+ // 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;
+ //
// UCInliner
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F);
@@ -317,6 +323,8 @@
this.tabPage2.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -325,12 +333,9 @@
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage2;
- private System.Windows.Forms.CheckedListBox cb_lb_vorbereitung;
private System.Windows.Forms.CheckBox cb_stvo;
private System.Windows.Forms.CheckBox cb_wasserhaltung;
private System.Windows.Forms.CheckBox cb_genehmigung;
- private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label label7;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.Button btn_get_temp;
private System.Windows.Forms.TextBox txt_temp_kanal;
@@ -345,5 +350,9 @@
private System.Windows.Forms.Button btn_transfer_ftp;
private System.Windows.Forms.ProgressBar ftpProgress;
private System.Windows.Forms.Button btn_create_protokol;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.CheckBox cb_mech;
+ private System.Windows.Forms.CheckBox cb_roboter;
+ private System.Windows.Forms.CheckBox cb_hd;
}
}
diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs
index 4e2d52e..f91d405 100644
--- a/SanSystem/UCInliner.cs
+++ b/SanSystem/UCInliner.cs
@@ -87,6 +87,10 @@ namespace SanSystem
cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inliner, "wasserhaltungEingerichtet"));
txt_temp_aussen.DataBindings.Add(new Binding("Text", inliner, "TempAusen"));
txt_temp_kanal.DataBindings.Add(new Binding("Text", inliner, "TempKanal"));
+
+ cb_mech.DataBindings.Add(new Binding("Checked", inliner, "VorbereitetMechanisch"));
+ cb_roboter.DataBindings.Add(new Binding("Checked", inliner, "VorbereitetRoboter"));
+ cb_hd.DataBindings.Add(new Binding("Checked", inliner, "HDReinigung"));
}
diff --git a/SanSystem/documents/JUME/liner_einbau.docx b/SanSystem/documents/JUME/liner_einbau.docx
index ffeb8f7..ab56059 100644
Binary files a/SanSystem/documents/JUME/liner_einbau.docx and b/SanSystem/documents/JUME/liner_einbau.docx differ