diff --git a/BerichtGen/FrmOptions.cs b/BerichtGen/FrmOptions.cs index 865e1c6..911243a 100644 --- a/BerichtGen/FrmOptions.cs +++ b/BerichtGen/FrmOptions.cs @@ -14,6 +14,9 @@ using System.Windows.Forms; namespace BerichtGen { + /// + /// + /// public partial class FrmOptions : Form { Thread generateProtokollThread; diff --git a/KlassenBIB/ChargeNummerCollection.cs b/KlassenBIB/ChargeNummerCollection.cs new file mode 100644 index 0000000..5370168 --- /dev/null +++ b/KlassenBIB/ChargeNummerCollection.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB +{ + /// + /// + /// + public class ChargeNummerCollection : List + { + } +} diff --git a/KlassenBIB/Hutprofil.cs b/KlassenBIB/Hutprofil.cs index b5febae..a215552 100644 --- a/KlassenBIB/Hutprofil.cs +++ b/KlassenBIB/Hutprofil.cs @@ -9,7 +9,7 @@ namespace KlassenBIB /// /// Zulaufeinbindung /// - public class Hutprofil : Reparatur + public class Hutprofil : SanMitHarz { } } diff --git a/KlassenBIB/Inspektionskuerzeln.cs b/KlassenBIB/Inspektionskuerzeln.cs index 1177f86..cfdb979 100644 --- a/KlassenBIB/Inspektionskuerzeln.cs +++ b/KlassenBIB/Inspektionskuerzeln.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Markup; namespace KlassenBIB { @@ -62,6 +63,6 @@ namespace KlassenBIB /// /// /// - public Reparatur Reparatur { get; set; } + public SanierungskonzeptCollection Sanierungskonzepts { get; set; } } } diff --git a/KlassenBIB/KlassenBIB.csproj b/KlassenBIB/KlassenBIB.csproj index b98c8df..5236747 100644 --- a/KlassenBIB/KlassenBIB.csproj +++ b/KlassenBIB/KlassenBIB.csproj @@ -44,18 +44,27 @@ + + + + + + + + + diff --git a/KlassenBIB/Kurzliner.cs b/KlassenBIB/Kurzliner.cs index f7a7364..eb6b28c 100644 --- a/KlassenBIB/Kurzliner.cs +++ b/KlassenBIB/Kurzliner.cs @@ -9,7 +9,7 @@ namespace KlassenBIB /// /// Partielle Reparatur /// - public class Kurzliner : Reparatur + public class Kurzliner : SanMitHarz { } } diff --git a/KlassenBIB/Reparatur.cs b/KlassenBIB/Reparatur.cs index 5f7740f..2af5f27 100644 --- a/KlassenBIB/Reparatur.cs +++ b/KlassenBIB/Reparatur.cs @@ -12,6 +12,21 @@ namespace KlassenBIB /// public abstract class Reparatur : Sanieren { + decimal positionImKanal; + /// + /// + /// + public decimal PositionImKanal + { + get + { + return positionImKanal; + } + set + { + positionImKanal = value; + } + } /// /// /// diff --git a/KlassenBIB/SanMitHarz.cs b/KlassenBIB/SanMitHarz.cs new file mode 100644 index 0000000..34d8473 --- /dev/null +++ b/KlassenBIB/SanMitHarz.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB +{ + /// + /// + /// + public class SanMitHarz : Reparatur + { + ChargeNummerCollection chargeNummerns; + + /// + /// Liste mit die Chargenummern + /// + public ChargeNummerCollection ChargeNummern + { + get + { + return chargeNummerns; + } + set + { + chargeNummerns = value; + } + } + } +} diff --git a/KlassenBIB/Sanierungskonzept.cs b/KlassenBIB/Sanierungskonzept.cs new file mode 100644 index 0000000..b43741f --- /dev/null +++ b/KlassenBIB/Sanierungskonzept.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Markup; + +namespace KlassenBIB +{ + /// + /// + /// + public class Sanierungskonzept + { + string anweisung; + + /// + /// Anweisung zur Darstellung vom Art des Reparatur + /// + public string Anweisung + { + get + { + return anweisung; + } + set + { + anweisung = value; + } + } + /// + /// Die Reparatur + /// + public Reparatur Reparatur { get; set; } + + } +} diff --git a/KlassenBIB/SanierungskonzeptCollection.cs b/KlassenBIB/SanierungskonzeptCollection.cs new file mode 100644 index 0000000..907a55b --- /dev/null +++ b/KlassenBIB/SanierungskonzeptCollection.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB +{ + /// + /// + /// + public class SanierungskonzeptCollection : List + { + } +} diff --git a/KlassenBIB/StructChargeNummern.cs b/KlassenBIB/StructChargeNummern.cs new file mode 100644 index 0000000..75a3865 --- /dev/null +++ b/KlassenBIB/StructChargeNummern.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB +{ + /// + /// + /// + public struct StructChargeNummern + { + /// + /// Bezeichnung des Harzes oder Material + /// + public string Bezeichnung; + /// + /// ChargeNummer vom Material + /// + public string ChargeNummer; + } +} diff --git a/SanSystem/FrmReparaturKonzept.Designer.cs b/SanSystem/FrmReparaturKonzept.Designer.cs new file mode 100644 index 0000000..b35a1e6 --- /dev/null +++ b/SanSystem/FrmReparaturKonzept.Designer.cs @@ -0,0 +1,88 @@ +namespace SanSystem +{ + partial class FrmReparaturKonzept + { + /// + /// 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.label1 = new System.Windows.Forms.Label(); + this.txt_anweisung = new System.Windows.Forms.TextBox(); + this.btn_add_san = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(51, 20); + this.label1.TabIndex = 0; + this.label1.Text = "label1"; + // + // txt_anweisung + // + this.txt_anweisung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_anweisung.Location = new System.Drawing.Point(121, 9); + this.txt_anweisung.Multiline = true; + this.txt_anweisung.Name = "txt_anweisung"; + this.txt_anweisung.Size = new System.Drawing.Size(221, 260); + this.txt_anweisung.TabIndex = 1; + // + // btn_add_san + // + this.btn_add_san.Location = new System.Drawing.Point(12, 275); + this.btn_add_san.Name = "btn_add_san"; + this.btn_add_san.Size = new System.Drawing.Size(330, 84); + this.btn_add_san.TabIndex = 2; + this.btn_add_san.Text = "Sanierung hinzufügen"; + this.btn_add_san.UseVisualStyleBackColor = true; + this.btn_add_san.Click += new System.EventHandler(this.btn_add_san_Click); + // + // FrmReparaturKonzept + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(354, 371); + this.Controls.Add(this.btn_add_san); + this.Controls.Add(this.txt_anweisung); + this.Controls.Add(this.label1); + this.Name = "FrmReparaturKonzept"; + this.Text = "FrmRepaturKonzept"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmRepaturKonzept_FormClosing); + this.Load += new System.EventHandler(this.FrmRepaturKonzept_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txt_anweisung; + private System.Windows.Forms.Button btn_add_san; + } +} \ No newline at end of file diff --git a/SanSystem/FrmReparaturKonzept.cs b/SanSystem/FrmReparaturKonzept.cs new file mode 100644 index 0000000..7bc0b50 --- /dev/null +++ b/SanSystem/FrmReparaturKonzept.cs @@ -0,0 +1,45 @@ +using KlassenBIB; +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 FrmReparaturKonzept : Form + { + Sanierungskonzept konzept = null; + /// + /// + /// + /// + public FrmReparaturKonzept(Sanierungskonzept konzept) + { + InitializeComponent(); + this.konzept = konzept != null ? konzept : new Sanierungskonzept(); + } + + private void FrmRepaturKonzept_Load(object sender, EventArgs e) + { + txt_anweisung.DataBindings.Add(new Binding("text", konzept, "Anweisung")); + } + + private void FrmRepaturKonzept_FormClosing(object sender, FormClosingEventArgs e) + { + txt_anweisung.DataBindings.Clear(); + } + + private void btn_add_san_Click(object sender, EventArgs e) + { + FrmSelectNewSan frmSelectNewSan = new FrmSelectNewSan(); + } + } +} diff --git a/SanSystem/FrmReparaturKonzept.resx b/SanSystem/FrmReparaturKonzept.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/FrmReparaturKonzept.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/FrmSanKonzeptList.Designer.cs b/SanSystem/FrmSanKonzeptList.Designer.cs new file mode 100644 index 0000000..c46d02b --- /dev/null +++ b/SanSystem/FrmSanKonzeptList.Designer.cs @@ -0,0 +1,89 @@ +namespace SanSystem +{ + partial class FrmSanKonzeptList + { + /// + /// 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.label1 = new System.Windows.Forms.Label(); + this.btn_san_add = new System.Windows.Forms.Button(); + this.lb_sans = new System.Windows.Forms.ListBox(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(12, 14); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(82, 20); + this.label1.TabIndex = 0; + this.label1.Text = "Sanierung"; + // + // btn_san_add + // + 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.TabIndex = 2; + this.btn_san_add.Text = "Neue Sanierung"; + this.btn_san_add.UseVisualStyleBackColor = true; + this.btn_san_add.Click += new System.EventHandler(this.btn_san_add_Click); + // + // lb_sans + // + this.lb_sans.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lb_sans.FormattingEnabled = true; + 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.TabIndex = 3; + // + // 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.Controls.Add(this.lb_sans); + this.Controls.Add(this.btn_san_add); + this.Controls.Add(this.label1); + this.Name = "FrmSanKonzeptList"; + this.Text = "FrmSanKonzept"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmSanKonzept_FormClosing); + this.Load += new System.EventHandler(this.FrmSanKonzept_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btn_san_add; + private System.Windows.Forms.ListBox lb_sans; + } +} \ No newline at end of file diff --git a/SanSystem/FrmSanKonzeptList.cs b/SanSystem/FrmSanKonzeptList.cs new file mode 100644 index 0000000..c0d525f --- /dev/null +++ b/SanSystem/FrmSanKonzeptList.cs @@ -0,0 +1,50 @@ +using KlassenBIB; +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 FrmSanKonzeptList : Form + { + List sanierungskonzept; + /// + /// + /// + public FrmSanKonzeptList(List sanierungskonzept) + { + InitializeComponent(); + + this.sanierungskonzept = sanierungskonzept != null ? sanierungskonzept : new List(); + } + + private void FrmSanKonzept_Load(object sender, EventArgs e) + { + lb_sans.DataSource = sanierungskonzept; + } + + private void FrmSanKonzept_FormClosing(object sender, FormClosingEventArgs e) + { + + } + + private void btn_san_add_Click(object sender, EventArgs e) + { + Sanierungskonzept sankonzept = new Sanierungskonzept(); + + sanierungskonzept.Add(sankonzept); + + FrmReparaturKonzept frmReparaturKonzept = new FrmReparaturKonzept(sankonzept); + frmReparaturKonzept.ShowDialog(); + } + } +} diff --git a/SanSystem/FrmSanKonzeptList.resx b/SanSystem/FrmSanKonzeptList.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/FrmSanKonzeptList.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/SanSystem.csproj b/SanSystem/SanSystem.csproj index e3fd296..28c9ee9 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -112,6 +112,18 @@ frmProjektList.cs + + Form + + + FrmReparaturKonzept.cs + + + Form + + + FrmSanKonzeptList.cs + Form @@ -174,6 +186,12 @@ frmProjektList.cs + + FrmReparaturKonzept.cs + + + FrmSanKonzeptList.cs + FrmSelectMassenDate.cs diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 7c7697a..7dbeac1 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -59,11 +59,11 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.dgv_schadenkuerzel = new System.Windows.Forms.DataGridView(); 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.tabPage2 = new System.Windows.Forms.TabPage(); - this.dgv_schadenkuerzel = new System.Windows.Forms.DataGridView(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -448,6 +448,28 @@ this.label1.TabIndex = 0; this.label1.Text = "Projektnummer"; // + // tabPage2 + // + 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; + // + // dgv_schadenkuerzel + // + 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; + this.dgv_schadenkuerzel.RowHeaderMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgv_schadenkuerzel_RowHeaderMouseDoubleClick); + // // btn_close // this.btn_close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -480,27 +502,6 @@ this.btn_delete.UseVisualStyleBackColor = true; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // - // tabPage2 - // - 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; - // - // dgv_schadenkuerzel - // - 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 // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 2bb99c0..4c88191 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -183,5 +183,26 @@ namespace SanSystem txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung")); } } + + private void dgv_schadenkuerzel_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) + { + DataGridView dataGridView = (DataGridView)sender; + if (dataGridView == null) return; + DataGridViewSelectedRowCollection dataGridViewRowsSelect = dataGridView.SelectedRows; + + + if (dataGridViewRowsSelect.Count > 1) return; + + DataGridViewRow dgvr = dataGridViewRowsSelect[0]; + Inspektionskuerzeln kuerzel = (dgvr.DataBoundItem as Inspektionskuerzeln); + if (kuerzel == null) return; + if (kuerzel.Sanierungskonzepts == null) + kuerzel.Sanierungskonzepts = new SanierungskonzeptCollection(); + + + FrmSanKonzeptList frmSanKonzept = new FrmSanKonzeptList(kuerzel.Sanierungskonzepts); + //frmSanKonzept.MdiParent = this.MdiParent; + frmSanKonzept.ShowDialog(); + } } }