Adust AreaComAdminWindow to new db schema

Elwig/Models/AreaCom.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models {
     [Table("area_commitment"), PrimaryKey("FbNr")]
@@ -12,8 +10,8 @@ namespace Elwig.Models {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
-        [Column("sortid")]
-        public string SortId { get; set; }
+        [Column("vtrgid")]
+        public string VtrgId { get; set; }
 
         [Column("cultid")]
         public string CultId { get; set; }
@@ -42,8 +40,8 @@ namespace Elwig.Models {
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; }
 
-        [ForeignKey("SortId")]
-        public virtual WineVar WineVar { get; private set; }
+        [ForeignKey("VtrgId")]
+        public virtual AreaComType AreaComType { get; private set; }
 
         [ForeignKey("CultId")]
         public virtual WineCult WineCult { get; private set; }
@@ -53,11 +51,5 @@ namespace Elwig.Models {
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
-
-        [InverseProperty("AreaCom")]
-        public virtual ISet<AreaComAttr> AttributeEntries { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => AttributeEntries.Select(e => e.WineAttr);
     }
 }

Elwig/Models/AreaComAttr.cs

@@ -1,19 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Elwig.Models {
-    [Table("area_commitment_attribute"), PrimaryKey("FbNr", "AttrId")]
-    public class AreaComAttr {
-        [Column("fbnr")]
-        public int FbNr { get; set; }
-
-        [Column("attrid")]
-        public string AttrId { get; set; }
-
-        [ForeignKey("FbNr")]
-        public virtual AreaCom AreaCom { get; private set; }
-
-        [ForeignKey("AttrId")]
-        public virtual WineAttr WineAttr { get; private set; }
-    }
-}

Elwig/Models/AreaComType.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]
+    public class AreaComType {
+        [Column("vtrgid")]
+        public string VtrgId { get; set; }
+
+        [Column("sortid")]
+        public string SortId { get; set; }
+
+        [Column("attrid_1")]
+        public string? AttrId1 { get; set; }
+
+        [Column("attrid_2")]
+        public string? AttrId2 { get; set; }
+
+        [Column("disc")]
+        public string? Discriminator { get; set; }
+
+        [Column("min_kg_per_ha")]
+        public int? MinKgPerHa { get; set; }
+
+        [Column("max_kg_per_ha")]
+        public int? MaxKgPerHa { get; set; }
+
+        [Column("penalty_amount")]
+        public double? PenaltyAmoutValue { get; set; }
+
+        [NotMapped]
+        public decimal? PenaltyAmount {
+            get => PenaltyAmoutValue != null ? (decimal)PenaltyAmoutValue : null;
+            set => PenaltyAmoutValue = value != null ? (double)value : null;
+        }
+
+        [ForeignKey("SortId")]
+        public virtual WineVar WineVar { get; private set; }
+
+        [ForeignKey("AttrId1")]
+        public virtual WineAttr? WineAttr1 { get; private set; }
+
+        [ForeignKey("AttrId2")]
+        public virtual WineAttr? WineAttr2 { get; private set; }
+
+        [NotMapped]
+        public string DisplayName => WineVar.Name + (WineAttr1 != null ? $" {WineAttr1.Name}" : "") +
+            (WineAttr2 != null ? $" {WineAttr2.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
+    }
+}

Elwig/Models/Member.cs

@@ -110,6 +110,9 @@ namespace Elwig.Models {
         [Column("active")]
         public bool IsActive { get; set; }
 
+        [Column("deceased")]
+        public bool IsDeceased { get; set; }
+
         [Column("iban")]
         public string? Iban { get; set; }