diff --git a/BerichtGen/BerichtGen.csproj b/BerichtGen/BerichtGen.csproj
index 28defee..33e0431 100644
--- a/BerichtGen/BerichtGen.csproj
+++ b/BerichtGen/BerichtGen.csproj
@@ -32,44 +32,44 @@
4
-
- ..\packages\Syncfusion.Chart.Base.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Base.dll
+
+ ..\packages\Syncfusion.Chart.Base.17.3.0.14\lib\net46\Syncfusion.Chart.Base.dll
-
- ..\packages\Syncfusion.Chart.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Windows.dll
+
+ ..\packages\Syncfusion.Chart.Windows.17.3.0.14\lib\net46\Syncfusion.Chart.Windows.dll
-
- ..\packages\Syncfusion.Compression.Base.17.3.0.9-beta\lib\net46\Syncfusion.Compression.Base.dll
+
+ ..\packages\Syncfusion.Compression.Base.17.3.0.14\lib\net46\Syncfusion.Compression.Base.dll
-
- ..\packages\Syncfusion.Xamarin.Compression.17.3.0.9-beta\lib\netstandard2.0\Syncfusion.Compression.Portable.dll
+
+ ..\packages\Syncfusion.Xamarin.Compression.17.3.0.14\lib\netstandard2.0\Syncfusion.Compression.Portable.dll
-
- ..\packages\Syncfusion.Core.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.Core.WinForms.dll
+
+ ..\packages\Syncfusion.Core.WinForms.17.3.0.14\lib\net46\Syncfusion.Core.WinForms.dll
-
- ..\packages\Syncfusion.DocIO.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.DocIO.Base.dll
+
+ ..\packages\Syncfusion.DocIO.WinForms.17.3.0.14\lib\net46\Syncfusion.DocIO.Base.dll
-
- ..\packages\Syncfusion.DocToPDFConverter.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.DocToPdfConverter.Base.dll
+
+ ..\packages\Syncfusion.DocToPDFConverter.WinForms.17.3.0.14\lib\net46\Syncfusion.DocToPdfConverter.Base.dll
-
- ..\packages\Syncfusion.Grouping.Base.17.3.0.9-beta\lib\net46\Syncfusion.Grouping.Base.dll
+
+ ..\packages\Syncfusion.Grouping.Base.17.3.0.14\lib\net46\Syncfusion.Grouping.Base.dll
-
- ..\packages\Syncfusion.Licensing.17.3.0.9-beta\lib\net46\Syncfusion.Licensing.dll
+
+ ..\packages\Syncfusion.Licensing.17.3.0.14\lib\net46\Syncfusion.Licensing.dll
-
- ..\packages\Syncfusion.OfficeChart.Base.17.3.0.9-beta\lib\net46\Syncfusion.OfficeChart.Base.dll
+
+ ..\packages\Syncfusion.OfficeChart.Base.17.3.0.14\lib\net46\Syncfusion.OfficeChart.Base.dll
-
- ..\packages\Syncfusion.Pdf.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.Pdf.Base.dll
+
+ ..\packages\Syncfusion.Pdf.WinForms.17.3.0.14\lib\net46\Syncfusion.Pdf.Base.dll
-
- ..\packages\Syncfusion.PdfViewer.Windows.17.3.0.9-beta\lib\net46\Syncfusion.PdfViewer.Windows.dll
+
+ ..\packages\Syncfusion.PdfViewer.Windows.17.3.0.14\lib\net46\Syncfusion.PdfViewer.Windows.dll
-
- ..\packages\Syncfusion.Shared.Base.17.3.0.9-beta\lib\net46\Syncfusion.Shared.Base.dll
+
+ ..\packages\Syncfusion.Shared.Base.17.3.0.14\lib\net46\Syncfusion.Shared.Base.dll
diff --git a/BerichtGen/FrmOptions.cs b/BerichtGen/FrmOptions.cs
index e12cf61..a575b4f 100644
--- a/BerichtGen/FrmOptions.cs
+++ b/BerichtGen/FrmOptions.cs
@@ -44,7 +44,7 @@ namespace BerichtGen
{
InitializeComponent();
- Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTUwNjM5QDMxMzcyZTMzMmUzMGRRZXRsZkhIYVc3dnJORUZOc2ZaZ1lIK25pdHc1QXR3U05zU1BlQzM3RFk9");
+ Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTU0ODAyQDMxMzcyZTMzMmUzMFNsK0VsVStJUHA5NzFMQUphWTRBNmcvWU5xdGpsUmpkN0h4UGVMM083RFE9");
this.firma = firma;
diff --git a/BerichtGen/makeGraphic.cs b/BerichtGen/makeGraphic.cs
index 9f04555..d125b83 100644
--- a/BerichtGen/makeGraphic.cs
+++ b/BerichtGen/makeGraphic.cs
@@ -95,7 +95,7 @@ namespace BerichtGen
///
public static bool GetGraphics(List struktures,string destinationPath)
{
- Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTUwNjM5QDMxMzcyZTMzMmUzMGRRZXRsZkhIYVc3dnJORUZOc2ZaZ1lIK25pdHc1QXR3U05zU1BlQzM3RFk9");
+ Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTU0ODAyQDMxMzcyZTMzMmUzMFNsK0VsVStJUHA5NzFMQUphWTRBNmcvWU5xdGpsUmpkN0h4UGVMM083RFE9");
ChartControl tempChart = getGraph(struktures, "Temperatur");
if (tempChart == null) return false;
diff --git a/BerichtGen/packages.config b/BerichtGen/packages.config
index 898d41e..1a6fe40 100644
--- a/BerichtGen/packages.config
+++ b/BerichtGen/packages.config
@@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CSVParser/BlueLight.cs b/CSVParser/BlueLight.cs
index f4f9ad4..e1d5f73 100644
--- a/CSVParser/BlueLight.cs
+++ b/CSVParser/BlueLight.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SanShared;
+using SanShared.Exceptions;
namespace CSVParser
{
@@ -36,7 +37,7 @@ namespace CSVParser
if (!DateTime.TryParse(datum + " " + uhrzeit, out zeit))
- throw new Exception("Konnte die datum uhrzeit nicht konventieren");
+ throw new CSVImportException("Konnte die datum uhrzeit nicht konventieren");
double.TryParse(parts[3].Replace("\"","").Replace('.', ','), out temperatur);
int.TryParse(parts[4].Replace("\"",""), out geschwindigkeit);
diff --git a/KlassenBIB/KlassenBIB.csproj b/KlassenBIB/KlassenBIB.csproj
index 29b9c26..1256a9c 100644
--- a/KlassenBIB/KlassenBIB.csproj
+++ b/KlassenBIB/KlassenBIB.csproj
@@ -82,6 +82,10 @@
+
+ {3F79BD28-9BF6-4902-8977-41E9E71F8488}
+ CSVParser
+
{C949087E-20E1-4A17-B021-FAEAD363C1D8}
SanShared
diff --git a/SanShared/Exceptions/CSVImportException.cs b/SanShared/Exceptions/CSVImportException.cs
new file mode 100644
index 0000000..ffa3ad6
--- /dev/null
+++ b/SanShared/Exceptions/CSVImportException.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SanShared.Exceptions
+{
+ public class CSVImportException : Exception
+ {
+ public CSVImportException()
+ {
+ }
+
+ public CSVImportException(string message) : base(message)
+ {
+ }
+
+ public CSVImportException(string message, Exception innerException) : base(message, innerException)
+ {
+ }
+
+ protected CSVImportException(SerializationInfo info, StreamingContext context) : base(info, context)
+ {
+ }
+ }
+}
diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj
index dc07dee..1184eb5 100644
--- a/SanShared/SanShared.csproj
+++ b/SanShared/SanShared.csproj
@@ -21,7 +21,8 @@
DEBUG;TRACE
prompt
4
- bin\Debug\SanShared.xml
+
+
pdbonly
@@ -43,6 +44,7 @@
+
diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj
index 4c34250..a86614b 100644
--- a/SanSystem/SanSystem.csproj
+++ b/SanSystem/SanSystem.csproj
@@ -37,56 +37,56 @@
True
-
- ..\packages\FluentFTP.27.1.2\lib\net45\FluentFTP.dll
+
+ ..\packages\FluentFTP.27.1.4\lib\net45\FluentFTP.dll
..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll
- ..\packages\Newtonsoft.Json.12.0.3-beta1\lib\net45\Newtonsoft.Json.dll
+ ..\packages\Newtonsoft.Json.12.0.3-beta2\lib\net45\Newtonsoft.Json.dll
-
- ..\packages\Syncfusion.Chart.Base.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Base.dll
+
+ ..\packages\Syncfusion.Chart.Base.17.3.0.14\lib\net46\Syncfusion.Chart.Base.dll
-
- ..\packages\Syncfusion.Chart.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Windows.dll
+
+ ..\packages\Syncfusion.Chart.Windows.17.3.0.14\lib\net46\Syncfusion.Chart.Windows.dll
-
- ..\packages\Syncfusion.Core.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.Core.WinForms.dll
+
+ ..\packages\Syncfusion.Core.WinForms.17.3.0.14\lib\net46\Syncfusion.Core.WinForms.dll
-
- ..\packages\Syncfusion.Grid.Base.17.3.0.9-beta\lib\net46\Syncfusion.Grid.Base.dll
+
+ ..\packages\Syncfusion.Grid.Base.17.3.0.14\lib\net46\Syncfusion.Grid.Base.dll
-
- ..\packages\Syncfusion.Grid.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Grid.Windows.dll
+
+ ..\packages\Syncfusion.Grid.Windows.17.3.0.14\lib\net46\Syncfusion.Grid.Windows.dll
-
- ..\packages\Syncfusion.Grouping.Base.17.3.0.9-beta\lib\net46\Syncfusion.Grouping.Base.dll
+
+ ..\packages\Syncfusion.Grouping.Base.17.3.0.14\lib\net46\Syncfusion.Grouping.Base.dll
-
- ..\packages\Syncfusion.Licensing.17.3.0.9-beta\lib\net46\Syncfusion.Licensing.dll
+
+ ..\packages\Syncfusion.Licensing.17.3.0.14\lib\net46\Syncfusion.Licensing.dll
-
- ..\packages\Syncfusion.SfInput.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.SfInput.WinForms.dll
+
+ ..\packages\Syncfusion.SfInput.WinForms.17.3.0.14\lib\net46\Syncfusion.SfInput.WinForms.dll
-
- ..\packages\Syncfusion.SfSpellChecker.WPF.17.3.0.9-beta\lib\net46\Syncfusion.SfSpellChecker.WPF.dll
+
+ ..\packages\Syncfusion.SfSpellChecker.WPF.17.3.0.14\lib\net46\Syncfusion.SfSpellChecker.WPF.dll
-
- ..\packages\Syncfusion.Shared.Base.17.3.0.9-beta\lib\net46\Syncfusion.Shared.Base.dll
+
+ ..\packages\Syncfusion.Shared.Base.17.3.0.14\lib\net46\Syncfusion.Shared.Base.dll
-
- ..\packages\Syncfusion.Shared.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Shared.Windows.dll
+
+ ..\packages\Syncfusion.Shared.Windows.17.3.0.14\lib\net46\Syncfusion.Shared.Windows.dll
-
- ..\packages\Syncfusion.SpellChecker.Base.17.3.0.9-beta\lib\net46\Syncfusion.SpellChecker.Base.dll
+
+ ..\packages\Syncfusion.SpellChecker.Base.17.3.0.14\lib\net46\Syncfusion.SpellChecker.Base.dll
-
- ..\packages\Syncfusion.Tools.Base.17.3.0.9-beta\lib\net46\Syncfusion.Tools.Base.dll
+
+ ..\packages\Syncfusion.Tools.Base.17.3.0.14\lib\net46\Syncfusion.Tools.Base.dll
-
- ..\packages\Syncfusion.Tools.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Tools.Windows.dll
+
+ ..\packages\Syncfusion.Tools.Windows.17.3.0.14\lib\net46\Syncfusion.Tools.Windows.dll
diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs
index 57b71a9..1603daf 100644
--- a/SanSystem/UCInliner.cs
+++ b/SanSystem/UCInliner.cs
@@ -15,6 +15,7 @@ using FluentFTP;
using System.Collections;
using CSVParser;
using BerichtGen;
+using SanShared.Exceptions;
namespace SanSystem
{
@@ -224,14 +225,23 @@ namespace SanSystem
IEnumerable files = Directory.EnumerateFiles(myPath, "*.csv", SearchOption.AllDirectories);
-
+
+
IReadCSVData csvFile = null;
List struktures = null;
+ if (files.Count().Equals(0)) return false;
csvFile = CsvParserFactory.ReadCSVFile(AcceptedCSVFormats.BLUELIGHT, files.Last());
try
{
- struktures = csvFile.ReadCSVStrukture();
-
+ try
+ {
+ struktures = csvFile.ReadCSVStrukture();
+ }
+ catch(CSVImportException)
+ {
+ MessageBox.Show("Es scheint den Falschen Anlagentyp angegeben worden sein.", "CSV Datei konnte nicht gelesen werden", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return false;
+ }
inliner.AnfangAushaertung = struktures.Select(x => x.Zeitstempel).Min();
inliner.EndeAushaertung = struktures.Select(x => x.Zeitstempel).Max();
inliner.Rueckholgeschwindigkeit = 0;
diff --git a/SanSystem/packages.config b/SanSystem/packages.config
index 6bb7a85..1ef8dcd 100644
--- a/SanSystem/packages.config
+++ b/SanSystem/packages.config
@@ -1,20 +1,20 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file