Compare commits
3
Commits
dev
...
2ceae0df31
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ceae0df31 | ||
|
|
a8199621c6 | ||
|
|
0fc4106cd2 |
No files matched your search
+7
-1
@@ -145,7 +145,13 @@ namespace Elwig {
|
|||||||
var list = new List<IScale>();
|
var list = new List<IScale>();
|
||||||
foreach (var s in Config.Scales) {
|
foreach (var s in Config.Scales) {
|
||||||
try {
|
try {
|
||||||
list.Add(Scale.FromConfig(s));
|
var scale = Scale.FromConfig(s);
|
||||||
|
if (scale is ICommandScale cmd) {
|
||||||
|
try {
|
||||||
|
await cmd.SetDateAndTime(DateTime.Now);
|
||||||
|
} catch { }
|
||||||
|
}
|
||||||
|
list.Add(scale);
|
||||||
} catch (Exception exc) {
|
} catch (Exception exc) {
|
||||||
list.Add(new InvalidScale(s.Id));
|
list.Add(new InvalidScale(s.Id));
|
||||||
if (s.Required)
|
if (s.Required)
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ namespace Elwig.Documents {
|
|||||||
if (info.Date != null || info.Time != null)
|
if (info.Date != null || info.Time != null)
|
||||||
weighing.Add(Normal(" \u2013 "));
|
weighing.Add(Normal(" \u2013 "));
|
||||||
if (info.Time != null)
|
if (info.Time != null)
|
||||||
weighing.Add(Normal($"{info.Time:HH:mm}"));
|
weighing.Add(Normal($"{info.Time:HH:mm:ss}"));
|
||||||
if (info.Date != null)
|
if (info.Date != null)
|
||||||
weighing.Add(Normal($", {info.Date:dd.MM.yyyy}"));
|
weighing.Add(Normal($", {info.Date:dd.MM.yyyy}"));
|
||||||
if (info.Gross != null && info.Tare != null && info.Net != null) {
|
if (info.Gross != null && info.Tare != null && info.Net != null) {
|
||||||
|
|||||||
+7
-7
@@ -23,21 +23,21 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="bblanchon.PDFium.Win32" Version="152.0.7934" />
|
<PackageReference Include="bblanchon.PDFium.Win32" Version="152.0.7961" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
||||||
<PackageReference Include="itext" Version="9.7.0" />
|
<PackageReference Include="itext" Version="9.7.0" />
|
||||||
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
|
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
|
||||||
<PackageReference Include="LinqKit" Version="1.3.11" />
|
<PackageReference Include="LinqKit" Version="1.3.11" />
|
||||||
<PackageReference Include="MailKit" Version="4.17.0" />
|
<PackageReference Include="MailKit" Version="4.17.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.10" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.10" />
|
||||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4078.44" />
|
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4078.44" />
|
||||||
<PackageReference Include="NJsonSchema" Version="11.6.1" />
|
<PackageReference Include="NJsonSchema" Version="11.6.1" />
|
||||||
<PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
|
<PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
|
||||||
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
|
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
|
||||||
<PackageReference Include="System.IO.Hashing" Version="10.0.9" />
|
<PackageReference Include="System.IO.Hashing" Version="10.0.10" />
|
||||||
<PackageReference Include="System.IO.Ports" Version="10.0.9" />
|
<PackageReference Include="System.IO.Ports" Version="10.0.10" />
|
||||||
<PackageReference Include="System.Management" Version="10.0.9" />
|
<PackageReference Include="System.Management" Version="10.0.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -49,7 +49,7 @@ namespace Elwig.Helpers.Weighing {
|
|||||||
/// <returns><[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time></returns>
|
/// <returns><[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time></returns>
|
||||||
public override readonly string ToString() {
|
public override readonly string ToString() {
|
||||||
var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
|
var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
|
||||||
return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
|
return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm:ss}>";
|
||||||
}
|
}
|
||||||
|
|
||||||
public readonly JsonObject ToJson() {
|
public readonly JsonObject ToJson() {
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
|
||||||
<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.6.1" />
|
<PackageReference Include="NUnit" Version="4.6.1" />
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace Tests.UnitTests.DocumentTests {
|
|||||||
1 Grüner Veltliner Qualitätswein 73 15,0 3 219
|
1 Grüner Veltliner Qualitätswein 73 15,0 3 219
|
||||||
Herkunft: Österreich / Weinland / Niederösterreich
|
Herkunft: Österreich / Weinland / Niederösterreich
|
||||||
/ Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
|
/ Matzner Hügel / Hohenruppersdorf / KG Hohenruppersdorf
|
||||||
Waage/Terminal: ?/1, ID: 321 – 09:02, 01.10.2020
|
Waage/Terminal: ?/1, ID: 321 – 09:02:46, 01.10.2020
|
||||||
Brutto: 3 219 kg – Tara: 0 kg – Netto: 3 219 kg – gerebelt gewogen
|
Brutto: 3 219 kg – Tara: 0 kg – Netto: 3 219 kg – gerebelt gewogen
|
||||||
"""));
|
"""));
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in new issue
Block a user