diff --git a/.gitignore b/.gitignore index 9666a9c..f4bb516 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ */bin/* */obj/* data.csv +data.html .vs/XMLParser/DesignTimeBuild/.dtbcache.v2 .vs/XMLParser/v16/.suo .vs/XMLParser/v16/TestStore/* diff --git a/XMLParser.Functions/CalculateDay.cs b/XMLParser.Functions/CalculateDay.cs index 41cda16..b56b9e8 100644 --- a/XMLParser.Functions/CalculateDay.cs +++ b/XMLParser.Functions/CalculateDay.cs @@ -36,12 +36,13 @@ namespace XMLParser.Functions if(length > 7.0m) SOOverlength += length - 7.0m; }); - result.Add(ECalculatedResult.STRASSENABLAUFANZAHL,SEs.Count); result.Add(ECalculatedResult.SONSTIGEANZAHL,SOs.Count); - - result.Add(ECalculatedResult.STRASSENABLAUFLAENGEZULAGEMETER,SEOverlength); result.Add(ECalculatedResult.SONSTIGELAENGEZULAGEMETER,SOOverlength); + + result.Add(ECalculatedResult.STRASSENABLAUFANZAHL,SEs.Count); + result.Add(ECalculatedResult.STRASSENABLAUFLAENGEZULAGEMETER,SEOverlength); + decimal HauptkanalLaenge =0.0m; List ranges = new List() diff --git a/XMLParser.Functions/ProtokollWriter/HTMLProtokollWriter.cs b/XMLParser.Functions/ProtokollWriter/HTMLProtokollWriter.cs index 652c492..6d7a849 100644 --- a/XMLParser.Functions/ProtokollWriter/HTMLProtokollWriter.cs +++ b/XMLParser.Functions/ProtokollWriter/HTMLProtokollWriter.cs @@ -4,6 +4,8 @@ using XMLParser.Contract; using XMLParser.Model; using System; using System.Text; +using System.Linq; +using System.Diagnostics; namespace XMLParser.Functions.ProtokollWriter { @@ -11,8 +13,14 @@ namespace XMLParser.Functions.ProtokollWriter { FileStream handle = null; Dictionary headertitles = null; + Dictionary Entwaesserung = null; public HTMLProtkollWriter(Dictionary headertitles) { + Entwaesserung = new Dictionary(); + Entwaesserung.Add("KR","Regenwasser"); + Entwaesserung.Add("KS","Schmutzwasser"); + Entwaesserung.Add("KM","Mischwasser"); + handle = File.Create("./data.html"); this.headertitles = headertitles; } @@ -28,12 +36,17 @@ namespace XMLParser.Functions.ProtokollWriter { writeToFile(""); writeToFile(""); + writeToFile(""); writeToFile(""); writeToFile(""); + writeToFile("
"); + writeToFile("
"); + writeToFile(""); } void writeHTMLFooter() { + writeToFile("
"); writeToFile(""); writeToFile(""); } @@ -41,6 +54,12 @@ namespace XMLParser.Functions.ProtokollWriter public void WriteEntry(Dictionary calculated, List inspektionenAmTag) { writeHTMLHeader(); + KanalObjekt objekt = inspektionenAmTag.Last(); + //Debugger.Break(); + writeToFile("
"); + writeToFile("

"+objekt.Inspektionsdaten.Lage.Strassename+"

"); + writeToFile("

"+Entwaesserung[objekt.Inspektionsdaten.OptischeInspektion.Rohrleitung.Grunddaten.Kanalart]+"

"); + writeToFile("
"); writeToFile(""); List avaibleHeaders = new List(); @@ -64,9 +83,7 @@ namespace XMLParser.Functions.ProtokollWriter writeToFile(""); foreach(ECalculatedResult s in avaibleHeaders) { - writeToFile(""); + writeToFile(string.Format("",headertitles[s])); } writeToFile(""); } diff --git a/XMLProgramm/Program.cs b/XMLProgramm/Program.cs index 27e3c49..61b65ec 100644 --- a/XMLProgramm/Program.cs +++ b/XMLProgramm/Program.cs @@ -15,21 +15,20 @@ namespace XMLProgramm static void Main(string[] args) { Dictionary headertitles = new Dictionary(); + headertitles.Add(ECalculatedResult.DN150DN250, "DN150 - DN250 [m]"); headertitles.Add(ECalculatedResult.DN300DN400, "DN300 - DN400 [m]"); headertitles.Add(ECalculatedResult.DN450DN600, "DN450 - DN600 [m]"); headertitles.Add(ECalculatedResult.DN650DN800, "DN650 - DN800 [m]"); headertitles.Add(ECalculatedResult.DN850DN1000,"DN850 - DN1000 [m]"); headertitles.Add(ECalculatedResult.GESAMTHAUPTKANAL,"Hauptkanal Gesamt [m]"); headertitles.Add(ECalculatedResult.STRASSENABLAUFANZAHL, "Straßenablauf [Stk]"); - headertitles.Add(ECalculatedResult.STRASSENABLAUFLAENGEZULAGEMETER,"Straßenablauf > 5m [m]"); + headertitles.Add(ECalculatedResult.STRASSENABLAUFLAENGEZULAGEMETER,"Zulage Länge Straßenablauf über 5m [m]"); headertitles.Add(ECalculatedResult.SONSTIGEANZAHL,"Anschlussleitung [Stk]"); - headertitles.Add(ECalculatedResult.SONSTIGELAENGEZULAGEMETER,"Anschlussleitung > 7m [m]"); - headertitles.Add(ECalculatedResult.DN150DN250, "DN150 - DN250 [m]"); - - + headertitles.Add(ECalculatedResult.SONSTIGELAENGEZULAGEMETER,"Zulage Länge Anschlussleitung über 7m [m]"); + //ICSVWriter csvWriter = new StrassenUmsatzCSVWriter(); IProtokollWriter protokollWriter = new XMLParser.Functions.ProtokollWriter.HTMLProtkollWriter(headertitles); - XMLParse ser = new XMLParse("2021-07-29_KR_H_L_Oldenburg_Eichenstraße.xml"); + XMLParse ser = new XMLParse("2021-08-12_KS_H_L_Oldenburg_Hüllsteder-Straße.xml"); IUmsatzCalculator calculator = new XMLParser.Functions.UmsatzCalculator.StrassenUmsatz(); calculator.Calculate(protokollWriter,ser.KanalObjekte); diff --git a/briefkopf.png b/briefkopf.png new file mode 100644 index 0000000..7d8853c Binary files /dev/null and b/briefkopf.png differ
"); - writeToFile(headertitles[s]); - writeToFile("{0}