UI refresh fix

.gitignore

@@ -53,3 +53,5 @@ Thumbs.db
 */obj
 Drab/.config
 Drab/drab.db
+Drab/drab.db-shm
+Drab/drab.db-wal

Drab.Core/Drab.Core.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net9.0-windows</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>

Drab.Core/Models/Result.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Drab.Core.Models;
-
-namespace Drab.Core.Models;
 
 public class Result<TOk, TBad>
 {

Drab.LocalDb/Drab.LocalDb.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net9.0-windows</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
     <ItemGroup>

Drab.LocalDb/Entities/OrderDb.cs

@@ -1,5 +1,4 @@
-using System;
+using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations;
 
 namespace Drab.LocalDb.Entities;
 

Drab.Logic/Constants.cs

@@ -1,6 +1,5 @@
-using Drab.Logic.Services;
+using System.Reflection;
-using System.IO;
+using Drab.Logic.Services;
-using System.Reflection;
 
 namespace Drab.Logic;
 

Drab.Logic/Drab.Logic.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net9.0-windows</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
     <ItemGroup>
         <Reference Include="System.Printing">
@@ -11,21 +12,21 @@
         </Reference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="FastReport.OpenSource" Version="2025.2.0"/>
+        <PackageReference Include="FastReport.OpenSource" Version="2025.2.0" />
-        <PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="2025.2.0"/>
+        <PackageReference Include="FastReport.OpenSource.Export.PdfSimple" Version="2025.2.0" />
-        <PackageReference Include="FastReport.OpenSource.Web" Version="2025.2.0"/>
+        <PackageReference Include="FastReport.OpenSource.Web" Version="2025.2.0" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
-        <PackageReference Include="NLog" Version="6.0.1"/>
+        <PackageReference Include="NLog" Version="6.0.1" />
-        <PackageReference Include="PdfiumViewer" Version="2.13.0"/>
+        <PackageReference Include="PdfiumViewer" Version="2.13.0" />
-        <PackageReference Include="PdfiumViewer.Native.x86_64.v8-xfa" Version="2018.4.8.256"/>
+        <PackageReference Include="PdfiumViewer.Native.x86_64.v8-xfa" Version="2018.4.8.256" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Drab.Core\Drab.Core.csproj"/>
+        <ProjectReference Include="..\Drab.Core\Drab.Core.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Templates"/>
+        <Folder Include="Templates" />
     </ItemGroup>
 
     <ItemGroup>

Drab.Logic/Dtos/DokDto.cs

@@ -1,9 +1,4 @@
-using Pcm.Db.Entities;
+namespace Drab.Logic.Dtos;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Drab.Logic.Dtos;
 
 public class DokDto
 {

Drab.Logic/Dtos/MagDto.cs

@@ -1,6 +1,4 @@
-using Pcm.Db.Entities;
+namespace Drab.Logic.Dtos;
-
-namespace Drab.Logic.Dtos;
 
 public class MagDto
 {

Drab.Logic/Dtos/PozDokDto.cs

@@ -1,7 +1,4 @@
-using System.Linq;
+namespace Drab.Logic.Dtos;
-using Pcm.Db.Entities;
-
-namespace Drab.Logic.Dtos;
 
 public class PozDokDto
 {

Drab.Logic/Dtos/TowarDto.cs

@@ -1,6 +1,4 @@
-using Pcm.Db.Entities;
+namespace Drab.Logic.Dtos;
-
-namespace Drab.Logic.Dtos;
 
 public class TowarDto
 {

Drab.Logic/GlobalUsings.cs

@@ -0,0 +1,12 @@
+// Global using directives
+
+global using Drab.Core.Configuration;
+global using Drab.LocalDb;
+global using Drab.LocalDb.Entities;
+global using Drab.Logic.Dtos;
+global using Drab.Logic.Interfaces;
+global using Drab.Logic.Models;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using NLog;
+global using Pcm.Db.Entities;

Drab.Logic/Interfaces/IDbFetcher.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
+namespace Drab.Logic.Interfaces;
-
-namespace Drab.Logic.Interfaces;
 
 public interface IDbFetcher
 {

Drab.Logic/Interfaces/ILocalOrderStore.cs

@@ -1,9 +1,4 @@
-using Drab.LocalDb.Entities;
+namespace Drab.Logic.Interfaces;
-using Drab.Logic.Dtos;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Drab.Logic.Interfaces;
 
 public interface ILocalOrderStore
 {

Drab.Logic/Interfaces/IOrderPdfGenerator.cs

@@ -1,7 +1,4 @@
-using Drab.Logic.Dtos;
+namespace Drab.Logic.Interfaces;
-using System.Threading.Tasks;
-
-namespace Drab.Logic.Interfaces;
 
 public interface IOrderPdfGenerator
 {

Drab.Logic/Interfaces/IOrderProcessor.cs

@@ -1,7 +1,4 @@
-using Drab.Logic.Dtos;
+namespace Drab.Logic.Interfaces;
-using System.Threading.Tasks;
-
-namespace Drab.Logic.Interfaces;
 
 public interface IOrderProcessor
 {

Drab.Logic/Interfaces/IOrderStore.cs

@@ -1,8 +1,4 @@
 using Drab.Core.Models;
-using Drab.Logic.Dtos;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Drab.Logic.Interfaces;
 

Drab.Logic/Interfaces/IPrintService.cs

@@ -1,7 +1,4 @@
-using Drab.Logic.Models;
+namespace Drab.Logic.Interfaces;
-using System.Threading.Tasks;
-
-namespace Drab.Logic.Interfaces;
 
 public interface IPrintService
 {

Drab.Logic/Ioc/IocLogicRegister.cs

@@ -1,7 +1,5 @@
-using Drab.Logic.Interfaces;
+using Drab.Logic.Services;
-using Drab.Logic.Services;
 using Drab.Logic.Utils;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Drab.Logic.Ioc;
 

Drab.Logic/Models/PrintDocument.cs

@@ -1,6 +1,4 @@
-using System.Drawing;
+namespace Drab.Logic.Models;
-
-namespace Drab.Logic.Models;
 
 public record PrintDocumentRequest(string FilePath, long DokId);
 

Drab.Logic/Services/LocalOrderStore.cs

@@ -1,31 +1,10 @@
-using System;
+namespace Drab.Logic.Services;
-using Drab.LocalDb;
-using Drab.LocalDb.Entities;
-using Drab.Logic.Dtos;
-using Drab.Logic.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
-using NLog;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Drab.Logic.Services;
+public class LocalOrderStore(IServiceScopeFactory serviceScopeFactory) : ILocalOrderStore
-
-public class LocalOrderStore : ILocalOrderStore
 {
-
-    private readonly ILogger _logger;
-    private readonly IServiceScopeFactory _serviceScopeFactory;
-
-    public LocalOrderStore(IServiceScopeFactory serviceScopeFactory)
-    {
-        _logger = LogManager.GetCurrentClassLogger();
-        _serviceScopeFactory = serviceScopeFactory;
-    }
-
     public async Task<List<OrderDb>> GetAll()
     {
-        using var scope = _serviceScopeFactory.CreateScope();
+        using var scope = serviceScopeFactory.CreateScope();
         await using var dbContext = scope.ServiceProvider.GetService<LocalDbContext>();
         var fromDate = DateTime.UtcNow.AddDays(-30);
 
@@ -38,7 +17,7 @@ public class LocalOrderStore : ILocalOrderStore
 
     public async Task<DokDto> GetOrderById(long dokId)
     {
-        using var scope = _serviceScopeFactory.CreateScope();
+        using var scope = serviceScopeFactory.CreateScope();
         await using var dbContext = scope.ServiceProvider.GetService<LocalDbContext>();
         var order = dbContext.Orders.FirstOrDefault(x => x.DokId == dokId);
 

Drab.Logic/Services/OldOrdersCleanupService.cs

@@ -1,11 +1,4 @@
-using System;
+using Microsoft.Extensions.Hosting;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Drab.LocalDb;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 namespace Drab.Logic.Services;
 
@@ -35,21 +28,39 @@ public class OldOrdersCleanupService : BackgroundService
                     .Where(o => o.Created < threshold)
                     .ToList();
 
-                if (oldOrders.Count != 0)
+                var filesToDelete = oldOrders
+                    .Select(o => Path.Combine(Constants.ReportsOutputPath, o.Filename))
+                    .Where(p => !string.IsNullOrWhiteSpace(p) && File.Exists(p))
+                    .ToList();
+
+                foreach (var path in filesToDelete)
+                {
+                    try
+                    {
+                        File.Delete(path);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogWarning(ex, "Failed to delete file: {FilePath}", path);
+                    }
+                }
+
+                if (oldOrders.Count > 0)
                 {
                     dbContext.Orders.RemoveRange(oldOrders);
                     await dbContext.SaveChangesAsync(stoppingToken);
 
-                    _logger.LogInformation("Usunięto {OldOrdersCount} starych zamówień.", oldOrders.Count);
+                    _logger.LogInformation("Removed {OrderCount} old orders and deleted {FileCount} files.",
+                        oldOrders.Count, filesToDelete.Count);
                 }
                 else
                 {
-                    _logger.LogInformation("Nie znaleziono starych zamówień do usunięcia.");
+                    _logger.LogInformation("Nothing to do.");
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Błąd podczas usuwania starych zamówień.");
+                _logger.LogError(ex, "Error occured:");
             }
 
             await Task.Delay(_interval, stoppingToken);

Drab.Logic/Services/OrderEventBus.cs

@@ -1,6 +1,4 @@
-using System;
+namespace Drab.Logic.Services;
-
-namespace Drab.Logic.Services;
 
 public class OrderEventBus
 {

Drab.Logic/Services/OrderPdfGenerator.cs

@@ -1,27 +1,14 @@
-using Drab.Logic.Dtos;
+using System.Reflection;
-using Drab.Logic.Interfaces;
 using FastReport;
 using FastReport.Export.PdfSimple;
-using NLog;
-using System;
-using System.IO;
-using System.Reflection;
-using System.Threading.Tasks;
 
 namespace Drab.Logic.Services;
 
-internal class OrderPdfGenerator : IOrderPdfGenerator
+internal class OrderPdfGenerator(ILogger<OrderPdfGenerator> logger) : IOrderPdfGenerator
 {
-    private readonly ILogger _logger;
-
-    public OrderPdfGenerator()
-    {
-        _logger = LogManager.GetCurrentClassLogger();
-    }
-
     public Task<string> GenerateOrder(DokDto order)
     {
-        _logger.Info($"Generate pdf document: {order.NrDok}");
+        logger.LogInformation("Generate pdf document: {OrderNo}", order.NrDok);
         var cleanFilename = order.NrDok.Replace('/', '-');
         var orderFilename = $"Zam_{cleanFilename}_{order.Data:yyyy-MM-dd}_{order.Sklep}_{order.DokId}.pdf";
         var templatePath = Path.Combine(Constants.ReportsTemplatesPath, "Order.frx");
@@ -44,7 +31,7 @@ internal class OrderPdfGenerator : IOrderPdfGenerator
         }
         catch (Exception e)
         {
-            _logger.Error(e, "Error on generating order document: {OrderNo}", order.NrDok);
+            logger.LogError(e, "Error on generating order document: {OrderNo}", order.NrDok);
             return Task.FromResult(string.Empty);
         }
     }

Drab.Logic/Services/OrderProcessor.cs

@@ -1,20 +1,10 @@
-using Drab.LocalDb;
+using Microsoft.EntityFrameworkCore;
-using Drab.LocalDb.Entities;
-using Drab.Logic.Dtos;
-using Drab.Logic.Interfaces;
-using Drab.Logic.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using NLog;
-using System;
-using System.IO;
-using System.Threading.Tasks;
 
 namespace Drab.Logic.Services;
 
 public class OrderProcessor : IOrderProcessor
 {
-    private readonly ILogger _logger;
+    private readonly ILogger<OrderProcessor> _logger;
     private readonly IServiceScopeFactory _serviceScopeFactory;
     private readonly IPrintService _printService;
     private readonly IOrderPdfGenerator _orderPdfGenerator;
@@ -23,13 +13,13 @@ public class OrderProcessor : IOrderProcessor
     public OrderProcessor(IServiceScopeFactory serviceScopeFactory,
                           IPrintService printService,
                           IOrderPdfGenerator orderPdfGenerator,
-                          OrderEventBus eventBus)
+                          OrderEventBus eventBus, ILogger<OrderProcessor> logger)
     {
-        _logger = LogManager.GetCurrentClassLogger();
         _serviceScopeFactory = serviceScopeFactory;
         _printService = printService;
         _orderPdfGenerator = orderPdfGenerator;
         _eventBus = eventBus;
+        _logger = logger;
     }
 
     public async Task ProcessOrder(DokDto order)
@@ -40,7 +30,6 @@ public class OrderProcessor : IOrderProcessor
             return;
 
         var filePath = await EnsureOrderPdfExists(order, dok);
-
         var printResult = await PrintOrder(order, filePath);
 
         if (printResult.IsSuccess)
@@ -57,7 +46,7 @@ public class OrderProcessor : IOrderProcessor
         if (dok != null)
             return dok;
 
-        _logger.Info("Creating new order - {OrderNo}", order.NrDok);
+        _logger.LogInformation("Creating new order - {OrderNo}", order.NrDok);
 
         dok = new OrderDb
         {
@@ -83,7 +72,7 @@ public class OrderProcessor : IOrderProcessor
                 return fullPath;
         }
 
-        _logger.Info("Generating order file: {OrderNo}", order.NrDok);
+        _logger.LogInformation("Generating order file: {OrderNo}", order.NrDok);
 
         var generatedFilename = await _orderPdfGenerator.GenerateOrder(order);
         var newPath = Path.Combine(Constants.ReportsOutputPath, generatedFilename);
@@ -98,11 +87,11 @@ public class OrderProcessor : IOrderProcessor
 
     private async Task<PrintDocumentResult> PrintOrder(DokDto order, string filePath)
     {
-        _logger.Info("Printing order: {OrderNo}", order.NrDok);
+        _logger.LogInformation("Printing order: {OrderNo}", order.NrDok);
 
         var result = await _printService.PrintPdf(new PrintDocumentRequest(filePath, order.DokId));
 
-        _logger.Info("Printing result - OrderNo: {OrderNo}, Success: {IsSuccess}, Message: {Message}",
+        _logger.LogInformation("Printing result - OrderNo: {OrderNo}, Success: {IsSuccess}, Message: {Message}",
             order.NrDok, result.IsSuccess, result.Message);
 
         return result;
@@ -120,7 +109,7 @@ public class OrderProcessor : IOrderProcessor
         }
         catch (Exception e)
         {
-            _logger.Error(e, "Error retrieving order from database");
+            _logger.LogError(e, "Error retrieving order from database");
             return null;
         }
     }

Drab.Logic/Services/OrdersStore.cs

@@ -1,45 +1,41 @@
-using Drab.Core.Models;
+using System.Globalization;
-using Drab.Logic.Dtos;
+using Drab.Core.Models;
-using Drab.Logic.Interfaces;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using NLog;
 using Pcm.Db;
 using Pcm.Db.Enums;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
-using Drab.Core.Configuration;
 
 namespace Drab.Logic.Services;
 
 public class OrdersStore : IOrdersStore, IDisposable
 {
-    private readonly ILogger _logger;
+    private readonly ILogger<OrdersStore> _logger;
     private readonly IServiceScopeFactory _serviceScopeFactory;
     private readonly IDrabSettings _drabSettings;
 
-    public OrdersStore(IServiceScopeFactory serviceScopeFactory, IDrabSettings drabSettings)
+    public OrdersStore(ILogger<OrdersStore> logger, IServiceScopeFactory serviceScopeFactory, IDrabSettings drabSettings)
     {
         _serviceScopeFactory = serviceScopeFactory;
         _drabSettings = drabSettings;
-        _logger = LogManager.GetCurrentClassLogger();
+        _logger = logger;
     }
 
     public async Task<Result<List<DokDto>, string>> FetchOrders()
     {
-        _logger.Info("Fetch new orders");
+        _logger.LogInformation("Fetch new orders");
 
+        var now = DateTime.Now;
+        var fallbackDate = now - TimeSpan.FromDays(30);
         DateTime date;
+
         try
         {
-            date = DateTime.ParseExact(_drabSettings.IgnoreOrdersBefore, "yyyy-MM-dd", CultureInfo.InvariantCulture);
+            var parsed = DateTime.ParseExact(_drabSettings.IgnoreOrdersBefore, "yyyy-MM-dd", CultureInfo.InvariantCulture);
+            date = (now - parsed).TotalDays > 30 ? fallbackDate : parsed;
         }
         catch
         {
-            date = DateTime.Now - TimeSpan.FromDays(30);
+            _logger.LogWarning("IgnoreOrdersBefore is invalid, falling back to last 30 days.");
+            date = fallbackDate;
         }
 
         using var scope = _serviceScopeFactory.CreateScope();
@@ -67,7 +63,7 @@ public class OrdersStore : IOrdersStore, IDisposable
         }
         catch (Exception e)
         {
-            _logger.Error(e, "Error on fetching orders");
+            _logger.LogError(e, "Error on fetching orders");
             return Result.Failed<List<DokDto>, string>(e.Message);
         }
     }

Drab.Logic/Services/PrintService.cs

@@ -1,26 +1,11 @@
-using Drab.Core.Configuration;
+using System.Drawing.Printing;
-using Drab.Logic.Interfaces;
-using Drab.Logic.Models;
-using PdfiumViewer;
-using System;
-using System.Collections.Generic;
-using System.Drawing.Printing;
-using System.IO;
-using System.Linq;
 using System.Printing;
-using System.Threading.Tasks;
+using PdfiumViewer;
 
 namespace Drab.Logic.Services;
 
-public class PrintService : IPrintService
+public class PrintService(IDrabSettings drabSettings) : IPrintService
 {
-    private readonly IDrabSettings _drabSettings;
-
-    public PrintService(IDrabSettings drabSettings)
-    {
-        _drabSettings = drabSettings;
-    }
-
     public async Task<PrintDocumentResult> PrintPdf(PrintDocumentRequest request)
     {
         try
@@ -46,7 +31,7 @@ public class PrintService : IPrintService
                 }
             }
 
-            await Task.Delay(TimeSpan.FromSeconds(_drabSettings.PrinterTimeoutSeconds));
+            await Task.Delay(TimeSpan.FromSeconds(drabSettings.PrinterTimeoutSeconds));
 
             var jobs = GetPrintJobs(request.DokId.ToString());
             if (jobs.Count == 0)

Drab.Logic/Templates/Order.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Name="Zamówienie" ReportInfo.Author="Piekarnia-Cukiernia BRZĘCZEK SP.K." ReportInfo.Version="1.0.0" ReportInfo.Created="06/20/2009 22:40:42" ReportInfo.Modified="07/11/2025 00:08:23" ReportInfo.CreatorVersion="2025.2.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Name="Zamówienie" ReportInfo.Author="Piekarnia-Cukiernia BRZĘCZEK SP.K." ReportInfo.Version="1.0.0" ReportInfo.Created="06/20/2009 22:40:42" ReportInfo.Modified="07/11/2025 01:02:35" ReportInfo.CreatorVersion="2025.2.0.0">
   <Styles>
     <Style Name="Dark" Fill.Color="Gainsboro" Font="Arial, 10pt" ApplyBorder="false" ApplyTextFill="false" ApplyFont="false"/>
   </Styles>
@@ -37,11 +37,11 @@
     <Parameter Name="generatedAt" DataType="System.String" AsString=""/>
     <Parameter Name="version" DataType="System.String" AsString=""/>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="Arial, 60pt" LastPageSource="15" FirstPageSource="15" OtherPageSource="15">
+  <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="Arial, 60pt" LastPageSource="15" FirstPageSource="15">
     <PageHeaderBand Name="PageHeader1" Width="718.2" Height="85.05">
       <TextObject Name="Text18" Width="718.2" Height="28.35" Text="[Order.NrDok]" HorzAlign="Center" Font="Arial, 14pt, style=Bold"/>
       <TextObject Name="Text20" Top="37.8" Width="283.5" Height="28.35" Text="Data: [Order.Data]&#13;&#10;" VertAlign="Center" Font="Arial, 11pt, style=Bold"/>
-      <TextObject Name="Text19" Left="292.95" Top="37.8" Width="396.9" Height="28.35" Text="Sklep: [Order.Sklep]" HorzAlign="Right" VertAlign="Center" Font="Arial, 11pt, style=Bold"/>
+      <TextObject Name="Text19" Left="283.5" Top="37.8" Width="434.7" Height="28.35" Text="Sklep: [Order.Sklep]" HorzAlign="Right" VertAlign="Center" Font="Arial, 11pt, style=Bold"/>
     </PageHeaderBand>
     <DataBand Name="Data1" Top="86.65" Width="718.2" Height="28.35" DataSource="Order">
       <TableObject Name="Table2" Width="717.95" Height="28.35">
@@ -81,10 +81,10 @@
         <LineObject Name="Line3" Width="718.2" Diagonal="true"/>
       </DataFooterBand>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="242.8" Width="718.2" Height="18.9">
+    <PageFooterBand Name="PageFooter1" Top="242.8" Width="718.2" Height="47.25">
       <TextObject Name="Text6" Left="471" Width="245.7" Height="18.9" Text="Strona [Page#] z [TotalPages#]" HorzAlign="Right" VertAlign="Center" Font="Arial, 10pt"/>
       <TextObject Name="Text7" Width="245.7" Height="18.9" Text="Wygenerowano: [generatedAt]" VertAlign="Center" Font="Arial, 10pt"/>
-      <TextObject Name="Text17" Left="245.7" Width="226.8" Height="18.9" Text="DRAB [version]" HorzAlign="Center" VertAlign="Center" Font="Arial, 10pt"/>
+      <TextObject Name="Text17" Top="28.35" Width="718.2" Height="18.9" Text="DRAB [version]" HorzAlign="Center" VertAlign="Center" Font="Arial, 10pt" TextFill.Color="Silver"/>
     </PageFooterBand>
   </ReportPage>
 </Report>

Drab.Logic/Utils/DbFetcher.cs

@@ -1,12 +1,4 @@
-using Drab.Core.Configuration;
+using Microsoft.Extensions.Hosting;
-using Drab.Logic.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
-using NLog;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
 
 namespace Drab.Logic.Utils;
 
@@ -15,14 +7,14 @@ public class DbFetcher : BackgroundService
     private readonly IDrabSettings _drabSettings;
     private readonly IServiceScopeFactory _serviceScopeFactory;
     private readonly IOrderProcessor _orderProcessor;
-    private readonly ILogger _logger;
+    private readonly ILogger<DbFetcher> _logger;
 
-    public DbFetcher(IDrabSettings drabSettings, IServiceScopeFactory serviceScopeFactory, IOrderProcessor orderProcessor)
+    public DbFetcher(IDrabSettings drabSettings, IServiceScopeFactory serviceScopeFactory, IOrderProcessor orderProcessor, ILogger<DbFetcher> logger)
     {
         _drabSettings = drabSettings;
         _serviceScopeFactory = serviceScopeFactory;
         _orderProcessor = orderProcessor;
-        _logger = LogManager.GetCurrentClassLogger();
+        _logger = logger;
     }
 
     protected override Task ExecuteAsync(CancellationToken stoppingToken)
@@ -31,12 +23,12 @@ public class DbFetcher : BackgroundService
         return Task.CompletedTask;
     }
 
-    public async Task Start()
+    private async Task Start()
     {
         await Task.Delay(TimeSpan.FromSeconds(2));
         while (true)
         {
-            _logger.Info("Fetch database for new orders");
+            _logger.LogInformation("Fetch database for new orders");
             try
             {
                 using var scope = _serviceScopeFactory.CreateScope();
@@ -44,14 +36,14 @@ public class DbFetcher : BackgroundService
                 var result = await orderStore.FetchOrders();
 
                 if (result.IsNotOk)
-                    _logger.Warn($"Fetch orders result failed: {result.Error}");
+                    _logger.LogWarning($"Fetch orders result failed: {result.Error}");
 
                 result.Value.ToList()
                     .ForEach(x => _orderProcessor.ProcessOrder(x));
             }
             catch (Exception e)
             {
-                _logger.Error(e, "Error on fetching new orders data:");
+                _logger.LogError(e, "Error on fetching new orders data:");
             }
             finally
             {

Drab/Program.cs

@@ -1,3 +1,4 @@
+using System.Globalization;
 using System.Net;
 using Drab.Core.Configuration;
 using Drab.Core.Ioc;
@@ -11,6 +12,15 @@ using NLog.Extensions.Logging;
 using Pcm.Db.Ioc;
 using Radzen;
 
+
+var culture = new CultureInfo("pl-PL");
+CultureInfo.DefaultThreadCurrentCulture = culture;
+CultureInfo.DefaultThreadCurrentUICulture = culture;
+CultureInfo.CurrentCulture = culture;
+CultureInfo.CurrentUICulture = culture;
+Thread.CurrentThread.CurrentCulture = culture;
+Thread.CurrentThread.CurrentUICulture = culture;
+
 var builder = WebApplication.CreateBuilder(args);
 
 var configurationBuilder = new ConfigurationBuilder()

Drab/Ui/App.razor

@@ -1,4 +1,4 @@
-@using Drab.Ui.components
+@using Drab.Ui.Components
 @using Microsoft.AspNetCore.Components.Web
 @using Radzen
 
@@ -18,7 +18,8 @@
 
 <body>
 <Routes @rendermode="RenderMode.InteractiveServer"/>
-<script src="_content/Radzen.Blazor/Radzen.Blazor.js?v=@(typeof(Colors).Assembly.GetName().Version)"></script>
+<script src="_content/Radzen.Blazor/Radzen.Blazor.js?v=@(typeof(Colors).Assembly.GetName()
+                                                           .Version)"></script>
 <script src="_framework/blazor.web.js"></script>
 </body>
 

Drab/Ui/Pages/Index.razor

@@ -2,7 +2,8 @@
 @using Drab.LocalDb
 @using Drab.LocalDb.Entities
 @using Drab.Logic.Services
-@using Drab.Ui.components
+@using Drab.Ui.Components
+@using Microsoft.EntityFrameworkCore
 @using Radzen
 @inject LocalDbContext LocalDbContext
 @inject DialogService DialogService
@@ -64,20 +65,20 @@
 </RadzenDataGrid>
 
 @code {
-    IQueryable<OrderDb> _orders;
+    List<OrderDb> _orders;
     private RadzenDataGrid<OrderDb>? _dataGridRef;
 
     protected override void OnInitialized()
     {
         EventBus.OrdersChanged += OnOrdersChanged;
-        _orders = LocalDbContext.Orders;
+        _orders = LocalDbContext.Orders.AsNoTracking().ToList();
     }
 
     private async Task RowClick(DataGridRowMouseEventArgs<OrderDb> obj)
     {
         await DialogService.OpenAsync<PdfViewer>($"Zamówienie {obj.Data.OrderNumber} - Sklep {obj.Data.Shop}",
-            new Dictionary<string, object>() {{nameof(PdfViewer.Filename), obj.Data.Filename}},
+            new Dictionary<string, object> {{nameof(PdfViewer.Filename), obj.Data.Filename}},
-            new DialogOptions()
+            new DialogOptions
             {
                 CloseDialogOnEsc = true,
                 CloseDialogOnOverlayClick = true,
@@ -92,8 +93,8 @@
     {
         InvokeAsync(() =>
         {
-            _orders = LocalDbContext.Orders;
+            _orders = LocalDbContext.Orders.AsNoTracking().ToList();
-            _dataGridRef?.Reload();
+            _dataGridRef?.RefreshDataAsync();
             StateHasChanged();
             return Task.CompletedTask;
         });

Drab/appsettings.Development.json

@@ -1,10 +0,0 @@
-{
-  "DetailedErrors": true,
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}

Drab/appsettings.json

@@ -3,7 +3,8 @@
     "LogLevel": {
       "Default": "Information",
       "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.EntityFrameworkCore.Model.Validation": "None"
     }
   },
   "ListenPort":  80,
@@ -11,7 +12,7 @@
   "DrabSettings": {
     "DbPollingFrequencyInSeconds": 180,
     "PrinterTimeoutSeconds": 30,
-    "IgnoreOrdersBefore": "2025-07-11"
+    "IgnoreOrdersBefore": "2025-07-08"
   },
   "PcmDbSettings": {
     "Host": "192.168.200.6",

Drab/nlog.config

@@ -25,6 +25,8 @@
     </targets>
 
     <rules>
+        <logger name="Microsoft.EntityFrameworkCore.Model.Validation" minlevel="Info" final="true"/>
+        <logger name="Microsoft.EntityFrameworkCore.Query" minlevel="Info" final="true"/>
         <logger name="Microsoft.Hosting.Lifetime" minlevel="Info" writeTo="File, Console" final="true"/>
         <logger name="Microsoft.*" maxlevel="Info" final="true"/>
         <logger name="System.Net.Http.*" maxlevel="Info" final="true"/>

Pcm.Db/Entities/Akwizytor.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Akwizytor
 {

Pcm.Db/Entities/Artykul.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Artykul
 {

Pcm.Db/Entities/Asort.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+using System.Text.Json.Serialization;
-using System.Text.Json.Serialization;
-
-#nullable disable
 
 namespace Pcm.Db.Entities;
 

Pcm.Db/Entities/Bank.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Bank
 {

Pcm.Db/Entities/Blokadum.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class Blokadum
 {

Pcm.Db/Entities/CentrStanZgody.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class CentrStanZgody
 {

Pcm.Db/Entities/Cza.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Cza
 {

Pcm.Db/Entities/DefinicjaKodu.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class DefinicjaKodu
 {

Pcm.Db/Entities/Dok.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Text.Json.Serialization;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-#nullable disable
 
 namespace Pcm.Db.Entities;
 

Pcm.Db/Entities/DokDodKth.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class DokDodKth
 {

Pcm.Db/Entities/DokKasa.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class DokKasa
 {

Pcm.Db/Entities/DokKontoBankowe.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class DokKontoBankowe
 {

Pcm.Db/Entities/DokKontr.cs

@@ -1,7 +1,5 @@
 using System.Text.Json.Serialization;
 
-#nullable disable
-
 namespace Pcm.Db.Entities;
 
 public class DokKontr

Pcm.Db/Entities/DokKur.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class DokKur
 {

Pcm.Db/Entities/DokPunkty.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class DokPunkty
 {

Pcm.Db/Entities/DokWalutum.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class DokWalutum
 {

Pcm.Db/Entities/DostProd.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class DostProd
 {

Pcm.Db/Entities/Dostawca.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class Dostawca
 {

Pcm.Db/Entities/DzienRozl.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class DzienRozl
 {

Pcm.Db/Entities/DzienRozlParam.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class DzienRozlParam
 {

Pcm.Db/Entities/FormZgod.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class FormZgod
 {

Pcm.Db/Entities/FormaPlatnPos7.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class FormaPlatnPos7
 {

Pcm.Db/Entities/FormaPlatnosci.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class FormaPlatnosci
 {

Pcm.Db/Entities/GrWartosc.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class GrWartosc
 {

Pcm.Db/Entities/GrupaAkcyzowa.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class GrupaAkcyzowa
 {

Pcm.Db/Entities/GrupaTow.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class GrupaTow
 {

Pcm.Db/Entities/GrupaUz.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class GrupaUz
 {

Pcm.Db/Entities/HarmCeny.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class HarmCeny
 {

Pcm.Db/Entities/HarmCykl.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class HarmCykl
 {

Pcm.Db/Entities/HarmHarm.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class HarmHarm
 {

Pcm.Db/Entities/HarmWpi.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class HarmWpi
 {

Pcm.Db/Entities/Istw.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Istw
 {

Pcm.Db/Entities/Jm.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Jm
 {

Pcm.Db/Entities/KartaLoj.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KartaLoj
 {

Pcm.Db/Entities/KasKod.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KasKod
 {

Pcm.Db/Entities/KasPar.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KasPar
 {

Pcm.Db/Entities/KasTow.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KasTow
 {

Pcm.Db/Entities/Kasa.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Kasa
 {

Pcm.Db/Entities/KasaFormaPlatn.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KasaFormaPlatn
 {

Pcm.Db/Entities/KatParam.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KatParam
 {

Pcm.Db/Entities/Kategorium.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Kategorium
 {

Pcm.Db/Entities/KodDod.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KodDod
 {

Pcm.Db/Entities/KodWazony.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KodWazony
 {

Pcm.Db/Entities/Komentarz.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class Komentarz
 {

Pcm.Db/Entities/Konfig.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class Konfig
 {

Pcm.Db/Entities/KontoBankowe.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KontoBankowe
 {

Pcm.Db/Entities/KontoBankoweKontr.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KontoBankoweKontr
 {

Pcm.Db/Entities/KontoLoj.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KontoLoj
 {

Pcm.Db/Entities/KontrOpi.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KontrOpi
 {

Pcm.Db/Entities/Kontrahent.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Text.Json.Serialization;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-#nullable disable
 
 namespace Pcm.Db.Entities;
 

Pcm.Db/Entities/Kraj.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class Kraj
 {

Pcm.Db/Entities/KrajStawka.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KrajStawka
 {

Pcm.Db/Entities/KthParWartosc.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KthParWartosc
 {

Pcm.Db/Entities/KthParam.cs

@@ -1,8 +1,4 @@
-using System.Collections.Generic;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KthParam
 {

Pcm.Db/Entities/KthTypO.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KthTypO
 {

Pcm.Db/Entities/KthWartosc.cs

@@ -1,6 +1,4 @@
-#nullable disable
+namespace Pcm.Db.Entities;
-
-namespace Pcm.Db.Entities;
 
 public class KthWartosc
 {

Pcm.Db/Entities/KursWaluty.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class KursWaluty
 {

Pcm.Db/Entities/LiniaLotnicza.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class LiniaLotnicza
 {

Pcm.Db/Entities/LogOperation.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-using System.Collections.Generic;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class LogOperation
 {

Pcm.Db/Entities/LogTypeDef.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class LogTypeDef
 {

Pcm.Db/Entities/LogValChangeNum.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class LogValChangeNum
 {

Pcm.Db/Entities/LogValChangeTxt.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Pcm.Db.Entities;
-
-#nullable disable
-
-namespace Pcm.Db.Entities;
 
 public class LogValChangeTxt
 {