winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Refactor and Fix PLZ/Ort in MemberListWindow

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-02-21 15:56:59 +01:00
parent a5d56a7c49
commit 71022c7fbf
14 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WGneu/Models/AT_Gem.cs
View File

@ -15,6 +15,6 @@ namespace WGneu.Models
public int Gkz { get; set; }
[Column("name")]
public String Name { get; set; }
public string Name { get; set; }
}
}

2
WGneu/Models/AT_Kg.cs
View File

@ -18,7 +18,7 @@ namespace WGneu.Models
public int Gkz { get; set; }
[Column("name")]
public String Name { get; set; }
public string Name { get; set; }
[ForeignKey("Gkz")]
public virtual AT_Gem Gem { get; set; }

2
WGneu/Models/AT_Ort.cs
View File

@ -21,7 +21,7 @@ namespace WGneu.Models
public int KgNr { get; set; }
[Column("name")]
public String Name { get; set; }
public string Name { get; set; }
[ForeignKey("Gkz")]
public virtual AT_Gem Gem { get; set; }

10
WGneu/Models/AT_Plz.cs
View File

@ -19,13 +19,13 @@ namespace WGneu.Models
public int Okz { get; set; }
[Column("country")]
public String CountryCode { get; }
public string CountryCode { get; }
[Column("id")]
public String Id { get; }
public string Id { get; }
[Column("dest")]
public String Dest { get; set; }
public string Dest { get; set; }
[ForeignKey("Okz")]
public virtual AT_Ort Ort { get; set; }
@ -33,9 +33,9 @@ namespace WGneu.Models
[ForeignKey("CountryCode")]
public virtual Country Country { get; set; }
public ISet<AT_Ort> Orte(WGContext ctx)
public ISet<AT_Plz> Orte(WgContext ctx)
{
return ctx.Postleitzahlen.Where(p => p.Plz == Plz).Select(p => p.Ort).ToHashSet();
return ctx.Postleitzahlen.Where(p => p.Plz == Plz).ToHashSet();
}
}
}

6
WGneu/Models/Country.cs
View File

@ -12,16 +12,16 @@ namespace WGneu.Models
public class Country
{
[Column("alpha2")]
public String Alpha2 { get; set; }
public string Alpha2 { get; set; }
[Column("alpha3")]
public String Alpha3 { get; set; }
public string Alpha3 { get; set; }
[Column("num")]
public int Num { get; set; }
[Column("name")]
public String Name { get; set; }
public string Name { get; set; }
[Column("is_visible")]
public int IsVisible { get; set; }

14
WGneu/Models/Member.cs
View File

@ -15,29 +15,29 @@ namespace WGneu.Models
public int MgNr { get; set; }
[Column("given_name")]
public String GivenName { get; set; }
public string GivenName { get; set; }
[Column("family_name")]
public String FamilyName { get; set; }
public string FamilyName { get; set; }
[Column("zwstid")]
public String Zweigstelle { get; set; }
public string Zweigstelle { get; set; }
[Column("country")]
public String CountryCode { get; set; }
public string CountryCode { get; set; }
[Column("postal_dest")]
public String PostalDestId { get; set; }
public string PostalDestId { get; set; }
[Column("address")]
public String Address { get; set; }
public string Address { get; set; }
[Column("default_kgnr")]
public int DefaultKgNr { get; set; }
[ForeignKey("CountryCode")]
public virtual Country Country { get; set; }
[ForeignKey("CountryCode, PostalDestId")]
public virtual PostalDest PostalDest { get; set; }

6
WGneu/Models/PostalDest.cs
View File

@ -12,15 +12,15 @@ namespace WGneu.Models
public class PostalDest
{
[Column("country")]
public String CountryCode { get; set; }
public string CountryCode { get; set; }
[Column("id")]
public String Id { get; set; }
public string Id { get; set; }
[ForeignKey("CountryCode")]
public virtual Country Country { get; set; }
public AT_Plz? Plz(WGContext ctx)
public AT_Plz? Plz(WgContext ctx)
{
if (CountryCode != "AT") return null;
return ctx.Postleitzahlen.Where(p => p.Id == Id).FirstOrDefault();