andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.6.0

Browse Source
This commit is contained in:
andy
2021-09-30 18:23:11 +01:00
parent c2d2d7f674
commit 46b90cea74
73 changed files with 1621 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebOnline/Online/Models/SaxModel_Online.cs
+39 -8
View File
@@ -46,7 +46,7 @@ namespace Saxonite.Net.Core.Web.Online.Models
{
get
{
if (userCanManageOrganisationMembers == null && ValidUserSession)
if (userCanManageOrganisationMembers == null && ValidUserSession)
{
SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params();
prmUserOrganisation.UserAccountIdsIncluded.Add(SessionData.User.UserAccountId);
@@ -158,7 +158,7 @@ namespace Saxonite.Net.Core.Web.Online.Models
public List<RegionData> GetRegionDataList_Active()
{
List<RegionData> regions = new List<RegionData>();
foreach (SaxRegion region in DataCacheConsole.GetActiveRegions())
foreach (SaxRegion.Data region in DataCacheConsole.GetActiveRegions())
{
RegionData regionData = new RegionData()
{
@@ -177,10 +177,10 @@ namespace Saxonite.Net.Core.Web.Online.Models
}
public String GetRegionCaption(SysId regionId)
{
SaxRegion region = DataCacheConsole.GetActiveRegions().Find(item => item.Id.Equals(regionId));
SaxRegion.Data region = DataCacheConsole.GetAllRegions().Find(item => item.Id.Equals(regionId));
return Localiser.GetRegionName(region);
}
public String GetRegionCaption(SaxRegion region)
public String GetRegionCaption(SaxRegion.Data region)
{
return Localiser.GetRegionName(region);
}
@@ -197,7 +197,7 @@ namespace Saxonite.Net.Core.Web.Online.Models
public List<SportData> GetSportDataList_Active()
{
List<SportData> sports = new List<SportData>();
foreach (SaxSport sport in DataCacheConsole.GetActiveSports())
foreach (SaxSport.Data sport in DataCacheConsole.GetActiveSports())
{
SportData sportData = new SportData()
{
@@ -210,14 +210,45 @@ namespace Saxonite.Net.Core.Web.Online.Models
}
return sports;
}
// Sport caption.
public String GetSportCaption(SysId sportId)
{
SaxSport sport = DataCacheConsole.GetActiveSports().Find(item => item.Id.Equals(sportId));
SaxSport.Data sport = DataCacheConsole.GetAllSports().Find(item => item.Id.Equals(sportId));
return GetSportCaption(sport);
}
public String GetSportCaption(SaxSport.Data sport)
{
if (sport == null) return "";
return Localiser.GetSportName(sport);
}
public String GetSportCaption(SaxSport sport)
// Speciality type.
public bool SportSpecialityNotRelevant(SysId sportId)
{
return Localiser.GetSportName(sport);
SaxSport.Data sport = DataCacheConsole.GetAllSports().Find(item => item.Id.Equals(sportId));
return SportSpecialityNotRelevant(sport);
}
public bool SportSpecialityNotRelevant(SaxSport.Data sport)
{
if (sport == null) return true;
return sport.SpecialityLabel == Sax.SportSpecialityLabel.NotRelevant;
}
// Speciality label.
public String GetSportSpecialityLabel(SysId sportId)
{
SaxSport.Data sport = DataCacheConsole.GetAllSports().Find(item => item.Id.Equals(sportId));
return GetSportSpecialityLabel(sport);
}
public String GetSportSpecialityLabel(SaxSport.Data sport)
{
if (sport == null) return "";
switch (sport.SpecialityLabel)
{
case Sax.SportSpecialityLabel.Positon:
return Localiser["label.position"];
case Sax.SportSpecialityLabel.Discipline:
return Localiser["label.discipline"];
}
return Localiser["label.speciality"];
}
//-------------------------------------------------------------------