Compare commits

..

3 Commits

Author SHA1 Message Date
OlgunR
bec9ea2356 Add DevExpress Document Viewer page and dependencies
Updated `_ViewImports.cshtml` to include DevExpress and DevExtreme tag helpers. Created `DocumentViewerDevExpress.cshtml` for displaying a DevExpress Document Viewer with necessary CDN links. Implemented the corresponding code-behind in `DocumentViewerDevExpress.cshtml.cs` to handle model binding and report key generation.
2026-06-08 17:21:36 +02:00
OlgunR
1cc617de42 Enhance PDF viewing experience with new document viewer
- Replaced button in `Details.cshtml` with a link to a new document viewer page.
- Created `DocumentViewer.cshtml` to display PDFs using an iframe, with a back button and a link to an experimental DevExpress viewer.
- Introduced `DocumentViewerModel` in `DocumentViewer.cshtml.cs` for handling invoice ID and PDF URL.
- Updated `OnGetAsync` in `ViewPdf.cshtml.cs` to set `Content-Disposition` to inline for better PDF rendering in the browser.
2026-06-08 16:59:57 +02:00
OlgunR
b515b4f523 Refactor PDF viewing and integrate DevExpress support
- Removed folder reference for "Controllers" in the project file.
- Updated `ViewPdf.cshtml` to include layout and clarify PDF output.
- Enhanced `ViewPdf.cshtml.cs` with improved logging and error handling.
- Added MVC controller services in `Program.cs` for DevExpress functionality.
- Introduced `DocumentViewerController` to manage document viewing requests.
2026-06-08 15:14:15 +02:00
11 changed files with 158 additions and 13 deletions

View File

@@ -0,0 +1,16 @@
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)
{
}
}
}

View File

@@ -29,8 +29,4 @@
<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>

View File

@@ -16,10 +16,10 @@
@if (!string.IsNullOrEmpty(Model.Invoice?.ResultFilePath)) @if (!string.IsNullOrEmpty(Model.Invoice?.ResultFilePath))
{ {
<button class="btn btn-primary mb-3 ms-2" <a class="btn btn-primary mb-3 ms-2"
onclick="openPdfViewer(@Model.Invoice.Id)"> href="/Invoices/DocumentViewer?id=@Model.Invoice.Id">
<i class="dx-icon-pdffile"></i> Ergebnis anzeigen <i class="dx-icon-pdffile"></i> Ergebnis anzeigen
</button> </a>
} }
@if (Model.Invoice is null) @if (Model.Invoice is null)

View File

@@ -0,0 +1,33 @@
@page
@model DXApp.TemplateKitProject.Pages.Invoices.DocumentViewerModel
@{
ViewData["Title"] = "Dokument Viewer";
var pdfUrl = Model.PdfUrl;
}
<div class="container-fluid" style="height:100vh; padding:0;">
<div class="d-flex align-items-center justify-content-between p-3 border-bottom">
<h5 class="m-0">Rechnung @Model.Id - Dokument</h5>
<div>
<a class="btn btn-secondary me-2" href="/Invoices">Zurück zur Übersicht</a>
<!-- Später: Button um DevExpress Viewer zu öffnen -->
<a class="btn btn-outline-primary" href="/Invoices/DocumentViewerDevExpress?id=@Model.Id">
DevExpress Viewer (experimental)
</a>
</div>
</div>
<div style="height:calc(100vh - 64px);">
@* Solide, funktionierende Baseline: Browser-internen PDF-Renderer verwenden *@
<iframe id="pdf-viewer-iframe"
src="@pdfUrl"
style="width:100%; height:100%; border: none;"
title="PDF Viewer"></iframe>
</div>
@* Hinweis:
- Diese Seite zeigt aktuell das PDF per einfachem iframe (funktioniert zuverlässig).
- Nächster Commit: wir ersetzen iframe durch DevExpress WebDocumentViewer oder laden diesen zusätzlich.
- Der Link "DevExpress Viewer (experimental)" ist ein Platzhalter; wir implementieren die Route /Invoices/DocumentViewerDevExpress in einem der nächsten Schritte.
*@
</div>

View File

@@ -0,0 +1,17 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace DXApp.TemplateKitProject.Pages.Invoices;
public class DocumentViewerModel : PageModel
{
[BindProperty(SupportsGet = true)]
public int Id { get; set; }
public string PdfUrl => $"/Invoices/ViewPdf?id={Id}";
public void OnGet()
{
// Keine serverseitige Logik nötig für die erste Version.
}
}

View File

@@ -0,0 +1,32 @@
@page
@model DXApp.TemplateKitProject.Pages.Invoices.DocumentViewerDevExpressModel
@{
ViewData["Title"] = "DevExpress Document Viewer";
}
@* Dev: Für schnelle Tests verwenden wir die CDN-Assets.
In Production bitte lokal hosten und Lizenz einbinden. *@
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/25.2.7/css/dx.common.css" />
<link rel="stylesheet" href="https://cdn3.devexpress.com/jslib/25.2.7/css/dx.light.css" />
<script src="https://cdn3.devexpress.com/jslib/25.2.7/js/dx.all.js"></script>
<script src="https://cdn3.devexpress.com/jslib/25.2.7/js/dx.aspnet.data.js"></script>
<div class="container-fluid" style="height:100vh; padding:0;">
<div class="d-flex align-items-center justify-content-between p-3 border-bottom">
<h5 class="m-0">DevExpress Viewer — Rechnung @Model.Id</h5>
<div>
<a class="btn btn-secondary me-2" href="/Invoices">Zurück zur Übersicht</a>
<a class="btn btn-outline-secondary" href="/Invoices/DocumentViewer?id=@Model.Id">Baseline Viewer</a>
</div>
</div>
<div style="height:calc(100vh - 64px);">
@* KORRIGIERTE SYNTAX: Der WebDocumentViewer-Helper wird direkt aufgerufen. *@
@(Html.DevExpress().WebDocumentViewer()
.Name("WebDocumentViewer")
.Height("100%")
.Width("100%")
.Bind(Model.ReportKey)
)
</div>
</div>

View File

@@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
namespace DXApp.TemplateKitProject.Pages.Invoices;
public class DocumentViewerDevExpressModel : PageModel
{
[BindProperty(SupportsGet = true)]
public int Id { get; set; }
public string ReportKey => $"invoice-{Id}";
public void OnGet()
{
}
}

View File

@@ -1,2 +1,6 @@
@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.
}

View File

@@ -1,24 +1,43 @@
using DXApp.TemplateKitProject.Data; using Microsoft.AspNetCore.Mvc;
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(AppDbContext db) : PageModel public class ViewPdfModel : 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)
{ {
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 || string.IsNullOrEmpty(invoice.ResultFilePath)) if (invoice is null)
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);
// Wichtig: keine "attachment" Content-Disposition setzen
// wir setzen inline (oder lassen es weg) damit Browser im Viewer darstellt
Response.Headers["Content-Disposition"] = $"inline; filename=\"{Path.GetFileName(invoice.ResultFilePath)}\"";
return File(bytes, "application/pdf"); return File(bytes, "application/pdf");
} }
} }

View File

@@ -1,4 +1,10 @@
@using DXApp.TemplateKitProject @using DXApp.TemplateKitProject
@using DXApp.TemplateKitProject.Pages
@namespace DXApp.TemplateKitProject.Pages @namespace DXApp.TemplateKitProject.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@* --- DevExpress & DevExtreme Integration --- *@
@using DevExpress.AspNetCore
@using DevExpress.AspNetCore.Reporting
@using DevExtreme.AspNet.Mvc @using DevExtreme.AspNet.Mvc
@addTagHelper *, DevExtreme.AspNet.Core

View File

@@ -8,6 +8,9 @@ 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
@@ -52,5 +55,8 @@ 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();