Husky/Kanalsanierungsverwaltung
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Syncfusion geupdated

Browse Source
This commit is contained in:
Husky
2019-10-10 16:43:18 +02:00
parent 30f0956d21
commit c2bbeb7e50
11 changed files with 138 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
SanSystem/SanSystem.csproj
View File

@@ -37,56 +37,56 @@
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="FluentFTP, Version=27.1.2.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.27.1.2\lib\net45\FluentFTP.dll</HintPath>
<Reference Include="FluentFTP, Version=27.1.4.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
<HintPath>..\packages\FluentFTP.27.1.4\lib\net45\FluentFTP.dll</HintPath>
</Reference>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.12.0.3-beta2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Chart.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Base.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Base.dll</HintPath>
<Reference Include="Syncfusion.Chart.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Base.17.3.0.14\lib\net46\Syncfusion.Chart.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Chart.Windows, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Chart.Windows.dll</HintPath>
<Reference Include="Syncfusion.Chart.Windows, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Chart.Windows.17.3.0.14\lib\net46\Syncfusion.Chart.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Core.WinForms, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Core.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.Core.WinForms.dll</HintPath>
<Reference Include="Syncfusion.Core.WinForms, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Core.WinForms.17.3.0.14\lib\net46\Syncfusion.Core.WinForms.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Grid.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Base.17.3.0.9-beta\lib\net46\Syncfusion.Grid.Base.dll</HintPath>
<Reference Include="Syncfusion.Grid.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Base.17.3.0.14\lib\net46\Syncfusion.Grid.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Grid.Windows, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Grid.Windows.dll</HintPath>
<Reference Include="Syncfusion.Grid.Windows, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grid.Windows.17.3.0.14\lib\net46\Syncfusion.Grid.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Grouping.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grouping.Base.17.3.0.9-beta\lib\net46\Syncfusion.Grouping.Base.dll</HintPath>
<Reference Include="Syncfusion.Grouping.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Grouping.Base.17.3.0.14\lib\net46\Syncfusion.Grouping.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Licensing, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Licensing.17.3.0.9-beta\lib\net46\Syncfusion.Licensing.dll</HintPath>
<Reference Include="Syncfusion.Licensing, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=632609b4d040f6b4, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Licensing.17.3.0.14\lib\net46\Syncfusion.Licensing.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SfInput.WinForms, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfInput.WinForms.17.3.0.9-beta\lib\net46\Syncfusion.SfInput.WinForms.dll</HintPath>
<Reference Include="Syncfusion.SfInput.WinForms, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfInput.WinForms.17.3.0.14\lib\net46\Syncfusion.SfInput.WinForms.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SfSpellChecker.WPF, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfSpellChecker.WPF.17.3.0.9-beta\lib\net46\Syncfusion.SfSpellChecker.WPF.dll</HintPath>
<Reference Include="Syncfusion.SfSpellChecker.WPF, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SfSpellChecker.WPF.17.3.0.14\lib\net46\Syncfusion.SfSpellChecker.WPF.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Shared.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Base.17.3.0.9-beta\lib\net46\Syncfusion.Shared.Base.dll</HintPath>
<Reference Include="Syncfusion.Shared.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Base.17.3.0.14\lib\net46\Syncfusion.Shared.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Shared.Windows, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Shared.Windows.dll</HintPath>
<Reference Include="Syncfusion.Shared.Windows, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Shared.Windows.17.3.0.14\lib\net46\Syncfusion.Shared.Windows.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SpellChecker.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SpellChecker.Base.17.3.0.9-beta\lib\net46\Syncfusion.SpellChecker.Base.dll</HintPath>
<Reference Include="Syncfusion.SpellChecker.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.SpellChecker.Base.17.3.0.14\lib\net46\Syncfusion.SpellChecker.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Tools.Base, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Base.17.3.0.9-beta\lib\net46\Syncfusion.Tools.Base.dll</HintPath>
<Reference Include="Syncfusion.Tools.Base, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Base.17.3.0.14\lib\net46\Syncfusion.Tools.Base.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.Tools.Windows, Version=17.3460.0.9, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Windows.17.3.0.9-beta\lib\net46\Syncfusion.Tools.Windows.dll</HintPath>
<Reference Include="Syncfusion.Tools.Windows, Version=17.3460.0.14, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
<HintPath>..\packages\Syncfusion.Tools.Windows.17.3.0.14\lib\net46\Syncfusion.Tools.Windows.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

16
SanSystem/UCInliner.cs
View File

@@ -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<string> files = Directory.EnumerateFiles(myPath, "*.csv", SearchOption.AllDirectories);
IReadCSVData csvFile = null;
List<UVcsvStrukture> 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;

32
SanSystem/packages.config
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FluentFTP" version="27.1.2" targetFramework="net472" />
<package id="FluentFTP" version="27.1.4" targetFramework="net472" />
<package id="Ionic.Zip" version="1.9.1.8" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.3-beta1" targetFramework="net472" />
<package id="Syncfusion.Chart.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Chart.Windows" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Core.WinForms" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Grid.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Grid.Windows" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Grouping.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Licensing" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.SfInput.WinForms" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.SfSpellChecker.WPF" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Shared.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Shared.Windows" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.SpellChecker.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Tools.Base" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Syncfusion.Tools.Windows" version="17.3.0.9-beta" targetFramework="net472" />
<package id="Newtonsoft.Json" version="12.0.3-beta2" targetFramework="net472" />
<package id="Syncfusion.Chart.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Chart.Windows" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Core.WinForms" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Grid.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Grid.Windows" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Grouping.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Licensing" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.SfInput.WinForms" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.SfSpellChecker.WPF" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Shared.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Shared.Windows" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.SpellChecker.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Tools.Base" version="17.3.0.14" targetFramework="net472" />
<package id="Syncfusion.Tools.Windows" version="17.3.0.14" targetFramework="net472" />
</packages>