FA/FA_WEB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes in Views and mappings

Browse Source
This commit is contained in:
Piotr Kus
2025-01-24 21:30:58 +01:00
parent ed726eea09
commit a95eed2041
12 changed files with 138 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OrdersManagement/Components/Layout/MainLayout.razor
View File

@@ -3,9 +3,9 @@
<div class="bb-page">
<Sidebar @ref="sidebar"
IconName="IconName.BootstrapFill"
Title="Blazor Bootstrap"
<Sidebar @ref="_sidebar"
IconName="IconName.App"
Title="FA Krosno Manager"
DataProvider="SidebarDataProvider" />
<main>
@@ -21,26 +21,26 @@
</div>
@code {
Sidebar sidebar;
IEnumerable<NavItem> navItems;
Sidebar? _sidebar;
IEnumerable<NavItem>? _navItems;
private async Task<SidebarDataProviderResult> SidebarDataProvider(SidebarDataProviderRequest request)
{
if (navItems is null)
navItems = GetNavItems();
_navItems ??= GetNavItems();
return await Task.FromResult(request.ApplyTo(navItems));
return await Task.FromResult(request.ApplyTo(_navItems));
}
private IEnumerable<NavItem> GetNavItems()
private IEnumerable<NavItem>? GetNavItems()
{
navItems = new List<NavItem>
_navItems = new List<NavItem>
{
new NavItem { Id = "1", Href = "/", IconName = IconName.HouseDoorFill, Text = "Zamówienia DELFOR", Match=NavLinkMatch.All},
new NavItem { Id = "2", Href = "/edicustomerorders", IconName = IconName.Database, Text = "Zamówienia klienta EDI"}
new NavItem { Id = "2", Href = "/EdiCustomerOrders", IconName = IconName.Database, Text = "Zamówienia klienta EDI"},
new NavItem { Id = "3", Href = "/CustomerOrders", IconName = IconName.Database, Text = "Zamówienia klienta"}
};
return navItems;
return _navItems;
}
}

86
OrdersManagement/Components/Pages/CustomerOrders.razor Normal file
View File

@@ -0,0 +1,86 @@
@page "/CustomerOrders"
@inject CustomerOrderService CustomerOrderService
@inject NavigationManager NavigationManager
@using SytelineSaAppEfDataModel.Dtos
@using FaKrosnoApi.Dtos
@using OrdersManagement.Dtos
@inherits LayoutComponentBase
<div class="row">
<h3>Zamówienia Klienta</h3>
</div>
<br />
<div class="row">
<Grid @ref="_grid"
TItem="CustomerOrderDto"
Class="table table-hover table-bordered table-striped"
DataProvider="CustomerOrdersDataProvider"
AllowFiltering="true"
Responsive="true"
AllowPaging="true"
PageSize="20"
AllowSelection="true"
AllowRowClick="true"
OnRowDoubleClick="OnRowDoubleClick"
SelectedItemsChanged="SelectedItemsChanged">
<GridColumns>
<GridColumn TItem="CustomerOrderDto" HeaderText="CO Number" PropertyName="CoNum">
@context.CoNum
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="Customer Number" PropertyName="CustNum">
@context.CustNum
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="Recipient" PropertyName="CustSeq">
@context.CustSeq
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="Last Update Date" PropertyName="CreateDate">
@context.CreateDate
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="Gate" PropertyName="Uf_FKR_EDI_Gate">
@context.Uf_FKR_EDI_Gate
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="RecipientCode" PropertyName="Uf_FKR_EDI_RecipientCode">
@context.Uf_FKR_EDI_RecipientCode
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="SellerCode" PropertyName="Uf_FKR_EDI_SellerCode">
@context.Uf_FKR_EDI_SellerCode
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="SenderCode" PropertyName="Uf_FKR_EDI_SenderCode">
@context.Uf_FKR_EDI_SenderCode
</GridColumn>
<GridColumn TItem="CustomerOrderDto" HeaderText="BuyerCode" PropertyName="Uf_FKR_EDI_BuyerCode">
@context.Uf_FKR_EDI_BuyerCode
</GridColumn>
</GridColumns>
</Grid>
</div>
@code {
Grid<CustomerOrderDto>? _grid;
private IEnumerable<CustomerOrderDto>? _customerOrders;
private CustomerOrderDto? _selectedCustomerOrder;
private async Task<GridDataProviderResult<CustomerOrderDto>> CustomerOrdersDataProvider(GridDataProviderRequest<CustomerOrderDto> request)
{
_customerOrders = await CustomerOrderService.GetCustomerOrdersAsync() ?? new List<CustomerOrderDto>();
_customerOrders = _customerOrders.OrderByDescending(x => x.CreateDate).ToList();
StateHasChanged();
return await Task.FromResult(request.ApplyTo(_customerOrders));
}
private void OnRowDoubleClick(GridRowEventArgs<CustomerOrderDto> obj)
{
string customerOrderId = obj.Item.CoNum;
NavigationManager.NavigateTo($"/CustomerOrder/{customerOrderId}");
}
private void SelectedItemsChanged(HashSet<CustomerOrderDto> obj)
{
_selectedCustomerOrder = obj.FirstOrDefault() ?? null;
}
}

2
OrdersManagement/Components/Pages/EdiCustomerOrder.razor
View File

@@ -1,4 +1,4 @@
@page "/edicustomerorder/{CustomerOrderId}"
@page "/EdiCustomerOrder/{CustomerOrderId}"
@inject EdiCustomerOrderService EdiCustomerOrderService
@using SytelineSaAppEfDataModel.Dtos

20
OrdersManagement/Components/Pages/EdiCustomerOrders.razor
View File

@@ -1,4 +1,4 @@
@page "/edicustomerorders"
@page "/EdiCustomerOrders"
@inject EdiCustomerOrderService EdiCustomerOrderService
@inject NavigationManager NavigationManager
@@ -8,7 +8,7 @@
@inherits LayoutComponentBase
<div class="row">
<h3>EdiCustomerOrders</h3>
<h3>Zamówienia Klienta EDI</h3>
</div>
<br />
<div class="row">
@@ -41,16 +41,16 @@
SelectedItemsChanged="SelectedItemsChanged">
<GridColumns>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="CO Number" PropertyName="CoNumber">
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="CO Number" PropertyName="CustomerOrderNumber">
@context.CustomerOrderNumber
</GridColumn>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Customer Number" PropertyName="CustNum">
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Customer Number" PropertyName="CustomerNumber">
@context.CustomerNumber
</GridColumn>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Recipient" PropertyName="Recipient">
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Recipient" PropertyName="CustomerSequence">
@context.CustomerSequence
</GridColumn>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Last Update Date" PropertyName="LastUpdateDate">
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Last Update Date" PropertyName="CreateDate">
@context.CreateDate
</GridColumn>
<GridColumn TItem="EdiCustomerOrderDto" HeaderText="Gate" PropertyName="Gate">
@@ -93,12 +93,6 @@
private bool _isVisible;
private bool _filter;
// protected override async Task OnInitializedAsync()
// {
// _ediCustomerOrders = await EdiCustomerOrderService.GetEdiCustomerOrdersAsync() ?? new List<EdiCustomerOrderDto>();
// _ediCustomerOrders = _ediCustomerOrders.OrderByDescending(x => x.CreateDate).ToList();
// }
private async Task<GridDataProviderResult<EdiCustomerOrderDto>> EdiCustomerOrdersDataProvider(GridDataProviderRequest<EdiCustomerOrderDto> request)
{
_ediCustomerOrders = await EdiCustomerOrderService.GetEdiCustomerOrdersAsync() ?? new List<EdiCustomerOrderDto>();
@@ -118,7 +112,7 @@
{
string customerOrderId = obj.Item.CustomerOrderNumber;
NavigationManager.NavigateTo($"/edicustomerorder/{customerOrderId}");
NavigationManager.NavigateTo($"/EdiCustomerOrder/{customerOrderId}");
}
private async void SendOrderToSyteLine()

2
OrdersManagement/Components/Pages/ScheduleOrderDetails.razor
View File

@@ -1,4 +1,4 @@
@page "/details/{ScheduleOrderId:int}"
@page "/ScheduleOrderDetails/{ScheduleOrderId:int}"
@inject ScheduleOrderDetailsService ScheduleOrderDetailsService

12
OrdersManagement/Components/Pages/ScheduleOrders.razor
View File

@@ -19,7 +19,7 @@
OnRowDoubleClick="OnRowDoubleClick">
<GridColumns>
<GridColumn TItem="ScheduleOrderDto" HeaderText="Id" PropertyName="Id">
<GridColumn TItem="ScheduleOrderDto" HeaderText="Id" PropertyName="ID">
@context.ID
</GridColumn>
<GridColumn TItem="ScheduleOrderDto" HeaderText="OrderID" PropertyName="OrderID">
@@ -28,11 +28,11 @@
<GridColumn TItem="ScheduleOrderDto" HeaderText="PO Number" PropertyName="PONum">
@context.PONum
</GridColumn>
<GridColumn TItem="ScheduleOrderDto" HeaderText="Recipient" PropertyName="Recipient">
@context.Recipient.RecipientCode
<GridColumn TItem="ScheduleOrderDto" HeaderText="Recipient" PropertyName="RecipientCode">
@context.RecipientCode
</GridColumn>
<GridColumn TItem="ScheduleOrderDto" HeaderText="Purchaser" Filterable="true" PropertyName="Purchaser">
@context.Recipient.Purchaser.PurchaserCode
<GridColumn TItem="ScheduleOrderDto" HeaderText="Purchaser" PropertyName="PurchaserCode">
@context.PurchaserCode
</GridColumn>
<GridColumn TItem="ScheduleOrderDto" HeaderText="Last Update Date" PropertyName="LastUpdateDate">
@context.LastUpdateDate
@@ -57,6 +57,6 @@
{
int scheduleOrderId = obj.Item.ID;
NavigationManager.NavigateTo($"/details/{scheduleOrderId}");
NavigationManager.NavigateTo($"/ScheduleOrderDetails/{scheduleOrderId}");
}
}

6
OrdersManagement/Program.cs
View File

@@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Routing.Constraints;
using OrdersManagement.Components;
using OrdersManagement.Services;
var builder = WebApplication.CreateBuilder(args);
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddBlazorBootstrap();
@@ -16,6 +16,7 @@ builder.Services.AddRazorComponents()
builder.Services.AddScoped<ScheduleOrderService>();
builder.Services.AddScoped<ScheduleOrderDetailsService>();
builder.Services.AddScoped<EdiCustomerOrderService>();
builder.Services.AddScoped<CustomerOrderService>();
var app = builder.Build();
@@ -35,5 +36,4 @@ app.UseAntiforgery();
app.MapRazorComponents<App>()
.AddInteractiveServerRenderMode();
app.Run();
app.Run();

17
OrdersManagement/Services/CustomerOrderService.cs Normal file
View File

@@ -0,0 +1,17 @@
using SytelineSaAppEfDataModel.Dtos;
namespace OrdersManagement.Services;
public class CustomerOrderService(HttpClient httpClient)
{
public async Task<IEnumerable<CustomerOrderDto>?> GetCustomerOrdersAsync()
{
return await httpClient.GetFromJsonAsync<IEnumerable<CustomerOrderDto>>("api/CustomerOrders");
}
public async Task<CustomerOrderDto?> GetCustomerOrderAsync(string customerOrderNumber)
{
return await httpClient.GetFromJsonAsync<CustomerOrderDto>(
$"api/CustomerOrders/by-order-number/?customerOrderNumber={Uri.EscapeDataString(customerOrderNumber)}");
}
}