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

v1.2.9

Browse Source
This commit is contained in:
Andy Howard
2022-10-12 13:50:38 +01:00
parent dc431e1634
commit 6c853d4091
34 changed files with 250 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteCoreWebOnline/Online/Controllers/AccountController-Ajax-UserSportExperience.cs
+5
View File
@@ -50,6 +50,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
public String PeriodFrom_YMD { get; set; }
public String PeriodTo_YMD { get; set; }
public String OrganisationId { get; set; }
public String Awards { get; set; }
public String RegionIdNation { get; set; }
public String RegionIdProvince { get; set; }
}
@@ -72,10 +73,12 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
}
private void PopulateSportExperienceResponseItemData(Model_UserSportExperience model, SportExperienceResponseItemData data, SaxUserSport userSport, SaxUserSportExperience userSportExperience)
{
PopulateSportExperienceResponseListData(model, data, userSport, userSportExperience);
data.PeriodFrom_YMD = DateUtil.FormatDateForJavascript(userSportExperience.PeriodFrom);
data.PeriodTo_YMD = DateUtil.FormatDateForJavascript(userSportExperience.PeriodTo);
data.Period = data.PeriodFrom + " - " + data.PeriodTo;
data.OrganisationId = model.EncryptId(userSportExperience.OrganisationId);
data.Awards = userSportExperience.Awards;
// Regions.
data.RegionIdNation = model.GetEncryptedRegionId(userSportExperience.RegionIdNation);
data.RegionIdProvince = model.GetEncryptedRegionId(userSportExperience.RegionIdProvince);
@@ -317,6 +320,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
userSportExperience.League = model.ExperienceLeague;
if (model.ExperienceSpeciality != null)
userSportExperience.Speciality = model.ExperienceSpeciality;
if (model.ExperienceAwards != null)
userSportExperience.Awards = model.ExperienceAwards;
// Regions.
if (model.ExperienceRegionIdNation != null)
userSportExperience.RegionIdNation = model.ExtractSysId(model.ExperienceRegionIdNation);
SaxoniteCoreWebOnline/Online/Models/Model_UserSportExperience.cs
+11
View File
@@ -38,6 +38,7 @@ namespace Saxonite.Net.Core.Web.Online.Models
public String ExperienceTeam { get; set; }
public String ExperienceLeague { get; set; }
public String ExperienceSpeciality { get; set; }
public String ExperienceAwards{ get; set; }
// Regions.
public String ExperienceRegionIdNation { get; set; }
public String ExperienceRegionIdProvince { get; set; }
@@ -108,6 +109,16 @@ namespace Saxonite.Net.Core.Web.Online.Models
responseData.SetControlError(nameof(ExperienceSpeciality), Localiser["msg.validation.maximum.length", GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Speciality)]);
}
// Awards.
if (ExperienceAwards != null)
{
responseData.SetControlValue(nameof(ExperienceAwards), ExperienceAwards);
if (StringUtil.IsEmpty(ExperienceAwards))
responseData.SetControlError(nameof(ExperienceAwards), Localiser["msg.validation.mandatory.value"]);
else if (StringUtil.GetLength(ExperienceAwards) > GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Awards))
responseData.SetControlError(nameof(ExperienceAwards), Localiser["msg.validation.maximum.length", GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Awards)]);
}
return !responseData.HasControlErrors();
}