From a049c64ea457e74afbbabc362aecaa4a8568528f Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Thu, 10 Oct 2019 09:20:37 +0200 Subject: [PATCH 1/3] Umstrukturierungen --- .../AbwasserTechnischeAnlageCollection.cs | 15 --- .../AusgefuehrteTaetigkeitenCollection.cs | 15 --- .../AbwasserTechnischeAnlage.cs} | 7 +- .../AuftraggeberList.cs} | 7 +- .../AusgefuehrteTaetigkeiten.cs} | 7 +- KlassenBIB/Collections/Bilder.cs | 12 +++ .../ChargeNummer.cs} | 3 - KlassenBIB/Collections/ImprägnierBericht.cs | 12 +++ .../Inspektionskuerzeln.cs} | 7 +- .../Collections/Leistungsverzeichnis.cs | 12 +++ KlassenBIB/Collections/Sanierung.cs | 12 +++ KlassenBIB/Collections/Sanierungskonzept.cs | 12 +++ KlassenBIB/Inspektionskuerzeln.cs | 54 +++------- KlassenBIB/Inspektionsobjekt.cs | 96 +++++------------ KlassenBIB/KlassenBIB.csproj | 47 ++++---- KlassenBIB/LeistungsverzeichnisCollection.cs | 15 --- KlassenBIB/MainDataBase.cs | 15 +-- KlassenBIB/Projekt.cs | 23 +--- .../Renovation}/AbstractImprägnier.cs | 0 .../Renovation/AbstractSanieren.cs} | 20 +--- .../Renovation}/ImprägnierungStrukture.cs | 9 -- .../Renovation}/InlinerSanierung.cs | 100 +++++------------- .../Renovation/UVAnlagenTyp.cs} | 2 +- .../Renovation}/VorOrtImprägnier.cs | 0 .../Renovation}/WerkseitigImprägniert.cs | 0 KlassenBIB/{ => Sanierung}/Reparatur.cs | 2 +- .../{ => Sanierung/Reparatur}/Hutprofil.cs | 0 .../{ => Sanierung/Reparatur}/Kurzliner.cs | 0 .../{ => Sanierung/Reparatur}/Quicklock.cs | 0 .../{ => Sanierung/Reparatur}/SanMitHarz.cs | 0 KlassenBIB/{ => Sanierung}/Sanierung.cs | 76 +++---------- .../{ => Sanierung}/StructChargeNummern.cs | 0 KlassenBIB/SanierungskonzeptCollection.cs | 15 --- KlassenBIB/SchachtAnbindung.cs | 8 +- SanSystem/MassenStatistik.cs | 4 +- SanSystem/frmObjektEdit.cs | 2 +- SanSystem/frmObjekteList.cs | 2 +- SanVerwaltung.sln | 4 + SchnittstelleImporter/I2006XML.cs | 2 +- 39 files changed, 201 insertions(+), 416 deletions(-) delete mode 100644 KlassenBIB/AbwasserTechnischeAnlageCollection.cs delete mode 100644 KlassenBIB/AusgefuehrteTaetigkeitenCollection.cs rename KlassenBIB/{BilderCollection.cs => Collections/AbwasserTechnischeAnlage.cs} (52%) rename KlassenBIB/{AuftraggeberListCollection.cs => Collections/AuftraggeberList.cs} (53%) rename KlassenBIB/{SanierungCollection.cs => Collections/AusgefuehrteTaetigkeiten.cs} (52%) create mode 100644 KlassenBIB/Collections/Bilder.cs rename KlassenBIB/{ChargeNummerCollection.cs => Collections/ChargeNummer.cs} (83%) create mode 100644 KlassenBIB/Collections/ImprägnierBericht.cs rename KlassenBIB/{InspektionskuerzelnCollection.cs => Collections/Inspektionskuerzeln.cs} (56%) create mode 100644 KlassenBIB/Collections/Leistungsverzeichnis.cs create mode 100644 KlassenBIB/Collections/Sanierung.cs create mode 100644 KlassenBIB/Collections/Sanierungskonzept.cs delete mode 100644 KlassenBIB/LeistungsverzeichnisCollection.cs rename KlassenBIB/{ => Sanierung/Renovation}/AbstractImprägnier.cs (100%) rename KlassenBIB/{Sanieren.cs => Sanierung/Renovation/AbstractSanieren.cs} (63%) rename KlassenBIB/{ => Sanierung/Renovation}/ImprägnierungStrukture.cs (64%) rename KlassenBIB/{ => Sanierung/Renovation}/InlinerSanierung.cs (83%) rename KlassenBIB/{AnlagenType.cs => Sanierung/Renovation/UVAnlagenTyp.cs} (92%) rename KlassenBIB/{ => Sanierung/Renovation}/VorOrtImprägnier.cs (100%) rename KlassenBIB/{ => Sanierung/Renovation}/WerkseitigImprägniert.cs (100%) rename KlassenBIB/{ => Sanierung}/Reparatur.cs (93%) rename KlassenBIB/{ => Sanierung/Reparatur}/Hutprofil.cs (100%) rename KlassenBIB/{ => Sanierung/Reparatur}/Kurzliner.cs (100%) rename KlassenBIB/{ => Sanierung/Reparatur}/Quicklock.cs (100%) rename KlassenBIB/{ => Sanierung/Reparatur}/SanMitHarz.cs (100%) rename KlassenBIB/{ => Sanierung}/Sanierung.cs (69%) rename KlassenBIB/{ => Sanierung}/StructChargeNummern.cs (100%) delete mode 100644 KlassenBIB/SanierungskonzeptCollection.cs diff --git a/KlassenBIB/AbwasserTechnischeAnlageCollection.cs b/KlassenBIB/AbwasserTechnischeAnlageCollection.cs deleted file mode 100644 index 03620fc..0000000 --- a/KlassenBIB/AbwasserTechnischeAnlageCollection.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace KlassenBIB -{ - /// - /// - /// - public class AbwasserTechnischeAnlageCollection : List - { - } -} diff --git a/KlassenBIB/AusgefuehrteTaetigkeitenCollection.cs b/KlassenBIB/AusgefuehrteTaetigkeitenCollection.cs deleted file mode 100644 index 34cfa78..0000000 --- a/KlassenBIB/AusgefuehrteTaetigkeitenCollection.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace KlassenBIB -{ - /// - /// - /// - public class AusgefuehrteTaetigkeitenCollection : List - { - } -} diff --git a/KlassenBIB/BilderCollection.cs b/KlassenBIB/Collections/AbwasserTechnischeAnlage.cs similarity index 52% rename from KlassenBIB/BilderCollection.cs rename to KlassenBIB/Collections/AbwasserTechnischeAnlage.cs index 30cb71f..d3c5dc4 100644 --- a/KlassenBIB/BilderCollection.cs +++ b/KlassenBIB/Collections/AbwasserTechnischeAnlage.cs @@ -4,12 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace KlassenBIB +namespace KlassenBIB.Collections { - /// - /// - /// - public class BilderCollection : List + public class AbwasserTechnischeAnlage : List { } } diff --git a/KlassenBIB/AuftraggeberListCollection.cs b/KlassenBIB/Collections/AuftraggeberList.cs similarity index 53% rename from KlassenBIB/AuftraggeberListCollection.cs rename to KlassenBIB/Collections/AuftraggeberList.cs index 83b298e..87ee031 100644 --- a/KlassenBIB/AuftraggeberListCollection.cs +++ b/KlassenBIB/Collections/AuftraggeberList.cs @@ -5,12 +5,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace KlassenBIB +namespace KlassenBIB.Collections { - /// - /// - /// - public class AuftraggeberListCollection : List + public class AuftraggeberList : List { } } diff --git a/KlassenBIB/SanierungCollection.cs b/KlassenBIB/Collections/AusgefuehrteTaetigkeiten.cs similarity index 52% rename from KlassenBIB/SanierungCollection.cs rename to KlassenBIB/Collections/AusgefuehrteTaetigkeiten.cs index 3dcd279..9852378 100644 --- a/KlassenBIB/SanierungCollection.cs +++ b/KlassenBIB/Collections/AusgefuehrteTaetigkeiten.cs @@ -4,12 +4,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace KlassenBIB +namespace KlassenBIB.Collections { - /// - /// - /// - public class SanierungCollection : List + public class AusgefuehrteTaetigkeiten : List { } } diff --git a/KlassenBIB/Collections/Bilder.cs b/KlassenBIB/Collections/Bilder.cs new file mode 100644 index 0000000..262a1b0 --- /dev/null +++ b/KlassenBIB/Collections/Bilder.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB.Collections +{ + public class Bilder : List + { + } +} diff --git a/KlassenBIB/ChargeNummerCollection.cs b/KlassenBIB/Collections/ChargeNummer.cs similarity index 83% rename from KlassenBIB/ChargeNummerCollection.cs rename to KlassenBIB/Collections/ChargeNummer.cs index 5370168..1fe1826 100644 --- a/KlassenBIB/ChargeNummerCollection.cs +++ b/KlassenBIB/Collections/ChargeNummer.cs @@ -6,9 +6,6 @@ using System.Threading.Tasks; namespace KlassenBIB { - /// - /// - /// public class ChargeNummerCollection : List { } diff --git a/KlassenBIB/Collections/ImprägnierBericht.cs b/KlassenBIB/Collections/ImprägnierBericht.cs new file mode 100644 index 0000000..0f7d41b --- /dev/null +++ b/KlassenBIB/Collections/ImprägnierBericht.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB.Collections +{ + public class ImprägnierBericht : List + { + } +} diff --git a/KlassenBIB/InspektionskuerzelnCollection.cs b/KlassenBIB/Collections/Inspektionskuerzeln.cs similarity index 56% rename from KlassenBIB/InspektionskuerzelnCollection.cs rename to KlassenBIB/Collections/Inspektionskuerzeln.cs index 42f0cbb..32d1365 100644 --- a/KlassenBIB/InspektionskuerzelnCollection.cs +++ b/KlassenBIB/Collections/Inspektionskuerzeln.cs @@ -5,13 +5,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace KlassenBIB +namespace KlassenBIB.Collections { - /// - /// - /// [Browsable(false)] - public class InspektionskuerzelnCollection : List + public class Inspektionskuerzeln : List { } } diff --git a/KlassenBIB/Collections/Leistungsverzeichnis.cs b/KlassenBIB/Collections/Leistungsverzeichnis.cs new file mode 100644 index 0000000..732e524 --- /dev/null +++ b/KlassenBIB/Collections/Leistungsverzeichnis.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB.Collections +{ + public class Leistungsverzeichnis : List + { + } +} diff --git a/KlassenBIB/Collections/Sanierung.cs b/KlassenBIB/Collections/Sanierung.cs new file mode 100644 index 0000000..a9a4f4e --- /dev/null +++ b/KlassenBIB/Collections/Sanierung.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB.Collections +{ + public class Sanierung : List + { + } +} diff --git a/KlassenBIB/Collections/Sanierungskonzept.cs b/KlassenBIB/Collections/Sanierungskonzept.cs new file mode 100644 index 0000000..93314b0 --- /dev/null +++ b/KlassenBIB/Collections/Sanierungskonzept.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace KlassenBIB.Collections +{ + public class Sanierungskonzept : List + { + } +} diff --git a/KlassenBIB/Inspektionskuerzeln.cs b/KlassenBIB/Inspektionskuerzeln.cs index cfdb979..6b16b65 100644 --- a/KlassenBIB/Inspektionskuerzeln.cs +++ b/KlassenBIB/Inspektionskuerzeln.cs @@ -12,57 +12,31 @@ namespace KlassenBIB /// public class Inspektionskuerzeln { - /// - /// - /// + public decimal Station { get; set; } - /// - /// - /// + public string Hauptkode { get; set; } - /// - /// - /// + public string Charakterisierung1 { get; set; } - /// - /// - /// + public string Charakterisierung2 { get; set; } - /// - /// - /// + public uint Quantifizierung1 { get; set; } - /// - /// - /// + public uint Quantifizierung2 { get; set; } - /// - /// - /// + public uint LageAmUmfangStart { get; set; } - /// - /// - /// + public uint LageAmUmfangEnde { get; set; } - /// - /// - /// + public bool ImVerbindung { get; set; } - /// - /// - /// + public string FotoReferenz { get; set; } - /// - /// - /// + public string VideoReferenz { get; set; } - /// - /// - /// + public string Anmerkung { get; set; } - /// - /// - /// - public SanierungskonzeptCollection Sanierungskonzepts { get; set; } + + public Collections.Sanierungskonzept Sanierungskonzepts { get; set; } } } diff --git a/KlassenBIB/Inspektionsobjekt.cs b/KlassenBIB/Inspektionsobjekt.cs index 7d46bb3..a2efd79 100644 --- a/KlassenBIB/Inspektionsobjekt.cs +++ b/KlassenBIB/Inspektionsobjekt.cs @@ -14,94 +14,52 @@ namespace KlassenBIB public class Inspektionsobjekt { private string strasseName = "none"; - /// - /// - /// + public bool GeschlossenesEnde { get; set; } - /// - /// - /// + public string StrasseName { get => strasseName; set => strasseName = value; } - /// - /// - /// + public string OrtName { get; set; } - /// - /// - /// + public string Hausnummer { get; set; } - /// - /// - /// + public string Projektnummer { get; set; } - /// - /// - /// + public string Objektbezeichnung { get; set; } - /// - /// - /// + public string VonPunkt { get; set; } - /// - /// - /// + public string BisPunkt { get; set; } - /// - /// - /// + public string RohrMaterial { get; set; } - /// - /// - /// + public uint Kanalrohrweite { get; set; } - /// - /// - /// + public double Haltungslaenge { get; set; } - /// - /// - /// + public double Schachtlaenge { get; set; } - /// - /// - /// + public DateTime HaltungGemessen { get; set; } - /// - /// - /// - public InspektionskuerzelnCollection Schadenskuerzeln { get; set; } - /// - /// - /// + + public Collections.Inspektionskuerzeln Schadenskuerzeln { get; set; } + public string Bemerkung { get; set; } - /// - /// - /// - public SanierungCollection Sanierung { get;set; } - /// - /// - /// - public AusgefuehrteTaetigkeitenCollection AusgefuehrteTaetigkeiten { get; set; } - /// - /// In welcher Richtung wurde Inspiziert - /// + + public Collections.Sanierung Sanierung { get;set; } + + public Collections.AusgefuehrteTaetigkeiten AusgefuehrteTaetigkeiten { get; set; } + public string Inspektionsrichtung { get; set; } - /// - /// - /// + public string Sanierungsnummer { get; set; } - /// - /// - /// + public Guid Guid { get; set; } - /// - /// - /// + public Inspektionsobjekt() { - Schadenskuerzeln = new InspektionskuerzelnCollection(); - Sanierung = new SanierungCollection(); - AusgefuehrteTaetigkeiten = new AusgefuehrteTaetigkeitenCollection(); + Schadenskuerzeln = new Collections.Inspektionskuerzeln(); + Sanierung = new Collections.Sanierung(); + AusgefuehrteTaetigkeiten = new Collections.AusgefuehrteTaetigkeiten(); if (HaltungGemessen <= DateTime.MinValue || HaltungGemessen >= DateTime.MaxValue) HaltungGemessen = DateTime.Now; } } diff --git a/KlassenBIB/KlassenBIB.csproj b/KlassenBIB/KlassenBIB.csproj index 29b9c26..84d160c 100644 --- a/KlassenBIB/KlassenBIB.csproj +++ b/KlassenBIB/KlassenBIB.csproj @@ -44,42 +44,43 @@ - - - + + + + - + - - - - + + + + - - - + + + - + - + - - - - - - + + + + + + - + - - - + + + diff --git a/KlassenBIB/LeistungsverzeichnisCollection.cs b/KlassenBIB/LeistungsverzeichnisCollection.cs deleted file mode 100644 index 47d71e8..0000000 --- a/KlassenBIB/LeistungsverzeichnisCollection.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace KlassenBIB -{ - /// - /// - /// - public class LeistungsverzeichnisCollection : List - { - } -} diff --git a/KlassenBIB/MainDataBase.cs b/KlassenBIB/MainDataBase.cs index 5b27721..83033c6 100644 --- a/KlassenBIB/MainDataBase.cs +++ b/KlassenBIB/MainDataBase.cs @@ -7,22 +7,15 @@ using System.Windows.Markup; namespace KlassenBIB { - /// - /// - /// [ContentProperty("AuftraggeberListe")] public class MainDataBase { - /// - /// - /// - public AuftraggeberListCollection AuftraggeberListe { get; set; } - /// - /// - /// + public Collections.AuftraggeberList AuftraggeberListe { get; set; } + public Collections.ImprägnierBericht ImprägnierBerichtListe { get; set; } public MainDataBase() { - AuftraggeberListe = new AuftraggeberListCollection(); + AuftraggeberListe = new Collections.AuftraggeberList(); + ImprägnierBerichtListe = new Collections.ImprägnierBericht(); } } } diff --git a/KlassenBIB/Projekt.cs b/KlassenBIB/Projekt.cs index 33adc0d..9a3a569 100644 --- a/KlassenBIB/Projekt.cs +++ b/KlassenBIB/Projekt.cs @@ -15,33 +15,18 @@ namespace KlassenBIB [ContentProperty("Objekte")] public class Projekt :IProjekt { - /// - /// - /// public string Nummer { get; set; } - /// - /// - /// public string Ort { get; set; } - /// - /// - /// public IAuftraggeber Auftraggeber { get; set; } - /// - /// - /// - public LeistungsverzeichnisCollection Leistungsverzeichnis { get; set; } - /// - /// - /// - public AbwasserTechnischeAnlageCollection Objekte { get; set; } + public Collections.Leistungsverzeichnis Leistungsverzeichnis { get; set; } + public Collections.AbwasserTechnischeAnlage Objekte { get; set; } /// /// /// public Projekt() { - Objekte = new AbwasserTechnischeAnlageCollection(); - Leistungsverzeichnis = new LeistungsverzeichnisCollection(); + Objekte = new Collections.AbwasserTechnischeAnlage(); + Leistungsverzeichnis = new Collections.Leistungsverzeichnis(); Auftraggeber = new Auftraggeber(); } } diff --git a/KlassenBIB/AbstractImprägnier.cs b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs similarity index 100% rename from KlassenBIB/AbstractImprägnier.cs rename to KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs diff --git a/KlassenBIB/Sanieren.cs b/KlassenBIB/Sanierung/Renovation/AbstractSanieren.cs similarity index 63% rename from KlassenBIB/Sanieren.cs rename to KlassenBIB/Sanierung/Renovation/AbstractSanieren.cs index 37c5bd5..ec3858f 100644 --- a/KlassenBIB/Sanieren.cs +++ b/KlassenBIB/Sanierung/Renovation/AbstractSanieren.cs @@ -6,30 +6,18 @@ using System.Threading.Tasks; namespace KlassenBIB { - /// - /// - /// - public abstract class Sanieren : Sanierung + public abstract class AbstractSanieren : Sanierung { DateTime datum = new DateTime(); bool fertig = false; string verzeichnispfad; - /// - /// - /// + + #region getSeters public string Besatzung { get; set; } - /// - /// - /// public DateTime Datum { get => datum; set => datum = value; } - /// - /// - /// public bool Fertig { get => fertig; set => fertig = value; } - /// - /// - /// public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; } + #endregion } } diff --git a/KlassenBIB/ImprägnierungStrukture.cs b/KlassenBIB/Sanierung/Renovation/ImprägnierungStrukture.cs similarity index 64% rename from KlassenBIB/ImprägnierungStrukture.cs rename to KlassenBIB/Sanierung/Renovation/ImprägnierungStrukture.cs index d235552..0a29629 100644 --- a/KlassenBIB/ImprägnierungStrukture.cs +++ b/KlassenBIB/Sanierung/Renovation/ImprägnierungStrukture.cs @@ -6,18 +6,9 @@ using System.Threading.Tasks; namespace KlassenBIB { - /// - /// - /// public class ImprägnierungStrukture { - /// - /// - /// public DateTime Zeitstempel { get; set; } - /// - /// - /// public double Temperature { get; set; } } } diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs similarity index 83% rename from KlassenBIB/InlinerSanierung.cs rename to KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs index f592b73..85287a4 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs @@ -14,7 +14,7 @@ namespace KlassenBIB /// Inliner class /// /// - public sealed class InlinerSanierung : Sanieren, IMakeProtokol + public sealed class InlinerSanierung : AbstractSanieren, IMakeProtokol { double kalibrierUnterdruck = -0.5; double kalibierWalzenAbstand = 0.9; @@ -34,19 +34,14 @@ namespace KlassenBIB string bediener; DateTime anfangKalibrierung; DateTime endeKalibirierung; + + - /// - /// Gibt den kompletten Harzbedarf auf die Haltungslänge bezogen zurück - /// public double GetGesamtHarzbedarf(double haltungslaenge) { return haltungslaenge * harzbedarf; } - /// - /// - /// - /// - /// + public override string CheckVerzeichnisse(string projektpfad) { string path = Path.Combine(projektpfad, PfadZurSan); @@ -57,12 +52,7 @@ namespace KlassenBIB return path; } - /// - /// - /// - /// - /// Projekt - /// + public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt) { Hashtable grunddaten = new Hashtable() @@ -157,30 +147,20 @@ namespace KlassenBIB grunddaten["harz_type"] = HarzTyp; return grunddaten; } - /// - /// - /// + public InlinerSanierung() { //datumKalibrierung = new DateTime(); Verzeichnispfad = "UVAnlage"; if (datumKalibrierung <= DateTime.MinValue || datumKalibrierung >= DateTime.MaxValue) datumKalibrierung = DateTime.Now; } - /// - /// - /// + public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; } - /// - /// - /// + public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; } - /// - /// - /// + public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; } - /// - /// - /// + public DateTime DatumKalibrierung { get @@ -192,65 +172,35 @@ namespace KlassenBIB datumKalibrierung = value; } } - /// - /// - /// + public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; } - /// - /// - /// + public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; } - /// - /// - /// + public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; } - /// - /// - /// + public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; } - /// - /// - /// + public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; } - /// - /// - /// + public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; } - /// - /// - /// + public string HarzTyp { get => harzTyp; set => harzTyp = value; } - /// - /// - /// + public string LinerTyp { get => linerTyp; set => linerTyp = value; } - /// - /// - /// + public DateTime AnfangAushaertung { get => anfangAushaertung; set => anfangAushaertung = value; } - /// - /// - /// + public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; } - /// - /// - /// + public string Ort { get => ort; set => ort = value; } - /// - /// - /// + public string Bediener { get => bediener; set => bediener = value; } - /// - /// - /// + public DateTime AnfangKalibrierung { get => anfangKalibrierung; set => anfangKalibrierung = value; } - /// - /// - /// + public DateTime EndeKalibirierung { get => endeKalibirierung; set => endeKalibirierung = value; } - /// - /// Preliner - /// + public bool Preliner { get => preliner; set => preliner = value; } } } diff --git a/KlassenBIB/AnlagenType.cs b/KlassenBIB/Sanierung/Renovation/UVAnlagenTyp.cs similarity index 92% rename from KlassenBIB/AnlagenType.cs rename to KlassenBIB/Sanierung/Renovation/UVAnlagenTyp.cs index a9ea849..0f4f084 100644 --- a/KlassenBIB/AnlagenType.cs +++ b/KlassenBIB/Sanierung/Renovation/UVAnlagenTyp.cs @@ -3,7 +3,7 @@ /// /// /// - public class AnlagenType + public class UVAnlagenTyp { /// /// diff --git a/KlassenBIB/VorOrtImprägnier.cs b/KlassenBIB/Sanierung/Renovation/VorOrtImprägnier.cs similarity index 100% rename from KlassenBIB/VorOrtImprägnier.cs rename to KlassenBIB/Sanierung/Renovation/VorOrtImprägnier.cs diff --git a/KlassenBIB/WerkseitigImprägniert.cs b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs similarity index 100% rename from KlassenBIB/WerkseitigImprägniert.cs rename to KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs diff --git a/KlassenBIB/Reparatur.cs b/KlassenBIB/Sanierung/Reparatur.cs similarity index 93% rename from KlassenBIB/Reparatur.cs rename to KlassenBIB/Sanierung/Reparatur.cs index 2af5f27..465cddc 100644 --- a/KlassenBIB/Reparatur.cs +++ b/KlassenBIB/Sanierung/Reparatur.cs @@ -10,7 +10,7 @@ namespace KlassenBIB /// /// Abstrakte Klasse zur Darstellung einer Partielle Reparatur /// - public abstract class Reparatur : Sanieren + public abstract class Reparatur : AbstractSanieren { decimal positionImKanal; /// diff --git a/KlassenBIB/Hutprofil.cs b/KlassenBIB/Sanierung/Reparatur/Hutprofil.cs similarity index 100% rename from KlassenBIB/Hutprofil.cs rename to KlassenBIB/Sanierung/Reparatur/Hutprofil.cs diff --git a/KlassenBIB/Kurzliner.cs b/KlassenBIB/Sanierung/Reparatur/Kurzliner.cs similarity index 100% rename from KlassenBIB/Kurzliner.cs rename to KlassenBIB/Sanierung/Reparatur/Kurzliner.cs diff --git a/KlassenBIB/Quicklock.cs b/KlassenBIB/Sanierung/Reparatur/Quicklock.cs similarity index 100% rename from KlassenBIB/Quicklock.cs rename to KlassenBIB/Sanierung/Reparatur/Quicklock.cs diff --git a/KlassenBIB/SanMitHarz.cs b/KlassenBIB/Sanierung/Reparatur/SanMitHarz.cs similarity index 100% rename from KlassenBIB/SanMitHarz.cs rename to KlassenBIB/Sanierung/Reparatur/SanMitHarz.cs diff --git a/KlassenBIB/Sanierung.cs b/KlassenBIB/Sanierung/Sanierung.cs similarity index 69% rename from KlassenBIB/Sanierung.cs rename to KlassenBIB/Sanierung/Sanierung.cs index 3663f21..4a375c3 100644 --- a/KlassenBIB/Sanierung.cs +++ b/KlassenBIB/Sanierung/Sanierung.cs @@ -8,12 +8,6 @@ using System.Threading.Tasks; namespace KlassenBIB { - // - // Zusammenfassung: - // Bietet die grundlegene Struktur für eine Sanierung - /// - /// - /// [EditorBrowsable(EditorBrowsableState.Never)] [Browsable(false)] public abstract class Sanierung : INotifyPropertyChanged @@ -31,14 +25,9 @@ namespace KlassenBIB DateTime hDReinigungDatum; //DateTime sanierungsDatum; Inspektionsobjekt inspektionsobjekt; - /// - /// - /// + protected string pfadZurSan; - /// - /// - /// [Browsable(false)] public Sanierung() { @@ -47,19 +36,11 @@ namespace KlassenBIB } - /// - /// - /// - /// - /// + public abstract string CheckVerzeichnisse(string projektpfad); - /// - /// - /// + public Guid Guid { get => guid; set => guid = value; } - /// - /// - /// + public double TempAusen { get => tempAusen; @@ -73,60 +54,35 @@ namespace KlassenBIB } } - /// - /// - /// + public double TempKanal { get => tempKanal; set => tempKanal = value; } - /// - /// - /// + public string Wetter { get => wetter; set => wetter = value; } - /// - /// - /// + public bool GenehmigungVorhanden { get => genehmigungVorhanden; set => genehmigungVorhanden = value; } - /// - /// - /// + public bool WasserhaltungEingerichtet { get => wasserhaltungEingerichtet; set => wasserhaltungEingerichtet = value; } - /// - /// - /// + public bool STVOAbsicherung { get => sTVOAbsicherung; set => sTVOAbsicherung = value; } - /// - /// - /// + public bool HDReinigung { get => hDReinigung; set => hDReinigung = value; } - /// - /// - /// + public DateTime HDReinigungDatum { get => hDReinigungDatum; set => hDReinigungDatum = value; } - /// - /// - /// + public Inspektionsobjekt Inspektionsobjekt { get => inspektionsobjekt; set => inspektionsobjekt = value; } - /// - /// - /// + protected string PfadZurSan { get { 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; } - /// - /// - /// + public event PropertyChangedEventHandler PropertyChanged; private void NotifyPropertyChanged([CallerMemberName] string propertyName = null) { diff --git a/KlassenBIB/StructChargeNummern.cs b/KlassenBIB/Sanierung/StructChargeNummern.cs similarity index 100% rename from KlassenBIB/StructChargeNummern.cs rename to KlassenBIB/Sanierung/StructChargeNummern.cs diff --git a/KlassenBIB/SanierungskonzeptCollection.cs b/KlassenBIB/SanierungskonzeptCollection.cs deleted file mode 100644 index 907a55b..0000000 --- a/KlassenBIB/SanierungskonzeptCollection.cs +++ /dev/null @@ -1,15 +0,0 @@ -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/SchachtAnbindung.cs b/KlassenBIB/SchachtAnbindung.cs index c436b40..27770e5 100644 --- a/KlassenBIB/SchachtAnbindung.cs +++ b/KlassenBIB/SchachtAnbindung.cs @@ -10,10 +10,10 @@ namespace KlassenBIB /// /// /// - public class SchachtAnbindung : Sanieren + public class SchachtAnbindung : AbstractSanieren { string schachtNummer; - BilderCollection savedBilders; + Collections.Bilder savedBilders; #region GettersSetters /// @@ -23,7 +23,7 @@ namespace KlassenBIB /// /// /// - public BilderCollection SavedBilders { get => savedBilders; set => savedBilders = value; } + public Collections.Bilder SavedBilders { get => savedBilders; set => savedBilders = value; } #endregion /// /// @@ -31,7 +31,7 @@ namespace KlassenBIB public SchachtAnbindung() { Verzeichnispfad = "Schachtanbindung"; - SavedBilders = new BilderCollection(); + SavedBilders = new Collections.Bilder(); } /// diff --git a/SanSystem/MassenStatistik.cs b/SanSystem/MassenStatistik.cs index 775cf5f..91787e7 100644 --- a/SanSystem/MassenStatistik.cs +++ b/SanSystem/MassenStatistik.cs @@ -47,7 +47,7 @@ namespace SanSystem dr["vorbereitet"] = "am " + objekt.HaltungGemessen.ToShortDateString(); int schachtanbindungen = 0; - foreach (Sanieren mainsan in objekt.Sanierung) + foreach (AbstractSanieren mainsan in objekt.Sanierung) { if ( mainsan.Datum.Day == targetDatum.Day && @@ -173,7 +173,7 @@ namespace SanSystem add = true; } - foreach(Sanieren san in objekt.Sanierung) + foreach(AbstractSanieren san in objekt.Sanierung) { if (san.Fertig && diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 2c66a58..fd862c2 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -234,7 +234,7 @@ namespace SanSystem Inspektionskuerzeln kuerzel = (dgvr.DataBoundItem as Inspektionskuerzeln); if (kuerzel == null) return; if (kuerzel.Sanierungskonzepts == null) - kuerzel.Sanierungskonzepts = new SanierungskonzeptCollection(); + kuerzel.Sanierungskonzepts = new KlassenBIB.Collections.Sanierungskonzept(); frmSanKonzeptList frmSanKonzept = new frmSanKonzeptList(kuerzel.Sanierungskonzepts); diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index d5ef822..f5177eb 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -50,7 +50,7 @@ namespace SanSystem int counter = 0; foreach(Sanierung san in tmp.Sanierung) { - Sanieren _san = (san as Sanieren); + AbstractSanieren _san = (san as AbstractSanieren); if (_san.Fertig) anzahlfertig++; counter++; } diff --git a/SanVerwaltung.sln b/SanVerwaltung.sln index 474446c..0e2ab98 100644 --- a/SanVerwaltung.sln +++ b/SanVerwaltung.sln @@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchnittstelleImporterTests" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSVParser", "CSVParser\CSVParser.csproj", "{3F79BD28-9BF6-4902-8977-41E9E71F8488}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DDF8C748-82A0-4FFC-8EE1-9C81C26A75E3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,8 +90,10 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {0FEC903E-6C9F-48AC-A207-0BACA184AAA8} = {DDF8C748-82A0-4FFC-8EE1-9C81C26A75E3} {FF6C3E9C-0AB0-4C67-A150-318C22734FBD} = {8DB2B84C-B8C5-4C32-82C0-47AD5FADD649} {BE364E88-92DA-4A6C-97E7-DDD7D887B3D4} = {8DB2B84C-B8C5-4C32-82C0-47AD5FADD649} + {9264791A-9D57-4133-BE47-75721057DBBB} = {DDF8C748-82A0-4FFC-8EE1-9C81C26A75E3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {78FE215A-2904-4B88-8553-88BF8165DAC4} diff --git a/SchnittstelleImporter/I2006XML.cs b/SchnittstelleImporter/I2006XML.cs index fa888db..313f5fc 100644 --- a/SchnittstelleImporter/I2006XML.cs +++ b/SchnittstelleImporter/I2006XML.cs @@ -152,7 +152,7 @@ namespace SchnittstelleImporter foreach(InspizierteAbwassertechnischeAnlage src in anlagen) { Inspektionsobjekt inspektionsobjekt = new Inspektionsobjekt(); - InspektionskuerzelnCollection inspektionskuerzelns = new InspektionskuerzelnCollection(); + KlassenBIB.Collections.Inspektionskuerzeln inspektionskuerzelns = new KlassenBIB.Collections.Inspektionskuerzeln(); inspektionsobjekt.Projektnummer = projektnummer; inspektionsobjekt.Objektbezeichnung = src.Objektbezeichnung; From 91fa0763e3401b9d6f0735b6ae385aa096157dd6 Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Thu, 10 Oct 2019 11:02:58 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Impr=C3=A4gnierbericht=20edit=20form=20gesc?= =?UTF-8?q?hrieben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- KlassenBIB/Projekt.cs | 3 - SanShared/IProjekt.cs | 6 - SanShared/SanShared.csproj | 3 +- SanSystem/SanSystem.csproj | 12 +- .../frmImprägnierBerichtEdit.Designer.cs | 420 ++++++++++++++++++ SanSystem/frmImprägnierBerichtEdit.cs | 20 + SanSystem/frmImprägnierBerichtEdit.resx | 120 +++++ 7 files changed, 573 insertions(+), 11 deletions(-) create mode 100644 SanSystem/frmImprägnierBerichtEdit.Designer.cs create mode 100644 SanSystem/frmImprägnierBerichtEdit.cs create mode 100644 SanSystem/frmImprägnierBerichtEdit.resx diff --git a/KlassenBIB/Projekt.cs b/KlassenBIB/Projekt.cs index 9a3a569..6cee984 100644 --- a/KlassenBIB/Projekt.cs +++ b/KlassenBIB/Projekt.cs @@ -9,9 +9,6 @@ using System.Windows.Markup; [assembly: XmlnsDefinition("http://schemas.cosysda.de/sanVerwaltung/xaml","KlassenBIB")] namespace KlassenBIB { - /// - /// - /// [ContentProperty("Objekte")] public class Projekt :IProjekt { diff --git a/SanShared/IProjekt.cs b/SanShared/IProjekt.cs index b6a676b..43c5b4c 100644 --- a/SanShared/IProjekt.cs +++ b/SanShared/IProjekt.cs @@ -1,13 +1,7 @@ namespace SanShared { - /// - /// - /// public interface IProjekt { - /// - /// - /// IAuftraggeber Auftraggeber { get; set; } } } \ No newline at end of file diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj index dc07dee..838f08b 100644 --- a/SanShared/SanShared.csproj +++ b/SanShared/SanShared.csproj @@ -21,7 +21,8 @@ DEBUG;TRACE prompt 4 - bin\Debug\SanShared.xml + + pdbonly diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 4c34250..466de40 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -22,7 +22,8 @@ TRACE;DEBUG;LAPTOP prompt 4 - bin\Debug\SanSystem.xml + + AnyCPU @@ -130,6 +131,12 @@ frmExceptionWindow.cs + + Form + + + frmImprägnierBerichtEdit.cs + Form @@ -225,6 +232,9 @@ frmExceptionWindow.cs + + frmImprägnierBerichtEdit.cs + frmKalibrierungFestlegung.cs diff --git a/SanSystem/frmImprägnierBerichtEdit.Designer.cs b/SanSystem/frmImprägnierBerichtEdit.Designer.cs new file mode 100644 index 0000000..ebf9762 --- /dev/null +++ b/SanSystem/frmImprägnierBerichtEdit.Designer.cs @@ -0,0 +1,420 @@ +namespace SanSystem +{ + partial class frmImprägnierBerichtEdit + { + /// + /// 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.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label8 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.label10 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); + this.textBox4 = new System.Windows.Forms.TextBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); + this.textBox6 = new System.Windows.Forms.TextBox(); + this.textBox7 = new System.Windows.Forms.TextBox(); + this.textBox8 = new System.Windows.Forms.TextBox(); + this.textBox9 = new System.Windows.Forms.TextBox(); + this.textBox10 = new System.Windows.Forms.TextBox(); + this.textBox11 = new System.Windows.Forms.TextBox(); + this.textBox12 = new System.Windows.Forms.TextBox(); + this.textBox13 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + 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(131, 25); + this.label1.TabIndex = 0; + this.label1.Text = "Imprägnier-Nr"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(14, 45); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(85, 25); + this.label2.TabIndex = 1; + this.label2.Text = "Vakuum"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(14, 81); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(136, 25); + this.label3.TabIndex = 2; + this.label3.Text = "Schlauch - Nr."; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(14, 117); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(111, 25); + this.label4.TabIndex = 3; + this.label4.Text = "Wanddicke"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(14, 153); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(149, 25); + this.label5.TabIndex = 4; + this.label5.Text = "Walzenabstand"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(11, 31); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(46, 25); + this.label6.TabIndex = 5; + this.label6.Text = "Typ"; + // + // 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(11, 68); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(113, 25); + this.label7.TabIndex = 6; + this.label7.Text = "Harzmenge"; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.textBox7); + this.groupBox1.Controls.Add(this.textBox12); + this.groupBox1.Controls.Add(this.textBox6); + this.groupBox1.Controls.Add(this.label6); + this.groupBox1.Controls.Add(this.label7); + this.groupBox1.Controls.Add(this.label12); + this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.groupBox1.Location = new System.Drawing.Point(23, 186); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(411, 203); + this.groupBox1.TabIndex = 7; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Mischung"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.textBox9); + this.groupBox2.Controls.Add(this.textBox8); + this.groupBox2.Controls.Add(this.label9); + this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.groupBox2.Location = new System.Drawing.Point(460, 9); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(315, 203); + this.groupBox2.TabIndex = 8; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Imprägnier Anfang"; + // + // 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(15, 44); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(69, 25); + this.label8.TabIndex = 0; + this.label8.Text = "Datum"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label9.Location = new System.Drawing.Point(15, 79); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(73, 25); + this.label9.TabIndex = 1; + this.label9.Text = "Uhrzeit"; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.textBox11); + this.groupBox3.Controls.Add(this.textBox10); + this.groupBox3.Controls.Add(this.label10); + this.groupBox3.Controls.Add(this.label11); + this.groupBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.groupBox3.Location = new System.Drawing.Point(460, 218); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(315, 203); + this.groupBox3.TabIndex = 9; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Imprägnier Ende"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label10.Location = new System.Drawing.Point(6, 67); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(73, 25); + this.label10.TabIndex = 1; + this.label10.Text = "Uhrzeit"; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label11.Location = new System.Drawing.Point(6, 33); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(69, 25); + this.label11.TabIndex = 0; + this.label11.Text = "Datum"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(11, 104); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(159, 25); + this.label12.TabIndex = 10; + this.label12.Text = "Harz Temperatur"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label13.Location = new System.Drawing.Point(14, 396); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(90, 25); + this.label13.TabIndex = 11; + this.label13.Text = "Bediener"; + // + // textBox1 + // + this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox1.Location = new System.Drawing.Point(215, 6); + this.textBox1.Name = "textBox1"; + this.textBox1.Size = new System.Drawing.Size(219, 30); + this.textBox1.TabIndex = 12; + // + // textBox2 + // + this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox2.Location = new System.Drawing.Point(215, 42); + this.textBox2.Name = "textBox2"; + this.textBox2.Size = new System.Drawing.Size(219, 30); + this.textBox2.TabIndex = 13; + // + // textBox3 + // + this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox3.Location = new System.Drawing.Point(215, 78); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(219, 30); + this.textBox3.TabIndex = 14; + // + // textBox4 + // + this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox4.Location = new System.Drawing.Point(215, 114); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(219, 30); + this.textBox4.TabIndex = 15; + // + // textBox5 + // + this.textBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox5.Location = new System.Drawing.Point(215, 150); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(219, 30); + this.textBox5.TabIndex = 16; + // + // textBox6 + // + this.textBox6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox6.Location = new System.Drawing.Point(192, 29); + this.textBox6.Name = "textBox6"; + this.textBox6.Size = new System.Drawing.Size(150, 30); + this.textBox6.TabIndex = 7; + // + // textBox7 + // + this.textBox7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox7.Location = new System.Drawing.Point(192, 65); + this.textBox7.Name = "textBox7"; + this.textBox7.Size = new System.Drawing.Size(150, 30); + this.textBox7.TabIndex = 8; + // + // textBox8 + // + this.textBox8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox8.Location = new System.Drawing.Point(117, 43); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(192, 30); + this.textBox8.TabIndex = 2; + // + // textBox9 + // + this.textBox9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox9.Location = new System.Drawing.Point(117, 79); + this.textBox9.Name = "textBox9"; + this.textBox9.Size = new System.Drawing.Size(192, 30); + this.textBox9.TabIndex = 3; + // + // textBox10 + // + this.textBox10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox10.Location = new System.Drawing.Point(117, 28); + this.textBox10.Name = "textBox10"; + this.textBox10.Size = new System.Drawing.Size(192, 30); + this.textBox10.TabIndex = 2; + // + // textBox11 + // + this.textBox11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox11.Location = new System.Drawing.Point(117, 64); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(192, 30); + this.textBox11.TabIndex = 3; + // + // textBox12 + // + this.textBox12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox12.Location = new System.Drawing.Point(192, 101); + this.textBox12.Name = "textBox12"; + this.textBox12.Size = new System.Drawing.Size(150, 30); + this.textBox12.TabIndex = 17; + // + // textBox13 + // + this.textBox13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox13.Location = new System.Drawing.Point(215, 396); + this.textBox13.Name = "textBox13"; + this.textBox13.Size = new System.Drawing.Size(219, 30); + this.textBox13.TabIndex = 18; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(827, 36); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(209, 384); + this.button1.TabIndex = 19; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + // + // frmImprägnierBerichtEdit + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1056, 468); + this.Controls.Add(this.button1); + this.Controls.Add(this.textBox13); + this.Controls.Add(this.textBox5); + this.Controls.Add(this.textBox4); + this.Controls.Add(this.textBox3); + this.Controls.Add(this.textBox2); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.label13); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this.groupBox1); + this.Controls.Add(this.label5); + this.Controls.Add(this.label4); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "frmImprägnierBerichtEdit"; + this.Text = "frmImprägnierBerichtEdit"; + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox textBox7; + private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.TextBox textBox9; + private System.Windows.Forms.TextBox textBox8; + private System.Windows.Forms.TextBox textBox11; + private System.Windows.Forms.TextBox textBox10; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox4; + private System.Windows.Forms.TextBox textBox5; + private System.Windows.Forms.TextBox textBox12; + private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.Button button1; + } +} \ No newline at end of file diff --git a/SanSystem/frmImprägnierBerichtEdit.cs b/SanSystem/frmImprägnierBerichtEdit.cs new file mode 100644 index 0000000..f15cf5c --- /dev/null +++ b/SanSystem/frmImprägnierBerichtEdit.cs @@ -0,0 +1,20 @@ +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 frmImprägnierBerichtEdit : Form + { + public frmImprägnierBerichtEdit() + { + InitializeComponent(); + } + } +} diff --git a/SanSystem/frmImprägnierBerichtEdit.resx b/SanSystem/frmImprägnierBerichtEdit.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/frmImprägnierBerichtEdit.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 From 3513ad5f44ca3b0f015e0b2dfe268d735b9c1b4d Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Thu, 10 Oct 2019 13:41:57 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Impr=C3=A4gnierungsbericht=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Renovation/AbstractImprägnier.cs | 1 + .../Renovation/WerkseitigImprägniert.cs | 3 +- SanSystem/SanSystem.csproj | 9 + .../frmImprägnierBerichtEdit.Designer.cs | 314 ++++++++++-------- SanSystem/frmImprägnierBerichtEdit.cs | 17 +- .../frmImprägnierBerichtList.Designer.cs | 73 ++++ SanSystem/frmImprägnierBerichtList.cs | 48 +++ SanSystem/frmImprägnierBerichtList.resx | 120 +++++++ SanSystem/frmMain.Designer.cs | 32 +- SanSystem/frmMain.cs | 6 + 10 files changed, 467 insertions(+), 156 deletions(-) create mode 100644 SanSystem/frmImprägnierBerichtList.Designer.cs create mode 100644 SanSystem/frmImprägnierBerichtList.cs create mode 100644 SanSystem/frmImprägnierBerichtList.resx diff --git a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs index 8ba084e..ed69894 100644 --- a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs +++ b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs @@ -26,5 +26,6 @@ namespace KlassenBIB public string Bediener { get; set; } public double HarzTemperatur { get; set; } public double Vakuum { get; set; } + public string HarzTyp { get; set; } } } diff --git a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs index 35fc620..32618c7 100644 --- a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs +++ b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs @@ -9,9 +9,8 @@ namespace KlassenBIB public class WerkseitigImprägniert : AbstractImprägnier { - public string Imprägniernummer { get; set; } public bool LagerungKorrekt { get; set; } - public int LängeCode { get; set; } + public string LängeCode { get; set; } } } diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index 466de40..b02c8b6 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -137,6 +137,12 @@ frmImprägnierBerichtEdit.cs + + Form + + + frmImprägnierBerichtList.cs + Form @@ -235,6 +241,9 @@ frmImprägnierBerichtEdit.cs + + frmImprägnierBerichtList.cs + frmKalibrierungFestlegung.cs diff --git a/SanSystem/frmImprägnierBerichtEdit.Designer.cs b/SanSystem/frmImprägnierBerichtEdit.Designer.cs index ebf9762..182bc51 100644 --- a/SanSystem/frmImprägnierBerichtEdit.Designer.cs +++ b/SanSystem/frmImprägnierBerichtEdit.Designer.cs @@ -36,28 +36,30 @@ this.label6 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.txt_harzmenge = new System.Windows.Forms.TextBox(); + this.txt_harzTemperatur = new System.Windows.Forms.TextBox(); + this.txt_mischungtyp = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label8 = new System.Windows.Forms.Label(); + this.textBox9 = new System.Windows.Forms.TextBox(); + this.textBox8 = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.textBox11 = new System.Windows.Forms.TextBox(); + this.textBox10 = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox4 = new System.Windows.Forms.TextBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); - this.textBox6 = new System.Windows.Forms.TextBox(); - this.textBox7 = new System.Windows.Forms.TextBox(); - this.textBox8 = new System.Windows.Forms.TextBox(); - this.textBox9 = new System.Windows.Forms.TextBox(); - this.textBox10 = new System.Windows.Forms.TextBox(); - this.textBox11 = new System.Windows.Forms.TextBox(); - this.textBox12 = new System.Windows.Forms.TextBox(); - this.textBox13 = new System.Windows.Forms.TextBox(); + this.txt_imprägniernr = new System.Windows.Forms.TextBox(); + this.txt_vakuum = new System.Windows.Forms.TextBox(); + this.txt_schlauchnummer = new System.Windows.Forms.TextBox(); + this.txt_wanddicke = new System.Windows.Forms.TextBox(); + this.txt_walzenabstand = new System.Windows.Forms.TextBox(); + this.txt_bediener = new System.Windows.Forms.TextBox(); this.button1 = new System.Windows.Forms.Button(); + this.label14 = new System.Windows.Forms.Label(); + this.txt_laengeCode = new System.Windows.Forms.TextBox(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -135,9 +137,9 @@ // // groupBox1 // - this.groupBox1.Controls.Add(this.textBox7); - this.groupBox1.Controls.Add(this.textBox12); - this.groupBox1.Controls.Add(this.textBox6); + this.groupBox1.Controls.Add(this.txt_harzmenge); + this.groupBox1.Controls.Add(this.txt_harzTemperatur); + this.groupBox1.Controls.Add(this.txt_mischungtyp); this.groupBox1.Controls.Add(this.label6); this.groupBox1.Controls.Add(this.label7); this.groupBox1.Controls.Add(this.label12); @@ -149,6 +151,40 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Mischung"; // + // txt_harzmenge + // + this.txt_harzmenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_harzmenge.Location = new System.Drawing.Point(192, 65); + this.txt_harzmenge.Name = "txt_harzmenge"; + this.txt_harzmenge.Size = new System.Drawing.Size(150, 30); + this.txt_harzmenge.TabIndex = 8; + // + // txt_harzTemperatur + // + this.txt_harzTemperatur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_harzTemperatur.Location = new System.Drawing.Point(192, 101); + this.txt_harzTemperatur.Name = "txt_harzTemperatur"; + this.txt_harzTemperatur.Size = new System.Drawing.Size(150, 30); + this.txt_harzTemperatur.TabIndex = 17; + // + // txt_mischungtyp + // + this.txt_mischungtyp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_mischungtyp.Location = new System.Drawing.Point(192, 29); + this.txt_mischungtyp.Name = "txt_mischungtyp"; + this.txt_mischungtyp.Size = new System.Drawing.Size(150, 30); + this.txt_mischungtyp.TabIndex = 7; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label12.Location = new System.Drawing.Point(11, 104); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(159, 25); + this.label12.TabIndex = 10; + this.label12.Text = "Harz Temperatur"; + // // groupBox2 // this.groupBox2.Controls.Add(this.textBox9); @@ -163,15 +199,21 @@ this.groupBox2.TabStop = false; this.groupBox2.Text = "Imprägnier Anfang"; // - // label8 + // textBox9 // - 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(15, 44); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(69, 25); - this.label8.TabIndex = 0; - this.label8.Text = "Datum"; + this.textBox9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox9.Location = new System.Drawing.Point(117, 79); + this.textBox9.Name = "textBox9"; + this.textBox9.Size = new System.Drawing.Size(192, 30); + this.textBox9.TabIndex = 3; + // + // textBox8 + // + this.textBox8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox8.Location = new System.Drawing.Point(117, 43); + this.textBox8.Name = "textBox8"; + this.textBox8.Size = new System.Drawing.Size(192, 30); + this.textBox8.TabIndex = 2; // // label9 // @@ -183,6 +225,16 @@ this.label9.TabIndex = 1; this.label9.Text = "Uhrzeit"; // + // 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(15, 44); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(69, 25); + this.label8.TabIndex = 0; + this.label8.Text = "Datum"; + // // groupBox3 // this.groupBox3.Controls.Add(this.textBox11); @@ -197,6 +249,22 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "Imprägnier Ende"; // + // textBox11 + // + this.textBox11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox11.Location = new System.Drawing.Point(117, 64); + this.textBox11.Name = "textBox11"; + this.textBox11.Size = new System.Drawing.Size(192, 30); + this.textBox11.TabIndex = 3; + // + // textBox10 + // + this.textBox10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox10.Location = new System.Drawing.Point(117, 28); + this.textBox10.Name = "textBox10"; + this.textBox10.Size = new System.Drawing.Size(192, 30); + this.textBox10.TabIndex = 2; + // // label10 // this.label10.AutoSize = true; @@ -217,129 +285,63 @@ this.label11.TabIndex = 0; this.label11.Text = "Datum"; // - // label12 - // - this.label12.AutoSize = true; - this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(11, 104); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(159, 25); - this.label12.TabIndex = 10; - this.label12.Text = "Harz Temperatur"; - // // label13 // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label13.Location = new System.Drawing.Point(14, 396); + this.label13.Location = new System.Drawing.Point(14, 458); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(90, 25); this.label13.TabIndex = 11; this.label13.Text = "Bediener"; // - // textBox1 + // txt_imprägniernr // - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.Location = new System.Drawing.Point(215, 6); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(219, 30); - this.textBox1.TabIndex = 12; + this.txt_imprägniernr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_imprägniernr.Location = new System.Drawing.Point(215, 6); + this.txt_imprägniernr.Name = "txt_imprägniernr"; + this.txt_imprägniernr.Size = new System.Drawing.Size(219, 30); + this.txt_imprägniernr.TabIndex = 12; // - // textBox2 + // txt_vakuum // - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.Location = new System.Drawing.Point(215, 42); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(219, 30); - this.textBox2.TabIndex = 13; + this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_vakuum.Location = new System.Drawing.Point(215, 42); + this.txt_vakuum.Name = "txt_vakuum"; + this.txt_vakuum.Size = new System.Drawing.Size(219, 30); + this.txt_vakuum.TabIndex = 13; // - // textBox3 + // txt_schlauchnummer // - this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox3.Location = new System.Drawing.Point(215, 78); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(219, 30); - this.textBox3.TabIndex = 14; + this.txt_schlauchnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_schlauchnummer.Location = new System.Drawing.Point(215, 78); + this.txt_schlauchnummer.Name = "txt_schlauchnummer"; + this.txt_schlauchnummer.Size = new System.Drawing.Size(219, 30); + this.txt_schlauchnummer.TabIndex = 14; // - // textBox4 + // txt_wanddicke // - this.textBox4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox4.Location = new System.Drawing.Point(215, 114); - this.textBox4.Name = "textBox4"; - this.textBox4.Size = new System.Drawing.Size(219, 30); - this.textBox4.TabIndex = 15; + this.txt_wanddicke.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_wanddicke.Location = new System.Drawing.Point(215, 114); + this.txt_wanddicke.Name = "txt_wanddicke"; + this.txt_wanddicke.Size = new System.Drawing.Size(219, 30); + this.txt_wanddicke.TabIndex = 15; // - // textBox5 + // txt_walzenabstand // - this.textBox5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox5.Location = new System.Drawing.Point(215, 150); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(219, 30); - this.textBox5.TabIndex = 16; + this.txt_walzenabstand.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_walzenabstand.Location = new System.Drawing.Point(215, 150); + this.txt_walzenabstand.Name = "txt_walzenabstand"; + this.txt_walzenabstand.Size = new System.Drawing.Size(219, 30); + this.txt_walzenabstand.TabIndex = 16; // - // textBox6 + // txt_bediener // - this.textBox6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox6.Location = new System.Drawing.Point(192, 29); - this.textBox6.Name = "textBox6"; - this.textBox6.Size = new System.Drawing.Size(150, 30); - this.textBox6.TabIndex = 7; - // - // textBox7 - // - this.textBox7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox7.Location = new System.Drawing.Point(192, 65); - this.textBox7.Name = "textBox7"; - this.textBox7.Size = new System.Drawing.Size(150, 30); - this.textBox7.TabIndex = 8; - // - // textBox8 - // - this.textBox8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox8.Location = new System.Drawing.Point(117, 43); - this.textBox8.Name = "textBox8"; - this.textBox8.Size = new System.Drawing.Size(192, 30); - this.textBox8.TabIndex = 2; - // - // textBox9 - // - this.textBox9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox9.Location = new System.Drawing.Point(117, 79); - this.textBox9.Name = "textBox9"; - this.textBox9.Size = new System.Drawing.Size(192, 30); - this.textBox9.TabIndex = 3; - // - // textBox10 - // - this.textBox10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox10.Location = new System.Drawing.Point(117, 28); - this.textBox10.Name = "textBox10"; - this.textBox10.Size = new System.Drawing.Size(192, 30); - this.textBox10.TabIndex = 2; - // - // textBox11 - // - this.textBox11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox11.Location = new System.Drawing.Point(117, 64); - this.textBox11.Name = "textBox11"; - this.textBox11.Size = new System.Drawing.Size(192, 30); - this.textBox11.TabIndex = 3; - // - // textBox12 - // - this.textBox12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox12.Location = new System.Drawing.Point(192, 101); - this.textBox12.Name = "textBox12"; - this.textBox12.Size = new System.Drawing.Size(150, 30); - this.textBox12.TabIndex = 17; - // - // textBox13 - // - this.textBox13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox13.Location = new System.Drawing.Point(215, 396); - this.textBox13.Name = "textBox13"; - this.textBox13.Size = new System.Drawing.Size(219, 30); - this.textBox13.TabIndex = 18; + this.txt_bediener.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_bediener.Location = new System.Drawing.Point(215, 458); + this.txt_bediener.Name = "txt_bediener"; + this.txt_bediener.Size = new System.Drawing.Size(219, 30); + this.txt_bediener.TabIndex = 18; // // button1 // @@ -350,18 +352,38 @@ this.button1.Text = "button1"; this.button1.UseVisualStyleBackColor = true; // + // label14 + // + this.label14.AutoSize = true; + this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label14.Location = new System.Drawing.Point(14, 411); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(122, 25); + this.label14.TabIndex = 20; + this.label14.Text = "Länge-Code"; + // + // txt_laengeCode + // + this.txt_laengeCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_laengeCode.Location = new System.Drawing.Point(215, 411); + this.txt_laengeCode.Name = "txt_laengeCode"; + this.txt_laengeCode.Size = new System.Drawing.Size(219, 30); + this.txt_laengeCode.TabIndex = 21; + // // frmImprägnierBerichtEdit // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1056, 468); + this.ClientSize = new System.Drawing.Size(1056, 558); + this.Controls.Add(this.txt_laengeCode); + this.Controls.Add(this.label14); this.Controls.Add(this.button1); - this.Controls.Add(this.textBox13); - this.Controls.Add(this.textBox5); - this.Controls.Add(this.textBox4); - this.Controls.Add(this.textBox3); - this.Controls.Add(this.textBox2); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.txt_bediener); + this.Controls.Add(this.txt_walzenabstand); + this.Controls.Add(this.txt_wanddicke); + this.Controls.Add(this.txt_schlauchnummer); + this.Controls.Add(this.txt_vakuum); + this.Controls.Add(this.txt_imprägniernr); this.Controls.Add(this.label13); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); @@ -402,19 +424,21 @@ private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; - private System.Windows.Forms.TextBox textBox7; - private System.Windows.Forms.TextBox textBox6; + private System.Windows.Forms.TextBox txt_harzmenge; + private System.Windows.Forms.TextBox txt_mischungtyp; private System.Windows.Forms.TextBox textBox9; private System.Windows.Forms.TextBox textBox8; private System.Windows.Forms.TextBox textBox11; private System.Windows.Forms.TextBox textBox10; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox4; - private System.Windows.Forms.TextBox textBox5; - private System.Windows.Forms.TextBox textBox12; - private System.Windows.Forms.TextBox textBox13; + private System.Windows.Forms.TextBox txt_imprägniernr; + private System.Windows.Forms.TextBox txt_vakuum; + private System.Windows.Forms.TextBox txt_schlauchnummer; + private System.Windows.Forms.TextBox txt_wanddicke; + private System.Windows.Forms.TextBox txt_walzenabstand; + private System.Windows.Forms.TextBox txt_harzTemperatur; + private System.Windows.Forms.TextBox txt_bediener; private System.Windows.Forms.Button button1; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox txt_laengeCode; } } \ No newline at end of file diff --git a/SanSystem/frmImprägnierBerichtEdit.cs b/SanSystem/frmImprägnierBerichtEdit.cs index f15cf5c..a89bc31 100644 --- a/SanSystem/frmImprägnierBerichtEdit.cs +++ b/SanSystem/frmImprägnierBerichtEdit.cs @@ -1,4 +1,5 @@ -using System; +using KlassenBIB; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +13,21 @@ namespace SanSystem { public partial class frmImprägnierBerichtEdit : Form { - public frmImprägnierBerichtEdit() + WerkseitigImprägniert werkseitigImprägniert = null; + public frmImprägnierBerichtEdit(WerkseitigImprägniert werkseitigImprägniert) { InitializeComponent(); + this.werkseitigImprägniert = werkseitigImprägniert; + + txt_imprägniernr.DataBindings.Add("Text", werkseitigImprägniert, "Imprägniernummer"); + txt_laengeCode.DataBindings.Add("Text", werkseitigImprägniert, "LängeCode"); + txt_schlauchnummer.DataBindings.Add("Text", werkseitigImprägniert, "Schlauchnummer"); + txt_wanddicke.DataBindings.Add("Text", werkseitigImprägniert, "Wanddicke"); + txt_harzmenge.DataBindings.Add("Text", werkseitigImprägniert, "Harzmenge"); + txt_harzTemperatur.DataBindings.Add("Text", werkseitigImprägniert, "HarzTemperatur"); + txt_bediener.DataBindings.Add("Text", werkseitigImprägniert, "Bediener"); + txt_mischungtyp.DataBindings.Add("Text", werkseitigImprägniert, "HarzTyp"); + } } } diff --git a/SanSystem/frmImprägnierBerichtList.Designer.cs b/SanSystem/frmImprägnierBerichtList.Designer.cs new file mode 100644 index 0000000..30a8c3c --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.Designer.cs @@ -0,0 +1,73 @@ +namespace SanSystem +{ + partial class frmImprägnierBerichtList + { + /// + /// 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.lst_imprägnierBerichtNr = new System.Windows.Forms.ListBox(); + this.btn_add = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // lst_imprägnierBerichtNr + // + this.lst_imprägnierBerichtNr.FormattingEnabled = true; + this.lst_imprägnierBerichtNr.ItemHeight = 16; + this.lst_imprägnierBerichtNr.Location = new System.Drawing.Point(12, 12); + this.lst_imprägnierBerichtNr.Name = "lst_imprägnierBerichtNr"; + this.lst_imprägnierBerichtNr.Size = new System.Drawing.Size(700, 276); + this.lst_imprägnierBerichtNr.TabIndex = 0; + this.lst_imprägnierBerichtNr.DoubleClick += new System.EventHandler(this.Lst_imprägnierBerichtNr_DoubleClick); + // + // btn_add + // + this.btn_add.Location = new System.Drawing.Point(60, 315); + this.btn_add.Name = "btn_add"; + this.btn_add.Size = new System.Drawing.Size(296, 74); + this.btn_add.TabIndex = 1; + this.btn_add.Text = "Neue Hinzufügen"; + this.btn_add.UseVisualStyleBackColor = true; + this.btn_add.Click += new System.EventHandler(this.Btn_add_Click); + // + // frmImprägnierBerichtList + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.btn_add); + this.Controls.Add(this.lst_imprägnierBerichtNr); + this.Name = "frmImprägnierBerichtList"; + this.Text = "frmImprägnierBerichtList"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.ListBox lst_imprägnierBerichtNr; + private System.Windows.Forms.Button btn_add; + } +} \ No newline at end of file diff --git a/SanSystem/frmImprägnierBerichtList.cs b/SanSystem/frmImprägnierBerichtList.cs new file mode 100644 index 0000000..c09044e --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.cs @@ -0,0 +1,48 @@ +using KlassenBIB; +using KlassenBIB.Collections; +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 frmImprägnierBerichtList : Form + { + public frmImprägnierBerichtList() + { + InitializeComponent(); + lst_imprägnierBerichtNr.DataSource = null; + List imprägnierberichte = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Select(x => x.Imprägniernummer).ToList(); + lst_imprägnierBerichtNr.DataSource = imprägnierberichte; + } + + private void Btn_add_Click(object sender, EventArgs e) + { + WerkseitigImprägniert werkseitigImprägnierts = new WerkseitigImprägniert(); + Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Add(werkseitigImprägnierts); + } + + private void Lst_imprägnierBerichtNr_DoubleClick(object sender, EventArgs e) + { + if ((sender as ListBox).SelectedItem == null) return; + string selectedImprägnierung = (sender as ListBox).SelectedItem.ToString(); + if (selectedImprägnierung == null) return; + WerkseitigImprägniert imprägnierung = Database.Datenbank.Instance.MainDatenbank.ImprägnierBerichtListe.Find(x => x.Imprägniernummer.Equals(selectedImprägnierung)); + if (imprägnierung == null) return; + + frmImprägnierBerichtEdit frmImprägnierBerichtEdit = new frmImprägnierBerichtEdit(imprägnierung); + frmImprägnierBerichtEdit.ShowDialog(); + /*frmObjekteList frmObjekteList = new frmObjekteList(selectedStreetName); + frmObjekteList.MdiParent = this.MdiParent; + //frmObjekteList.FormClosed += FrmObjekt_FormClosed; + frmObjekteList.Show(); + */ + } + } +} diff --git a/SanSystem/frmImprägnierBerichtList.resx b/SanSystem/frmImprägnierBerichtList.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/frmImprägnierBerichtList.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/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index 057c032..4fd7d6c 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -39,9 +39,11 @@ this.auftraggeberToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel(); - this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.imprägnierberichteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -54,7 +56,9 @@ this.projektToolStripMenuItem, this.speichernToolStripMenuItem, this.massenstatistikToolStripMenuItem, - this.projektordnerÖffnenToolStripMenuItem}); + this.projektordnerÖffnenToolStripMenuItem, + this.toolStripMenuItem1, + this.imprägnierberichteToolStripMenuItem}); this.mainmenu.Location = new System.Drawing.Point(0, 0); this.mainmenu.Name = "mainmenu"; this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); @@ -115,6 +119,18 @@ this.massenstatistikToolStripMenuItem.Text = "Massenstatistik"; this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click); // + // projektordnerÖffnenToolStripMenuItem + // + this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem"; + this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32); + this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen"; + this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(14, 32); + // // statusStrip1 // this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); @@ -133,12 +149,12 @@ this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20); this.toolStripStatus_projekt_Label.Text = "Projekt"; // - // projektordnerÖffnenToolStripMenuItem + // imprägnierberichteToolStripMenuItem // - this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem"; - this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32); - this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen"; - this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click); + this.imprägnierberichteToolStripMenuItem.Name = "imprägnierberichteToolStripMenuItem"; + this.imprägnierberichteToolStripMenuItem.Size = new System.Drawing.Size(193, 32); + this.imprägnierberichteToolStripMenuItem.Text = "Imprägnierberichte"; + this.imprägnierberichteToolStripMenuItem.Click += new System.EventHandler(this.ImprägnierberichteToolStripMenuItem_Click); // // frmMain // @@ -176,6 +192,8 @@ private System.Windows.Forms.ToolStripMenuItem stammdatenImportierenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem auftraggeberToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem projektordnerÖffnenToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem imprägnierberichteToolStripMenuItem; } } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 770d4f9..3bd6276 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -187,5 +187,11 @@ namespace SanSystem MessageBox.Show("Es ist ein fehler aufgetreten beim öffnen vom Baustellenordner " + ex.Message); } } + + private void ImprägnierberichteToolStripMenuItem_Click(object sender, EventArgs e) + { + frmImprägnierBerichtList frmImprägnierBerichtList = new frmImprägnierBerichtList(); + frmImprägnierBerichtList.ShowDialog(); + } } }