Modifier migration

Elwig/App.xaml

@@ -55,7 +55,7 @@
 
         <DataTemplate x:Key="ModifierTemplate">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}" MinWidth="150" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding ValueStr}"/>
             </StackPanel>
         </DataTemplate>

Elwig/Documents/style.css

@@ -263,7 +263,7 @@ main .signatures {
     width: 100%;
     display: flex;
     justify-content: space-around;
-    margin: 20mm 0 5mm 0;
+    margin: 20mm 0 2mm 0;
 }
 
 main .signatures > * {

Elwig/Models/DeliveryPart.cs

@@ -105,7 +105,7 @@ namespace Elwig.Models {
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
         [NotMapped]
-        public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier);
+        public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
     }

Elwig/Models/Modifier.cs

@@ -11,6 +11,9 @@ namespace Elwig.Models {
         [Column("modid")]
         public string ModId { get; set; }
 
+        [Column("ordering")]
+        public int Ordering { get; set; }
+
         [Column("name")]
         public string Name { get; set; }
 
@@ -39,9 +42,9 @@ namespace Elwig.Models {
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; }
 
-        public string ValueStr => (Abs != null) ?
+        public string ValueStr =>
-            $"{(Abs < 0 ? " -" : "+")}{Math.Abs(Abs.Value)} {Season.Currency.Symbol}/kg" :
+            (Abs != null) ? $"{(Abs.Value < 0 ? "\u00a0-" : "+")}{Math.Abs(Abs.Value)}\u00a0{Season.Currency.Symbol}/kg" :
-            $"{(Rel < 0 ? " -" : "+")}{Math.Abs(Rel.Value):P2}";
+            (Rel != null) ? $"{(Rel.Value < 0 ? "\u00a0-" : "+")}{(Math.Abs(Rel.Value) < 0.1 ? "\u2007" : "")}{Math.Abs(Rel.Value):0.00##\u00a0%}" : "";
 
         public override string ToString() {
             return Name;

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -198,7 +198,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
             ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await Context.WineQualityLevels.ToListAsync(), i => (i as WineQualLevel)?.QualId);
-            ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Name).ToListAsync(), i => (i as Modifier)?.ModId);
+            ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
             ControlUtils.RenewItemsSource(WineOriginInput, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId);
             var kgList = await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).Cast<object>().ToListAsync();
             kgList.Insert(0, new NullItem());
@@ -217,10 +217,10 @@ namespace Elwig.Windows {
 
         private void RefreshDeliveryParts() {
             if (DeliveryList.SelectedItem is Delivery d) {
-                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Name).ToList(), i => (i as Modifier)?.ModId);
+                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Ordering).ToList(), i => (i as Modifier)?.ModId);
                 ControlUtils.RenewItemsSource(DeliveryPartList, d.Parts.OrderBy(p => p.DPNr).ToList(), i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId, (i as DeliveryPart)?.DPNr), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
-                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Name).ToList(), i => (i as Modifier)?.ModId);
+                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Ordering).ToList(), i => (i as Modifier)?.ModId);
                 DeliveryPartList.ItemsSource = null;
             }
         }