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

Compare commits

base: Adam:2eaf74b19995b0eac135d8bf8763c5f5802bd07e
Branches Tags
Adam:main
Adam:FruitBank_v0.0.8.0
..
compare: Adam:f274f4697161d2fc0aa219f1cc5f9fcbeec7ecee
Branches Tags
Adam:FruitBank_v0.0.8.0
Adam:main

No commits in common. "2eaf74b19995b0eac135d8bf8763c5f5802bd07e" and "f274f4697161d2fc0aa219f1cc5f9fcbeec7ecee" have entirely different histories.
2eaf74b199 ... f274f46971

14 changed files with 168 additions and 174 deletions
Show Stats Expand all files Collapse all files

1
FruitBank.Common.Server/FruitBank.Common.Server.csproj
View File

@ -35,6 +35,7 @@
<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Services.Server.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.SignalR.Core">
<!--<HintPath>C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.9\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll</HintPath>-->
<HintPath>C:\Program Files\dotnet\packs\Microsoft.AspNetCore.App.Ref\9.0.10\ref\net9.0\Microsoft.AspNetCore.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Mango.Nop.Core">

5
FruitBank.Common.Server/Services/Loggers/LoggerToLoggerApiController.cs
View File

@ -1,11 +1,8 @@
using AyCode.Core.Loggers;
using FruitBank.Common.Loggers;
using FruitBank.Common.Loggers;
using Mango.Nop.Core.Loggers;
namespace FruitBank.Common.Server.Services.Loggers;
public class LoggerToLoggerApiController : Logger<LoggerToLoggerApiController>
{
public LoggerToLoggerApiController(params IAcLogWriterBase[] logWriters) : base(logWriters)
{ }
}

5
FruitBank.Common.Server/Services/SignalRs/DevAdminSignalRhub.cs
View File

@ -36,11 +36,6 @@ public class DevAdminSignalRHub : AcWebSignalRHubWithSessionBase<SignalRTags, Lo
DynamicMethodCallModels.Add(new AcDynamicMethodCallModel<SignalRAttribute>(customOrderSignalREndpoint));
}
protected override void LogContextUserNameAndId()
{
return;
base.LogContextUserNameAndId();
}
//public override Task OnReceiveMessage(int messageTag, byte[]? message, int? requestId)
//{
// return ProcessOnReceiveMessage(messageTag, message, requestId, async tagName =>

4
FruitBank.Common/FruitBank.Common.csproj
View File

@ -40,6 +40,10 @@
<Reference Include="Nop.Core">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Nop.Core.dll</HintPath>
</Reference>
<Reference Include="Nop.Core">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Mango.Nop.Core.dll</HintPath>
</Reference>
</ItemGroup>
</Project>

6
FruitBank.Common/FruitBankConstClient.cs
View File

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

2
FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs
View File

@ -29,8 +29,6 @@ namespace FruitBankHybrid.Shared.Tests
[TestInitialize]
public void TestInit()
{
if (!FruitBankConstClient.BaseUrl.Contains("localhost:")) throw new Exception("NEM LOCALHOST-ON TESZTELÜNK!");
_signalRClient = new FruitBankSignalRClient(new List<IAcLogWriterClientBase>
{
//new ConsoleLogWriter(AppType.TestUnit, LogLevel.Detail, nameof(FruitBankClientTests)),

9
FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj
View File

@ -34,12 +34,15 @@
<Reference Include="Mango.Nop.Core">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Mango.Nop.Core.dll</HintPath>
</Reference>
<Reference Include="Mango.Nop.Services">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Services\bin\FruitBank\Debug\net9.0\Mango.Nop.Services.dll</HintPath>
</Reference>
<Reference Include="Nop.Core">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Nop.Core.dll</HintPath>
</Reference>
<Reference Include="Nop.Data">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Nop.Data.dll</HintPath>
</Reference>
<Reference Include="Nop.Services">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Nop.Services.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

3
FruitBankHybrid.Shared.Tests/OrderClientTests.cs
View File

@ -1,6 +1,5 @@
using AyCode.Core.Enums;
using AyCode.Core.Loggers;
using FruitBank.Common;
using FruitBank.Common.Loggers;
using FruitBankHybrid.Shared.Services.SignalRs;
using Nop.Core.Domain.Orders;
@ -17,8 +16,6 @@ public sealed class OrderClientTests
[TestInitialize]
public void TestInit()
{
if (!FruitBankConstClient.BaseUrl.Contains("localhost:")) throw new Exception("NEM LOCALHOST-ON TESZTELÜNK!");
_signalRClient = new FruitBankSignalRClient(new List<IAcLogWriterClientBase>
{
//new ConsoleLogWriter(AppType.TestUnit, LogLevel.Detail, nameof(FruitBankClientTests)),

2
FruitBankHybrid.Shared/Extensions/DevexpressComponentExtensions.cs → FruitBankHybrid.Shared/Extensions/DevextremeComponentExtension.cs
View File

@ -3,7 +3,7 @@ using DevExpress.Blazor.Internal;
namespace FruitBankHybrid.Shared.Extensions;
public static class DevexpressComponentExtensions
public static class DevextremeComponentExtension
{
public static async Task ShowMessageBoxAsync(this IDialogService messageBox, string title, string text, MessageBoxRenderStyle messageBoxRenderStyle)
{

2
FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>

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

@ -71,27 +71,25 @@
</DxComboBox>
</DxFormLayoutItem>
@if (SelectedOrder == null)
@switch (SelectedOrder)
{
case null:
<DxFormLayoutItem ColSpanMd="2" />
}
else
{
if (SelectedOrder is { MeasurementOwnerId: 0, IsComplete: false } && HasMeasuringAccess)
{
break;
case { MeasurementOwnerId: 0, IsComplete: false } when HasMeasuringAccess:
<DxFormLayoutItem ColSpanMd="2">
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="(SelectedOrder != null)"
CssClass="w-100"
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="@(SelectedOrder != null)" CssClass="w-100"
Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Indítás" : "Folyamatban...")"
Click="() => OnStartMeasuringClick()" />
</DxFormLayoutItem>
}
else
{
break;
default:
<DxFormLayoutItem ColSpanMd="2" Caption="Indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.LastName)" />
</DxFormLayoutItem>
}
break;
}
@* <DxFormLayoutItem ColSpanMd="1"></DxFormLayoutItem> *@

10
FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
View File

@ -174,11 +174,8 @@ namespace FruitBankHybrid.Shared.Pages
private async Task OnStartMeasuringClick()
{
if (SelectedOrder == null || !LoggedInModel.IsLoggedIn || SelectedOrder.MeasurementOwnerId != 0) return;
var confirmed = !LoggedInModel.IsRevisor || await DialogService.ShowConfirmBoxAsync("Megerősítés", "Ha elindítja a mérést, senki más nem tudja befelyezni! Biztoan folytatja?", MessageBoxRenderStyle.Info);
if (!confirmed) return;
if (SelectedOrder != null && LoggedInModel.IsLoggedIn && SelectedOrder.MeasurementOwnerId == 0)
{
var responseOrderDto = await FruitBankSignalRClient.StartMeasuring(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id);
if (responseOrderDto != null)
{
@ -192,12 +189,13 @@ namespace FruitBankHybrid.Shared.Pages
StateHasChanged();
}
}
private async Task OnMeasuringAuditorClick()
{
if (SelectedOrder != null && LoggedInModel.IsRevisor && SelectedOrder.IsMeasured && SelectedOrder.OrderStatus != OrderStatus.Complete)
{
if (await DialogService.ShowConfirmBoxAsync("Megerősítés", "Biztoan jóváhagyja a rendelést? Jóváhagyás után a mérések nem módosíthatóak!", MessageBoxRenderStyle.Info))
if (await DialogService.ShowConfirmBoxAsync("Megerősítés", "Biztoan jóváhagyja a rendelést? Jóváhagyás után a mérések nem módosíthatóak!", MessageBoxRenderStyle.Danger))
{
var responseOrderDto = await FruitBankSignalRClient.SetOrderStatusToComplete(SelectedOrder.Id, LoggedInModel.CustomerDto!.Id);
if (responseOrderDto != null)

21
FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
View File

@ -39,14 +39,21 @@
<Reference Include="AyCode.Utils">
<HintPath>..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll</HintPath>
</Reference>
<Reference Include="Nop.Core">
<HintPath>..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Nop.Core.dll</HintPath>
<Reference Include="DevExpress.Blazor.Resources.v25.1">
</Reference>
<Reference Include="DevExpress.Blazor.v25.1">
</Reference>
<Reference Include="DevExpress.Blazor.v25.1.Viewer">
</Reference>
<Reference Include="DevExpress.Data.v25.1">
</Reference>
<Reference Include="DevExpress.Utils.v25.1">
</Reference>
<Reference Include="DevExpress.Blazor.Resources.v25.1"></Reference>
<Reference Include="DevExpress.Blazor.v25.1"></Reference>
<Reference Include="DevExpress.Blazor.v25.1.Viewer"></Reference>
<Reference Include="DevExpress.Data.v25.1"></Reference>
<Reference Include="DevExpress.Utils.v25.1"></Reference>
</ItemGroup>
</Project>

4
FruitBankHybrid.Web/FruitBankHybrid.Web.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<!--<PublishTrimmed>true</PublishTrimmed>-->
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\FruitBank.Common.Server\FruitBank.Common.Server.csproj" />
<ProjectReference Include="..\FruitBank.Common\FruitBank.Common.csproj" />