Adam
/
FruitBankHybridApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Loretta 2025-10-21 16:29:30 +02:00
parent a4cbdc6a53
commit bfc903f714
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FruitBank.Common/FruitBankConstClient.cs
View File

@ -7,8 +7,8 @@ public static class FruitBankConstClient
{
public static string DefaultLocale = "en-US";
public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
//public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
//public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
//public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop
//public static string BaseUrl = "https://localhost:7144"; //HybridApp

2
FruitBankHybrid.Shared/Layout/MainLayout.razor.css
View File

@ -46,7 +46,7 @@ main {
}
}
@media (min-width: 641px) {
@media (min-width: 2641px) {
.page {
flex-direction: row;
}

2
FruitBankHybrid.Shared/Layout/NavMenu.razor.css
View File

@ -85,7 +85,7 @@
display: block;
}
@media (min-width: 641px) {
@media (min-width: 2641px) {
.navbar-toggler {
display: none;
}

3
FruitBankHybrid.Shared/Pages/MeasuringIn.razor
View File

@ -28,7 +28,8 @@
Date="@(SelectedShipping?.ShippingDate.Date ?? DateTime.Now.Date)"
CustomDisabledDate="@OnCustomDisabledMeasuringDate"
DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))"
InputId="deDisabledDates">
InputId="deDisabledDates"
PickerDisplayMode="DatePickerDisplayMode.Calendar">
<DayCellTemplate>
@{
var cssClass = GetMeasuringDateCssClassNames(ctxShippingDate);

13
FruitBankHybrid.Shared/Pages/MeasuringOut.razor
View File

@ -31,7 +31,8 @@
Date="@(SelectedOrder?.DateOfReceiptOrCreated.Date ?? DateTime.Now.Date)"
CustomDisabledDate="@OnCustomDisabledMeasuringDate"
DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))"
InputId="deDisabledDates">
InputId="deDisabledDates"
PickerDisplayMode="DatePickerDisplayMode.Calendar">
<DayCellTemplate>
@{
var cssClass = GetMeasuringDateCssClassNames(ctxOrderDate);
@ -73,11 +74,11 @@
@switch (SelectedOrder)
{
case null:
<DxFormLayoutItem ColSpanMd="2" />
<DxFormLayoutItem ColSpanMd="3" />
break;
case { MeasurementOwnerId: 0, IsComplete: false } when HasMeasuringAccess:
<DxFormLayoutItem ColSpanMd="2">
<DxFormLayoutItem ColSpanMd="3">
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="@(SelectedOrder != null)" CssClass="w-100"
Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Mérés indítása" : "Mérés folyamatban...")"
Click="() => OnStartMeasuringClick()" />
@ -85,7 +86,7 @@
break;
default:
<DxFormLayoutItem ColSpanMd="2" Caption="Mérést indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
<DxFormLayoutItem ColSpanMd="3" Caption="Mérést indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.FullName)" />
</DxFormLayoutItem>
break;
@ -96,7 +97,7 @@
{
var isCompleteOrder = SelectedOrder.IsComplete;
<DxFormLayoutItem Caption="Revizor:" ColSpanMd="2" CaptionCssClass="@(isCompleteOrder ? "text-success" : "")">
<DxFormLayoutItem Caption="Revizor:" ColSpanMd="3" CaptionCssClass="@(isCompleteOrder ? "text-success" : "")">
<DxButton Text="@(isCompleteOrder ? "Jóváhagyva" : "Mérés jóváhagyása")" Enabled="@(!isCompleteOrder && SelectedOrder.IsMeasured)" CssClass="w-100"
Click="() => OnMeasuringAuditorClick()" />
</DxFormLayoutItem>
@ -180,7 +181,7 @@
<DxButton Text="Új mérés" Click="() => AddNewPalletItemClick(selectedOrderItemDto)" CssClass="w-100"
Enabled="@(selectedOrderItemDto.OrderItemPallets[^1].Id > 0)" />
</DxFormLayoutItem>
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="2">
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="4">
<DxButton Text="Utolsó mérés törlése" Click="() => LastPalletItemDeleteClick(selectedOrderItemDto)" CssClass="w-100"
Enabled="@(selectedOrderItemDto.OrderItemPallets.Count > 1 && selectedOrderItemDto.OrderItemPallets[^1].Id <= 0)" />
</DxFormLayoutItem>

4
FruitBankHybrid.Web/Program.cs
View File

@ -4,13 +4,14 @@ using FruitBank.Common.Models;
using FruitBank.Common.Server.Services.Loggers;
using FruitBank.Common.Server.Services.SignalRs;
using FruitBankHybrid.Shared.Services;
using FruitBankHybrid.Shared.Services.SignalRs;
using FruitBankHybrid.Web.Components;
using FruitBankHybrid.Web.Services;
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddRazorComponents().AddInteractiveServerComponents().AddInteractiveWebAssemblyComponents();
builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpress.Blazor.SizeMode.Large);
builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpress.Blazor.SizeMode.Medium);
builder.Services.AddMvc();
builder.Services.AddSingleton<IFormFactor, FormFactor>();
@ -22,6 +23,7 @@ builder.Services.AddScoped<IAcLogWriterBase, ConsoleLogWriter>();
//builder.Services.AddScoped<IFruitBankDataControllerServer, FruitBankDataController>();
builder.Services.AddSignalR(options => options.MaximumReceiveMessageSize = 256 * 1024);
builder.Services.AddScoped<FruitBankSignalRClient>();
var app = builder.Build();
// Configure the HTTP request pipeline.