diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.deps.json b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.deps.json index 638858b..6d56a85 100644 --- a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.deps.json +++ b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.deps.json @@ -180,7 +180,7 @@ "AquaCare.Model/1.0.0": { "runtime": { "AquaCare.Model.dll": { - "assemblyVersion": "1.0.0.0", + "assemblyVersion": "1.0.0", "fileVersion": "1.0.0.0" } } @@ -192,7 +192,7 @@ }, "runtime": { "AquaCare.Persistence.dll": { - "assemblyVersion": "1.0.0.0", + "assemblyVersion": "1.0.0", "fileVersion": "1.0.0.0" } } diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll index 5bc5a6b..e66aece 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb index b14f61c..0cd548a 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Controller.pdb differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll index c2b23a1..0241915 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb index 948962a..33b0d1d 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll index 807f2e6..51e5b66 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb index bf73c2e..24ad421 100644 Binary files a/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Controller/bin/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.dgspec.json b/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.dgspec.json index 6feefbe..c1a3f77 100644 --- a/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.dgspec.json +++ b/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj": {} + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj": {} }, "projects": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj", "projectName": "AquaCare.Controller", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -32,11 +32,11 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj" }, - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj" } } } @@ -49,9 +49,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -72,24 +72,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } }, - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", "projectName": "AquaCare.Model", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -114,9 +114,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -137,24 +137,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } }, - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", "projectName": "AquaCare.Persistence", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -169,8 +169,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj" } } } @@ -183,9 +183,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -212,7 +212,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.g.props b/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.g.props index a9b3149..3812a55 100644 --- a/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.g.props +++ b/AquaCare.Controller/obj/AquaCare.Controller.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Maximilian.Martikke\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Martikke Maximilian\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.13.2 + 6.12.0 - + \ No newline at end of file diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs index c3ebb23..b54f8d6 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfo.cs @@ -13,10 +13,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+779394132bfaf23fea1a693613c42ca82dc3a78d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ea362ca3e776b0f0ddd532781e368f6a9a8d1857")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Controller")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache index 6d18afd..25e97d6 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.AssemblyInfoInputs.cache @@ -1 +1 @@ -1282edd95663dc86f0bf214ca74d7037942226c6a549e1911d1ba477daa1e204 +820caf03bc24f4f7b4286c530f03701c7248bfbd62793c2cda10edcca9adeb02 diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.GeneratedMSBuildEditorConfig.editorconfig b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.GeneratedMSBuildEditorConfig.editorconfig index 563d921..5fb5b9c 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.GeneratedMSBuildEditorConfig.editorconfig +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = AquaCare.Controller -build_property.ProjectDir = C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Controller\ +build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.assets.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.assets.cache index 092fce3..3330e0f 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.assets.cache and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.assets.cache differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache index 903cd29..c413ac5 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.AssemblyReference.cache differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.CoreCompileInputs.cache b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.CoreCompileInputs.cache index 8044835..b98304a 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.CoreCompileInputs.cache +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -04dd474bcf11df7abd91e7289173d7028f1e98d8fef09bda589535dc59ce1aca +8c5670a9af08caf7ebafb496595f730cf275e8e8862b49d185a4b7e49e5a2371 diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.FileListAbsolute.txt b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.FileListAbsolute.txt index 2cd30c4..a417164 100644 --- a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.FileListAbsolute.txt +++ b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.csproj.FileListAbsolute.txt @@ -100,3 +100,20 @@ C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Controller\obj\Debug\net9 C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Controller\obj\Debug\net9.0\refint\AquaCare.Controller.dll C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.pdb C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Controller\obj\Debug\net9.0\ref\AquaCare.Controller.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Controller.deps.json +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Controller.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Controller.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Persistence.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Model.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\bin\Debug\net9.0\AquaCare.Persistence.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.csproj.AssemblyReference.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.AssemblyInfoInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.AssemblyInfo.cs +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.csproj.CoreCompileInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.C1037AF7.Up2Date +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\refint\AquaCare.Controller.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\AquaCare.Controller.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Controller\obj\Debug\net9.0\ref\AquaCare.Controller.dll diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll index 5bc5a6b..e66aece 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb index b14f61c..0cd548a 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb and b/AquaCare.Controller/obj/Debug/net9.0/AquaCare.Controller.pdb differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll index 5e4ae8f..c54d684 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/ref/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll index 5e4ae8f..c54d684 100644 Binary files a/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll and b/AquaCare.Controller/obj/Debug/net9.0/refint/AquaCare.Controller.dll differ diff --git a/AquaCare.Controller/obj/project.assets.json b/AquaCare.Controller/obj/project.assets.json index 1aa6ac9..f345b64 100644 --- a/AquaCare.Controller/obj/project.assets.json +++ b/AquaCare.Controller/obj/project.assets.json @@ -367,23 +367,23 @@ ] }, "packageFolders": { - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\": {}, + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj", "projectName": "AquaCare.Controller", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -398,11 +398,11 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj" }, - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj" } } } @@ -415,9 +415,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -438,7 +438,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Controller/obj/project.nuget.cache b/AquaCare.Controller/obj/project.nuget.cache index 3928329..8b9cbd5 100644 --- a/AquaCare.Controller/obj/project.nuget.cache +++ b/AquaCare.Controller/obj/project.nuget.cache @@ -1,16 +1,16 @@ { "version": 2, - "dgSpecHash": "eKpsRkhbTGQ=", + "dgSpecHash": "iMQBe7bDYoA=", "success": true, - "projectFilePath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Controller\\AquaCare.Controller.csproj", + "projectFilePath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Controller\\AquaCare.Controller.csproj", "expectedPackageFiles": [ - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\microsoft.data.sqlite\\9.0.5\\microsoft.data.sqlite.9.0.5.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.5\\microsoft.data.sqlite.core.9.0.5.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512" + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\microsoft.data.sqlite\\9.0.5\\microsoft.data.sqlite.9.0.5.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.5\\microsoft.data.sqlite.core.9.0.5.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/AquaCare.Model/Werte.cs b/AquaCare.Model/Werte.cs index 6c97e38..51fc90e 100644 --- a/AquaCare.Model/Werte.cs +++ b/AquaCare.Model/Werte.cs @@ -3,6 +3,9 @@ public class Wert { public DateTime Datum { get; set; } = DateTime.Now; + public bool Gefuettert { get; set; } + public bool FilterReinigen { get; set; } + public bool WasserWechseln { get; set; } public double Temperatur { get; set; } public double PhWert { get; set; } public double Nitrat { get; set; } diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll index c2b23a1..0241915 100644 Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb index 948962a..33b0d1d 100644 Binary files a/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.dgspec.json b/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.dgspec.json index a8a718b..bd8691b 100644 --- a/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.dgspec.json +++ b/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": {} + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": {} }, "projects": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", "projectName": "AquaCare.Model", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -42,9 +42,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -65,7 +65,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.g.props b/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.g.props index a9b3149..3812a55 100644 --- a/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.g.props +++ b/AquaCare.Model/obj/AquaCare.Model.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Maximilian.Martikke\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Martikke Maximilian\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.13.2 + 6.12.0 - + \ No newline at end of file diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs index 925e225..3500d30 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfo.cs @@ -13,10 +13,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+779394132bfaf23fea1a693613c42ca82dc3a78d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ea362ca3e776b0f0ddd532781e368f6a9a8d1857")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache index c396306..71b3e26 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -c7bb89bffc4235c4c3eac094c7619cb66c8ee1d969dda3793e28d28a3063c0f5 +085892f4350a33ad23a6e03569bc6c6028d2c316aed3f39b56f71976d8407b90 diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.GeneratedMSBuildEditorConfig.editorconfig b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.GeneratedMSBuildEditorConfig.editorconfig index 96cd46e..377f057 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.GeneratedMSBuildEditorConfig.editorconfig +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = AquaCare.Model -build_property.ProjectDir = C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Model\ +build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.assets.cache b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.assets.cache index b8c805a..9a68399 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.assets.cache and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.assets.cache differ diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.CoreCompileInputs.cache b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.CoreCompileInputs.cache index 0e148b6..eaa8c05 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.CoreCompileInputs.cache +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3f90cfd3de7d09f8eb2c9be1f8b9acf2cfb0893b8a084e05d1e4d6dddce259bc +12727b7c458cde28ab1f6f774d0f5729a87631cfb14d3a3fcc512bc6608e4802 diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.FileListAbsolute.txt b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.FileListAbsolute.txt index c28fe0e..2824b80 100644 --- a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.FileListAbsolute.txt +++ b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.csproj.FileListAbsolute.txt @@ -64,3 +64,14 @@ C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Model\obj\Debug\net9.0\Aq C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Model\obj\Debug\net9.0\refint\AquaCare.Model.dll C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.pdb C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Model\obj\Debug\net9.0\ref\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\bin\Debug\net9.0\AquaCare.Model.deps.json +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\bin\Debug\net9.0\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\bin\Debug\net9.0\AquaCare.Model.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.AssemblyInfoInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.AssemblyInfo.cs +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.csproj.CoreCompileInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\refint\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\AquaCare.Model.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Model\obj\Debug\net9.0\ref\AquaCare.Model.dll diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll index c2b23a1..0241915 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb index 948962a..33b0d1d 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Model/obj/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll index b9f4233..17c348f 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/ref/AquaCare.Model.dll differ diff --git a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll index b9f4233..17c348f 100644 Binary files a/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll and b/AquaCare.Model/obj/Debug/net9.0/refint/AquaCare.Model.dll differ diff --git a/AquaCare.Model/obj/project.assets.json b/AquaCare.Model/obj/project.assets.json index 191fac1..ac7eaca 100644 --- a/AquaCare.Model/obj/project.assets.json +++ b/AquaCare.Model/obj/project.assets.json @@ -8,23 +8,23 @@ "net9.0": [] }, "packageFolders": { - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\": {}, + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", "projectName": "AquaCare.Model", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -49,9 +49,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -72,7 +72,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Model/obj/project.nuget.cache b/AquaCare.Model/obj/project.nuget.cache index 6a21b82..0649bc2 100644 --- a/AquaCare.Model/obj/project.nuget.cache +++ b/AquaCare.Model/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "lSTrMjx9sQ8=", + "dgSpecHash": "z5nw/MVQs4Y=", "success": true, - "projectFilePath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", + "projectFilePath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/AquaCare.Persistence/Datenbank.cs b/AquaCare.Persistence/Datenbank.cs index 5a93b2d..47aa148 100644 --- a/AquaCare.Persistence/Datenbank.cs +++ b/AquaCare.Persistence/Datenbank.cs @@ -1,6 +1,7 @@ using Microsoft.Data.Sqlite; using System; using System.Collections.Generic; +using AquaCare.Model; // Model-Wert verwenden namespace AquaCare.Persistence { @@ -19,6 +20,9 @@ namespace AquaCare.Persistence CREATE TABLE IF NOT EXISTS Werte ( ID INTEGER PRIMARY KEY AUTOINCREMENT, Datum TEXT NOT NULL, + Gefuettert INTEGER NOT NULL, + FilterReinigen INTEGER NOT NULL, + WasserWechseln INTEGER NOT NULL, Temperatur REAL NOT NULL, PHWert REAL NOT NULL, Nitrat REAL NOT NULL, @@ -33,23 +37,28 @@ namespace AquaCare.Persistence } // Fügt einen neuen Wert in die Datenbank ein - public void AddValue(DateTime datum, double temperatur, double phWert, double nitrat, double ammoniak) + public void AddValue(Wert wert) { using (var connection = new SqliteConnection(ConnectionString)) { connection.Open(); string insertCommand = @" - INSERT INTO Werte (Datum, Temperatur, PHWert, Nitrat, Ammoniak) - VALUES (@Datum, @Temperatur, @PHWert, @Nitrat, @Ammoniak);"; + INSERT INTO Werte + (Datum, Gefuettert, FilterReinigen, WasserWechseln, Temperatur, PHWert, Nitrat, Ammoniak) + VALUES + (@Datum, @Gefuettert, @FilterReinigen, @WasserWechseln, @Temperatur, @PHWert, @Nitrat, @Ammoniak);"; using (var command = new SqliteCommand(insertCommand, connection)) { - command.Parameters.AddWithValue("@Datum", datum.ToString("yyyy-MM-dd")); - command.Parameters.AddWithValue("@Temperatur", temperatur); - command.Parameters.AddWithValue("@PHWert", phWert); - command.Parameters.AddWithValue("@Nitrat", nitrat); - command.Parameters.AddWithValue("@Ammoniak", ammoniak); + command.Parameters.AddWithValue("@Datum", wert.Datum.ToString("yyyy-MM-dd")); + command.Parameters.AddWithValue("@Gefuettert", wert.Gefuettert ? 1 : 0); + command.Parameters.AddWithValue("@FilterReinigen", wert.FilterReinigen ? 1 : 0); + command.Parameters.AddWithValue("@WasserWechseln", wert.WasserWechseln ? 1 : 0); + command.Parameters.AddWithValue("@Temperatur", wert.Temperatur); + command.Parameters.AddWithValue("@PHWert", wert.PhWert); + command.Parameters.AddWithValue("@Nitrat", wert.Nitrat); + command.Parameters.AddWithValue("@Ammoniak", wert.Ammoniak); command.ExecuteNonQuery(); } @@ -65,16 +74,16 @@ namespace AquaCare.Persistence { connection.Open(); - string selectCommand = "SELECT Datum, Temperatur, PHWert, Nitrat, Ammoniak FROM Werte;"; + string selectCommand = "SELECT Datum, Gefuettert, FilterReinigen, WasserWechseln, Temperatur, PHWert, Nitrat, Ammoniak FROM Werte;"; using (var command = new SqliteCommand(selectCommand, connection)) using (var reader = command.ExecuteReader()) { while (reader.Read()) { - string value = $"Datum: {reader.GetString(0)}, Temperatur: {reader.GetDouble(1)}°C, " + - $"pH-Wert: {reader.GetDouble(2)}, Nitrat: {reader.GetDouble(3)} mg/L, " + - $"Ammoniak: {reader.GetDouble(4)} mg/L"; + string value = $"Datum: {reader.GetString(0)}, Gefüttert: {(reader.GetInt32(1) == 1 ? "Ja" : "Nein")}, " + + $"Filter gereinigt: {(reader.GetInt32(2) == 1 ? "Ja" : "Nein")}, Wasser gewechselt: {(reader.GetInt32(3) == 1 ? "Ja" : "Nein")}, " + + $"Temperatur: {reader.GetDouble(4)}°C, pH-Wert: {reader.GetDouble(5)}, Nitrat: {reader.GetDouble(6)} mg/L, Ammoniak: {reader.GetDouble(7)} mg/L"; values.Add(value); } } @@ -83,7 +92,7 @@ namespace AquaCare.Persistence return values; } - // Ruft alle gespeicherten Werte aus der Datenbank ab und gibt sie als Objekte zurück + // Ruft alle gespeicherten Werte aus der Datenbank ab und gibt sie als Wert-Objekte zurück public List GetValuesAsObjects() { var werte = new List(); @@ -92,7 +101,7 @@ namespace AquaCare.Persistence { connection.Open(); - string selectCommand = "SELECT Datum, Temperatur, PHWert, Nitrat, Ammoniak FROM Werte ORDER BY Datum ASC;"; + string selectCommand = "SELECT Datum, Gefuettert, FilterReinigen, WasserWechseln, Temperatur, PHWert, Nitrat, Ammoniak FROM Werte ORDER BY Datum ASC;"; using (var command = new SqliteCommand(selectCommand, connection)) using (var reader = command.ExecuteReader()) @@ -101,11 +110,14 @@ namespace AquaCare.Persistence { werte.Add(new Wert { - Datum = reader.GetString(0), - Temperatur = reader.GetDouble(1), - PHWert = reader.GetDouble(2), - Nitrat = reader.GetDouble(3), - Ammoniak = reader.GetDouble(4) + Datum = DateTime.Parse(reader.GetString(0)), + Gefuettert = reader.GetInt32(1) == 1, + FilterReinigen = reader.GetInt32(2) == 1, + WasserWechseln = reader.GetInt32(3) == 1, + Temperatur = reader.GetDouble(4), + PhWert = reader.GetDouble(5), + Nitrat = reader.GetDouble(6), + Ammoniak = reader.GetDouble(7) }); } } @@ -114,14 +126,4 @@ namespace AquaCare.Persistence return werte; } } - - // Klasse zur Darstellung eines Wertes - public class Wert - { - public string Datum { get; set; } - public double Temperatur { get; set; } - public double PHWert { get; set; } - public double Nitrat { get; set; } - public double Ammoniak { get; set; } - } } \ No newline at end of file diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll index c2b23a1..0241915 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.dll differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb index 948962a..33b0d1d 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Model.pdb differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.deps.json b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.deps.json index eb3886f..09d85a4 100644 --- a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.deps.json +++ b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.deps.json @@ -180,7 +180,7 @@ "AquaCare.Model/1.0.0": { "runtime": { "AquaCare.Model.dll": { - "assemblyVersion": "1.0.0.0", + "assemblyVersion": "1.0.0", "fileVersion": "1.0.0.0" } } diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll index 807f2e6..51e5b66 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb index bf73c2e..24ad421 100644 Binary files a/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/bin/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.dgspec.json b/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.dgspec.json index d15b63d..00d4ab7 100644 --- a/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.dgspec.json +++ b/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj": {} + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj": {} }, "projects": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", "projectName": "AquaCare.Model", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -42,9 +42,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -65,24 +65,24 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } }, - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", "projectName": "AquaCare.Persistence", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -97,8 +97,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj" } } } @@ -111,9 +111,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -140,7 +140,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.g.props b/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.g.props index a9b3149..3812a55 100644 --- a/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.g.props +++ b/AquaCare.Persistence/obj/AquaCare.Persistence.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Maximilian.Martikke\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Martikke Maximilian\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.13.2 + 6.12.0 - + \ No newline at end of file diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs index 9bb61d3..9b558af 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfo.cs @@ -13,10 +13,10 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+779394132bfaf23fea1a693613c42ca82dc3a78d")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ea362ca3e776b0f0ddd532781e368f6a9a8d1857")] [assembly: System.Reflection.AssemblyProductAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.Persistence")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// Generated by the MSBuild WriteCodeFragment class. +// Von der MSBuild WriteCodeFragment-Klasse generiert. diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache index 6a020aa..0386f32 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.AssemblyInfoInputs.cache @@ -1 +1 @@ -57c3277149286d0ed4c1c075a55c6fa24ead45846b43c76099ce5f3ff6a2a738 +f69529c0fda3f5d841fe6bd5d1a521078cd01fc4e145f63b80f5f469286dc30a diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.GeneratedMSBuildEditorConfig.editorconfig b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.GeneratedMSBuildEditorConfig.editorconfig index c647c99..390d765 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.GeneratedMSBuildEditorConfig.editorconfig +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.GeneratedMSBuildEditorConfig.editorconfig @@ -8,7 +8,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = AquaCare.Persistence -build_property.ProjectDir = C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Persistence\ +build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 9.0 diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.assets.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.assets.cache index 36f28ae..8e78774 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.assets.cache and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.assets.cache differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache index 8ec6dcb..1e0cb7f 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.AssemblyReference.cache differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.CoreCompileInputs.cache b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.CoreCompileInputs.cache index 4c4bdfe..5813c0e 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.CoreCompileInputs.cache +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -12e2e01a0997f7cbc23d84196d20e0a3b332dcb8ecd5d2c5f0118e2d2746de20 +64c31384184bc0240079a0f6c997dadbdd61ef697772bd96963fef17d5183727 diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.FileListAbsolute.txt b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.FileListAbsolute.txt index 1828a11..313376c 100644 --- a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.FileListAbsolute.txt +++ b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.csproj.FileListAbsolute.txt @@ -88,3 +88,18 @@ C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Persistence\obj\Debug\net C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Persistence\obj\Debug\net9.0\refint\AquaCare.Persistence.dll C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.pdb C:\Users\Maximilian.Martikke\Desktop\AquaCare\AquaCare.Persistence\obj\Debug\net9.0\ref\AquaCare.Persistence.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\bin\Debug\net9.0\AquaCare.Persistence.deps.json +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\bin\Debug\net9.0\AquaCare.Persistence.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\bin\Debug\net9.0\AquaCare.Persistence.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\bin\Debug\net9.0\AquaCare.Model.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\bin\Debug\net9.0\AquaCare.Model.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.csproj.AssemblyReference.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.AssemblyInfoInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.AssemblyInfo.cs +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.csproj.CoreCompileInputs.cache +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.DB9F918F.Up2Date +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\refint\AquaCare.Persistence.dll +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\AquaCare.Persistence.pdb +C:\Users\Martikke Maximilian\Desktop\AquaCare-1\AquaCare.Persistence\obj\Debug\net9.0\ref\AquaCare.Persistence.dll diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll index 807f2e6..51e5b66 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb index bf73c2e..24ad421 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb and b/AquaCare.Persistence/obj/Debug/net9.0/AquaCare.Persistence.pdb differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll index 04bf746..7b8db02 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/ref/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll index 04bf746..7b8db02 100644 Binary files a/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll and b/AquaCare.Persistence/obj/Debug/net9.0/refint/AquaCare.Persistence.dll differ diff --git a/AquaCare.Persistence/obj/project.assets.json b/AquaCare.Persistence/obj/project.assets.json index 2e00513..b2c19fe 100644 --- a/AquaCare.Persistence/obj/project.assets.json +++ b/AquaCare.Persistence/obj/project.assets.json @@ -348,23 +348,23 @@ ] }, "packageFolders": { - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\": {}, + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "projectUniqueName": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", "projectName": "AquaCare.Persistence", - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", - "packagesPath": "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\obj\\", + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "packagesPath": "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\", + "outputPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\Maximilian.Martikke\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Martikke Maximilian\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -379,8 +379,8 @@ "net9.0": { "targetAlias": "net9.0", "projectReferences": { - "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj": { - "projectPath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Model\\AquaCare.Model.csproj" + "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj": { + "projectPath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Model\\AquaCare.Model.csproj" } } } @@ -393,9 +393,9 @@ "restoreAuditProperties": { "enableAudit": "true", "auditLevel": "low", - "auditMode": "direct" + "auditMode": "all" }, - "SdkAnalysisLevel": "9.0.200" + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { "net9.0": { @@ -422,7 +422,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.204/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.100/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AquaCare.Persistence/obj/project.nuget.cache b/AquaCare.Persistence/obj/project.nuget.cache index a252fe6..7f91c08 100644 --- a/AquaCare.Persistence/obj/project.nuget.cache +++ b/AquaCare.Persistence/obj/project.nuget.cache @@ -1,16 +1,16 @@ { "version": 2, - "dgSpecHash": "TQt5mFwK/og=", + "dgSpecHash": "h3A898YCXCw=", "success": true, - "projectFilePath": "C:\\Users\\Maximilian.Martikke\\Desktop\\AquaCare\\AquaCare.Persistence\\AquaCare.Persistence.csproj", + "projectFilePath": "C:\\Users\\Martikke Maximilian\\Desktop\\AquaCare-1\\AquaCare.Persistence\\AquaCare.Persistence.csproj", "expectedPackageFiles": [ - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\microsoft.data.sqlite\\9.0.5\\microsoft.data.sqlite.9.0.5.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.5\\microsoft.data.sqlite.core.9.0.5.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\Maximilian.Martikke\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512" + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\microsoft.data.sqlite\\9.0.5\\microsoft.data.sqlite.9.0.5.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.5\\microsoft.data.sqlite.core.9.0.5.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Martikke Maximilian\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/AquaCare.View/MainWindow.axaml b/AquaCare.View/MainWindow.axaml index 4f746a9..8cccede 100644 --- a/AquaCare.View/MainWindow.axaml +++ b/AquaCare.View/MainWindow.axaml @@ -24,8 +24,7 @@ @@ -37,17 +36,24 @@ - + - - diff --git a/AquaCare.View/PflegeWindow.axaml b/AquaCare.View/PflegeWindow.axaml index 2ab94fc..351b79b 100644 --- a/AquaCare.View/PflegeWindow.axaml +++ b/AquaCare.View/PflegeWindow.axaml @@ -4,40 +4,54 @@ x:Class="AquaCare.View.PflegeWindow" xmlns:mc ="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="Pflege Werte eintragen" - Width="400" Height="350"> + Width="550" Height="480"> - - - - - - + Margin="20" + RowSpacing="10" + ColumnSpacing="20"> + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + - - + + -