diff --git a/KlassenBIB/Sanierungskonzept.cs b/KlassenBIB/Sanierungskonzept.cs
index b43741f..891d1da 100644
--- a/KlassenBIB/Sanierungskonzept.cs
+++ b/KlassenBIB/Sanierungskonzept.cs
@@ -32,6 +32,20 @@ namespace KlassenBIB
/// Die Reparatur
///
public Reparatur Reparatur { get; set; }
-
+
+ public override string ToString()
+ {
+ string result = "";
+
+ bool sanVorhanden = Reparatur != null;
+
+ bool sanAbgeschlossen = (sanVorhanden && Reparatur.Fertig);
+
+ result = string.Format("{0} abgeschlossen : {1}", Anweisung, sanAbgeschlossen);
+
+ return result;
+
+ }
+
}
}
diff --git a/SanSystem/FrmReparaturKonzept.cs b/SanSystem/FrmReparaturKonzept.cs
index d2f5a8c..b054d54 100644
--- a/SanSystem/FrmReparaturKonzept.cs
+++ b/SanSystem/FrmReparaturKonzept.cs
@@ -45,23 +45,29 @@ namespace SanSystem
frmSelectNewSan.AddKurzlinerClicked += FrmSelectNewSan_AddKurzlinerClicked;
frmSelectNewSan.AddHutprofilClicked += FrmSelectNewSan_AddHutprofilClicked;
frmSelectNewSan.AddQuicklockClicked += FrmSelectNewSan_AddQuicklockClicked;
- frmSelectNewSan.ShowDialog();
-
+ try
+ {
+ frmSelectNewSan.ShowDialog();
+ }
+ catch(NotImplementedException ex)
+ {
+ MessageBox.Show(string.Format("{0} Sanierung wurde noch nicht implementiert",ex.Message));
+ }
}
private void FrmSelectNewSan_AddQuicklockClicked(object sender, EventArgs e)
{
- throw new NotImplementedException();
+ throw new NotImplementedException("Quicklock");
}
private void FrmSelectNewSan_AddHutprofilClicked(object sender, EventArgs e)
{
- throw new NotImplementedException();
+ throw new NotImplementedException("Hutprofil");
}
private void FrmSelectNewSan_AddKurzlinerClicked(object sender, EventArgs e)
{
- throw new NotImplementedException();
+ throw new NotImplementedException("Kurzliner");
}
}
}
diff --git a/SanSystem/FrmSanKonzeptList.Designer.cs b/SanSystem/FrmSanKonzeptList.Designer.cs
index c46d02b..aad5b3d 100644
--- a/SanSystem/FrmSanKonzeptList.Designer.cs
+++ b/SanSystem/FrmSanKonzeptList.Designer.cs
@@ -47,7 +47,7 @@
//
this.btn_san_add.Location = new System.Drawing.Point(12, 174);
this.btn_san_add.Name = "btn_san_add";
- this.btn_san_add.Size = new System.Drawing.Size(429, 91);
+ this.btn_san_add.Size = new System.Drawing.Size(813, 91);
this.btn_san_add.TabIndex = 2;
this.btn_san_add.Text = "Neue Sanierung";
this.btn_san_add.UseVisualStyleBackColor = true;
@@ -60,14 +60,15 @@
this.lb_sans.ItemHeight = 20;
this.lb_sans.Location = new System.Drawing.Point(172, 12);
this.lb_sans.Name = "lb_sans";
- this.lb_sans.Size = new System.Drawing.Size(269, 144);
+ this.lb_sans.Size = new System.Drawing.Size(653, 144);
this.lb_sans.TabIndex = 3;
+ this.lb_sans.DoubleClick += new System.EventHandler(this.lb_sans_DoubleClick);
//
// FrmSanKonzeptList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(453, 280);
+ this.ClientSize = new System.Drawing.Size(837, 280);
this.Controls.Add(this.lb_sans);
this.Controls.Add(this.btn_san_add);
this.Controls.Add(this.label1);
diff --git a/SanSystem/FrmSanKonzeptList.cs b/SanSystem/FrmSanKonzeptList.cs
index c0d525f..04f1f47 100644
--- a/SanSystem/FrmSanKonzeptList.cs
+++ b/SanSystem/FrmSanKonzeptList.cs
@@ -46,5 +46,20 @@ namespace SanSystem
FrmReparaturKonzept frmReparaturKonzept = new FrmReparaturKonzept(sankonzept);
frmReparaturKonzept.ShowDialog();
}
+
+ private void lb_sans_DoubleClick(object sender, EventArgs e)
+ {
+ //if ((sender as ListBox).SelectedItem == null) return;
+
+ Sanierungskonzept konzept = (Sanierungskonzept)(sender as ListBox).SelectedItem;
+
+ if (konzept == null) return;
+
+ FrmReparaturKonzept frmReparaturKonzept = new FrmReparaturKonzept(konzept);
+ frmReparaturKonzept.ShowDialog();
+
+ //throw new Exception((sender as ListBox).SelectedItem.GetType().ToString());
+
+ }
}
}
diff --git a/SanSystem/FrmSelectNewSan.Designer.cs b/SanSystem/FrmSelectNewSan.Designer.cs
index 59261b6..6bdd5e1 100644
--- a/SanSystem/FrmSelectNewSan.Designer.cs
+++ b/SanSystem/FrmSelectNewSan.Designer.cs
@@ -36,6 +36,7 @@
//
// btn_inliner
//
+ this.btn_inliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_inliner.Location = new System.Drawing.Point(12, 12);
this.btn_inliner.Name = "btn_inliner";
this.btn_inliner.Size = new System.Drawing.Size(187, 58);
@@ -46,6 +47,7 @@
//
// btn_schacht_anb
//
+ this.btn_schacht_anb.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_schacht_anb.Location = new System.Drawing.Point(212, 12);
this.btn_schacht_anb.Name = "btn_schacht_anb";
this.btn_schacht_anb.Size = new System.Drawing.Size(187, 58);
@@ -56,6 +58,7 @@
//
// btn_kurzliner
//
+ this.btn_kurzliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_kurzliner.Location = new System.Drawing.Point(412, 12);
this.btn_kurzliner.Name = "btn_kurzliner";
this.btn_kurzliner.Size = new System.Drawing.Size(187, 58);
@@ -66,6 +69,7 @@
//
// btn_hut
//
+ this.btn_hut.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_hut.Location = new System.Drawing.Point(612, 12);
this.btn_hut.Name = "btn_hut";
this.btn_hut.Size = new System.Drawing.Size(187, 58);
@@ -79,7 +83,6 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(814, 87);
- this.ControlBox = false;
this.Controls.Add(this.btn_hut);
this.Controls.Add(this.btn_kurzliner);
this.Controls.Add(this.btn_schacht_anb);
diff --git a/TempCAN/TemperaturBuilder.cs b/TempCAN/TemperaturBuilder.cs
index 86573a0..d0fb342 100644
--- a/TempCAN/TemperaturBuilder.cs
+++ b/TempCAN/TemperaturBuilder.cs
@@ -8,12 +8,12 @@ using SanShared;
namespace TempCAN
{
///
- ///
+ /// Auflistung der Schnittstellen
///
public enum TemperaturSchnittstellen
{
///
- ///
+ /// Tinkerforge schnittstelle
///
TINKERFORGE
}