From 6761b17f4d9ece48fc42258b144cb0ea2df8713d Mon Sep 17 00:00:00 2001 From: Husky Date: Fri, 26 Feb 2021 08:27:11 +0100 Subject: [PATCH] Erweitert --- ConsoleApplication/ConsoleApplication.csproj | 5 ++++ ConsoleApplication/nuget.config | 9 ++++++ DataStoring.CSV/AuftraggeberRepository.cs | 25 +++++++++++++++++ DataStoring.CSV/DataStoring.CSV.csproj | 12 ++++++++ .../DataStoring.Contract.csproj | 11 ++++++++ .../IAuftraggeberRepository.cs | 11 ++++++++ Dichtheitsprüfung.sln | 28 ++++++++++++++++++- Models/Auftraggeber.cs | 9 +++--- WPFClient/App.xaml | 9 ------ WPFClient/App.xaml.cs | 17 ----------- WPFClient/AssemblyInfo.cs | 10 ------- WPFClient/MainWindow.xaml | 12 -------- WPFClient/MainWindow.xaml.cs | 28 ------------------- WPFClient/WPFClient.csproj | 13 --------- nuget.config | 9 ++++++ 15 files changed, 114 insertions(+), 94 deletions(-) create mode 100644 ConsoleApplication/nuget.config create mode 100644 DataStoring.CSV/AuftraggeberRepository.cs create mode 100644 DataStoring.CSV/DataStoring.CSV.csproj create mode 100644 DataStoring.Contract/DataStoring.Contract.csproj create mode 100644 DataStoring.Contract/IAuftraggeberRepository.cs delete mode 100644 WPFClient/App.xaml delete mode 100644 WPFClient/App.xaml.cs delete mode 100644 WPFClient/AssemblyInfo.cs delete mode 100644 WPFClient/MainWindow.xaml delete mode 100644 WPFClient/MainWindow.xaml.cs delete mode 100644 WPFClient/WPFClient.csproj create mode 100644 nuget.config diff --git a/ConsoleApplication/ConsoleApplication.csproj b/ConsoleApplication/ConsoleApplication.csproj index 348a8aa..9df6079 100644 --- a/ConsoleApplication/ConsoleApplication.csproj +++ b/ConsoleApplication/ConsoleApplication.csproj @@ -12,6 +12,11 @@ + + Exe netcoreapp3.1 diff --git a/ConsoleApplication/nuget.config b/ConsoleApplication/nuget.config new file mode 100644 index 0000000..31999dd --- /dev/null +++ b/ConsoleApplication/nuget.config @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/DataStoring.CSV/AuftraggeberRepository.cs b/DataStoring.CSV/AuftraggeberRepository.cs new file mode 100644 index 0000000..0c1d968 --- /dev/null +++ b/DataStoring.CSV/AuftraggeberRepository.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Models; +using DataStoring.Contract; + +namespace DataStoring.CSV +{ + public class AuftraggeberRepository: IAuftraggeberRepository + { + public List Query => File + .ReadAllLines("auftraggeber.csv") + .Select(l => l.Split(',')) + .Select(p => new Auftraggeber + { + Id = int.Parse(p[0]), + Name = p[1], + Strasse = p[2], + Ort = p[3], + Tel = p[4], + }) + .ToList(); + } +} diff --git a/DataStoring.CSV/DataStoring.CSV.csproj b/DataStoring.CSV/DataStoring.CSV.csproj new file mode 100644 index 0000000..9035512 --- /dev/null +++ b/DataStoring.CSV/DataStoring.CSV.csproj @@ -0,0 +1,12 @@ + + + + + + + + + netstandard2.0 + + + diff --git a/DataStoring.Contract/DataStoring.Contract.csproj b/DataStoring.Contract/DataStoring.Contract.csproj new file mode 100644 index 0000000..500c098 --- /dev/null +++ b/DataStoring.Contract/DataStoring.Contract.csproj @@ -0,0 +1,11 @@ + + + + + + + + netstandard2.0 + + + diff --git a/DataStoring.Contract/IAuftraggeberRepository.cs b/DataStoring.Contract/IAuftraggeberRepository.cs new file mode 100644 index 0000000..4c7d7a7 --- /dev/null +++ b/DataStoring.Contract/IAuftraggeberRepository.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using Models; + +namespace DataStoring.Contract +{ + public interface IAuftraggeberRepository + { + List Query {get;} + } +} diff --git a/Dichtheitsprüfung.sln b/Dichtheitsprüfung.sln index a8627ac..72b93a4 100644 --- a/Dichtheitsprüfung.sln +++ b/Dichtheitsprüfung.sln @@ -15,7 +15,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "Models\Models.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtokollWriter", "ProtokollWriter\ProtokollWriter.csproj", "{9762AAF6-BB07-4416-9522-3D2A05C4216A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFClient", "WPFClient\WPFClient.csproj", "{75CAC182-0861-4E01-88DF-52FF5CFAB3C2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStoring.Contract", "DataStoring.Contract\DataStoring.Contract.csproj", "{BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStoring.CSV", "DataStoring.CSV\DataStoring.CSV.csproj", "{18E745A2-2D17-4C21-BD6F-521E681A9834}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -114,5 +116,29 @@ Global {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x64.Build.0 = Release|Any CPU {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x86.ActiveCfg = Release|Any CPU {75CAC182-0861-4E01-88DF-52FF5CFAB3C2}.Release|x86.Build.0 = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|x64.ActiveCfg = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|x64.Build.0 = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|x86.ActiveCfg = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Debug|x86.Build.0 = Debug|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|Any CPU.Build.0 = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|x64.ActiveCfg = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|x64.Build.0 = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|x86.ActiveCfg = Release|Any CPU + {BDC2AC0C-8CD5-4B4F-840F-24EE31E3B06C}.Release|x86.Build.0 = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|x64.ActiveCfg = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|x64.Build.0 = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|x86.ActiveCfg = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Debug|x86.Build.0 = Debug|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|Any CPU.Build.0 = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|x64.ActiveCfg = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|x64.Build.0 = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|x86.ActiveCfg = Release|Any CPU + {18E745A2-2D17-4C21-BD6F-521E681A9834}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/Models/Auftraggeber.cs b/Models/Auftraggeber.cs index 6c787af..e768e01 100644 --- a/Models/Auftraggeber.cs +++ b/Models/Auftraggeber.cs @@ -4,10 +4,11 @@ using System.Collections.Generic; namespace Models { public class Auftraggeber { - public string Name =""; - public string Ort = ""; - public string Strasse = ""; - public string Tel = ""; + public int Id {get;set;} + public string Name {get;set;} + public string Ort {get;set;} + public string Strasse {get;set;} + public string Tel {get;set;} public IEnumerable Baustellen = new List(); } } \ No newline at end of file diff --git a/WPFClient/App.xaml b/WPFClient/App.xaml deleted file mode 100644 index f63d388..0000000 --- a/WPFClient/App.xaml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/WPFClient/App.xaml.cs b/WPFClient/App.xaml.cs deleted file mode 100644 index 4122d91..0000000 --- a/WPFClient/App.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace WPFClient -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - } -} diff --git a/WPFClient/AssemblyInfo.cs b/WPFClient/AssemblyInfo.cs deleted file mode 100644 index 2211234..0000000 --- a/WPFClient/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Windows; - -[assembly:ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] diff --git a/WPFClient/MainWindow.xaml b/WPFClient/MainWindow.xaml deleted file mode 100644 index 544243c..0000000 --- a/WPFClient/MainWindow.xaml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/WPFClient/MainWindow.xaml.cs b/WPFClient/MainWindow.xaml.cs deleted file mode 100644 index 9570038..0000000 --- a/WPFClient/MainWindow.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace WPFClient -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - } - } -} diff --git a/WPFClient/WPFClient.csproj b/WPFClient/WPFClient.csproj deleted file mode 100644 index 502f559..0000000 --- a/WPFClient/WPFClient.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - WinExe - net5.0-windows - true - - - - - - - diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..b40f45b --- /dev/null +++ b/nuget.config @@ -0,0 +1,9 @@ + + + + + + + + +