Protokoll wird nun geschrieben
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
<ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" />
|
<ProjectReference Include="..\DPGetDataContract\DPGetDataContract.csproj" />
|
||||||
<ProjectReference Include="..\ProtokollWriterContract\ProtokollWriterContract.csproj" />
|
<ProjectReference Include="..\ProtokollWriterContract\ProtokollWriterContract.csproj" />
|
||||||
<ProjectReference Include="..\ProtokollWriter\ProtokollWriter.csproj" />
|
<ProjectReference Include="..\ProtokollWriter\ProtokollWriter.csproj" />
|
||||||
|
<ProjectReference Include="..\Models\Models.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|||||||
@@ -2,6 +2,9 @@
|
|||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using DataGen;
|
using DataGen;
|
||||||
using DPGetDataContract;
|
using DPGetDataContract;
|
||||||
|
using Models;
|
||||||
|
using ProtokollWriter;
|
||||||
|
using ProtokollWriterContract;
|
||||||
|
|
||||||
|
|
||||||
namespace ConsoleApplication
|
namespace ConsoleApplication
|
||||||
@@ -12,7 +15,46 @@ namespace ConsoleApplication
|
|||||||
{
|
{
|
||||||
IDPGetDataContract eingabe = new MeasureDataGen();
|
IDPGetDataContract eingabe = new MeasureDataGen();
|
||||||
(eingabe as MeasureDataGen).GenerateUnterdruck(DateTime.Now,-100);
|
(eingabe as MeasureDataGen).GenerateUnterdruck(DateTime.Now,-100);
|
||||||
Debugger.Break();
|
|
||||||
|
Inspektionsobjekt SW01 = new Inspektionsobjekt();
|
||||||
|
|
||||||
|
Auftraggeber Auftraggeber = new Auftraggeber() {
|
||||||
|
Name = "OOWV",
|
||||||
|
Ort = "Oldenburg",
|
||||||
|
Strasse = "Donnerschweer",
|
||||||
|
Tel = "029293"
|
||||||
|
};
|
||||||
|
|
||||||
|
Bauvorhaben bauvorhaben = new Bauvorhaben() {
|
||||||
|
Auftraggeber = Auftraggeber,
|
||||||
|
Standort = "Oldenburg",
|
||||||
|
Strasse = "Am Schlachthof",
|
||||||
|
Ort = "Oldenburg",
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
SW01.ObereSchacht = "SW01";
|
||||||
|
SW01.UntereSchacht = "SW02";
|
||||||
|
SW01.Objektname = "SW01";
|
||||||
|
SW01.Durchmesser = 200;
|
||||||
|
SW01.ObjektLänge = 20m;
|
||||||
|
SW01.Bauvorhaben = bauvorhaben;
|
||||||
|
SW01.Bemerkung = "";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
SW01.PressureTests.Add(new PressureTest() {
|
||||||
|
Bestanden = true,
|
||||||
|
Measuredatas = eingabe.ReadMessureList,
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
IProtokollWriter protokollWriter = new SBTextFileWriter();
|
||||||
|
protokollWriter.WriteProtokoll(SW01,0);
|
||||||
|
|
||||||
|
|
||||||
|
//Debugger.Break();
|
||||||
Console.WriteLine("Hello World!");
|
Console.WriteLine("Hello World!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ using System.Collections.Generic;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using Models;
|
using Models;
|
||||||
using ProtokollWriterContract;
|
using ProtokollWriterContract;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
namespace ProtokollWriter {
|
namespace ProtokollWriter {
|
||||||
/// Erstellt eine Städtler und Beck Dichtheitsprüfdatei
|
/// Erstellt eine Städtler und Beck Dichtheitsprüfdatei
|
||||||
@@ -43,7 +44,10 @@ namespace ProtokollWriter {
|
|||||||
{
|
{
|
||||||
inspObjekt = inspektionsobjekt;
|
inspObjekt = inspektionsobjekt;
|
||||||
this.prüfungsnummer = (int)prüfungsnummer;
|
this.prüfungsnummer = (int)prüfungsnummer;
|
||||||
this.targetFile = string.Format("{0}_{1}.txt",inspObjekt.Objektname);
|
this.targetFile = string.Format("{0}_{1}.txt",inspObjekt.Objektname,inspObjekt.UntereSchacht);
|
||||||
|
Ersetzen();
|
||||||
|
ReadVorlage();
|
||||||
|
WriteFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReadVorlage() {
|
void ReadVorlage() {
|
||||||
@@ -53,7 +57,7 @@ namespace ProtokollWriter {
|
|||||||
|
|
||||||
string getPrüfnummer() {
|
string getPrüfnummer() {
|
||||||
string[] pruefung = inspObjekt.PressureTests[prüfungsnummer].prüfdatum.Split('.');
|
string[] pruefung = inspObjekt.PressureTests[prüfungsnummer].prüfdatum.Split('.');
|
||||||
return string.Format("{0}{1}{2}-{3}", pruefung[2], pruefung[1], pruefung[0]);
|
return string.Format("{0}{1}{2}-{3}", pruefung[2], pruefung[1], pruefung[0],prüfungsnummer);
|
||||||
}
|
}
|
||||||
|
|
||||||
double getPruefVolumen() {
|
double getPruefVolumen() {
|
||||||
@@ -103,7 +107,7 @@ namespace ProtokollWriter {
|
|||||||
string n = "";
|
string n = "";
|
||||||
|
|
||||||
foreach(MeasureData data in inspObjekt.PressureTests[prüfungsnummer].Measuredatas) {
|
foreach(MeasureData data in inspObjekt.PressureTests[prüfungsnummer].Measuredatas) {
|
||||||
n = string.Format("{0}{1}\r\n",n,data.ToString());
|
n = string.Format("{0}{1} = {2};{3};{4};{5}\r\n",n,data.EintragID,data.EintragID+2,data.Datum,data.Pressure,data.MeasureType);
|
||||||
}
|
}
|
||||||
zeile = n;
|
zeile = n;
|
||||||
}
|
}
|
||||||
|
|||||||
97
vorlage.txt
Normal file
97
vorlage.txt
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
[Allgemeines]
|
||||||
|
Datum = "{DATUM}"
|
||||||
|
Pruefnr = "{PRUEFNR}"
|
||||||
|
|
||||||
|
[Auftraggeber]
|
||||||
|
Name = "{AUFTRAGGEBER_NAME}"
|
||||||
|
Strasse = "{AUFTRAGGEBER_STRASSE}"
|
||||||
|
Ort = "{AUFTRAGGEBER_ORT}"
|
||||||
|
Tel = "{AUFTRAGGEBER_TEL}"
|
||||||
|
|
||||||
|
[Bauvorhaben]
|
||||||
|
Bauvorhaben = "{BAUVORHABEN_STANDORT}"
|
||||||
|
Pruefabschnitt = ""
|
||||||
|
Strasse = "{BAUVORHABEN_STRASSE}"
|
||||||
|
Ort = "{BAUVORHABEN_ORT}"
|
||||||
|
Pruefobjekt = ""
|
||||||
|
Pruefzeichen = ""
|
||||||
|
Einbaustelle = ""
|
||||||
|
Hersteller = ""
|
||||||
|
Anlagentyp = ""
|
||||||
|
Werkstoff = ""
|
||||||
|
|
||||||
|
[Messdatei]
|
||||||
|
Datei1 = "{MESSDATEI}.txt"
|
||||||
|
Datei2 = ""
|
||||||
|
Datei3 = ""
|
||||||
|
|
||||||
|
[Pruefung1999]
|
||||||
|
Pruefart = ""
|
||||||
|
Pegeloberflaeche = ""
|
||||||
|
Hoehewasserpegel = ""
|
||||||
|
Fuellvolumen = ""
|
||||||
|
Benetzteflaeche = ""
|
||||||
|
Zulwasserverlust = ""
|
||||||
|
Pruefzeit = ""
|
||||||
|
Zulpegelabfall = ""
|
||||||
|
Beginnsaettigung = ""
|
||||||
|
Gewaehltepruefzeit = ""
|
||||||
|
Beginnpruefung = ""
|
||||||
|
Beginnpruefungbeipegelwert = ""
|
||||||
|
Endepruefung = ""
|
||||||
|
Endepruefungbeipegelwert = ""
|
||||||
|
Messzeit = ""
|
||||||
|
Tatwasserverlust = ""
|
||||||
|
Tatpegelabfall = ""
|
||||||
|
Pruefresultat = ""
|
||||||
|
Bemerkungen = "{BEMERKUNG}"
|
||||||
|
Pruefdruck = ""
|
||||||
|
Gewaehltepruefdauer = ""
|
||||||
|
Zulwasserzugabe = ""
|
||||||
|
Pruefdauerbehaelter = ""
|
||||||
|
Wasserverlustbehaelter = ""
|
||||||
|
|
||||||
|
[Schachtbauwerk1999]
|
||||||
|
0 = ""
|
||||||
|
1 = ""
|
||||||
|
2 = ""
|
||||||
|
3 = ""
|
||||||
|
4 = ""
|
||||||
|
|
||||||
|
[Rohrleitungen1999]
|
||||||
|
0 = ""
|
||||||
|
1 = ""
|
||||||
|
2 = ""
|
||||||
|
3 = ""
|
||||||
|
4 = ""
|
||||||
|
|
||||||
|
[Luftprüfung]
|
||||||
|
Werkstoff = "2"
|
||||||
|
Pruefverfahren = "2"
|
||||||
|
Rohrquerschnitt = "0"
|
||||||
|
Rohrdurchmesser = "{DN}"
|
||||||
|
Rohrlaenge = "{LAENGE}"
|
||||||
|
Pruefvolumen = "{VOLUMEN}"
|
||||||
|
Pruefdruckp0 = "100,0"
|
||||||
|
Toleranzdeltap = "15,0"
|
||||||
|
SollBeruhigungszeit = "5"
|
||||||
|
SollPruefzeit = "3,0"
|
||||||
|
BeginnBeruhigungszeit = "22.08.2018 12:13:18"
|
||||||
|
PruefdruckBeginnBeruhigungszeit = "115,951"
|
||||||
|
BeginnPruefung = "22.08.2018 12:18:19"
|
||||||
|
PruefdruckBeginnPruefung = "117,049"
|
||||||
|
EndePruefung = "22.08.2018 12:21:20"
|
||||||
|
PruefdruckEndePruefung = "117,769"
|
||||||
|
IstPruefzeit = "03:01"
|
||||||
|
Druckabfall = "0,72"
|
||||||
|
Pruefresultat = "{PRUEFRESULTAT}"
|
||||||
|
Haltungsnummer = "{HALTUNGNR}"
|
||||||
|
AnzahlMuffen = ""
|
||||||
|
vonSchacht = "{VONSCHACHT}"
|
||||||
|
bisSchacht = "{BISSCHACHT}"
|
||||||
|
|
||||||
|
[Messdaten]
|
||||||
|
{@MESSDATEN}
|
||||||
|
|
||||||
|
[Protokolldatei]
|
||||||
|
Datei = "/C/Dichtheitsprüfgerät/Protokolle/000/{MESSDATEI}.txt"
|
||||||
Reference in New Issue
Block a user