Compare commits
4 Commits
feat/custo
...
feat/serve
| Author | SHA1 | Date | |
|---|---|---|---|
| 96c7cd6e8a | |||
| 4047ba7c6b | |||
| 897860b2bf | |||
| 8933cff558 |
@@ -236,6 +236,12 @@ Manual testing workflow:
|
|||||||
3. Test sender login at `/sender/login`
|
3. Test sender login at `/sender/login`
|
||||||
4. Test receiver flow at `/envelope/login/{envelopeKey}`
|
4. Test receiver flow at `/envelope/login/{envelopeKey}`
|
||||||
|
|
||||||
|
## Technical Debt TODOs
|
||||||
|
|
||||||
|
- Refactor `EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderPage.razor` to reduce complexity.
|
||||||
|
- Move sender dashboard business/status logic into dedicated services and extension methods (for example effective status resolution, tab classification, receiver signed/rejected detection, and grid-layout filter sanitation).
|
||||||
|
- Keep `EnvelopeSenderPage.razor` focused on UI composition/state orchestration; avoid embedding heavy domain logic directly in the Razor component.
|
||||||
|
|
||||||
## Database
|
## Database
|
||||||
|
|
||||||
**SQL Server** (DD_ECM)
|
**SQL Server** (DD_ECM)
|
||||||
|
|||||||
@@ -26,4 +26,24 @@ public class AnnotationService(IHttpClientFactory httpClientFactory)
|
|||||||
var result = await response.Content.ReadFromJsonAsync<List<AnnotationDto>>(_jsonOptions, cancel);
|
var result = await response.Content.ReadFromJsonAsync<List<AnnotationDto>>(_jsonOptions, cancel);
|
||||||
return result ?? [];
|
return result ?? [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task RejectAsync(string envelopeKey, string? reason, CancellationToken cancel = default)
|
||||||
|
{
|
||||||
|
using var http = httpClientFactory.CreateClient("EnvelopeGenerator.Server");
|
||||||
|
|
||||||
|
var response = await http.PostAsJsonAsync(
|
||||||
|
$"/api/Annotation/reject/{Uri.EscapeDataString(envelopeKey)}",
|
||||||
|
reason,
|
||||||
|
_jsonOptions,
|
||||||
|
cancel);
|
||||||
|
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
var body = await response.Content.ReadAsStringAsync(cancel);
|
||||||
|
throw new HttpRequestException(
|
||||||
|
$"Failed to reject envelope {envelopeKey}: {(int)response.StatusCode} {response.StatusCode} - {body}",
|
||||||
|
null,
|
||||||
|
response.StatusCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,7 +262,7 @@
|
|||||||
var envelope = cellContext.DataItem as EnvelopeDto;
|
var envelope = cellContext.DataItem as EnvelopeDto;
|
||||||
if (envelope != null)
|
if (envelope != null)
|
||||||
{
|
{
|
||||||
var statusInfo = GetStatusInfo(envelope.Status);
|
var statusInfo = GetStatusInfo(GetEffectiveEnvelopeStatus(envelope));
|
||||||
<div class="status-badge status-badge--@statusInfo.CssClass">
|
<div class="status-badge status-badge--@statusInfo.CssClass">
|
||||||
<span class="status-dot status-dot--@statusInfo.DotColor"></span>
|
<span class="status-dot status-dot--@statusInfo.DotColor"></span>
|
||||||
@statusInfo.Label
|
@statusInfo.Label
|
||||||
@@ -314,12 +314,20 @@
|
|||||||
{
|
{
|
||||||
<div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
|
<div style="display: flex; align-items: center; gap: 1rem; padding: 0.5rem; background: white; border-radius: 6px; border: 1px solid #e5e7eb;">
|
||||||
@{
|
@{
|
||||||
|
var isRejected = IsReceiverRejected(envelope, receiver);
|
||||||
var isSigned = IsReceiverSigned(envelope, receiver);
|
var isSigned = IsReceiverSigned(envelope, receiver);
|
||||||
var accessCode = receiver.AccessCode;
|
var accessCode = receiver.AccessCode;
|
||||||
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
var hasAccessCode = !string.IsNullOrWhiteSpace(accessCode);
|
||||||
}
|
}
|
||||||
<span class="receiver-badge receiver-badge--@(isSigned ? "signed" : "unsigned")" style="min-width: 100px;">
|
<span class="receiver-badge receiver-badge--@(isRejected ? "unsigned" : (isSigned ? "signed" : "unsigned"))" style="min-width: 100px;">
|
||||||
@if (isSigned)
|
@if (isRejected)
|
||||||
|
{
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
|
||||||
|
</svg>
|
||||||
|
<span>@GetStatusLabel(EnvelopeStatus.DocumentRejected)</span>
|
||||||
|
}
|
||||||
|
else if (isSigned)
|
||||||
{
|
{
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="currentColor" viewBox="0 0 16 16">
|
||||||
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
|
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
|
||||||
@@ -590,10 +598,11 @@
|
|||||||
{
|
{
|
||||||
_allEnvelopes = await EnvelopeService.GetAsync() ?? [];
|
_allEnvelopes = await EnvelopeService.GetAsync() ?? [];
|
||||||
|
|
||||||
// Split into active and completed based on status
|
// Split into active and completed based on effective status
|
||||||
|
// (history-aware: rejected envelopes should not stay in active tab).
|
||||||
var envelopes = _allEnvelopes.ToList();
|
var envelopes = _allEnvelopes.ToList();
|
||||||
_activeEnvelopes = envelopes.Where(e => ((EnvelopeStatus)e.Status).IsActive()).ToList();
|
_activeEnvelopes = envelopes.Where(e => GetEffectiveEnvelopeStatus(e).IsActive()).ToList();
|
||||||
_completedEnvelopes = envelopes.Where(e => ((EnvelopeStatus)e.Status).IsCompleted()).ToList();
|
_completedEnvelopes = envelopes.Where(e => GetEffectiveEnvelopeStatus(e).IsCompleted()).ToList();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -745,13 +754,13 @@
|
|||||||
|
|
||||||
bool IsEnvelopeSent(EnvelopeDto envelope)
|
bool IsEnvelopeSent(EnvelopeDto envelope)
|
||||||
{
|
{
|
||||||
var status = (EnvelopeStatus)envelope.Status;
|
var status = GetEffectiveEnvelopeStatus(envelope);
|
||||||
return status >= EnvelopeStatus.EnvelopeQueued;
|
return status >= EnvelopeStatus.EnvelopeQueued;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsEnvelopeEditable(EnvelopeDto envelope)
|
bool IsEnvelopeEditable(EnvelopeDto envelope)
|
||||||
{
|
{
|
||||||
var status = (EnvelopeStatus)envelope.Status;
|
var status = GetEffectiveEnvelopeStatus(envelope);
|
||||||
return status is EnvelopeStatus.EnvelopeCreated or EnvelopeStatus.EnvelopeSaved;
|
return status is EnvelopeStatus.EnvelopeCreated or EnvelopeStatus.EnvelopeSaved;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -800,7 +809,7 @@
|
|||||||
IReadOnlyList<StatusFilterItem> GetStatusFilterItems(IEnumerable<EnvelopeDto>? source)
|
IReadOnlyList<StatusFilterItem> GetStatusFilterItems(IEnumerable<EnvelopeDto>? source)
|
||||||
{
|
{
|
||||||
return (source ?? Enumerable.Empty<EnvelopeDto>())
|
return (source ?? Enumerable.Empty<EnvelopeDto>())
|
||||||
.Select(x => x.Status)
|
.Select(GetEffectiveEnvelopeStatus)
|
||||||
.Distinct()
|
.Distinct()
|
||||||
.OrderBy(x => x)
|
.OrderBy(x => x)
|
||||||
.Select(x => new StatusFilterItem(x, GetStatusLabel(x)))
|
.Select(x => new StatusFilterItem(x, GetStatusLabel(x)))
|
||||||
@@ -818,7 +827,7 @@
|
|||||||
|
|
||||||
bool IsReceiverSigned(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
bool IsReceiverSigned(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
{
|
{
|
||||||
var status = (EnvelopeStatus)envelope.Status;
|
var status = GetEffectiveEnvelopeStatus(envelope);
|
||||||
if (status is EnvelopeStatus.EnvelopeCompletelySigned or EnvelopeStatus.MessageCompletionSent)
|
if (status is EnvelopeStatus.EnvelopeCompletelySigned or EnvelopeStatus.MessageCompletionSent)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
@@ -841,6 +850,43 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsReceiverRejected(EnvelopeDto envelope, EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto receiver)
|
||||||
|
{
|
||||||
|
var status = GetEffectiveEnvelopeStatus(envelope);
|
||||||
|
var histories = envelope.Histories?.Where(h =>
|
||||||
|
h.Status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected).ToList() ?? [];
|
||||||
|
|
||||||
|
if (histories.Count == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (histories.Any(h => h.Receiver?.Id == receiver.ReceiverId))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
var receiverEmail = receiver.Receiver?.EmailAddress;
|
||||||
|
if (!string.IsNullOrWhiteSpace(receiverEmail) &&
|
||||||
|
histories.Any(h => string.Equals(h.UserReference, receiverEmail, StringComparison.OrdinalIgnoreCase)))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(receiver.Name) &&
|
||||||
|
histories.Any(h => string.Equals(h.UserReference, receiver.Name, StringComparison.OrdinalIgnoreCase)))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return status == EnvelopeStatus.EnvelopeRejected && (envelope.EnvelopeReceivers?.Count() ?? 0) == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
EnvelopeStatus GetEffectiveEnvelopeStatus(EnvelopeDto envelope)
|
||||||
|
{
|
||||||
|
var rawStatus = envelope.Status;
|
||||||
|
|
||||||
|
if (rawStatus is EnvelopeStatus.EnvelopeRejected or EnvelopeStatus.EnvelopeWithdrawn)
|
||||||
|
return rawStatus;
|
||||||
|
|
||||||
|
var hasRejectedHistory = (envelope.Histories ?? Enumerable.Empty<HistoryDto>())
|
||||||
|
.Any(h => h.Status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected);
|
||||||
|
|
||||||
|
return hasRejectedHistory ? EnvelopeStatus.EnvelopeRejected : rawStatus;
|
||||||
|
}
|
||||||
|
|
||||||
DateTime GetHistoryDate(HistoryDto history)
|
DateTime GetHistoryDate(HistoryDto history)
|
||||||
{
|
{
|
||||||
return history.ActionDate ?? history.AddedWhen;
|
return history.ActionDate ?? history.AddedWhen;
|
||||||
@@ -983,13 +1029,18 @@
|
|||||||
// If cache is empty (LoadFromServerAsync failed), skip layout restore silently.
|
// If cache is empty (LoadFromServerAsync failed), skip layout restore silently.
|
||||||
var prefs = UserPreferencesService.GetCached();
|
var prefs = UserPreferencesService.GetCached();
|
||||||
if (prefs is not null && prefs.GridLayouts.TryGetValue(CurrentGridKey, out var json))
|
if (prefs is not null && prefs.GridLayouts.TryGetValue(CurrentGridKey, out var json))
|
||||||
e.Layout = JsonSerializer.Deserialize<GridPersistentLayout>(json);
|
{
|
||||||
|
var layout = JsonSerializer.Deserialize<GridPersistentLayout>(json);
|
||||||
|
SanitizeLayoutFilters(layout);
|
||||||
|
e.Layout = layout;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async Task OnGridLayoutAutoSaving(GridPersistentLayoutEventArgs e)
|
async Task OnGridLayoutAutoSaving(GridPersistentLayoutEventArgs e)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
SanitizeLayoutFilters(e.Layout);
|
||||||
var json = JsonSerializer.Serialize(e.Layout);
|
var json = JsonSerializer.Serialize(e.Layout);
|
||||||
await UserPreferencesService.SaveGridLayoutAsync(CurrentGridKey, json);
|
await UserPreferencesService.SaveGridLayoutAsync(CurrentGridKey, json);
|
||||||
}
|
}
|
||||||
@@ -999,5 +1050,55 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Keep column/order personalization, but never persist/restore data filters.
|
||||||
|
// Tab counters are based on tab datasets; persisted grid filters can hide rows and
|
||||||
|
// make the grid appear empty or incomplete.
|
||||||
|
static void SanitizeLayoutFilters(GridPersistentLayout? layout)
|
||||||
|
{
|
||||||
|
if (layout is null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ClearWritableProperty(layout, "FilterCriteria");
|
||||||
|
ClearWritableProperty(layout, "SearchText");
|
||||||
|
|
||||||
|
if (layout.Columns is not System.Collections.IEnumerable columns)
|
||||||
|
return;
|
||||||
|
|
||||||
|
foreach (var column in columns)
|
||||||
|
{
|
||||||
|
if (column is null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
ClearWritableProperty(column, "FilterCriteria");
|
||||||
|
ClearWritableProperty(column, "FilterValues");
|
||||||
|
ClearWritableProperty(column, "FilterValue");
|
||||||
|
ClearWritableProperty(column, "SearchText");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ClearWritableProperty(object target, string propertyName)
|
||||||
|
{
|
||||||
|
var prop = target.GetType()
|
||||||
|
.GetProperties(System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public)
|
||||||
|
.FirstOrDefault(p => p.Name == propertyName && p.GetIndexParameters().Length == 0);
|
||||||
|
|
||||||
|
if (prop is null || !prop.CanWrite)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var propertyType = prop.PropertyType;
|
||||||
|
object? value;
|
||||||
|
|
||||||
|
if (!propertyType.IsValueType || Nullable.GetUnderlyingType(propertyType) is not null)
|
||||||
|
{
|
||||||
|
value = null;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
value = Activator.CreateInstance(propertyType);
|
||||||
|
}
|
||||||
|
|
||||||
|
prop.SetValue(target, value);
|
||||||
|
}
|
||||||
|
|
||||||
private sealed record StatusFilterItem(EnvelopeStatus Value, string Text);
|
private sealed record StatusFilterItem(EnvelopeStatus Value, string Text);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
@using EnvelopeGenerator.Server.Client.Models.Constants
|
@using EnvelopeGenerator.Server.Client.Models.Constants
|
||||||
@using EnvelopeGenerator.Server.Client.Services
|
@using EnvelopeGenerator.Server.Client.Services
|
||||||
@using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver
|
@using EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver
|
||||||
|
@using EnvelopeGenerator.Domain.Constants
|
||||||
@using Microsoft.JSInterop
|
@using Microsoft.JSInterop
|
||||||
@using DevExpress.Blazor
|
@using DevExpress.Blazor
|
||||||
@using System.Drawing
|
@using System.Drawing
|
||||||
@@ -16,6 +17,7 @@
|
|||||||
@inject EnvelopeGenerator.Server.Client.Services.AuthService AuthService
|
@inject EnvelopeGenerator.Server.Client.Services.AuthService AuthService
|
||||||
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverAuthorizationService ReceiverAuthorizationService
|
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverAuthorizationService ReceiverAuthorizationService
|
||||||
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverPageDataService PageDataService
|
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverPageDataService PageDataService
|
||||||
|
@inject AnnotationService AnnotationService
|
||||||
@inject AppVersionService AppVersion
|
@inject AppVersionService AppVersion
|
||||||
@inject IMemoryCache MemoryCache
|
@inject IMemoryCache MemoryCache
|
||||||
@inject ILogger<ReceiverPage> Logger
|
@inject ILogger<ReceiverPage> Logger
|
||||||
@@ -125,6 +127,17 @@
|
|||||||
<span class="pdf-toolbar__btn-text">Unterschreiben</span>
|
<span class="pdf-toolbar__btn-text">Unterschreiben</span>
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--reject"
|
||||||
|
@onclick="OpenRejectPopup"
|
||||||
|
disabled="@_isRejectSubmitting"
|
||||||
|
title="Ablehnen"
|
||||||
|
style="flex-shrink: 0;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
|
||||||
|
</svg>
|
||||||
|
<span class="pdf-toolbar__btn-text">Ablehnen</span>
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -342,6 +355,75 @@
|
|||||||
</FooterContentTemplate>
|
</FooterContentTemplate>
|
||||||
</DxPopup>
|
</DxPopup>
|
||||||
|
|
||||||
|
@* Rejection Popup *@
|
||||||
|
<DxPopup @bind-Visible="_rejectPopupVisible"
|
||||||
|
HeaderText="Dokument ablehnen"
|
||||||
|
Width="500px"
|
||||||
|
MaxWidth="95vw"
|
||||||
|
ShowFooter="true"
|
||||||
|
CloseOnOutsideClick="false"
|
||||||
|
ShowCloseButton="false"
|
||||||
|
CloseOnEscape="false">
|
||||||
|
<BodyContentTemplate>
|
||||||
|
<div style="display: flex; align-items: flex-start; gap: 0.9rem; padding: 0.2rem 0 0.8rem;">
|
||||||
|
<div style="flex-shrink: 0; width: 36px; height: 36px; border-radius: 999px; background: #fee2e2; color: #b91c1c; display: inline-flex; align-items: center; justify-content: center;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
<div style="min-width: 0;">
|
||||||
|
<div style="font-size: 0.95rem; font-weight: 600; color: #1f2937; margin-bottom: 0.3rem;">
|
||||||
|
Möchten Sie dieses Dokument wirklich ablehnen?
|
||||||
|
</div>
|
||||||
|
<div style="font-size: 0.84rem; color: #6b7280; line-height: 1.45;">
|
||||||
|
Diese Aktion markiert den Umschlag als abgelehnt und informiert den Absender.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label for="rp-reject-reason" class="form-label" style="font-size: 0.875rem; font-weight: 500; color: #495057;">
|
||||||
|
Grund <span style="color: #6c757d; font-weight: 400;">(optional)</span>
|
||||||
|
</label>
|
||||||
|
<textarea id="rp-reject-reason"
|
||||||
|
class="form-control"
|
||||||
|
rows="4"
|
||||||
|
maxlength="1000"
|
||||||
|
value="@_rejectReason"
|
||||||
|
@oninput="args => _rejectReason = args.Value?.ToString() ?? string.Empty"
|
||||||
|
placeholder="Grund der Ablehnung"
|
||||||
|
style="border: 2px solid #e9ecef; border-radius: 8px; padding: 0.625rem; resize: vertical;"></textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrWhiteSpace(_rejectValidationMessage))
|
||||||
|
{
|
||||||
|
<div style="background: #fee2e2; border-left: 4px solid #dc2626; padding: 0.75rem 1rem; margin-top: 1rem; border-radius: 4px;">
|
||||||
|
<span style="color: #b91c1c; font-size: 0.875rem; font-weight: 500;">@_rejectValidationMessage</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</BodyContentTemplate>
|
||||||
|
<FooterContentTemplate>
|
||||||
|
<div class="d-flex gap-2 justify-content-end w-100" style="padding: 0.5rem 0;">
|
||||||
|
<button class="btn btn-outline-secondary"
|
||||||
|
@onclick="CloseRejectPopup"
|
||||||
|
disabled="@_isRejectSubmitting"
|
||||||
|
style="border-radius: 6px; padding: 0.625rem 1.25rem; font-weight: 500;">
|
||||||
|
Zurück
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-danger"
|
||||||
|
@onclick="SubmitRejectAsync"
|
||||||
|
disabled="@_isRejectSubmitting"
|
||||||
|
style="border-radius: 6px; padding: 0.625rem 1.5rem; font-weight: 600;">
|
||||||
|
@if (_isRejectSubmitting)
|
||||||
|
{
|
||||||
|
<span class="spinner-border spinner-border-sm me-1" role="status"></span>
|
||||||
|
}
|
||||||
|
Ablehnen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</FooterContentTemplate>
|
||||||
|
</DxPopup>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
// ----- Constants -----
|
// ----- Constants -----
|
||||||
const string SignatureTabDraw = "draw";
|
const string SignatureTabDraw = "draw";
|
||||||
@@ -387,6 +469,12 @@
|
|||||||
string _signerPosition = string.Empty;
|
string _signerPosition = string.Empty;
|
||||||
string _signaturePlace = string.Empty;
|
string _signaturePlace = string.Empty;
|
||||||
|
|
||||||
|
// ----- Rejection popup state -----
|
||||||
|
bool _rejectPopupVisible;
|
||||||
|
bool _isRejectSubmitting;
|
||||||
|
string _rejectReason = string.Empty;
|
||||||
|
string? _rejectValidationMessage;
|
||||||
|
|
||||||
// ----- Lifecycle -----
|
// ----- Lifecycle -----
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
@@ -423,6 +511,11 @@
|
|||||||
_envelopeReceiver = await PageDataService.GetEnvelopeReceiverAsync(EnvelopeKey);
|
_envelopeReceiver = await PageDataService.GetEnvelopeReceiverAsync(EnvelopeKey);
|
||||||
if (_envelopeReceiver is null)
|
if (_envelopeReceiver is null)
|
||||||
Logger.LogWarning("Envelope receiver data is null for {EnvelopeKey}", EnvelopeKey);
|
Logger.LogWarning("Envelope receiver data is null for {EnvelopeKey}", EnvelopeKey);
|
||||||
|
else if (IsRejected(_envelopeReceiver))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}/rejected", forceLoad: true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Build initial report (no signature image yet)
|
// Build initial report (no signature image yet)
|
||||||
_report = BuildReport(_pdfBytes, _signatures, capturedSignature: null);
|
_report = BuildReport(_pdfBytes, _signatures, capturedSignature: null);
|
||||||
@@ -468,6 +561,16 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ----- Report builder -----
|
// ----- Report builder -----
|
||||||
|
static bool IsRejected(EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto envelopeReceiver)
|
||||||
|
{
|
||||||
|
var status = envelopeReceiver.Envelope?.Status;
|
||||||
|
if (status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return envelopeReceiver.Envelope?.Histories?.Any(h =>
|
||||||
|
h.Status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected) == true;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Builds an XtraReport wrapping the PDF bytes.
|
/// Builds an XtraReport wrapping the PDF bytes.
|
||||||
/// If a signature is captured and there are signature fields, the signature image is
|
/// If a signature is captured and there are signature fields, the signature image is
|
||||||
@@ -701,6 +804,56 @@
|
|||||||
forceLoad: true);
|
forceLoad: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OpenRejectPopup()
|
||||||
|
{
|
||||||
|
_rejectValidationMessage = null;
|
||||||
|
_rejectPopupVisible = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CloseRejectPopup()
|
||||||
|
{
|
||||||
|
if (_isRejectSubmitting)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_rejectPopupVisible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task SubmitRejectAsync()
|
||||||
|
{
|
||||||
|
if (_isRejectSubmitting)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_isRejectSubmitting = true;
|
||||||
|
_rejectValidationMessage = null;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var reason = string.IsNullOrWhiteSpace(_rejectReason)
|
||||||
|
? null
|
||||||
|
: _rejectReason.Trim();
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(EnvelopeKey))
|
||||||
|
{
|
||||||
|
_rejectValidationMessage = "Envelope-Schluessel fehlt.";
|
||||||
|
_isRejectSubmitting = false;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await AnnotationService.RejectAsync(EnvelopeKey, reason);
|
||||||
|
|
||||||
|
Navigation.NavigateTo($"/envelope/login/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "Failed to reject envelope {EnvelopeKey}", EnvelopeKey);
|
||||||
|
_rejectValidationMessage = "Die Ablehnung konnte nicht gespeichert werden. Bitte versuchen Sie es erneut.";
|
||||||
|
_isRejectSubmitting = false;
|
||||||
|
await InvokeAsync(StateHasChanged);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async Task<string?> GetActiveSignatureDataUrlAsync()
|
async Task<string?> GetActiveSignatureDataUrlAsync()
|
||||||
{
|
{
|
||||||
if (_activeSignatureTab == SignatureTabDraw)
|
if (_activeSignatureTab == SignatureTabDraw)
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
@page "/envelope/{EnvelopeKey}/rejected"
|
||||||
|
@rendermode InteractiveServer
|
||||||
|
@using EnvelopeGenerator.Application.Resources
|
||||||
|
@using EnvelopeGenerator.Domain.Constants
|
||||||
|
@using EnvelopeGenerator.Domain.Interfaces
|
||||||
|
@using Microsoft.Extensions.Localization
|
||||||
|
@inject NavigationManager Navigation
|
||||||
|
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverAuthorizationService ReceiverAuthorizationService
|
||||||
|
@inject EnvelopeGenerator.Server.Services.EnvelopeReceiverPageDataService PageDataService
|
||||||
|
@inject IStringLocalizer<Resource> UiLocalizer
|
||||||
|
|
||||||
|
<div class="envelope-viewer-layout" style="justify-content: center; align-items: center; padding: 1.5rem;">
|
||||||
|
<div style="width: min(920px, 100%); background: rgba(255,255,255,0.96); border-radius: 20px; box-shadow: 0 18px 48px rgba(15,23,42,0.22); overflow: hidden;">
|
||||||
|
<div style="padding: 1.2rem 1.4rem; border-bottom: 1px solid rgba(15,23,42,0.08); background: linear-gradient(135deg, rgba(239,68,68,0.12) 0%, rgba(220,38,38,0.08) 100%);">
|
||||||
|
<div style="font-size: 1rem; font-weight: 700; color: #991b1b;">@L("DocRejected", "Dokument abgelehnt")</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="padding: 2rem 1.5rem;">
|
||||||
|
<div style="display: flex; justify-content: center; margin-bottom: 1rem;">
|
||||||
|
<div style="width: 90px; height: 90px; border-radius: 999px; background: #fee2e2; display: inline-flex; align-items: center; justify-content: center; color: #b91c1c;">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z" />
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2 style="text-align: center; font-size: 1.4rem; color: #7f1d1d; margin-bottom: 0.75rem;">
|
||||||
|
@(_isReadAndConfirm
|
||||||
|
? L("RejectionInfo1Confirmation", "Dieses Dokument wurde als nicht bestaetigt markiert.")
|
||||||
|
: L("RejectionInfo1", "Dieses Dokument wurde abgelehnt."))
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<p style="text-align: center; margin: 0 auto; max-width: 760px; color: #374151; line-height: 1.6;">
|
||||||
|
@((MarkupString)_messageLine2)
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div style="margin-top: 1.4rem; text-align: center;">
|
||||||
|
<a href="/" class="btn btn-outline-secondary" style="font-weight: 600;">Portal Startseite</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[Parameter] public string? EnvelopeKey { get; set; }
|
||||||
|
|
||||||
|
bool _isReadAndConfirm;
|
||||||
|
string _messageLine2 = string.Empty;
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(EnvelopeKey))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo("/");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = await ReceiverAuthorizationService.AuthorizeAsync(EnvelopeKey);
|
||||||
|
if (user is null)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo($"/envelope/login/{Uri.EscapeDataString(EnvelopeKey)}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var envelopeReceiver = await PageDataService.GetEnvelopeReceiverAsync(EnvelopeKey);
|
||||||
|
if (envelopeReceiver is null)
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!IsRejected(envelopeReceiver))
|
||||||
|
{
|
||||||
|
Navigation.NavigateTo($"/envelope/{Uri.EscapeDataString(EnvelopeKey)}", forceLoad: true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_isReadAndConfirm = envelopeReceiver.Envelope?.IsReadAndConfirm() ?? false;
|
||||||
|
|
||||||
|
var senderName = envelopeReceiver.Envelope?.User is null
|
||||||
|
? string.Empty
|
||||||
|
: $"{envelopeReceiver.Envelope.User.Prename} {envelopeReceiver.Envelope.User.Name}".Trim();
|
||||||
|
var senderEmail = envelopeReceiver.Envelope?.User?.Email ?? string.Empty;
|
||||||
|
var envelopeTitle = envelopeReceiver.Envelope?.Title ?? string.Empty;
|
||||||
|
|
||||||
|
var template = L("RejectionInfo2", "Das Dokument \"{2}\" von {0} ({1}) wurde abgelehnt.");
|
||||||
|
_messageLine2 = string.Format(template, senderName, senderEmail, envelopeTitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool IsRejected(EnvelopeGenerator.Application.Common.Dto.EnvelopeReceiver.EnvelopeReceiverDto envelopeReceiver)
|
||||||
|
{
|
||||||
|
var status = envelopeReceiver.Envelope?.Status;
|
||||||
|
if (status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return envelopeReceiver.Envelope?.Histories?.Any(h =>
|
||||||
|
h.Status is EnvelopeStatus.DocumentRejected or EnvelopeStatus.EnvelopeRejected) == true;
|
||||||
|
}
|
||||||
|
|
||||||
|
string L(string key, string fallback)
|
||||||
|
{
|
||||||
|
var value = UiLocalizer[key];
|
||||||
|
return value.ResourceNotFound ? fallback : value.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -100,11 +100,12 @@ public class AnnotationController : ControllerBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Rejects the document for the current receiver.
|
/// Rejects the document for the current receiver.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="envelopeKey">Envelope key route parameter.</param>
|
||||||
/// <param name="reason">Optional rejection reason.</param>
|
/// <param name="reason">Optional rejection reason.</param>
|
||||||
[Authorize(Policy = AuthPolicy.Receiver)]
|
[Authorize(Policy = AuthPolicy.Receiver)]
|
||||||
[HttpPost("reject")]
|
[HttpPost("reject/{envelopeKey}")]
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
public async Task<IActionResult> Reject([FromBody] string? reason = null)
|
public async Task<IActionResult> Reject([FromRoute] string envelopeKey, [FromBody] string? reason = null)
|
||||||
{
|
{
|
||||||
var signature = User.ReceiverSignature();
|
var signature = User.ReceiverSignature();
|
||||||
var uuid = User.EnvelopeUuid();
|
var uuid = User.EnvelopeUuid();
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public static class ReceiverClaimExtensions
|
|||||||
/// Gets the authenticated receiver email address from the claims.
|
/// Gets the authenticated receiver email address from the claims.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string ReceiverMail(this ClaimsPrincipal user)
|
public static string ReceiverMail(this ClaimsPrincipal user)
|
||||||
=> user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email);
|
=> user.GetRequiredClaimValue(JwtRegisteredClaimNames.Email, ClaimTypes.Email);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the authenticated envelope identifier from the claims.
|
/// Gets the authenticated envelope identifier from the claims.
|
||||||
@@ -120,4 +120,4 @@ public static class ReceiverClaimExtensions
|
|||||||
{
|
{
|
||||||
return Role.Receiver.Authorized.Any(user.IsInRole);
|
return Role.Receiver.Authorized.Any(user.IsInRole);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -609,6 +609,29 @@ body.resizing {
|
|||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pdf-toolbar__btn--reject {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.375rem;
|
||||||
|
min-width: auto;
|
||||||
|
padding: 0.5rem 0.75rem;
|
||||||
|
background: linear-gradient(135deg, rgba(239, 68, 68, 0.08) 0%, rgba(220, 38, 38, 0.08) 100%);
|
||||||
|
border: 1px solid rgba(239, 68, 68, 0.3);
|
||||||
|
color: #b91c1c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.pdf-toolbar__btn--reject:hover:not(:disabled) {
|
||||||
|
background: linear-gradient(135deg, #ef4444 0%, #dc2626 100%);
|
||||||
|
border-color: transparent;
|
||||||
|
color: #ffffff;
|
||||||
|
box-shadow: 0 4px 12px rgba(239, 68, 68, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.pdf-toolbar__btn--reject:disabled {
|
||||||
|
opacity: 0.6;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
.pdf-toolbar__btn-text {
|
.pdf-toolbar__btn-text {
|
||||||
font-size: 0.813rem;
|
font-size: 0.813rem;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -1211,6 +1234,18 @@ body.resizing {
|
|||||||
color: #a5b4fc;
|
color: #a5b4fc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[data-sf-theme="blazing-dark"] .pdf-toolbar__btn--reject {
|
||||||
|
background: rgba(239, 68, 68, 0.15);
|
||||||
|
border-color: rgba(248, 113, 113, 0.4);
|
||||||
|
color: #fca5a5;
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-sf-theme="blazing-dark"] .pdf-toolbar__btn--reject:hover:not(:disabled) {
|
||||||
|
background: rgba(239, 68, 68, 0.35);
|
||||||
|
border-color: rgba(248, 113, 113, 0.6);
|
||||||
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
/* Error container */
|
/* Error container */
|
||||||
[data-sf-theme="blazing-dark"] .error-container .alert-danger {
|
[data-sf-theme="blazing-dark"] .error-container .alert-danger {
|
||||||
background: rgba(239, 68, 68, 0.12);
|
background: rgba(239, 68, 68, 0.12);
|
||||||
|
|||||||
Reference in New Issue
Block a user