XML files added
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,3 +6,4 @@ data.html
|
|||||||
.vs/XMLParser/v16/.suo
|
.vs/XMLParser/v16/.suo
|
||||||
.vs/XMLParser/v16/TestStore/*
|
.vs/XMLParser/v16/TestStore/*
|
||||||
*/obj/*
|
*/obj/*
|
||||||
|
/.vs/*
|
||||||
|
|||||||
4430
2021-09-07_KR_H_L_Oldenburg_Ferdinand-von-Schill-Straße.xml
Normal file
4430
2021-09-07_KR_H_L_Oldenburg_Ferdinand-von-Schill-Straße.xml
Normal file
File diff suppressed because it is too large
Load Diff
38605
2021-09-10_KS_H_L_Oldenburg_Alexandersfeld.xml
Normal file
38605
2021-09-10_KS_H_L_Oldenburg_Alexandersfeld.xml
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
5518
2021-11-08_KS_H_L_Oldenburg_Aschhauser-Weg.xml
Normal file
5518
2021-11-08_KS_H_L_Oldenburg_Aschhauser-Weg.xml
Normal file
File diff suppressed because it is too large
Load Diff
8387
2021-11-10_KS_H_L_Oldenburg_Heidkamperweg.xml
Normal file
8387
2021-11-10_KS_H_L_Oldenburg_Heidkamperweg.xml
Normal file
File diff suppressed because it is too large
Load Diff
3628
2021-11-12_KS_H_L_Oldenburg_Westersteder-Straße.xml
Normal file
3628
2021-11-12_KS_H_L_Oldenburg_Westersteder-Straße.xml
Normal file
File diff suppressed because it is too large
Load Diff
35017
2022-01-26_KS_H_L_Oldenburg_Haßforter-Straße.xml
Normal file
35017
2022-01-26_KS_H_L_Oldenburg_Haßforter-Straße.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,7 @@ namespace XMLParser.Contract
|
|||||||
{
|
{
|
||||||
public interface IUmsatzCalculator
|
public interface IUmsatzCalculator
|
||||||
{
|
{
|
||||||
|
List<KanalObjekt> Kanalobjekte {get; set;}
|
||||||
void Calculate(IProtokollWriter protokollWriter,List<KanalObjekt> objekte = null);
|
void Calculate(IProtokollWriter protokollWriter,List<KanalObjekt> objekte = null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ namespace XMLParser.Functions.UmsatzCalculator
|
|||||||
{
|
{
|
||||||
public class StrassenUmsatz : IUmsatzCalculator
|
public class StrassenUmsatz : IUmsatzCalculator
|
||||||
{
|
{
|
||||||
|
public List<KanalObjekt> Kanalobjekte { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
|
||||||
|
|
||||||
public void Calculate(IProtokollWriter protokollWriter, List<KanalObjekt> objekte)
|
public void Calculate(IProtokollWriter protokollWriter, List<KanalObjekt> objekte)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ namespace XMLParser.Functions.UmsatzCalculator
|
|||||||
{
|
{
|
||||||
public class TagesUmsatz : IUmsatzCalculator
|
public class TagesUmsatz : IUmsatzCalculator
|
||||||
{
|
{
|
||||||
|
List<KanalObjekt> _kanalObjekte;
|
||||||
|
public List<KanalObjekt> Kanalobjekte { get => _kanalObjekte; set => _kanalObjekte = value; }
|
||||||
|
|
||||||
public void Calculate(IProtokollWriter protokollWriter, List<KanalObjekt> objekte = null)
|
public void Calculate(IProtokollWriter protokollWriter, List<KanalObjekt> objekte = null)
|
||||||
{
|
{
|
||||||
DirectoryInfo info = new DirectoryInfo("./");
|
DirectoryInfo info = new DirectoryInfo("./");
|
||||||
@@ -21,6 +24,7 @@ namespace XMLParser.Functions.UmsatzCalculator
|
|||||||
XMLParse ser = new XMLParse(aktuell.FullName);
|
XMLParse ser = new XMLParse(aktuell.FullName);
|
||||||
objekte.AddRange(ser.KanalObjekte);
|
objekte.AddRange(ser.KanalObjekte);
|
||||||
}
|
}
|
||||||
|
Kanalobjekte = objekte;
|
||||||
IEnumerable<string> datums = objekte.OrderBy(d => d.Inspektionsdaten.OptischeInspektion.Inspektionstime).Select(x => x.Inspektionsdaten.OptischeInspektion.Inspektionsdatum).Distinct();
|
IEnumerable<string> datums = objekte.OrderBy(d => d.Inspektionsdaten.OptischeInspektion.Inspektionstime).Select(x => x.Inspektionsdaten.OptischeInspektion.Inspektionsdatum).Distinct();
|
||||||
|
|
||||||
decimal gesamt = 0.0m;
|
decimal gesamt = 0.0m;
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ namespace XMLParser
|
|||||||
List<AbwassertechnischeAnlage> Stammdaten = new List<AbwassertechnischeAnlage>();
|
List<AbwassertechnischeAnlage> Stammdaten = new List<AbwassertechnischeAnlage>();
|
||||||
List<InspizierteAbwassertechnischeAnlage> Inspektionsdaten = new List<InspizierteAbwassertechnischeAnlage>();
|
List<InspizierteAbwassertechnischeAnlage> Inspektionsdaten = new List<InspizierteAbwassertechnischeAnlage>();
|
||||||
|
|
||||||
|
if(!File.Exists(XmlFile)) throw new FileNotFoundException(string.Format("XML Datei mit den Pfad {0} wurde nicht gefunden",XmlFile));
|
||||||
XmlDocument doc = new XmlDocument();
|
XmlDocument doc = new XmlDocument();
|
||||||
doc.Load(XmlFile);
|
doc.Load(XmlFile);
|
||||||
rootChild = doc.LastChild;
|
rootChild = doc.LastChild;
|
||||||
@@ -246,6 +247,7 @@ namespace XMLParser
|
|||||||
case "FotoSpeichermedium":break;
|
case "FotoSpeichermedium":break;
|
||||||
case "Fotonummer":break;
|
case "Fotonummer":break;
|
||||||
case "Timecode":break;
|
case "Timecode":break;
|
||||||
|
case "GrundAbbruch":break;
|
||||||
default: throw new NotImplementedException(d.Name);
|
default: throw new NotImplementedException(d.Name);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 16.6.30114.105
|
VisualStudioVersion = 17.1.31911.260
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLParserTest", "XMLParserTest\XMLParserTest.csproj", "{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XMLParserTest", "XMLParserTest\XMLParserTest.csproj", "{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLProgramm", "XMLProgramm\XMLProgramm.csproj", "{641D9B83-D358-4015-9873-E5787DFC70D1}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XMLProgramm", "XMLProgramm\XMLProgramm.csproj", "{641D9B83-D358-4015-9873-E5787DFC70D1}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLParser.Contract", "XMLParser.Contract\XMLParser.Contract.csproj", "{E32C7894-5512-46A4-A868-49A834291056}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XMLParser.Contract", "XMLParser.Contract\XMLParser.Contract.csproj", "{E32C7894-5512-46A4-A868-49A834291056}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLParser.Model", "XMLParser.Model\XMLParser.Model.csproj", "{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XMLParser.Model", "XMLParser.Model\XMLParser.Model.csproj", "{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XMLParser.Functions", "XMLParser.Functions\XMLParser.Functions.csproj", "{660892AF-FB33-422D-9C48-4838DBD95712}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -20,22 +22,7 @@ Global
|
|||||||
Release|x64 = Release|x64
|
Release|x64 = Release|x64
|
||||||
Release|x86 = Release|x86
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Debug|x86.Build.0 = Debug|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|x86.ActiveCfg = Release|Any CPU
|
|
||||||
{55DEEE0A-8AED-403B-B2C7-F8EEAA45ED1F}.Release|x86.Build.0 = Release|Any CPU
|
|
||||||
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|x64.ActiveCfg = Debug|Any CPU
|
{089D18AE-F5F0-4371-BC0A-AEF00FBBFB55}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
@@ -84,5 +71,23 @@ Global
|
|||||||
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x64.Build.0 = Release|Any CPU
|
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x64.Build.0 = Release|Any CPU
|
||||||
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x86.ActiveCfg = Release|Any CPU
|
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x86.Build.0 = Release|Any CPU
|
{4EC6DA2E-EF68-4E9E-8471-B0B59BBD96AD}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{660892AF-FB33-422D-9C48-4838DBD95712}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {F0FA9E20-CB22-4C5B-8BDF-D19CC32F7A8C}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
@@ -28,6 +28,15 @@ namespace XMLProgramm
|
|||||||
headertitles.Add(ECalculatedResult.SONSTIGEANZAHL,"Anschlussleitung [Stk]");
|
headertitles.Add(ECalculatedResult.SONSTIGEANZAHL,"Anschlussleitung [Stk]");
|
||||||
headertitles.Add(ECalculatedResult.SONSTIGELAENGEZULAGEMETER,"Zulage Länge Anschlussleitung über 7m [m]");
|
headertitles.Add(ECalculatedResult.SONSTIGELAENGEZULAGEMETER,"Zulage Länge Anschlussleitung über 7m [m]");
|
||||||
|
|
||||||
|
#if DEBUG
|
||||||
|
|
||||||
|
IProtokollWriter protokollWriter = new XMLParser.Functions.ProtokollWriter.HTMLProtkollWriter(headertitles);
|
||||||
|
XMLParse sers = new XMLParse("2022-01-26_KS_H_L_Oldenburg_Haßforter-Straße.xml");
|
||||||
|
var d = sers.KanalObjekte.FindAll(x => x.Inspektionsdaten.OptischeInspektion.Wasserhaltung != EWasserhaltung.NONE);
|
||||||
|
IUmsatzCalculator calculators = new XMLParser.Functions.UmsatzCalculator.StrassenUmsatz();
|
||||||
|
calculators.Calculate(protokollWriter, sers.KanalObjekte);
|
||||||
|
#else
|
||||||
|
|
||||||
if(args.Length > 0)
|
if(args.Length > 0)
|
||||||
{
|
{
|
||||||
Console.WriteLine(args[0]);
|
Console.WriteLine(args[0]);
|
||||||
@@ -42,6 +51,7 @@ namespace XMLProgramm
|
|||||||
}
|
}
|
||||||
watch.Stop();
|
watch.Stop();
|
||||||
Console.WriteLine("Total elapsed = "+watch.ElapsedMilliseconds + "ms");
|
Console.WriteLine("Total elapsed = "+watch.ElapsedMilliseconds + "ms");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user