diff --git a/KlassenBIB/Hutprofil.cs b/KlassenBIB/Hutprofil.cs
new file mode 100644
index 0000000..b5febae
--- /dev/null
+++ b/KlassenBIB/Hutprofil.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KlassenBIB
+{
+ ///
+ /// Zulaufeinbindung
+ ///
+ public class Hutprofil : Reparatur
+ {
+ }
+}
diff --git a/KlassenBIB/Inspektionskuerzeln.cs b/KlassenBIB/Inspektionskuerzeln.cs
index 0df037f..1177f86 100644
--- a/KlassenBIB/Inspektionskuerzeln.cs
+++ b/KlassenBIB/Inspektionskuerzeln.cs
@@ -59,5 +59,9 @@ namespace KlassenBIB
///
///
public string Anmerkung { get; set; }
+ ///
+ ///
+ ///
+ public Reparatur Reparatur { get; set; }
}
}
diff --git a/KlassenBIB/Kurzliner.cs b/KlassenBIB/Kurzliner.cs
new file mode 100644
index 0000000..f7a7364
--- /dev/null
+++ b/KlassenBIB/Kurzliner.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KlassenBIB
+{
+ ///
+ /// Partielle Reparatur
+ ///
+ public class Kurzliner : Reparatur
+ {
+ }
+}
diff --git a/KlassenBIB/Quicklock.cs b/KlassenBIB/Quicklock.cs
new file mode 100644
index 0000000..546ae0b
--- /dev/null
+++ b/KlassenBIB/Quicklock.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KlassenBIB
+{
+ ///
+ /// Quicklock manschette
+ ///
+ public class Quicklock : Reparatur
+ {
+ }
+}
diff --git a/KlassenBIB/Reparatur.cs b/KlassenBIB/Reparatur.cs
new file mode 100644
index 0000000..5f7740f
--- /dev/null
+++ b/KlassenBIB/Reparatur.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KlassenBIB
+{
+
+ ///
+ /// Abstrakte Klasse zur Darstellung einer Partielle Reparatur
+ ///
+ public abstract class Reparatur : Sanieren
+ {
+ ///
+ ///
+ ///
+ ///
+ ///
+ public override string CheckVerzeichnisse(string projektpfad)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs
index d6f4c7a..7c7697a 100644
--- a/SanSystem/frmObjektEdit.Designer.cs
+++ b/SanSystem/frmObjektEdit.Designer.cs
@@ -30,6 +30,8 @@
{
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.cb_objekname_man = new System.Windows.Forms.CheckBox();
+ this.label8 = new System.Windows.Forms.Label();
this.txt_ort = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.txt_bemerkung = new System.Windows.Forms.TextBox();
@@ -60,24 +62,25 @@
this.btn_close = new System.Windows.Forms.Button();
this.btn_add_san = new System.Windows.Forms.Button();
this.btn_delete = new System.Windows.Forms.Button();
- this.label8 = new System.Windows.Forms.Label();
- this.cb_objekname_man = new System.Windows.Forms.CheckBox();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.dgv_schadenkuerzel = new System.Windows.Forms.DataGridView();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox2.SuspendLayout();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dgv_schadenkuerzel)).BeginInit();
this.SuspendLayout();
//
// tabControl1
//
- this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1);
- this.tabControl1.Location = new System.Drawing.Point(13, 14);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1264, 612);
+ this.tabControl1.Size = new System.Drawing.Size(1290, 702);
this.tabControl1.TabIndex = 0;
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
//
@@ -112,11 +115,32 @@
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- this.tabPage1.Size = new System.Drawing.Size(1256, 579);
+ this.tabPage1.Size = new System.Drawing.Size(1282, 669);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "Grunddaten";
this.tabPage1.UseVisualStyleBackColor = true;
//
+ // cb_objekname_man
+ //
+ this.cb_objekname_man.AutoSize = true;
+ this.cb_objekname_man.Location = new System.Drawing.Point(108, 70);
+ this.cb_objekname_man.Name = "cb_objekname_man";
+ this.cb_objekname_man.Size = new System.Drawing.Size(60, 20);
+ this.cb_objekname_man.TabIndex = 29;
+ this.cb_objekname_man.Text = "man?";
+ this.cb_objekname_man.UseVisualStyleBackColor = true;
+ this.cb_objekname_man.CheckedChanged += new System.EventHandler(this.cb_objekname_man_CheckedChanged);
+ //
+ // 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(725, 276);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(91, 20);
+ this.label8.TabIndex = 28;
+ this.label8.Text = "Bemerkung";
+ //
// txt_ort
//
this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -456,26 +480,26 @@
this.btn_delete.UseVisualStyleBackColor = true;
this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);
//
- // label8
+ // tabPage2
//
- 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(725, 276);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(91, 20);
- this.label8.TabIndex = 28;
- this.label8.Text = "Bemerkung";
+ this.tabPage2.Controls.Add(this.dgv_schadenkuerzel);
+ this.tabPage2.Location = new System.Drawing.Point(4, 29);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage2.Size = new System.Drawing.Size(1282, 669);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "Kanalinformationen";
+ this.tabPage2.UseVisualStyleBackColor = true;
//
- // cb_objekname_man
+ // dgv_schadenkuerzel
//
- this.cb_objekname_man.AutoSize = true;
- this.cb_objekname_man.Location = new System.Drawing.Point(108, 70);
- this.cb_objekname_man.Name = "cb_objekname_man";
- this.cb_objekname_man.Size = new System.Drawing.Size(60, 20);
- this.cb_objekname_man.TabIndex = 29;
- this.cb_objekname_man.Text = "man?";
- this.cb_objekname_man.UseVisualStyleBackColor = true;
- this.cb_objekname_man.CheckedChanged += new System.EventHandler(this.cb_objekname_man_CheckedChanged);
+ this.dgv_schadenkuerzel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.dgv_schadenkuerzel.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dgv_schadenkuerzel.Location = new System.Drawing.Point(6, 6);
+ this.dgv_schadenkuerzel.Name = "dgv_schadenkuerzel";
+ this.dgv_schadenkuerzel.Size = new System.Drawing.Size(1268, 269);
+ this.dgv_schadenkuerzel.TabIndex = 0;
//
// frmObjektEdit
//
@@ -499,6 +523,8 @@
this.tabPage1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dgv_schadenkuerzel)).EndInit();
this.ResumeLayout(false);
}
@@ -539,5 +565,7 @@
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.CheckBox cb_objekname_man;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView dgv_schadenkuerzel;
}
}
\ No newline at end of file
diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs
index 16bf409..2bb99c0 100644
--- a/SanSystem/frmObjektEdit.cs
+++ b/SanSystem/frmObjektEdit.cs
@@ -34,6 +34,8 @@ namespace SanSystem
btn_close.Text = Global.Instance.language.Labels["btn_close"];
this.inspektionsobjekt = inspektion;
+ dgv_schadenkuerzel.DataSource = inspektion.Schadenskuerzeln;
+
foreach(Sanierung san in inspektion.Sanierung)
{
TabPage tab = new TabPage();