Bump version to 0.10.5

CHANGELOG.md

@@ -2,6 +2,37 @@
 Changelog
 =========
 
+[v0.10.5][v0.10.5] (2024-08-24) {#v0.10.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) kann der Benutzer beim Übertragen von Flächenbindungen entscheiden, ob der Beginn der Laufzeit übernommen werden soll, oder nicht. (bec1b165bf)
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich für Waagen vom Typ `SysTec-IT` Datum und Uhrzeit festzulegen. (cd2b482b5a)
+
+### Sonstiges {#v0.10.5-misc}
+
+* Abstände in der Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (adbe418b7c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) scheinen keine Warnungen mehr auf, wenn ein nicht-optionales Feld nicht ausgefüllt wurde. (2ae2564647)
+
+[v0.10.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.5
+
+
+
+
+[v0.10.4][v0.10.4] (2024-08-22) {#v0.10.4}
+------------------------------------------
+
+### Sonstiges {#v0.10.4-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Wochentag auch beim Bearbeiten angezeigt. (85931e62e8)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden Anzahl der Mitglieder und Geschäftsanteile nicht mehr von allen aktiven angezeigt, sonder von den momentan gefilterten. (49e4b65c27)
+* Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (f54677d429)
+
+[v0.10.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.4
+
+
+
 
 [v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3}
 ------------------------------------------

Elwig/Dialogs/AreaComDialog.xaml

@@ -8,7 +8,7 @@
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="230" Width="450">
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -48,11 +48,15 @@
                             Minimum="1900" Maximum="9999"
                             HorizontalAlignment="Center" VerticalAlignment="Top"
                             TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearTo}"/>
 
-        <TextBlock x:Name="DescBlock1" Margin="0,85,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
             Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
-            und werden beim <Bold>Nachfolger</Bold> ab inkl. Saison <Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
+            und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
         </TextBlock>
         <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComDialog.xaml.cs

@@ -7,6 +7,7 @@ namespace Elwig.Dialogs {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearTo { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
@@ -22,6 +23,7 @@ namespace Elwig.Dialogs {
             QuestionBlock2.Visibility = Visibility.Visible;
             DescBlock1.Visibility = Visibility.Hidden;
             DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
             Height = 240;
             SeasonInput.Margin = new(0, 40, 0, 0);
             SeasonLabel.Margin = new(0, 40, 100, 0);
@@ -41,7 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.10.3</Version>
+    <Version>0.10.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Elwig/Helpers/Validator.cs

@@ -8,7 +8,7 @@ namespace Elwig.Helpers {
     public static class Validator {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
-            { "43", new string[][] {
+            { "43", [
                 [],
                 ["57", "59"],
                 [
@@ -17,17 +17,17 @@ namespace Elwig.Helpers {
                     "650", "651", "652", "653", "655", "657", "659", "660", "661",
                     "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
                 ]
-            } },
-            { "49", Array.Empty<string[]>() },
-            { "48", Array.Empty<string[]>() },
-            { "420", Array.Empty<string[]>() },
-            { "421", Array.Empty<string[]>() },
-            { "36", Array.Empty<string[]>() },
-            { "386", Array.Empty<string[]>() },
-            { "39", Array.Empty<string[]>() },
-            { "33", Array.Empty<string[]>() },
-            { "41", Array.Empty<string[]>() },
-            { "423", Array.Empty<string[]>() },
+            ] },
+            { "49", [] },
+            { "48", [] },
+            { "420", [] },
+            { "421", [] },
+            { "36", [] },
+            { "386", [] },
+            { "39", [] },
+            { "33", [] },
+            { "41", [] },
+            { "423", [] },
         };
 
         public static ValidationResult CheckInteger(TextBox input, bool required) {

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -118,5 +118,9 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
+        }
     }
 }

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
@@ -31,5 +32,10 @@ namespace Elwig.Helpers.Weighing {
         /// Revoke clearance to fill the scale container
         /// </summary>
         Task RevokeFillingClearance();
+
+        /// <summary>
+        /// Try to set date and time on the scale
+        /// </summary>
+        Task SetDateAndTime(DateTime dateTime);
     }
 }

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -161,5 +161,10 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public async Task SetDateAndTime(DateTime dateTime) {
+            await SendCommand($"ST{dateTime:dd.MM.yyHH:mm:ss}");
+            await ReceiveResponse();
+        }
     }
 }

Elwig/Services/DeliveryAncmtService.cs

@@ -9,7 +9,6 @@ using Elwig.Documents;
 using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
 using Microsoft.Win32;
-using System.Net.Http;
 using System.Windows.Input;
 using System.Windows;
 using System;
@@ -27,6 +26,8 @@ namespace Elwig.Services {
         }
 
         public static void ClearInputs(this DeliveryAncmtAdminViewModel vm) {
+            vm.StatusAncmtCreated = "-";
+            vm.StatusAncmtModified = "-";
         }
 
         public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
@@ -34,6 +35,8 @@ namespace Elwig.Services {
             vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
             vm.SortId = a.SortId;
             vm.Weight = a.Weight;
+            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
         }
 
         public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {

Elwig/Services/MemberService.cs

@@ -597,7 +597,7 @@ namespace Elwig.Services {
                     KgNr = c.KgNr,
                     GstNr = c.GstNr,
                     RdNr = c.RdNr,
-                    YearFrom = year,
+                    YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
                     YearTo = c.YearTo,
                 }));
 

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

@@ -62,6 +62,15 @@ namespace Elwig.ViewModels {
             set => WeightString = $"{value}";
         }
 
+        [ObservableProperty]
+        private string _statusAncmts = "-";
+        [ObservableProperty]
+        private string _statusWeight = "-";
+        [ObservableProperty]
+        private string _statusAncmtCreated = "-";
+        [ObservableProperty]
+        private string _statusAncmtModified = "-";
+
         [ObservableProperty]
         private Visibility _controlButtonsVisibility = Visibility.Visible;
         [ObservableProperty]

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -11,6 +11,7 @@ namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
+        public bool MaintainAreaComYearTo = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -123,7 +123,7 @@
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="20"/>
+                            <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/>
                             <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/>
                             <TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/>
                             <TextBlock Text="{Binding Description}" Width="200"/>
@@ -268,6 +268,7 @@
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/>
                                     <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/>
                                     <TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/>
                                     <TextBlock Text="{Binding Description}"/>
@@ -306,17 +307,39 @@
                 <ItemsPanelTemplate>
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="1*" MinWidth="120"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="1*" MinWidth="150"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="2.25*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
                         </Grid.ColumnDefinitions>
                     </Grid>
                 </ItemsPanelTemplate>
             </StatusBar.ItemsPanel>
             <StatusBarItem>
-
+                <TextBlock>
+                    Anmeldungen: <Run Text="{Binding StatusAncmts}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock>
+                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock>
+                    Anmldg. erstellt: <Run Text="{Binding StatusAncmtCreated}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock>
+                    Anmldg. geändert: <Run Text="{Binding StatusAncmtModified}"/>
+                </TextBlock>
             </StatusBarItem>
         </StatusBar>
     </Grid>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -31,6 +31,8 @@ namespace Elwig.Windows {
                 MgNrInput, MemberInput, DeliveryScheduleInput, SortIdInput, WineVarietyInput, WeightInput,
             ];
 
+            DoShowWarningWindows = false;
+
             InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
@@ -127,6 +129,9 @@ namespace Elwig.Windows {
                 DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             if (updateSort && DeliveryAncmtList.SelectedItem != null)
                 DeliveryAncmtList.ScrollIntoView(DeliveryAncmtList.SelectedItem);
+
+            ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
+            ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
         }
 
         private async Task RefreshInputs(bool validate = false) {

Elwig/Windows/MainWindow.xaml

@@ -25,6 +25,9 @@
                 <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click"/>
                 <MenuItem Header="Speicherort öffnen..." Click="Menu_Database_Open_Click"/>
             </MenuItem>
+            <MenuItem Header="Waagen">
+                <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scales_SetDateTime_Click"/>
+            </MenuItem>
             <MenuItem x:Name="HelpMenu" Header="Hilfe">
                 <MenuItem Header="Über"/>
                 <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>

Elwig/Windows/MainWindow.xaml.cs

@@ -90,6 +90,21 @@ namespace Elwig.Windows {
             } catch { }
         }
 
+        private async void Menu_Scales_SetDateTime_Click(object sender, RoutedEventArgs evt) {
+            if (App.CommandScales.Count == 0) {
+                MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            foreach (var s in App.CommandScales) {
+                try {
+                    await s.SetDateAndTime(DateTime.Now);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+            MessageBox.Show("Datum und Uhrzeit auf entsprechenden Waagen gesetzt!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
         private void Menu_Database_Query_Click(object sender, RoutedEventArgs evt) {
             var w = new QueryWindow();
             w.Show();

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -150,6 +150,9 @@ namespace Elwig.Windows {
                 MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             if (updateSort && MemberList.SelectedItem != null)
                 MemberList.ScrollIntoView(MemberList.SelectedItem);
+
+            ViewModel.StatusMembers = $"{members.Count:N0} ({await ctx.Members.CountAsync():N0})";
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
         private async Task RefreshInputs(bool validate = false) {
@@ -237,7 +240,6 @@ namespace Elwig.Windows {
             var mM = Math.Max(mA.Length, Math.Max(mI.Length, mT.Length));
             var mS = mM > 3;
             if (mS) mM--;
-            ViewModel.StatusMembers = $"{mA} ({mT})";
             ViewModel.StatusMembersToolTip =
                 $"{new string(s1, Math.Max(0, mM - mA.Length))}{(mS && mA.Length < 4 ? s2 : "")}{mA} aktive Mitglieder\n" +
                 $"{new string(s1, Math.Max(0, mM - mI.Length))}{(mS && mI.Length < 4 ? s2 : "")}{mI} nicht aktive Mitglieder\n" +
@@ -249,7 +251,6 @@ namespace Elwig.Windows {
             var bM = Math.Max(bA.Length, Math.Max(bI.Length, bT.Length));
             var bS = bM > 3;
             if (bS) bM--;
-            ViewModel.StatusBusinessShares = $"{bA} ({bT})";
             ViewModel.StatusBusinessSharesToolTip =
                 $"{new string(s1, Math.Max(0, bM - bA.Length))}{(bS && bA.Length < 4 ? s2 : "")}{bA} Geschäftsanteile von aktiven Mitgliedern\n" +
                 $"{new string(s1, Math.Max(0, bM - bI.Length))}{(bS && bI.Length < 4 ? s2 : "")}{bI} Geschäftsanteile von nicht aktiven Mitgliedern\n" +
@@ -746,6 +747,7 @@ namespace Elwig.Windows {
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
+                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();