Browse Source

Improve payment request page filter section

pull/69/head
Engincan VESKE 5 years ago
parent
commit
cdac97211a
  1. 2
      modules/payment/src/Payment.Admin.Application.Contracts/Permissions/PaymentAdminPermissions.cs
  2. 49
      modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor
  3. 31
      modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor.cs

2
modules/payment/src/Payment.Admin.Application.Contracts/Permissions/PaymentAdminPermissions.cs

@ -2,7 +2,7 @@
{
public class PaymentAdminPermissions
{
public const string GroupName = "Payment";
public const string GroupName = "PaymentAdmin";
public static class Request
{

49
modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor

@ -15,32 +15,39 @@
<CardBody>
<Form>
<div id="FilterSection" class="row mt-3">
<Column ColumnSize="ColumnSize.Is3">
<Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["ProductName"]</FieldLabel>
<TextEdit TValue="string" KeyPress="OnKeyPress" @bind-Text="@GetListInput.ProductName" />
</Column>
<Column ColumnSize="ColumnSize.Is3">
<TextEdit Placeholder="@L["ProductName"]" @bind-Text="@GetListInput.ProductName"/>
</Field>
<Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["Status"]</FieldLabel>
<Select TValue="PaymentRequestState?" @SelectedValue="@GetListInput.Status" SelectedValueChanged="@OnPaymentRequestStateChanged">
@* <SelectItem Value="@((PaymentRequestState?)null)"></SelectItem> *@
@foreach (PaymentRequestState state in Enum.GetValues(typeof(PaymentRequestState)))
<Select Placeholder="@L["Status"]" TValue="PaymentRequestState?" SelectedValue="@GetListInput.Status" SelectedValueChanged="OnPaymentRequestStateChanged">
<option value="@((PaymentRequestState?) null)">-</option>
@foreach (var item in PaymentRequestStates)
{
<SelectItem Value="@((int) state)">@state.ToString()</SelectItem>
<SelectItem Value="@item">@L["PaymentType:" + item]</SelectItem>
}
</Select>
</Column>
<Column ColumnSize="ColumnSize.Is3">
<Field>
<FieldLabel>@L["MinCreationTime"]</FieldLabel>
<DateEdit TValue="DateTime?" Date="@GetListInput.MinCreationTime" DateChanged="OnSelectedDateChangedForMinCreationTime" />
</Field>
</Column>
<Column ColumnSize="ColumnSize.Is3">
<Field>
<FieldLabel>@L["MaxCreationTime"]</FieldLabel>
<DateEdit TValue="DateTime?" Date="@GetListInput.MaxCreationTime" DateChanged="OnSelectedDateChangedForMaxCreationTime" />
</Field>
</Column>
</Field>
<Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["MinCreationTime"]</FieldLabel>
<DateEdit Placeholder="@L["MinCreationTime"]" @bind-Date="@GetListInput.MinCreationTime"/>
</Field>
<Field ColumnSize="ColumnSize.Is3">
<FieldLabel>@L["MaxCreationTime"]</FieldLabel>
<DateEdit Placeholder="@L["MaxCreationTime"]" @bind-Date="@GetListInput.MaxCreationTime"/>
</Field>
<Field ColumnSize="ColumnSize.Is12">
<Row>
<Column ColumnSize="ColumnSize.Is9"></Column>
<Column ColumnSize="ColumnSize.Is3">
<SubmitButton Block="true"
Clicked="@GetPaymentRequestsAsync">
<Icon Name="IconName.Search" />
</SubmitButton>
</Column>
</Row>
</Field>
</div>
</Form>

31
modules/payment/src/Payment.Admin.Blazor/Pages/Payment/Requests/Index.razor.cs

@ -9,6 +9,8 @@ using Microsoft.AspNetCore.Components.Web;
using Payment.Admin.Payments;
using Volo.Abp.Application.Dtos;
using Payment.PaymentRequests;
using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns;
using Volo.Abp.BlazoriseUI.Components;
namespace Payment.Admin.Pages.Payment.Requests
{
@ -19,6 +21,8 @@ namespace Payment.Admin.Pages.Payment.Requests
protected IReadOnlyList<PaymentRequestWithDetailsDto> PaymentRequests { get; set; }
protected IReadOnlyList<PaymentRequestState> PaymentRequestStates => Enum.GetValues<PaymentRequestState>();
protected PaymentRequestGetListInput GetListInput { get; set; }
protected virtual int PageSize { get; } = LimitedResultRequestDto.DefaultMaxResultCount;
@ -28,7 +32,7 @@ namespace Payment.Admin.Pages.Payment.Requests
protected string CurrentSorting { get; set; }
protected int? TotalCount { get; set; }
public Index()
{
GetListInput = new();
@ -39,7 +43,7 @@ namespace Payment.Admin.Pages.Payment.Requests
await GetPaymentRequestsAsync();
await InvokeAsync(StateHasChanged);
}
protected virtual async Task GetPaymentRequestsAsync()
{
try
@ -72,31 +76,8 @@ namespace Payment.Admin.Pages.Payment.Requests
await InvokeAsync(StateHasChanged);
}
private async Task OnKeyPress(KeyboardEventArgs e)
{
if (e.Code is "Enter" or "NumpadEnter")
{
await GetPaymentRequestsAsync();
}
}
private async Task OnSelectedDateChangedForMinCreationTime(DateTime? minCreationTime)
{
GetListInput.MinCreationTime = minCreationTime;
await GetPaymentRequestsAsync();
}
private async Task OnSelectedDateChangedForMaxCreationTime(DateTime? maxCreationTime)
{
GetListInput.MaxCreationTime = maxCreationTime;
await GetPaymentRequestsAsync();
}
private async Task OnPaymentRequestStateChanged(PaymentRequestState? status)
{
Console.WriteLine("Status changed!");
Console.WriteLine(status);
GetListInput.Status = status;
await GetPaymentRequestsAsync();
}

Loading…
Cancel
Save