diff --git a/ReportImp/VSDHammReports/Import/CustomDataImporter.cs b/ReportImp/VSDHammReports/Import/CustomDataImporter.cs index af5bfcd0c..fe8e189e2 100644 --- a/ReportImp/VSDHammReports/Import/CustomDataImporter.cs +++ b/ReportImp/VSDHammReports/Import/CustomDataImporter.cs @@ -33,10 +33,10 @@ namespace VSDHammReports.Import { string line = lines[i]; var fields = line.Split(';'); - if (fields.Length >= 5) + if (fields.Length >= 3) { - if (!String.IsNullOrEmpty(fields[3]) && !String.IsNullOrEmpty(fields[4]) && !String.IsNullOrEmpty(fields[5]) - && (fields[3].ToString().Contains("Westfale") || fields[3].ToString().Contains("LWL"))) + if (!String.IsNullOrEmpty(fields[0]) && !String.IsNullOrEmpty(fields[1]) && !String.IsNullOrEmpty(fields[2]) + && fields[0].ToString().Contains("LWL")) { try { @@ -44,11 +44,22 @@ namespace VSDHammReports.Import decimal betrag = 0m; var neuerAvis = new Avis(); - decimal.TryParse(fields[5], out betrag); - neuerAvis.Betrag = betrag; - if (!String.IsNullOrEmpty(fields[4])) + var amount = fields[2].ToString(); + if (amount.Contains("H")) { - var zweck = fields[4]; + amount = amount.Replace(" H", ""); + decimal.TryParse(amount, out betrag); + } + else if (amount.Contains("S")) + { + amount.Replace(" S", ""); + decimal.TryParse(amount, out betrag); + betrag *= -1; + } + neuerAvis.Betrag = betrag; + if (!String.IsNullOrEmpty(fields[1])) + { + var zweck = fields[1]; var matches = Regex.Matches(zweck, "/"); if (matches.Count >= 5) { @@ -78,19 +89,12 @@ namespace VSDHammReports.Import } else { - var datumMonat = fields[4].Substring(fields[4].Length - 7, 2); - var datumJahr = fields[4].Substring(fields[4].Length - 4, 4); + var datumMonat = fields[2].Substring(fields[2].Length - 7, 2); + var datumJahr = fields[2].Substring(fields[2].Length - 4, 4); if (int.TryParse(datumMonat, out int resultMonth) && int.TryParse(datumJahr, out int resultYear)) { gueltigkeitsTag = new DateTime(resultYear, resultMonth, 1); } - else - { - if (DateTime.TryParse(fields[4], out DateTime resultDate)) - { - gueltigkeitsTag = resultDate; - } - } } } neuerAvis.GueltigkeitsDatum = gueltigkeitsTag;