Es können jetzt von xml 2006 importiert werden

This commit is contained in:
Husky
2018-07-21 11:57:06 +02:00
parent ea3b8c564a
commit 20388f5603
42 changed files with 815 additions and 42 deletions

View File

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

View File

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

View File

@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
/// Interface zur Import von Daten
/// </summary>
public interface IImportedObjekte
{
/// <summary>
/// Angaben zur XMLDatei die importiert werden soll
/// </summary>
string XMLFile { get; set; }
/// <summary>
/// Angaben zur Projektnummern die eingetragen werden soll in die Objekte
/// </summary>
string Projektnummer { get; set; }
/// <summary>
/// Funktion der die Inspektionsobjekte übergibt
/// </summary>
/// <returns></returns>
List<Inspektionsobjekt> GetInspektionsobjekte();
}
}

View File

@@ -10,6 +10,10 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
/// Inliner class
///
/// </summary>
public sealed class InlinerSanierung : Sanieren, IMakeProtokol
{
double kalibrierUnterdruck = -0.5;

View File

@@ -6,18 +6,58 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </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; }
}
}

View File

@@ -7,6 +7,9 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
[Browsable(false)]
public class InspektionskuerzelnCollection : List<Inspektionskuerzeln>
{

View File

@@ -7,27 +7,76 @@ using System.Windows.Markup;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
[ContentProperty("Sanierung")]
public class Inspektionsobjekt
{
private string strasseName = "none";
/// <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; }
public InspektionskuerzelnCollection Schadenskuerzeln { get; private set; }
/// <summary>
///
/// </summary>
public InspektionskuerzelnCollection Schadenskuerzeln { get; set; }
/// <summary>
///
/// </summary>
public string Bemerkung { get; set; }
/// <summary>
///
/// </summary>
public SanierungCollection Sanierung { get;set; }
/// <summary>
///
/// </summary>
public Inspektionsobjekt()
{
Schadenskuerzeln = new InspektionskuerzelnCollection();

View File

@@ -44,6 +44,7 @@
<ItemGroup>
<Compile Include="AbwasserTechnischeAnlageCollection.cs" />
<Compile Include="BilderCollection.cs" />
<Compile Include="IImportedObjekte.cs" />
<Compile Include="InlinerSanierung.cs" />
<Compile Include="Projekt.cs" />
<Compile Include="Inspektionskuerzeln.cs" />

View File

@@ -8,13 +8,27 @@ using System.Windows.Markup;
[assembly: XmlnsDefinition("http://schemas.cosysda.de/sanVerwaltung/xaml","KlassenBIB")]
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
[ContentProperty("Objekte")]
public class Projekt
{
/// <summary>
///
/// </summary>
public string Nummer { get; set; }
/// <summary>
///
/// </summary>
public string Ort { get; set; }
/// <summary>
///
/// </summary>
public AbwasserTechnischeAnlageCollection Objekte { get; set; }
/// <summary>
///
/// </summary>
public Projekt()
{
Objekte = new AbwasserTechnischeAnlageCollection();

View File

@@ -28,6 +28,9 @@ namespace KlassenBIB
Inspektionsobjekt inspektionsobjekt;
protected string pfadZurSan;
/// <summary>
///
/// </summary>
[Browsable(false)]
public Sanierung()
{
@@ -36,9 +39,16 @@ namespace KlassenBIB
}
/// <summary>
///
/// </summary>
/// <param name="projektpfad"></param>
/// <returns></returns>
public abstract string CheckVerzeichnisse(string projektpfad);
//public Guid Guid { get => guid; set => guid = value; }
/// <summary>
///
/// </summary>
public double TempAusen
{
get => tempAusen;
@@ -52,14 +62,41 @@ 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
{
@@ -67,7 +104,9 @@ namespace KlassenBIB
}
}
//public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; }
/// <summary>
///
/// </summary>
public event PropertyChangedEventHandler PropertyChanged;
private void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{

View File

@@ -6,12 +6,26 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class SavedBilder
{
/// <summary>
///
/// </summary>
public string Bildname { get; set; }
/// <summary>
///
/// </summary>
public string Speicherpfad { get; set; }
/// <summary>
///
/// </summary>
public string Bemerkung { get; set; }
/// <summary>
///
/// </summary>
public override string ToString()
{
return Bildname;

View File

@@ -7,23 +7,36 @@ using System.Threading.Tasks;
namespace KlassenBIB
{
/// <summary>
///
/// </summary>
public class SchachtAnbindung : Sanieren
{
string schachtNummer;
BilderCollection savedBilders;
#region GettersSetters
/// <summary>
///
/// </summary>
public string SchachtNummer { get => schachtNummer; set => schachtNummer = value; }
/// <summary>
///
/// </summary>
public BilderCollection SavedBilders { get => savedBilders; set => savedBilders = value; }
#endregion
/// <summary>
///
/// </summary>
public SchachtAnbindung()
{
Verzeichnispfad = "Schachtanbindung";
SavedBilders = new BilderCollection();
}
/// <summary>
///
/// </summary>
public override string CheckVerzeichnisse(string projektpfad)
{
string path = Path.Combine(projektpfad, PfadZurSan);