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

improvements, fixes, etc...

This commit is contained in:
Loretta 2025-09-30 07:24:29 +02:00
parent 9c91650c6d
commit 0c2c5ab8ee
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FruitBank.Common/Interfaces/MeasuringAttributeValues.cs
View File

@ -1,4 +1,6 @@
namespace FruitBank.Common.Interfaces; using System.Runtime;
namespace FruitBank.Common.Interfaces;
public class MeasuringAttributeValues : IMeasuringAttributeValues public class MeasuringAttributeValues : IMeasuringAttributeValues
{ {
@ -22,6 +24,10 @@ public class MeasuringAttributeValues : IMeasuringAttributeValues
IsMeasurable = isMeasurable; IsMeasurable = isMeasurable;
} }
public bool HasValues() public bool HasValues() => NetWeight != null && GrossWeight != null && IsMeasurable != null;
=> NetWeight != null && GrossWeight != null && IsMeasurable != null;
public override string ToString()
{
return $"NetWeight: {NetWeight}; GrossWeight: {GrossWeight}; IsMeasurable: {IsMeasurable}";
}
} }

15
FruitBankHybrid.Shared/Layout/NavMenu.razor
View File

@ -30,13 +30,14 @@
</NavLink> </NavLink>
</div> </div>
} }
else
<div class="nav-item px-3"> {
<NavLink class="nav-link" href="Login"> <div class="nav-item px-3">
<span class="icon weather-icon" aria-hidden="true"></span> Bejelentkezés <NavLink class="nav-link" href="Login">
</NavLink> <span class="icon weather-icon" aria-hidden="true"></span> Bejelentkezés
</div> </NavLink>
</div>
}
</nav> </nav>
</div> </div>

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

@ -108,6 +108,7 @@
<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" <DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")"
Field="@nameof(ShippingItem.MeasuredQuantity)" Field="@nameof(ShippingItem.MeasuredQuantity)"
Enabled="@(SelectedShippingItem.ProductId.GetValueOrDefault(0) > 0)"
Caption="MeasuredQuantity:" Caption="MeasuredQuantity:"
ColSpanMd="2" ColSpanMd="2"
BeginRow="false"> BeginRow="false">
@ -115,14 +116,14 @@
<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" <DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")"
Field="@nameof(ShippingItem.MeasuredGrossWeight)" Field="@nameof(ShippingItem.MeasuredGrossWeight)"
Enabled="@(SelectedShippingItem.IsMeasurable)" Enabled="@(SelectedShippingItem.IsMeasurable && SelectedShippingItem.ProductId.GetValueOrDefault(0) > 0)"
Caption="MeasuredGrossWeight:" Caption="MeasuredGrossWeight:"
ColSpanMd="2"> ColSpanMd="2">
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")" <DxFormLayoutItem CaptionCssClass="@(SelectedShippingItem.IsMeasured ? "text-success" : "")"
Field="@nameof(ShippingItem.MeasuredNetWeight)" Field="@nameof(ShippingItem.MeasuredNetWeight)"
Enabled="@(SelectedShippingItem.IsMeasurable)" Enabled="@(SelectedShippingItem.IsMeasurable && SelectedShippingItem.ProductId.GetValueOrDefault(0) > 0)"
Caption="MeasuredNetWeight:" Caption="MeasuredNetWeight:"
ColSpanMd="2"> ColSpanMd="2">
</DxFormLayoutItem> </DxFormLayoutItem>
@ -136,9 +137,18 @@
<ValidationSummary /> <ValidationSummary />
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem ColSpanMd="12" BeginRow="true"> @if (SelectedShippingItem.ProductId.GetValueOrDefault(0) > 0)
<DxButton Text="@(SelectedShippingItem.IsMeasured ? "Módosít" : "Mentés")" Enabled="BtnSaveEnabled" SubmitFormOnClick="true" CssClass="w-100" /> {
</DxFormLayoutItem> <DxFormLayoutItem ColSpanMd="12" BeginRow="true">
<DxButton Text="@(SelectedShippingItem.IsMeasured ? "Módosít" : "Mentés")" Enabled="BtnSaveEnabled" SubmitFormOnClick="true" CssClass="w-100"/>
</DxFormLayoutItem>
}
else
{
<DxFormLayoutItem ColSpanMd="12" BeginRow="true">
<text>Nem végezhető el a mérés, nincs megadva a ProductId! Jelezze a vezetőségnek...</text>
</DxFormLayoutItem>
}
</DxFormLayout> </DxFormLayout>
</EditForm> </EditForm>
} }