tsai
/
eventhub
mirror of https://github.com/abpframework/eventhub
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Improve payment request page filter section

pull/69/head
Engincan VESKE 5 years ago
parent
c843c3aeae
commit
cdac97211a
3 changed files with 35 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

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

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

Write Preview
Loading…
Cancel
Save