Entities/Member: Add OrganicOperatorId

Elwig/Documents/MemberDataSheet.cs

@@ -161,7 +161,8 @@ namespace Elwig.Documents {
                 .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
                     .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
-                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd((Member.IsOrganic ? "Ja" : "Nein") + (Member.OrganicAuthorityCode != null ? $" ({Member.OrganicAuthorityCode})" : ""), colspan: 2))
+                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsOrganic ? "Ja" : "Nein", 10)
+                    .Add(Normal(Member.OrganicAuthorityCode != null || Member.OrganicOperatorId != null ? $" ({Member.OrganicAuthorityCode}{(Member.OrganicAuthorityCode != null && Member.OrganicOperatorId != null ? ", " : "")}{Member.OrganicOperatorId})" : "", 8)), colspan: 2))
                 .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
                 .AddCell(NewDataTh("Status:")).AddCell(NewTd(new KernedParagraph(Member.IsActive ? "Aktiv " : "Nicht aktiv ", 10)
                     .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))

Elwig/Helpers/Export/ElwigData.cs

@@ -638,6 +638,7 @@ namespace Elwig.Helpers.Export {
                 ["zwstid"] = m.ZwstId,
                 ["lfbis_nr"] = m.LfbisNr,
                 ["ustid_nr"] = m.UstIdNr,
+                ["ooc_id"] = m.OrganicOperatorId,
                 ["org_auth_code"] = m.OrganicAuthorityCode,
                 ["juridical_pers"] = m.IsJuridicalPerson,
                 ["volllieferant"] = m.IsVollLieferant,
@@ -711,6 +712,7 @@ namespace Elwig.Helpers.Export {
                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
                 UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                OrganicOperatorId = json["ooc_id"]?.AsValue().GetValue<string>(),
                 OrganicAuthorityCode = json["org_auth_code"]?.AsValue().GetValue<string>(),
                 IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
                 IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,

Elwig/Helpers/Validator.cs

@@ -623,6 +623,37 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckOrganicOperatorId(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            for (int i = 0, v = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (char.IsAsciiDigit(ch)) {
+                    if (v == 3 && text[^1] != '-')
+                        text += "-";
+                    v++;
+                    text += ch;
+                }
+
+                if (i == input.CaretIndex - 1) {
+                    pos = text.Length;
+                } else if (v >= 10) {
+                    break;
+                }
+            }
+
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "OOC-ID ist nicht optional") : new(true, null);
+            } else if (!text.StartsWith("040-") || text.Length != 11) {
+                return new(false, "OOC-ID ist ungültig");
+            }
+
+            return new(true, null);
+        }
+
         public static ValidationResult CheckOrganicAuthorityCode(TextBox input, bool required) {
             string text = "";
             int pos = input.CaretIndex;

Elwig/Models/Entities/Member.cs

@@ -96,6 +96,9 @@ namespace Elwig.Models.Entities {
         [Column("ustid_nr")]
         public string? UstIdNr { get; set; }
 
+        [Column("ooc_id")]
+        public string? OrganicOperatorId { get; set; }
+
         [Column("org_auth_code")]
         public string? OrganicAuthorityCode { get; set; }
 

Elwig/Resources/Sql/41-42.sql

@@ -1,3 +1,8 @@
 -- schema version 41 to 42
 
+ALTER TABLE member ADD COLUMN ooc_id           TEXT             CHECK (ooc_id   REGEXP '^[0-9]{3}-[0-9]{7}$')      DEFAULT NULL;
 ALTER TABLE member ADD COLUMN org_auth_code    TEXT             CHECK (org_auth_code REGEXP '^[A-Z]{2}-[A-ZÖØ]{3}-[0-9]{2,3}(-[A-Z]{2})?$') DEFAULT NULL;
+
+UPDATE member SET org_auth_code = UPPER(SUBSTR(a.name, -11, 10)) FROM member m JOIN member_billing_address a ON a.mgnr = m.mgnr WHERE a.name LIKE '%AT-BIO-___)';
+UPDATE member SET org_auth_code = UPPER(SUBSTR(a.name, -10, 10)) FROM member m JOIN member_billing_address a ON a.mgnr = m.mgnr WHERE a.name LIKE '%AT-BIO-___';
+UPDATE member SET org_auth_code = UPPER(suffix) WHERE suffix LIKE 'AT-BIO-___';

Elwig/Services/MemberService.cs

@@ -106,6 +106,7 @@ namespace Elwig.Services {
 
             vm.UstIdNr = m.UstIdNr;
             vm.LfbisNr = m.LfbisNr;
+            vm.OrganicOperatorId = m.OrganicOperatorId;
             vm.OrganicAuthorityCode = m.OrganicAuthorityCode;
             vm.IsBuchführend = m.IsBuchführend;
             vm.IsOrganic = m.IsOrganic;
@@ -556,6 +557,7 @@ namespace Elwig.Services {
 
                 UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
                 LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                OrganicOperatorId = string.IsNullOrWhiteSpace(vm.OrganicOperatorId) ? null : vm.OrganicOperatorId,
                 OrganicAuthorityCode = string.IsNullOrWhiteSpace(vm.OrganicAuthorityCode) ? null : vm.OrganicAuthorityCode,
                 IsBuchführend = vm.IsBuchführend,
                 IsOrganic = vm.IsOrganic,

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -118,6 +118,8 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _lfbisNr;
         [ObservableProperty]
+        private string? _organicOperatorId;
+        [ObservableProperty]
         private string? _organicAuthorityCode;
         [ObservableProperty]
         private bool _isBuchführend;

Elwig/Windows/AdministrationWindow.cs

@@ -576,6 +576,14 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
 
+        protected void OrganicOperatorIdInput_TextChanged(object sender, TextChangedEventArgs? evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckOrganicOperatorId);
+        }
+
+        protected void OrganicOperatorIdInput_LostFocus(object sender, RoutedEventArgs? evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckOrganicOperatorId);
+        }
+
         protected void OrganicAuthorityCodeInput_TextChanged(object sender, TextChangedEventArgs? evt) {
             InputTextChanged((TextBox)sender, Validator.CheckOrganicAuthorityCode);
         }

Elwig/Windows/MemberAdminWindow.xaml

@@ -547,31 +547,40 @@
             <GroupBox Header="Betrieb" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="90"/>
-                        <ColumnDefinition Width="110"/>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="69"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="55"/>
+                        <ColumnDefinition Width="101"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
-                        <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
-                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
-
-                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="LfbisNrInput" Text="{Binding LfbisNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                             Margin="0,10,5,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
+                    <Label Content="UID:" Margin="10,40,0,0" Grid.Column="0" ToolTip="USt-IdNr. / Umsatzsteuer-Identifikationsnummer"/>
+                    <TextBox x:Name="UstIdNrInput" Text="{Binding UstIdNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,5,0" Grid.Column="0" Grid.ColumnSpan="2" Width="96" HorizontalAlignment="Right"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+
                     <CheckBox x:Name="OrganicInput" Content="Bio" IsChecked="{Binding IsOrganic, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Bio-KSt.:" Margin="10,40,95,0" Grid.Column="2" HorizontalAlignment="Right" ToolTip="Bio-Kontrollstelle"/>
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="5,15,0,0" VerticalAlignment="Top"/>
+
+                    <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsChecked="{Binding IsBuchführend, Mode=TwoWay}" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="5,45,0,0" VerticalAlignment="Top"/>
+
+                    <Label Content="Kontrollstelle:" Margin="0,10,5,0" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" ToolTip="Bio-Kontrollstelle"/>
                     <TextBox x:Name="OrganicAuthorityCodeInput" Text="{Binding OrganicAuthorityCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Grid.Column="2" Width="82" HorizontalAlignment="Right"
+                             Margin="0,10,19,0" Grid.Column="4" Width="82" HorizontalAlignment="Left"
                              TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
+
+                    <Label Content="OOC-ID:" Margin="0,40,0,0" Grid.Column="3" HorizontalAlignment="Left" ToolTip="Bio-EU-Operator-ID / Organic Operator Certificate ID"/>
+                    <TextBox x:Name="OrganicOperatorIdInput" Text="{Binding OrganicOperatorId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,40,10,0" Grid.Column="4" Width="91" HorizontalAlignment="Left"
+                             TextChanged="OrganicOperatorIdInput_TextChanged" LostFocus="OrganicOperatorIdInput_LostFocus"/>
                 </Grid>
             </GroupBox>
             <GroupBox Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">