Revert "Refactor PDF viewing and integrate DevExpress support"
This reverts commit b515b4f523.
This commit is contained in:
@@ -1,16 +0,0 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using DevExpress.AspNetCore.Reporting.WebDocumentViewer;
|
|
||||||
using DevExpress.AspNetCore.Reporting.WebDocumentViewer.Native.Services;
|
|
||||||
|
|
||||||
namespace DXApp.TemplateKitProject.Controllers
|
|
||||||
{
|
|
||||||
[Route("DocumentViewer")]
|
|
||||||
public class DocumentViewerController : WebDocumentViewerController
|
|
||||||
{
|
|
||||||
// Hier den erwarteten DevExpress-Service injizieren und an die Basisklasse weitergeben
|
|
||||||
public DocumentViewerController(IWebDocumentViewerMvcControllerService controllerService)
|
|
||||||
: base(controllerService)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -29,4 +29,8 @@
|
|||||||
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />
|
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Controllers\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,6 +1,2 @@
|
|||||||
@page
|
@page
|
||||||
@model DXApp.TemplateKitProject.Pages.Invoices.ViewPdfModel
|
@model DXApp.TemplateKitProject.Pages.Invoices.ViewPdfModel
|
||||||
@{
|
|
||||||
Layout = "_Layout";
|
|
||||||
// Diese Seite liefert keinen HTML-Content; der Handler gibt die PDF zurück.
|
|
||||||
}
|
|
||||||
@@ -1,40 +1,24 @@
|
|||||||
using Microsoft.AspNetCore.Mvc;
|
using DXApp.TemplateKitProject.Data;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
using DXApp.TemplateKitProject.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
namespace DXApp.TemplateKitProject.Pages.Invoices;
|
namespace DXApp.TemplateKitProject.Pages.Invoices;
|
||||||
|
|
||||||
public class ViewPdfModel : PageModel
|
public class ViewPdfModel(AppDbContext db) : PageModel
|
||||||
{
|
{
|
||||||
private readonly AppDbContext _db;
|
|
||||||
private readonly ILogger<ViewPdfModel> _logger;
|
|
||||||
|
|
||||||
public ViewPdfModel(AppDbContext db, ILogger<ViewPdfModel> logger)
|
|
||||||
{
|
|
||||||
_db = db;
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<IActionResult> OnGetAsync(int id)
|
public async Task<IActionResult> OnGetAsync(int id)
|
||||||
{
|
{
|
||||||
// Sicherheit: defensive checks, gleiche Logik wie CustomReportStorageWebExtension
|
var invoice = await db.ZugferdInvoices
|
||||||
var invoice = await _db.ZugferdInvoices
|
|
||||||
.AsNoTracking()
|
|
||||||
.FirstOrDefaultAsync(i => i.Id == id);
|
.FirstOrDefaultAsync(i => i.Id == id);
|
||||||
|
|
||||||
if (invoice is null)
|
if (invoice is null || string.IsNullOrEmpty(invoice.ResultFilePath))
|
||||||
return NotFound();
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(invoice.ResultFilePath))
|
|
||||||
return NotFound();
|
return NotFound();
|
||||||
|
|
||||||
if (!System.IO.File.Exists(invoice.ResultFilePath))
|
if (!System.IO.File.Exists(invoice.ResultFilePath))
|
||||||
return NotFound();
|
return NotFound();
|
||||||
|
|
||||||
var bytes = await System.IO.File.ReadAllBytesAsync(invoice.ResultFilePath);
|
var bytes = await System.IO.File.ReadAllBytesAsync(invoice.ResultFilePath);
|
||||||
_logger.LogInformation("ViewPdf: Invoice {Id} ausgeliefert ({Size} Bytes).", id, bytes.Length);
|
return File(bytes, "application/pdf");
|
||||||
|
|
||||||
return File(bytes, "application/pdf", $"{Path.GetFileName(invoice.ResultFilePath)}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,9 +8,6 @@ using DevExpress.XtraReports.Web.Extensions;
|
|||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
// MVC-Controller hinzufügen (benötigt für DevExpress WebDocumentViewer)
|
|
||||||
builder.Services.AddControllersWithViews();
|
|
||||||
|
|
||||||
builder.Services.AddRazorPages();
|
builder.Services.AddRazorPages();
|
||||||
|
|
||||||
// DevExpress Controls und Reporting Services
|
// DevExpress Controls und Reporting Services
|
||||||
@@ -55,8 +52,5 @@ app.UseDevExpressControls();
|
|||||||
|
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
app.UseAuthorization();
|
app.UseAuthorization();
|
||||||
|
|
||||||
// Controller-Routen verfügbar machen (wichtig für DevExpress WebDocumentViewer)
|
|
||||||
app.MapControllers();
|
|
||||||
app.MapRazorPages();
|
app.MapRazorPages();
|
||||||
app.Run();
|
app.Run();
|
||||||
Reference in New Issue
Block a user