Compare commits
3 Commits
28af7f8dd3
...
775bb08e95
Author | SHA1 | Date | |
---|---|---|---|
775bb08e95 | |||
fe0a7dab2a | |||
138dae715e |
@ -26,20 +26,20 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
||||||
<PackageReference Include="LinqKit" Version="1.3.7" />
|
<PackageReference Include="LinqKit" Version="1.3.8" />
|
||||||
<PackageReference Include="MailKit" Version="4.9.0" />
|
<PackageReference Include="MailKit" Version="4.10.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
|
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.2" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.2" />
|
||||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
|
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3065.39" />
|
||||||
<PackageReference Include="NJsonSchema" Version="11.1.0" />
|
<PackageReference Include="NJsonSchema" Version="11.1.0" />
|
||||||
<PackageReference Include="PdfiumViewer" Version="2.13.0" />
|
<PackageReference Include="PdfiumViewer" Version="2.13.0" />
|
||||||
<PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
|
<PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
|
||||||
<PackageReference Include="RazorLight" Version="2.3.1" />
|
<PackageReference Include="RazorLight" Version="2.3.1" />
|
||||||
<PackageReference Include="ScottPlot.WPF" Version="5.0.53" />
|
<PackageReference Include="ScottPlot.WPF" Version="5.0.54" />
|
||||||
<PackageReference Include="System.IO.Ports" Version="9.0.1" />
|
<PackageReference Include="System.IO.Ports" Version="9.0.2" />
|
||||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" />
|
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -23,6 +23,10 @@ namespace Elwig.Helpers {
|
|||||||
public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
|
public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
|
||||||
public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
|
public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
|
||||||
|
|
||||||
|
public bool HasBoxWeighing(string? zwstId) => IsWinzerkeller && (zwstId != "W");
|
||||||
|
public bool HasBoxWeighing(Branch? b) => HasBoxWeighing(b?.ZwstId);
|
||||||
|
public bool HasBoxWeighing() => HasBoxWeighing(App.ZwstId);
|
||||||
|
|
||||||
public string NameToken;
|
public string NameToken;
|
||||||
public string NameShort;
|
public string NameShort;
|
||||||
public string Name;
|
public string Name;
|
||||||
|
@ -310,19 +310,23 @@ namespace Elwig.Windows {
|
|||||||
UnsetDefaultValue(GerebeltGewogenInput);
|
UnsetDefaultValue(GerebeltGewogenInput);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
|
if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
|
||||||
LesewagenInput.IsEnabled = false;
|
LesewagenInput.IsEnabled = false;
|
||||||
SetDefaultValue(LesewagenInput, false);
|
SetDefaultValue(LesewagenInput, false);
|
||||||
HandPickedInput.IsThreeState = false;
|
|
||||||
UnsetDefaultValue(HandPickedInput);
|
|
||||||
} else {
|
} else {
|
||||||
LesewagenInput.IsEnabled = true;
|
LesewagenInput.IsEnabled = true;
|
||||||
UnsetDefaultValue(LesewagenInput);
|
UnsetDefaultValue(LesewagenInput);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
|
||||||
|
HandPickedInput.IsThreeState = false;
|
||||||
|
UnsetDefaultValue(HandPickedInput);
|
||||||
|
} else {
|
||||||
HandPickedInput.IsThreeState = true;
|
HandPickedInput.IsThreeState = true;
|
||||||
SetDefaultValue(HandPickedInput, null);
|
SetDefaultValue(HandPickedInput, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
|
if (App.Client.IsMatzen || App.Client.IsWinzerkeller || App.Client.IsBaden || App.Client.IsWeinland) {
|
||||||
GebundenInput.IsEnabled = false;
|
GebundenInput.IsEnabled = false;
|
||||||
SetDefaultValue(GebundenInput, null);
|
SetDefaultValue(GebundenInput, null);
|
||||||
} else {
|
} else {
|
||||||
|
@ -19,16 +19,16 @@
|
|||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
|
||||||
<PackageReference Include="Appium.WebDriver" Version="4.4.5" />
|
<PackageReference Include="Appium.WebDriver" Version="4.4.5" />
|
||||||
<PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
|
<PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
|
||||||
<PackageReference Include="NUnit" Version="4.3.2" />
|
<PackageReference Include="NUnit" Version="4.3.2" />
|
||||||
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
|
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
|
||||||
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
|
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="coverlet.collector" Version="6.0.3">
|
<PackageReference Include="coverlet.collector" Version="6.0.4">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
Reference in New Issue
Block a user