rumprobieren 2
This commit is contained in:
parent
a1bfbd510a
commit
2a80a9c0db
64
.gitignore
vendored
Normal file
64
.gitignore
vendored
Normal file
@ -0,0 +1,64 @@
|
||||
<<<<<<< HEAD
|
||||
## Build outputs
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
|
||||
## VS directories
|
||||
.vs/
|
||||
.vscode/
|
||||
|
||||
## Media files
|
||||
*.mp4
|
||||
*.avi
|
||||
*.mov
|
||||
*.wmv
|
||||
|
||||
## Binary files
|
||||
*.dll
|
||||
*.pdb
|
||||
*.dylib
|
||||
*.exe
|
||||
|
||||
## Database files
|
||||
*.db
|
||||
*.db-shm
|
||||
*.db-wal
|
||||
|
||||
## Package files
|
||||
*.nupkg
|
||||
packages/
|
||||
=======
|
||||
## Visual Studio Code files
|
||||
.vscode/
|
||||
*.code-workspace
|
||||
|
||||
## Visual Studio files
|
||||
.vs/
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
## Build results
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
[Ww][Ii][Nn]32/
|
||||
[Aa][Rr][Mm]/
|
||||
[Aa][Rr][Mm]64/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
|
||||
## Database files
|
||||
AquaCare.Persistence/AquaCareDatenbank.db
|
||||
AquaCare.Persistence/AquaCareDatenbank.db-shm
|
||||
AquaCare.Persistence/AquaCareDatenbank.db-wal
|
||||
|
||||
## .NET Core
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
|
||||
@ -1,22 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+d3bbef701c3f40da5d46c100801aac699d98a5b6")]
|
||||
[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.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
841f7cc68945e6a33cba6b9b65a75ec6eb972db4910b35aae3acfc5c8bc1ec6e
|
||||
@ -1,15 +0,0 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net9.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = AquaCare.Controller
|
||||
build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare\AquaCare.Controller\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
build_property.EffectiveAnalysisLevelStyle = 9.0
|
||||
build_property.EnableCodeStyleSeverity =
|
||||
@ -1,22 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+d3bbef701c3f40da5d46c100801aac699d98a5b6")]
|
||||
[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.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
aea3ac189d9d3aecb1d08eaf99d24a76ee6d6b333da18afc5d1c20ec006858c5
|
||||
@ -1,15 +0,0 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net9.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = AquaCare.Model
|
||||
build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare\AquaCare.Model\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
build_property.EffectiveAnalysisLevelStyle = 9.0
|
||||
build_property.EnableCodeStyleSeverity =
|
||||
@ -1,22 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
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+d3bbef701c3f40da5d46c100801aac699d98a5b6")]
|
||||
[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.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
eb8c3ff26b1ec6ca864e5f1e243b21eeb1764dc7b4a2be1d591769d46c44ea6b
|
||||
@ -1,15 +0,0 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net9.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = AquaCare.Persistence
|
||||
build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare\AquaCare.Persistence\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
build_property.EffectiveAnalysisLevelStyle = 9.0
|
||||
build_property.EnableCodeStyleSeverity =
|
||||
@ -1,9 +1,6 @@
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Interactivity;
|
||||
<<<<<<< HEAD
|
||||
using AquaCare.Controller;
|
||||
=======
|
||||
>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
|
||||
using AquaCare.Persistence;
|
||||
using System;
|
||||
|
||||
@ -11,41 +8,26 @@ namespace AquaCare.View
|
||||
{
|
||||
public partial class WerteWindow : Window
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
private readonly WerteController _controller;
|
||||
=======
|
||||
private readonly Datenbank _datenbank;
|
||||
>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
|
||||
|
||||
public WerteWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
<<<<<<< HEAD
|
||||
_controller = new WerteController(new Datenbank());
|
||||
LoadData();
|
||||
}
|
||||
|
||||
private void LoadData()
|
||||
{
|
||||
var werte = _controller.LoadWerte();
|
||||
WerteDataGrid.ItemsSource = werte; // Bindet die Werte an das DataGrid
|
||||
=======
|
||||
_datenbank = new Datenbank();
|
||||
LoadValues();
|
||||
}
|
||||
|
||||
private void LoadValues()
|
||||
{
|
||||
try
|
||||
{
|
||||
var werte = _datenbank.GetValuesAsObjects();
|
||||
var werte = _controller.LoadWerte();
|
||||
WerteDataGrid.ItemsSource = werte; // Bindet die Werte an das DataGrid
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine($"Fehler beim Laden der Werte: {ex.Message}");
|
||||
}
|
||||
>>>>>>> a4542b5f4bc0c338195b14e0a86137c5ccec21c6
|
||||
}
|
||||
|
||||
private void CloseWindowClick(object? sender, RoutedEventArgs e)
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("AquaCare.View")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d3bbef701c3f40da5d46c100801aac699d98a5b6")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("AquaCare.View")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("AquaCare.View")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
// Generated by the MSBuild WriteCodeFragment class.
|
||||
|
||||
@ -1 +0,0 @@
|
||||
ff0ba8b904ce04bb32e575158fa45ff32de6ef9c97f9bdb0839e3a7160c7a498
|
||||
@ -1,15 +0,0 @@
|
||||
is_global = true
|
||||
build_property.TargetFramework = net9.0
|
||||
build_property.TargetPlatformMinVersion =
|
||||
build_property.UsingMicrosoftNETSdkWeb =
|
||||
build_property.ProjectTypeGuids =
|
||||
build_property.InvariantGlobalization =
|
||||
build_property.PlatformNeutralAssembly =
|
||||
build_property.EnforceExtendedAnalyzerRules =
|
||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||
build_property.RootNamespace = AquaCare.View
|
||||
build_property.ProjectDir = C:\Users\Martikke Maximilian\Desktop\AquaCare\AquaCare.View\
|
||||
build_property.EnableComHosting =
|
||||
build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
build_property.EffectiveAnalysisLevelStyle = 9.0
|
||||
build_property.EnableCodeStyleSeverity =
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user