Merge remote-tracking branch 'origin/master'

This commit is contained in:
Husky
2019-10-10 16:43:38 +02:00
49 changed files with 1092 additions and 435 deletions

View File

@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class AbwasserTechnischeAnlageCollection : List<Inspektionsobjekt>
{
}
}

View File

@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class AusgefuehrteTaetigkeitenCollection : List<AusgefuehrteTaetigkeiten>
{
}
}

View File

@@ -4,12 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
namespace KlassenBIB.Collections
{
/// <summary>
///
/// </summary>
public class BilderCollection : List<SavedBilder>
public class AbwasserTechnischeAnlage : List<Inspektionsobjekt>
{
}
}

View File

@@ -5,12 +5,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
namespace KlassenBIB.Collections
{
/// <summary>
///
/// </summary>
public class AuftraggeberListCollection : List<IAuftraggeber>
public class AuftraggeberList : List<IAuftraggeber>
{
}
}

View File

@@ -4,12 +4,9 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
namespace KlassenBIB.Collections
{
/// <summary>
///
/// </summary>
public class SanierungCollection : List<Sanierung>
public class AusgefuehrteTaetigkeiten : List<KlassenBIB.AusgefuehrteTaetigkeiten>
{
}
}

View File

@@ -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<SavedBilder>
{
}
}

View File

@@ -6,9 +6,6 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class ChargeNummerCollection : List<StructChargeNummern>
{
}

View File

@@ -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<WerkseitigImprägniert>
{
}
}

View File

@@ -5,13 +5,10 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
namespace KlassenBIB.Collections
{
/// <summary>
///
/// </summary>
[Browsable(false)]
public class InspektionskuerzelnCollection : List<Inspektionskuerzeln>
public class Inspektionskuerzeln : List<KlassenBIB.Inspektionskuerzeln>
{
}
}

View File

@@ -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<LeistungsVerzeichnis>
{
}
}

View File

@@ -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<KlassenBIB.Sanierung>
{
}
}

View File

@@ -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<KlassenBIB.Sanierungskonzept>
{
}
}

View File

@@ -12,57 +12,31 @@ namespace KlassenBIB
/// </summary>
public class Inspektionskuerzeln
{
/// <summary>
///
/// </summary>
public decimal Station { get; set; }
/// <summary>
///
/// </summary>
public string Hauptkode { get; set; }
/// <summary>
///
/// </summary>
public string Charakterisierung1 { get; set; }
/// <summary>
///
/// </summary>
public string Charakterisierung2 { get; set; }
/// <summary>
///
/// </summary>
public uint Quantifizierung1 { get; set; }
/// <summary>
///
/// </summary>
public uint Quantifizierung2 { get; set; }
/// <summary>
///
/// </summary>
public uint LageAmUmfangStart { get; set; }
/// <summary>
///
/// </summary>
public uint LageAmUmfangEnde { get; set; }
/// <summary>
///
/// </summary>
public bool ImVerbindung { get; set; }
/// <summary>
///
/// </summary>
public string FotoReferenz { get; set; }
/// <summary>
///
/// </summary>
public string VideoReferenz { get; set; }
/// <summary>
///
/// </summary>
public string Anmerkung { get; set; }
/// <summary>
///
/// </summary>
public SanierungskonzeptCollection Sanierungskonzepts { get; set; }
public Collections.Sanierungskonzept Sanierungskonzepts { get; set; }
}
}

View File

@@ -14,94 +14,52 @@ namespace KlassenBIB
public class Inspektionsobjekt
{
private string strasseName = "none";
/// <summary>
///
/// </summary>
public bool GeschlossenesEnde { get; set; }
/// <summary>
///
/// </summary>
public string StrasseName { get => strasseName; set => strasseName = value; }
/// <summary>
///
/// </summary>
public string OrtName { get; set; }
/// <summary>
///
/// </summary>
public string Hausnummer { get; set; }
/// <summary>
///
/// </summary>
public string Projektnummer { get; set; }
/// <summary>
///
/// </summary>
public string Objektbezeichnung { get; set; }
/// <summary>
///
/// </summary>
public string VonPunkt { get; set; }
/// <summary>
///
/// </summary>
public string BisPunkt { get; set; }
/// <summary>
///
/// </summary>
public string RohrMaterial { get; set; }
/// <summary>
///
/// </summary>
public uint Kanalrohrweite { get; set; }
/// <summary>
///
/// </summary>
public double Haltungslaenge { get; set; }
/// <summary>
///
/// </summary>
public double Schachtlaenge { get; set; }
/// <summary>
///
/// </summary>
public DateTime HaltungGemessen { get; set; }
/// <summary>
///
/// </summary>
public InspektionskuerzelnCollection Schadenskuerzeln { get; set; }
/// <summary>
///
/// </summary>
public Collections.Inspektionskuerzeln Schadenskuerzeln { get; set; }
public string Bemerkung { get; set; }
/// <summary>
///
/// </summary>
public SanierungCollection Sanierung { get;set; }
/// <summary>
///
/// </summary>
public AusgefuehrteTaetigkeitenCollection AusgefuehrteTaetigkeiten { get; set; }
/// <summary>
/// In welcher Richtung wurde Inspiziert
/// </summary>
public Collections.Sanierung Sanierung { get;set; }
public Collections.AusgefuehrteTaetigkeiten AusgefuehrteTaetigkeiten { get; set; }
public string Inspektionsrichtung { get; set; }
/// <summary>
///
/// </summary>
public string Sanierungsnummer { get; set; }
/// <summary>
///
/// </summary>
public Guid Guid { get; set; }
/// <summary>
///
/// </summary>
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;
}
}

View File

@@ -44,42 +44,43 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AbstractImprägnier.cs" />
<Compile Include="AbwasserTechnischeAnlageCollection.cs" />
<Compile Include="AnlagenType.cs" />
<Compile Include="Collections\ImprägnierBericht.cs" />
<Compile Include="Sanierung\Renovation\AbstractImprägnier.cs" />
<Compile Include="Collections\AbwasserTechnischeAnlage.cs" />
<Compile Include="Sanierung\Renovation\UVAnlagenTyp.cs" />
<Compile Include="Auftraggeber.cs" />
<Compile Include="AuftraggeberListCollection.cs" />
<Compile Include="Collections\AuftraggeberList.cs" />
<Compile Include="AusgefuehrteTaetigkeiten.cs" />
<Compile Include="AusgefuehrteTaetigkeitenCollection.cs" />
<Compile Include="BilderCollection.cs" />
<Compile Include="ChargeNummerCollection.cs" />
<Compile Include="Hutprofil.cs" />
<Compile Include="Collections\AusgefuehrteTaetigkeiten.cs" />
<Compile Include="Collections\Bilder.cs" />
<Compile Include="Collections\ChargeNummer.cs" />
<Compile Include="Sanierung\Reparatur\Hutprofil.cs" />
<Compile Include="IImportedObjekte.cs" />
<Compile Include="ImprägnierungStrukture.cs" />
<Compile Include="InlinerSanierung.cs" />
<Compile Include="Kurzliner.cs" />
<Compile Include="Sanierung\Renovation\ImprägnierungStrukture.cs" />
<Compile Include="Sanierung\Renovation\InlinerSanierung.cs" />
<Compile Include="Sanierung\Reparatur\Kurzliner.cs" />
<Compile Include="LeistungsVerzeichnis.cs" />
<Compile Include="LeistungsverzeichnisCollection.cs" />
<Compile Include="Collections\Leistungsverzeichnis.cs" />
<Compile Include="Lieferschein.cs" />
<Compile Include="MainDataBase.cs" />
<Compile Include="Projekt.cs" />
<Compile Include="Inspektionskuerzeln.cs" />
<Compile Include="InspektionskuerzelnCollection.cs" />
<Compile Include="Collections\Inspektionskuerzeln.cs" />
<Compile Include="Inspektionsobjekt.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Quicklock.cs" />
<Compile Include="Reparatur.cs" />
<Compile Include="SanMitHarz.cs" />
<Compile Include="Sanieren.cs" />
<Compile Include="Sanierung.cs" />
<Compile Include="SanierungCollection.cs" />
<Compile Include="Sanierung\Reparatur\Quicklock.cs" />
<Compile Include="Sanierung\Reparatur.cs" />
<Compile Include="Sanierung\Reparatur\SanMitHarz.cs" />
<Compile Include="Sanierung\Renovation\AbstractSanieren.cs" />
<Compile Include="Sanierung\Sanierung.cs" />
<Compile Include="Collections\Sanierung.cs" />
<Compile Include="Sanierungskonzept.cs" />
<Compile Include="SanierungskonzeptCollection.cs" />
<Compile Include="Collections\Sanierungskonzept.cs" />
<Compile Include="SavedBilder.cs" />
<Compile Include="SchachtAnbindung.cs" />
<Compile Include="StructChargeNummern.cs" />
<Compile Include="VorOrtImprägnier.cs" />
<Compile Include="WerkseitigImprägniert.cs" />
<Compile Include="Sanierung\StructChargeNummern.cs" />
<Compile Include="Sanierung\Renovation\VorOrtImprägnier.cs" />
<Compile Include="Sanierung\Renovation\WerkseitigImprägniert.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CSVParser\CSVParser.csproj">

View File

@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class LeistungsverzeichnisCollection : List<LeistungsVerzeichnis>
{
}
}

View File

@@ -7,22 +7,15 @@ using System.Windows.Markup;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
[ContentProperty("AuftraggeberListe")]
public class MainDataBase
{
/// <summary>
///
/// </summary>
public AuftraggeberListCollection AuftraggeberListe { get; set; }
/// <summary>
///
/// </summary>
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();
}
}
}

View File

@@ -9,39 +9,21 @@ using System.Windows.Markup;
[assembly: XmlnsDefinition("http://schemas.cosysda.de/sanVerwaltung/xaml","KlassenBIB")]
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
[ContentProperty("Objekte")]
public class Projekt :IProjekt
{
/// <summary>
///
/// </summary>
public string Nummer { get; set; }
/// <summary>
///
/// </summary>
public string Ort { get; set; }
/// <summary>
///
/// </summary>
public IAuftraggeber Auftraggeber { get; set; }
/// <summary>
///
/// </summary>
public LeistungsverzeichnisCollection Leistungsverzeichnis { get; set; }
/// <summary>
///
/// </summary>
public AbwasserTechnischeAnlageCollection Objekte { get; set; }
public Collections.Leistungsverzeichnis Leistungsverzeichnis { get; set; }
public Collections.AbwasserTechnischeAnlage Objekte { get; set; }
/// <summary>
///
/// </summary>
public Projekt()
{
Objekte = new AbwasserTechnischeAnlageCollection();
Leistungsverzeichnis = new LeistungsverzeichnisCollection();
Objekte = new Collections.AbwasserTechnischeAnlage();
Leistungsverzeichnis = new Collections.Leistungsverzeichnis();
Auftraggeber = new Auftraggeber();
}
}

View File

@@ -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; }
}
}

View File

@@ -6,30 +6,18 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public abstract class Sanieren : Sanierung
public abstract class AbstractSanieren : Sanierung
{
DateTime datum = new DateTime();
bool fertig = false;
string verzeichnispfad;
/// <summary>
///
/// </summary>
#region getSeters
public string Besatzung { get; set; }
/// <summary>
///
/// </summary>
public DateTime Datum { get => datum; set => datum = value; }
/// <summary>
///
/// </summary>
public bool Fertig { get => fertig; set => fertig = value; }
/// <summary>
///
/// </summary>
public string Verzeichnispfad { get => verzeichnispfad; protected set => verzeichnispfad = value; }
#endregion
}
}

View File

@@ -6,18 +6,9 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class ImprägnierungStrukture
{
/// <summary>
///
/// </summary>
public DateTime Zeitstempel { get; set; }
/// <summary>
///
/// </summary>
public double Temperature { get; set; }
}
}

View File

@@ -14,7 +14,7 @@ namespace KlassenBIB
/// Inliner class
///
/// </summary>
public sealed class InlinerSanierung : Sanieren, IMakeProtokol
public sealed class InlinerSanierung : AbstractSanieren, IMakeProtokol
{
double kalibrierUnterdruck = -0.5;
double kalibierWalzenAbstand = 0.9;
@@ -35,18 +35,13 @@ namespace KlassenBIB
DateTime anfangKalibrierung;
DateTime endeKalibirierung;
/// <summary>
/// Gibt den kompletten Harzbedarf auf die Haltungslänge bezogen zurück
/// </summary>
public double GetGesamtHarzbedarf(double haltungslaenge)
{
return haltungslaenge * harzbedarf;
}
/// <summary>
///
/// </summary>
/// <param name="projektpfad"></param>
/// <returns></returns>
public override string CheckVerzeichnisse(string projektpfad)
{
string path = Path.Combine(projektpfad, PfadZurSan);
@@ -57,12 +52,7 @@ namespace KlassenBIB
return path;
}
/// <summary>
///
/// </summary>
/// <param name="destinationPath"></param>
/// <param name="projekt">Projekt</param>
/// <returns></returns>
public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt)
{
Hashtable grunddaten = new Hashtable()
@@ -157,30 +147,20 @@ namespace KlassenBIB
grunddaten["harz_type"] = HarzTyp;
return grunddaten;
}
/// <summary>
///
/// </summary>
public InlinerSanierung()
{
//datumKalibrierung = new DateTime();
Verzeichnispfad = "UVAnlage";
if (datumKalibrierung <= DateTime.MinValue || datumKalibrierung >= DateTime.MaxValue) datumKalibrierung = DateTime.Now;
}
/// <summary>
///
/// </summary>
public double KalibrierUnterdruck { get => kalibrierUnterdruck; set => kalibrierUnterdruck = value; }
/// <summary>
///
/// </summary>
public double KalibierWalzenAbstand { get => kalibierWalzenAbstand; set => kalibierWalzenAbstand = value; }
/// <summary>
///
/// </summary>
public double HarzKalibrierTemperatur { get => harzKalibrierTemperatur; set => harzKalibrierTemperatur = value; }
/// <summary>
///
/// </summary>
public DateTime DatumKalibrierung
{
get
@@ -192,65 +172,35 @@ namespace KlassenBIB
datumKalibrierung = value;
}
}
/// <summary>
///
/// </summary>
public string HarzChargenummer { get => harzChargenummer; set => harzChargenummer = value; }
/// <summary>
///
/// </summary>
public string LinerChargenummer { get => linerChargenummer; set => linerChargenummer = value; }
/// <summary>
///
/// </summary>
public double Harzbedarf { get => harzbedarf; set => harzbedarf = value; }
/// <summary>
///
/// </summary>
public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; }
/// <summary>
///
/// </summary>
public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; }
/// <summary>
///
/// </summary>
public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; }
/// <summary>
///
/// </summary>
public string HarzTyp { get => harzTyp; set => harzTyp = value; }
/// <summary>
///
/// </summary>
public string LinerTyp { get => linerTyp; set => linerTyp = value; }
/// <summary>
///
/// </summary>
public DateTime AnfangAushaertung { get => anfangAushaertung; set => anfangAushaertung = value; }
/// <summary>
///
/// </summary>
public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; }
/// <summary>
///
/// </summary>
public string Ort { get => ort; set => ort = value; }
/// <summary>
///
/// </summary>
public string Bediener { get => bediener; set => bediener = value; }
/// <summary>
///
/// </summary>
public DateTime AnfangKalibrierung { get => anfangKalibrierung; set => anfangKalibrierung = value; }
/// <summary>
///
/// </summary>
public DateTime EndeKalibirierung { get => endeKalibirierung; set => endeKalibirierung = value; }
/// <summary>
/// Preliner
/// </summary>
public bool Preliner { get => preliner; set => preliner = value; }
}
}

View File

@@ -3,7 +3,7 @@
/// <summary>
///
/// </summary>
public class AnlagenType
public class UVAnlagenTyp
{
/// <summary>
///

View File

@@ -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; }
}
}

View File

@@ -10,7 +10,7 @@ namespace KlassenBIB
/// <summary>
/// Abstrakte Klasse zur Darstellung einer Partielle Reparatur
/// </summary>
public abstract class Reparatur : Sanieren
public abstract class Reparatur : AbstractSanieren
{
decimal positionImKanal;
/// <summary>

View File

@@ -8,12 +8,6 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
//
// Zusammenfassung:
// Bietet die grundlegene Struktur für eine Sanierung
/// <summary>
///
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
[Browsable(false)]
public abstract class Sanierung : INotifyPropertyChanged
@@ -31,14 +25,9 @@ namespace KlassenBIB
DateTime hDReinigungDatum;
//DateTime sanierungsDatum;
Inspektionsobjekt inspektionsobjekt;
/// <summary>
///
/// </summary>
protected string pfadZurSan;
/// <summary>
///
/// </summary>
[Browsable(false)]
public Sanierung()
{
@@ -47,19 +36,11 @@ namespace KlassenBIB
}
/// <summary>
///
/// </summary>
/// <param name="projektpfad"></param>
/// <returns></returns>
public abstract string CheckVerzeichnisse(string projektpfad);
/// <summary>
///
/// </summary>
public Guid Guid { get => guid; set => guid = value; }
/// <summary>
///
/// </summary>
public double TempAusen
{
get => tempAusen;
@@ -73,60 +54,35 @@ namespace KlassenBIB
}
}
/// <summary>
///
/// </summary>
public double TempKanal { get => tempKanal; set => tempKanal = value; }
/// <summary>
///
/// </summary>
public string Wetter { get => wetter; set => wetter = value; }
/// <summary>
///
/// </summary>
public bool GenehmigungVorhanden { get => genehmigungVorhanden; set => genehmigungVorhanden = value; }
/// <summary>
///
/// </summary>
public bool WasserhaltungEingerichtet { get => wasserhaltungEingerichtet; set => wasserhaltungEingerichtet = value; }
/// <summary>
///
/// </summary>
public bool STVOAbsicherung { get => sTVOAbsicherung; set => sTVOAbsicherung = value; }
/// <summary>
///
/// </summary>
public bool HDReinigung { get => hDReinigung; set => hDReinigung = value; }
/// <summary>
///
/// </summary>
public DateTime HDReinigungDatum { get => hDReinigungDatum; set => hDReinigungDatum = value; }
/// <summary>
///
/// </summary>
public Inspektionsobjekt Inspektionsobjekt { get => inspektionsobjekt; set => inspektionsobjekt = value; }
/// <summary>
///
/// </summary>
protected string PfadZurSan {
get
{
return string.Format("{0}-{1}", Inspektionsobjekt.VonPunkt, Inspektionsobjekt.BisPunkt);
}
}
/// <summary>
///
/// </summary>
public bool VorbereitetMechanisch { get => vorbereitetMechanisch; set => vorbereitetMechanisch = value; }
/// <summary>
///
/// </summary>
public bool VorbereitetRoboter { get => vorbereitetRoboter; set => vorbereitetRoboter = value; }
//public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; }
/// <summary>
///
/// </summary>
public event PropertyChangedEventHandler PropertyChanged;
private void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{

View File

@@ -1,15 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class SanierungskonzeptCollection : List<Sanierungskonzept>
{
}
}

View File

@@ -10,10 +10,10 @@ namespace KlassenBIB
/// <summary>
///
/// </summary>
public class SchachtAnbindung : Sanieren
public class SchachtAnbindung : AbstractSanieren
{
string schachtNummer;
BilderCollection savedBilders;
Collections.Bilder savedBilders;
#region GettersSetters
/// <summary>
@@ -23,7 +23,7 @@ namespace KlassenBIB
/// <summary>
///
/// </summary>
public BilderCollection SavedBilders { get => savedBilders; set => savedBilders = value; }
public Collections.Bilder SavedBilders { get => savedBilders; set => savedBilders = value; }
#endregion
/// <summary>
///
@@ -31,7 +31,7 @@ namespace KlassenBIB
public SchachtAnbindung()
{
Verzeichnispfad = "Schachtanbindung";
SavedBilders = new BilderCollection();
SavedBilders = new Collections.Bilder();
}
/// <summary>

View File

@@ -1,13 +1,7 @@
namespace SanShared
{
/// <summary>
///
/// </summary>
public interface IProjekt
{
/// <summary>
///
/// </summary>
IAuftraggeber Auftraggeber { get; set; }
}
}

View File

@@ -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 &&

View File

@@ -22,7 +22,8 @@
<DefineConstants>TRACE;DEBUG;LAPTOP</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\SanSystem.xml</DocumentationFile>
<DocumentationFile>
</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -130,6 +131,18 @@
<Compile Include="frmExceptionWindow.Designer.cs">
<DependentUpon>frmExceptionWindow.cs</DependentUpon>
</Compile>
<Compile Include="frmImprägnierBerichtEdit.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmImprägnierBerichtEdit.Designer.cs">
<DependentUpon>frmImprägnierBerichtEdit.cs</DependentUpon>
</Compile>
<Compile Include="frmImprägnierBerichtList.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmImprägnierBerichtList.Designer.cs">
<DependentUpon>frmImprägnierBerichtList.cs</DependentUpon>
</Compile>
<Compile Include="frmKalibrierungFestlegung.cs">
<SubType>Form</SubType>
</Compile>
@@ -225,6 +238,12 @@
<EmbeddedResource Include="frmExceptionWindow.resx">
<DependentUpon>frmExceptionWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmImprägnierBerichtEdit.resx">
<DependentUpon>frmImprägnierBerichtEdit.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmImprägnierBerichtList.resx">
<DependentUpon>frmImprägnierBerichtList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmKalibrierungFestlegung.resx">
<DependentUpon>frmKalibrierungFestlegung.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1,444 @@
namespace SanSystem
{
partial class frmImprägnierBerichtEdit
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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.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.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.label13 = new System.Windows.Forms.Label();
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();
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.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);
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";
//
// 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);
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";
//
// 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;
//
// 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
//
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";
//
// 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);
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";
//
// 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;
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";
//
// 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, 458);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(90, 25);
this.label13.TabIndex = 11;
this.label13.Text = "Bediener";
//
// txt_imprägniernr
//
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;
//
// txt_vakuum
//
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;
//
// txt_schlauchnummer
//
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;
//
// txt_wanddicke
//
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;
//
// txt_walzenabstand
//
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;
//
// txt_bediener
//
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
//
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;
//
// 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, 558);
this.Controls.Add(this.txt_laengeCode);
this.Controls.Add(this.label14);
this.Controls.Add(this.button1);
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);
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 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 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;
}
}

View File

@@ -0,0 +1,33 @@
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 frmImprägnierBerichtEdit : Form
{
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");
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -0,0 +1,73 @@
namespace SanSystem
{
partial class frmImprägnierBerichtList
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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;
}
}

View File

@@ -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<string> 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();
*/
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -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;
}
}

View File

@@ -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();
}
}
}

View File

@@ -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);

View File

@@ -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++;
}

View File

@@ -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}

View File

@@ -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;