Database: Change bins once again...
This commit is contained in:
@ -118,10 +118,6 @@ namespace Elwig.Models {
|
||||
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}" : "");
|
||||
|
||||
[InverseProperty("Part")]
|
||||
public virtual DeliveryPartBin? Bin { get; private set; }
|
||||
|
||||
[NotMapped]
|
||||
public int[] Bins => (new int?[] { Bin?.Bin1, Bin?.Bin2, Bin?.Bin3, Bin?.Bin4, Bin?.Bin5, Bin?.Bin6, Bin?.Bin7, Bin?.Bin8, Bin?.Bin9 })
|
||||
.Where(b => b != null).Select(b => b.Value).ToArray();
|
||||
public virtual ISet<DeliveryPartBin> Bins { get; private set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Elwig.Models {
|
||||
[Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr")]
|
||||
[Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr")]
|
||||
public class DeliveryPartBin {
|
||||
[Column("year")]
|
||||
public int Year { get; set; }
|
||||
@ -13,34 +13,16 @@ namespace Elwig.Models {
|
||||
[Column("dpnr")]
|
||||
public int DPNr { get; set; }
|
||||
|
||||
[Column("binnr")]
|
||||
public int BinNr { get; set; }
|
||||
|
||||
[Column("discr")]
|
||||
public string Discr { get; set; }
|
||||
|
||||
[Column("value")]
|
||||
public int Value { get; set; }
|
||||
|
||||
[ForeignKey("Year, DId, DPNr")]
|
||||
public virtual DeliveryPart Part { get; private set; }
|
||||
|
||||
[Column("bin_1")]
|
||||
public int? Bin1 { get; set; }
|
||||
|
||||
[Column("bin_2")]
|
||||
public int? Bin2 { get; set; }
|
||||
|
||||
[Column("bin_3")]
|
||||
public int? Bin3 { get; set; }
|
||||
|
||||
[Column("bin_4")]
|
||||
public int? Bin4 { get; set; }
|
||||
|
||||
[Column("bin_5")]
|
||||
public int? Bin5 { get; set; }
|
||||
|
||||
[Column("bin_6")]
|
||||
public int? Bin6 { get; set; }
|
||||
|
||||
[Column("bin_7")]
|
||||
public int? Bin7 { get; set; }
|
||||
|
||||
[Column("bin_8")]
|
||||
public int? Bin8 { get; set; }
|
||||
|
||||
[Column("bin_9")]
|
||||
public int? Bin9 { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
|
||||
namespace Elwig.Models {
|
||||
[Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
|
||||
@ -34,78 +32,6 @@ namespace Elwig.Models {
|
||||
set => ModRelValue = (double)value;
|
||||
}
|
||||
|
||||
[Column("price_1")]
|
||||
public long? Price1Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price1 {
|
||||
get => Price1Value != null ? Variant.Season.DecFromDb(Price1Value.Value) : null;
|
||||
set => Price1Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_2")]
|
||||
public long? Price2Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price2 {
|
||||
get => Price2Value != null ? Variant.Season.DecFromDb(Price2Value.Value) : null;
|
||||
set => Price2Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_3")]
|
||||
public long? Price3Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price3 {
|
||||
get => Price3Value != null ? Variant.Season.DecFromDb(Price3Value.Value) : null;
|
||||
set => Price3Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_4")]
|
||||
public long? Price4Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price4 {
|
||||
get => Price4Value != null ? Variant.Season.DecFromDb(Price4Value.Value) : null;
|
||||
set => Price4Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_5")]
|
||||
public long? Price5Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price5 {
|
||||
get => Price5Value != null ? Variant.Season.DecFromDb(Price5Value.Value) : null;
|
||||
set => Price5Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_6")]
|
||||
public long? Price6Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price6 {
|
||||
get => Price6Value != null ? Variant.Season.DecFromDb(Price6Value.Value) : null;
|
||||
set => Price6Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_7")]
|
||||
public long? Price7Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price7 {
|
||||
get => Price7Value != null ? Variant.Season.DecFromDb(Price7Value.Value) : null;
|
||||
set => Price7Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_8")]
|
||||
public long? Price8Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price8 {
|
||||
get => Price8Value != null ? Variant.Season.DecFromDb(Price8Value.Value) : null;
|
||||
set => Price8Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("price_9")]
|
||||
public long? Price9Value { get; set; }
|
||||
[NotMapped]
|
||||
public decimal? Price9 {
|
||||
get => Price9Value != null ? Variant.Season.DecFromDb(Price9Value.Value) : null;
|
||||
set => Price9Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[Column("amount")]
|
||||
public long? AmountValue { get; set; }
|
||||
[NotMapped]
|
||||
@ -114,10 +40,6 @@ namespace Elwig.Models {
|
||||
set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
|
||||
}
|
||||
|
||||
[NotMapped]
|
||||
public decimal[] Prices => (new decimal?[] { Price1, Price2, Price3, Price4, Price5, Price6, Price7, Price8, Price9 })
|
||||
.Where(p => p != null).Select(p => p.Value).ToArray();
|
||||
|
||||
[ForeignKey("Year, AvNr")]
|
||||
public virtual PaymentVar Variant { get; private set; }
|
||||
|
||||
|
||||
44
Elwig/Models/PaymentDeliveryPartBin.cs
Normal file
44
Elwig/Models/PaymentDeliveryPartBin.cs
Normal file
@ -0,0 +1,44 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace Elwig.Models {
|
||||
[Table("payment_delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr", "AvNr")]
|
||||
public class PaymentDeliveryPartBin {
|
||||
[Column("year")]
|
||||
public int Year { get; set; }
|
||||
|
||||
[Column("did")]
|
||||
public int DId { get; set; }
|
||||
|
||||
[Column("dpnr")]
|
||||
public int DPNr { get; set; }
|
||||
|
||||
[Column("binnr")]
|
||||
public int BinNr { get; set; }
|
||||
|
||||
[Column("avnr")]
|
||||
public int AvNr { get; set; }
|
||||
|
||||
[Column("price")]
|
||||
public long PriceValue { get; set; }
|
||||
[NotMapped]
|
||||
public decimal Price {
|
||||
get => Variant.Season.DecFromDb(PriceValue);
|
||||
set => PriceValue = Variant.Season.DecToDb(value);
|
||||
}
|
||||
|
||||
[Column("amount")]
|
||||
public long AmountValue { get; set; }
|
||||
[NotMapped]
|
||||
public decimal Amount {
|
||||
get => Variant.Season.DecFromDb(AmountValue);
|
||||
set => AmountValue = Variant.Season.DecToDb(value);
|
||||
}
|
||||
|
||||
[ForeignKey("Year, AvNr")]
|
||||
public virtual PaymentVar Variant { get; private set; }
|
||||
|
||||
[ForeignKey("Year, DId, DPNr")]
|
||||
public virtual DeliveryPart DeliveryPart { get; private set; }
|
||||
}
|
||||
}
|
||||
@ -3,7 +3,6 @@ using Microsoft.EntityFrameworkCore;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
using System.Linq;
|
||||
|
||||
namespace Elwig.Models {
|
||||
[Table("season"), PrimaryKey("Year")]
|
||||
@ -43,37 +42,6 @@ namespace Elwig.Models {
|
||||
}
|
||||
}
|
||||
|
||||
[Column("bin_1_name")]
|
||||
public string? Bin1Name { get; set; }
|
||||
|
||||
[Column("bin_2_name")]
|
||||
public string? Bin2Name { get; set; }
|
||||
|
||||
[Column("bin_3_name")]
|
||||
public string? Bin3Name { get; set; }
|
||||
|
||||
[Column("bin_4_name")]
|
||||
public string? Bin4Name { get; set; }
|
||||
|
||||
[Column("bin_5_name")]
|
||||
public string? Bin5Name { get; set; }
|
||||
|
||||
[Column("bin_6_name")]
|
||||
public string? Bin6Name { get; set; }
|
||||
|
||||
[Column("bin_7_name")]
|
||||
public string? Bin7Name { get; set; }
|
||||
|
||||
[Column("bin_8_name")]
|
||||
public string? Bin8Name { get; set; }
|
||||
|
||||
[Column("bin_9_name")]
|
||||
public string? Bin9Name { get; set; }
|
||||
|
||||
[NotMapped]
|
||||
public string[] BinNames => (new string?[] { Bin1Name, Bin2Name, Bin3Name, Bin4Name, Bin5Name, Bin6Name, Bin7Name, Bin8Name, Bin9Name })
|
||||
.Where(n => n != null).Select(n => n ?? "").ToArray();
|
||||
|
||||
[ForeignKey("CurrencyCode")]
|
||||
public virtual Currency Currency { get; private set; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user