Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2cd5d4aeed | ||
|
|
decc46d84a | ||
|
|
6ed8c0e231 | ||
|
|
59ea707007 | ||
|
|
0cce15a8f6 | ||
|
|
5f200fbeef |
@@ -0,0 +1,166 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
/// <summary>
|
||||
/// Zentrale Datenbankverwaltung für Logof Client.
|
||||
///
|
||||
/// Zuständig für:
|
||||
/// - PostgreSQL-Verbindung
|
||||
/// - EF Core DbContext
|
||||
/// - Datenbankmodelle
|
||||
/// - Migrationen
|
||||
/// - Verbindungstest
|
||||
/// </summary>
|
||||
public static class DatabseService
|
||||
{
|
||||
private static DbContextOptions<LogofDbContext>? _options;
|
||||
|
||||
/// <summary>
|
||||
/// Initialisiert die Datenbankverbindung.
|
||||
/// Sollte einmal beim Programmstart aufgerufen werden.
|
||||
/// </summary>
|
||||
public static void Initialize(string connectionString)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(connectionString))
|
||||
throw new ArgumentException(
|
||||
"Kein Datenbank-Connection-String angegeben.",
|
||||
nameof(connectionString));
|
||||
|
||||
var builder = new DbContextOptionsBuilder<LogofDbContext>();
|
||||
|
||||
builder.UseNpgsql(connectionString);
|
||||
|
||||
_options = builder.Options;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Erstellt einen neuen DbContext.
|
||||
/// </summary>
|
||||
public static LogofDbContext GetContext()
|
||||
{
|
||||
if (_options == null)
|
||||
throw new InvalidOperationException(
|
||||
"DB wurde noch nicht initialisiert. " +
|
||||
"Rufen Sie DB.Initialize(...) auf.");
|
||||
|
||||
return new LogofDbContext(_options);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Testet die Verbindung zum Datenbankserver.
|
||||
/// </summary>
|
||||
public static async Task<bool> TestConnectionAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
await using var db = GetContext();
|
||||
return await db.Database.CanConnectAsync();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Erstellt bzw. aktualisiert das Datenbankschema
|
||||
/// anhand der vorhandenen EF-Core-Migrationen.
|
||||
/// </summary>
|
||||
public static async Task MigrateAsync()
|
||||
{
|
||||
await using var db = GetContext();
|
||||
|
||||
await db.Database.MigrateAsync();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ============================================================================
|
||||
// DATABASE CONTEXT
|
||||
// ============================================================================
|
||||
|
||||
public class LogofDbContext : DbContext
|
||||
{
|
||||
public DbSet<CustomerEx> Customers => Set<CustomerEx>();
|
||||
|
||||
public LogofDbContext(
|
||||
DbContextOptions<LogofDbContext> options)
|
||||
: base(options)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
base.OnModelCreating(modelBuilder);
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
// Customer
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
modelBuilder.Entity<CustomerEx>(entity =>
|
||||
{
|
||||
entity.ToTable("customers");
|
||||
|
||||
entity.HasKey(x => x.Id);
|
||||
|
||||
entity.Property(x => x.Id)
|
||||
.ValueGeneratedOnAdd();
|
||||
|
||||
entity.Property(x => x.Name)
|
||||
.HasMaxLength(255)
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(x => x.Description)
|
||||
.HasMaxLength(4000);
|
||||
|
||||
entity.Property(x => x.SenderAddress)
|
||||
.HasMaxLength(4000);
|
||||
|
||||
entity.Property(x => x.Separator)
|
||||
.HasMaxLength(1)
|
||||
.IsRequired();
|
||||
|
||||
// Optimistic Concurrency
|
||||
entity.Property(x => x.Version)
|
||||
.IsConcurrencyToken();
|
||||
|
||||
entity.Property(x => x.CreatedAt)
|
||||
.IsRequired();
|
||||
|
||||
entity.Property(x => x.UpdatedAt)
|
||||
.IsRequired();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ============================================================================
|
||||
// DATABASE MODELS
|
||||
// ============================================================================
|
||||
|
||||
public class CustomerEx
|
||||
{
|
||||
public long Id { get; set; }
|
||||
|
||||
public string Name { get; set; } = "";
|
||||
|
||||
public string Description { get; set; } = "";
|
||||
|
||||
public string SenderAddress { get; set; } = "";
|
||||
|
||||
public char Separator { get; set; } = ',';
|
||||
|
||||
/// <summary>
|
||||
/// Wird bei jeder Änderung erhöht.
|
||||
/// Verhindert, dass zwei Benutzer sich gegenseitig
|
||||
/// Änderungen überschreiben.
|
||||
/// </summary>
|
||||
public long Version { get; set; } = 1;
|
||||
|
||||
public DateTime CreatedAt { get; set; }
|
||||
|
||||
public DateTime UpdatedAt { get; set; }
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
@@ -12,7 +13,7 @@ namespace Logof_Client;
|
||||
public static class SchemaMigration
|
||||
{
|
||||
// Current schema version - increment when you make breaking changes
|
||||
public const int CURRENT_SCHEMA_VERSION = 3;
|
||||
public const int CURRENT_SCHEMA_VERSION = 4;
|
||||
|
||||
// Dictionary of migration functions, keyed by the version they migrate TO
|
||||
private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new()
|
||||
@@ -22,7 +23,7 @@ public static class SchemaMigration
|
||||
// { 2, MigrateV1ToV2 },
|
||||
|
||||
// Example: Migration from v2 to v3
|
||||
// { 3, MigrateV2ToV3 },
|
||||
{ 4, MigrateV3ToV4 },
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
@@ -93,12 +94,12 @@ public static class SchemaMigration
|
||||
/// Example migration function: from v2 to v3.
|
||||
/// Add a new required field with a default value.
|
||||
/// </summary>
|
||||
private static JObject MigrateV2ToV3(JObject obj)
|
||||
private static JObject MigrateV3ToV4(JObject obj)
|
||||
{
|
||||
// Example: Add a new field that didn't exist before
|
||||
if (!obj.ContainsKey("new_required_field"))
|
||||
if (!obj.ContainsKey("moduleConfig"))
|
||||
{
|
||||
obj["new_required_field"] = "default_value";
|
||||
obj["moduleConfig"] = JToken.FromObject(new ModuleConfig());
|
||||
}
|
||||
|
||||
return obj;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
@@ -19,6 +20,8 @@ public class Settings
|
||||
public Customers customers = new();
|
||||
public PdfExportSettings pdfExport { get; set; } = new();
|
||||
|
||||
public ModuleConfig moduleConfig { get; set; } = new ModuleConfig();
|
||||
|
||||
public Settings()
|
||||
{
|
||||
_instance = this;
|
||||
@@ -70,6 +73,29 @@ public class Settings
|
||||
}
|
||||
}
|
||||
|
||||
public class ModuleConfig
|
||||
{
|
||||
/// <summary>
|
||||
/// Contains enabled modules and whether it's password-protected or not (non-existing-feature but soon)
|
||||
/// </summary>
|
||||
public List<(LCModule, bool)> EnabledModules = new();
|
||||
public ModuleConfig()
|
||||
{
|
||||
EnabledModules = new List<(LCModule,bool)>();
|
||||
}
|
||||
}
|
||||
|
||||
public enum LCModule
|
||||
{
|
||||
Addressmanagement,
|
||||
Pricemanagement,
|
||||
Wiki,
|
||||
Staffmanagement,
|
||||
UnifiedEndpointManagement,
|
||||
Financemanagement
|
||||
}
|
||||
|
||||
|
||||
public class PdfExportSettings
|
||||
{
|
||||
public double cellPaddingTopMm { get; set; } = 4;
|
||||
|
||||
+4
-1
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
@@ -24,6 +24,9 @@
|
||||
<PackageReference Include="Markdown.Avalonia" Version="11.0.3" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="PdfSharp" Version="6.1.1" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12" />
|
||||
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
+24
-5
@@ -22,7 +22,7 @@
|
||||
</MenuItem>
|
||||
</Menu>
|
||||
<TabControl Grid.Row="1">
|
||||
<TabItem>
|
||||
<TabItem IsVisible="False" x:Name="Addressmanagement">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="MapPinHouse" Width="32" Height="32" Size="32" />
|
||||
@@ -396,7 +396,7 @@
|
||||
</Grid>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem IsEnabled="False">
|
||||
<TabItem IsEnabled="False" IsVisible="False" x:Name="Staffmanagement">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Users" Width="32" Height="32" Size="32" />
|
||||
@@ -404,7 +404,7 @@
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
</TabItem>
|
||||
<TabItem IsEnabled="False">
|
||||
<TabItem IsEnabled="False" IsVisible="False" x:Name="Financemanagement">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="BadgeEuro" Width="32" Height="32" Size="32" />
|
||||
@@ -412,7 +412,7 @@
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
</TabItem>
|
||||
<TabItem IsEnabled="False">
|
||||
<TabItem IsEnabled="False" IsVisible="False" x:Name="Pricemanagement">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="ReceiptEuro" Width="32" Height="32" Size="32" />
|
||||
@@ -420,7 +420,15 @@
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
</TabItem>
|
||||
<TabItem IsEnabled="True">
|
||||
<TabItem IsEnabled="False" IsVisible="False" x:Name="UnifiedEndpointManagement">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="MonitorCog" Width="32" Height="32" Size="32" />
|
||||
<Label FontSize="20" Content="UEM" VerticalContentAlignment="Center" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
</TabItem>
|
||||
<TabItem IsEnabled="True" IsVisible="False" x:Name="Wiki">
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" />
|
||||
@@ -540,6 +548,17 @@
|
||||
<!-- </Grid> -->
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Puzzle" Width="16" Height="16" Size="16" />
|
||||
<Label FontSize="16" Content="Module" VerticalContentAlignment="Center" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<StackPanel Orientation="Vertical" Spacing="10" x:Name="StpSettingsModules">
|
||||
|
||||
</StackPanel>
|
||||
</TabItem>
|
||||
<TabItem>
|
||||
<TabItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
|
||||
@@ -85,8 +85,92 @@ public partial class MainWindow : Window
|
||||
{
|
||||
Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error);
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
foreach(var module in Enum.GetValues<LCModule>())
|
||||
{
|
||||
CheckBox b = new CheckBox
|
||||
{
|
||||
IsChecked = false
|
||||
};
|
||||
b.Click += (object sender, RoutedEventArgs e) => {
|
||||
RenewModuleSettings(module, b.IsChecked);
|
||||
};
|
||||
|
||||
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
|
||||
{
|
||||
if(conf.Item1 == module)
|
||||
{
|
||||
b.IsChecked = true;
|
||||
}
|
||||
}
|
||||
|
||||
Label l = new Label()
|
||||
{
|
||||
Content = module.ToString(),
|
||||
};
|
||||
StpSettingsModules.Children.Add(new StackPanel()
|
||||
{
|
||||
Orientation = Avalonia.Layout.Orientation.Horizontal,
|
||||
Children = {b,l}
|
||||
});
|
||||
}
|
||||
|
||||
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
|
||||
{
|
||||
Logger.Log($"Enabling module: {conf.Item1}");
|
||||
switch (conf.Item1)
|
||||
{
|
||||
case LCModule.Addressmanagement:
|
||||
Addressmanagement.IsVisible = true;
|
||||
break;
|
||||
case LCModule.Pricemanagement:
|
||||
Pricemanagement.IsVisible = true;
|
||||
break;
|
||||
case LCModule.Staffmanagement:
|
||||
Staffmanagement.IsVisible = true;
|
||||
break;
|
||||
case LCModule.Financemanagement:
|
||||
Financemanagement.IsVisible = true;
|
||||
break;
|
||||
case LCModule.Wiki:
|
||||
Wiki.IsVisible = true;
|
||||
break;
|
||||
case LCModule.UnifiedEndpointManagement:
|
||||
UnifiedEndpointManagement.IsVisible = true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
} catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while applying module configuration: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private void RenewModuleSettings(LCModule value, bool? enabled = true)
|
||||
{
|
||||
if (enabled == true)
|
||||
{
|
||||
Settings._instance.moduleConfig.EnabledModules.Add((value,false));
|
||||
} else
|
||||
{
|
||||
int index = -1;
|
||||
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
|
||||
{
|
||||
if(conf.Item1 == value)
|
||||
{
|
||||
index = Settings._instance.moduleConfig.EnabledModules.IndexOf(conf);
|
||||
}
|
||||
}
|
||||
if(index != -1)
|
||||
Settings._instance.moduleConfig.EnabledModules.RemoveAt(index);
|
||||
}
|
||||
Settings.Save();
|
||||
}
|
||||
private async void StartAddressCheck(int addresSetID)
|
||||
{
|
||||
var progressWindow = new ProgressWindow();
|
||||
|
||||
Reference in New Issue
Block a user