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
@@ -47,7 +47,7 @@ namespace Saxonite.Net.Core.Web.Base.Middleware
// Log action. // Log action.
//String rawTarget = context.Features.Get<IHttpRequestFeature>().RawTarget; //String rawTarget = context.Features.Get<IHttpRequestFeature>().RawTarget;
if (SaxSystem.DebugMode) SaLogger.Debug(fn + " Action: '" + Regex.Replace(context.Request.Path.ToString(), "^/", "") + "'. Method: " + context.Request.Method); if (SaxSystem.DebugMode) SaLogger.Trace(fn + " Action: '" + Regex.Replace(context.Request.Path.ToString(), "^/", "") + "'. Method: " + context.Request.Method);
// Intercept POST requests and apply anti-forgery test. // Intercept POST requests and apply anti-forgery test.
if (HttpMethods.IsPost(context.Request.Method)) if (HttpMethods.IsPost(context.Request.Method))
@@ -0,0 +1,62 @@
{
"AppConfigs": {
"Saxonite-Dev": {
"Environments": [ "Development" ],
"Instance": "Dev",
"URLs": {
"Online": {
"Root": "https://localhost:44364/"
}
},
"CoreDatabase": {
"Location": "MsSql:Sarand110\\SQL2016.Saxonite_Dev",
"User": "saxonite",
"Password": "sax-dev-2021"
},
"Email": {
"Context": "SAX-SF-Dev",
"ContactUs": {
"AddressesTo": [ "info@sportierre.com" ]
}
},
"Documents": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Docs"
},
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Logs\\Admin"
}
},
"Saxonite-Test": {
"Environments": [ "Production" ],
"Instance": "QC",
"CoreDatabase": {
"Location": "MsSql:Sarand106\\SQL2014.Saxonite_Dev",
"User": "saxonite",
"Password": "sax-dev-2021"
},
"Email": {
"Context": "SAX-SF-Dev",
"ContactUs": {
"AddressesTo": [ "info@sportierre.com" ],
"AddressesBcc": []
}
},
"Documents": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Docs"
},
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC\\Logs\\Admin"
},
"Variants": [
{
"ApplicationRootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC2\\App",
"Instance": "QC",
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC2\\Logs\\Admin"
}
}
]
}
}
}
@@ -264,6 +264,9 @@
<data name="label.average" xml:space="preserve"> <data name="label.average" xml:space="preserve">
<value>Average</value> <value>Average</value>
</data> </data>
<data name="label.awards" xml:space="preserve">
<value>Awards</value>
</data>
<data name="label.calendar" xml:space="preserve"> <data name="label.calendar" xml:space="preserve">
<value>Calendar</value> <value>Calendar</value>
</data> </data>
@@ -50,6 +50,7 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
public String PeriodFrom_YMD { get; set; } public String PeriodFrom_YMD { get; set; }
public String PeriodTo_YMD { get; set; } public String PeriodTo_YMD { get; set; }
public String OrganisationId { get; set; } public String OrganisationId { get; set; }
public String Awards { get; set; }
public String RegionIdNation { get; set; } public String RegionIdNation { get; set; }
public String RegionIdProvince { 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) 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.PeriodFrom_YMD = DateUtil.FormatDateForJavascript(userSportExperience.PeriodFrom);
data.PeriodTo_YMD = DateUtil.FormatDateForJavascript(userSportExperience.PeriodTo); data.PeriodTo_YMD = DateUtil.FormatDateForJavascript(userSportExperience.PeriodTo);
data.Period = data.PeriodFrom + " - " + data.PeriodTo; data.Period = data.PeriodFrom + " - " + data.PeriodTo;
data.OrganisationId = model.EncryptId(userSportExperience.OrganisationId); data.OrganisationId = model.EncryptId(userSportExperience.OrganisationId);
data.Awards = userSportExperience.Awards;
// Regions. // Regions.
data.RegionIdNation = model.GetEncryptedRegionId(userSportExperience.RegionIdNation); data.RegionIdNation = model.GetEncryptedRegionId(userSportExperience.RegionIdNation);
data.RegionIdProvince = model.GetEncryptedRegionId(userSportExperience.RegionIdProvince); data.RegionIdProvince = model.GetEncryptedRegionId(userSportExperience.RegionIdProvince);
@@ -317,6 +320,8 @@ namespace Saxonite.Net.Core.Web.Online.Controllers
userSportExperience.League = model.ExperienceLeague; userSportExperience.League = model.ExperienceLeague;
if (model.ExperienceSpeciality != null) if (model.ExperienceSpeciality != null)
userSportExperience.Speciality = model.ExperienceSpeciality; userSportExperience.Speciality = model.ExperienceSpeciality;
if (model.ExperienceAwards != null)
userSportExperience.Awards = model.ExperienceAwards;
// Regions. // Regions.
if (model.ExperienceRegionIdNation != null) if (model.ExperienceRegionIdNation != null)
userSportExperience.RegionIdNation = model.ExtractSysId(model.ExperienceRegionIdNation); userSportExperience.RegionIdNation = model.ExtractSysId(model.ExperienceRegionIdNation);
@@ -38,6 +38,7 @@ namespace Saxonite.Net.Core.Web.Online.Models
public String ExperienceTeam { get; set; } public String ExperienceTeam { get; set; }
public String ExperienceLeague { get; set; } public String ExperienceLeague { get; set; }
public String ExperienceSpeciality { get; set; } public String ExperienceSpeciality { get; set; }
public String ExperienceAwards{ get; set; }
// Regions. // Regions.
public String ExperienceRegionIdNation { get; set; } public String ExperienceRegionIdNation { get; set; }
public String ExperienceRegionIdProvince { 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)]); 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(); return !responseData.HasControlErrors();
} }
@@ -102,14 +102,14 @@
<div class="row"> <div class="row">
<div class="col-sm-3"> <div class="col-sm-3">
<div class="sax-label pb12"> <div class="sax-label pt-sm-4">
<label for=""><span>@Localiser["label.period"]</span></label> <label for=""><span>@Localiser["label.period"]</span></label>
</div> </div>
</div> </div>
<div class="col-sm-9"> <div class="col-sm-9">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-6">
@* Period From *@ @* Period From *@
<div class="sax-form-control ExperiencePeriodFrom"> <div class="sax-form-control ExperiencePeriodFrom">
<div class="sax-label"> <div class="sax-label">
@@ -122,7 +122,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-6">
@* Period To *@ @* Period To *@
<div class="sax-form-control ExperiencePeriodTo"> <div class="sax-form-control ExperiencePeriodTo">
<div class="sax-label"> <div class="sax-label">
@@ -224,6 +224,23 @@
</div> </div>
</div> </div>
@* Awards *@
<div class="sax-form-control ExperienceAwards">
<div class="row">
<div class="col-sm-3">
<div class="sax-label">
<label for=""><span>@Localiser["label.awards"]</span></label>
</div>
</div>
<div class="col-sm-9">
<div class="sax-control">
<textarea name="ExperienceAwards" class="ExperienceAwards sax-textarea" rows="4" maxlength="@Model.GetControlMaxLength(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Awards)"></textarea>
</div>
<div class="sax-message"></div>
</div>
</div>
</div>
} }
<div class="spacer2"></div> <div class="spacer2"></div>
@@ -0,0 +1,57 @@
{
"AppConfigs": {
"Saxonite-Dev": {
"Environments": [ "Development" ],
"Instance": "Dev",
"CoreDatabase": {
"Location": "MsSql:Sarand110\\SQL2016.Saxonite_Dev",
"User": "saxonite",
"Password": "sax-dev-2021"
},
"Email": {
"Context": "SAX-SF-Dev",
"ContactUs": {
"AddressesTo": [ "info@sportierre.com" ]
}
},
"Documents": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Docs"
},
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Logs\\Online"
}
},
"Saxonite-Test": {
"Environments": [ "Production" ],
"Instance": "QC",
"CoreDatabase": {
"Location": "MsSql:Sarand106\\SQL2014.Saxonite_Dev",
"User": "saxonite",
"Password": "sax-dev-2021"
},
"Email": {
"Context": "SAX-SF-Dev",
"ContactUs": {
"AddressesTo": [ "info@sportierre.com" ],
"AddressesBcc": []
}
},
"Documents": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\Docs"
},
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC\\Logs\\Online"
},
"Variants": [
{
"ApplicationRootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC2\\App",
"Instance": "QC",
"Logging": {
"RootFolder": "D:\\Sarand\\Projects\\Users\\AHoward\\VS2022\\Saxonite\\QC2\\Logs\\Online"
}
}
]
}
}
}
@@ -108,6 +108,7 @@
$('.sax-input.ExperienceTeam', frm).val(item.team); $('.sax-input.ExperienceTeam', frm).val(item.team);
$('.sax-input.ExperienceLeague', frm).val(item.league); $('.sax-input.ExperienceLeague', frm).val(item.league);
$('.sax-input.ExperienceSpeciality', frm).val(item.speciality); $('.sax-input.ExperienceSpeciality', frm).val(item.speciality);
$('.sax-textarea.ExperienceAwards', frm).val(item.awards);
sax.openDialog(se.$dlg.sportExp, 560, 600); sax.openDialog(se.$dlg.sportExp, 560, 600);
} }
se.fn.storeSportExperience = function () se.fn.storeSportExperience = function ()
+7 -3
View File
@@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App
//------------------------------------------------------------------- //-------------------------------------------------------------------
public static class Version public static class Version
{ {
private static String version { get; } = "1.2.8.0"; private static String version { get; } = "1.2.9.0";
// Retrieve version. // Retrieve version.
public static String GetFullVersion () { return version; } public static String GetFullVersion () { return version; }
public static String GetAppVersion () public static String GetAppVersion ()
@@ -40,8 +40,12 @@ namespace Saxonite.Net.Standard.Base.App
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Version history. // Version history.
//------------------------------------------------------------------- //-------------------------------------------------------------------
// 1.2.8 ?-Jul-2022 // 1.2.9 12-Oct-2022
// - // - Online Sports Experience update bug resolved.
// - Sports Experience Awards.
// 1.2.8 16-Jul-2022 Online Organisations - Select Region
// - Fix problem with selecting organisation region.
// - Admin - Organisation associations, in progress.
// 1.2.7 9-Jun-2022 Online Activty list images // 1.2.7 9-Jun-2022 Online Activty list images
// - Organisation logo and article thumbnail in article list. // - Organisation logo and article thumbnail in article list.
// 1.2.6 16-May-2022 Image resizing // 1.2.6 16-May-2022 Image resizing
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Base.App namespace Saxonite.Base.App
{ {
@@ -380,6 +380,7 @@ namespace Saxonite.Base.App
UserSportExperience_SpecialitiesOther, UserSportExperience_SpecialitiesOther,
UserSportExperience_RegionIdNation, UserSportExperience_RegionIdNation,
UserSportExperience_RegionIdProvince, UserSportExperience_RegionIdProvince,
UserSportExperience_Awards,
UserSportExperience_UserSportExperienceData, UserSportExperience_UserSportExperienceData,
UserSportExperience_Notes, UserSportExperience_Notes,
UserSportExperience_Flags, UserSportExperience_Flags,
@@ -395,7 +396,7 @@ namespace Saxonite.Base.App
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Data members. // Data members.
private static readonly int tableCount = 20; private static readonly int tableCount = 20;
private static readonly int columnCount = 346; private static readonly int columnCount = 347;
private static ulong maxTextLen = 0; private static ulong maxTextLen = 0;
//------------------------------------------------------------------- //-------------------------------------------------------------------
@@ -923,6 +924,7 @@ namespace Saxonite.Base.App
new ColumnDfn(20,"SpecialitiesOther",0,-9,false,1000), new ColumnDfn(20,"SpecialitiesOther",0,-9,false,1000),
new ColumnDfn(20,"RegionIdNation",4,4,false,10), new ColumnDfn(20,"RegionIdNation",4,4,false,10),
new ColumnDfn(20,"RegionIdProvince",4,4,false,10), new ColumnDfn(20,"RegionIdProvince",4,4,false,10),
new ColumnDfn(20,"Awards",0,-9,false,2000),
new ColumnDfn(20,"UserSportExperienceData",0,-9,false,0), new ColumnDfn(20,"UserSportExperienceData",0,-9,false,0),
new ColumnDfn(20,"Notes",0,-9,false,2000), new ColumnDfn(20,"Notes",0,-9,false,2000),
new ColumnDfn(20,"Flags",3,5,false,5), new ColumnDfn(20,"Flags",3,5,false,5),
@@ -37,6 +37,7 @@ namespace Saxonite.Net.Standard.Base.Bus
League, League,
Speciality, Speciality,
SpecialitiesOther, SpecialitiesOther,
Awards,
// Regions. // Regions.
RegionIdNation, RegionIdNation,
Region_Nation_Name, Region_Nation_Name,
@@ -67,6 +68,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public String League { get; set; } public String League { get; set; }
public String Speciality { get; set; } public String Speciality { get; set; }
public HashSet<String> SpecialitiesOther { get; } = new HashSet<String>(StringComparer.OrdinalIgnoreCase); public HashSet<String> SpecialitiesOther { get; } = new HashSet<String>(StringComparer.OrdinalIgnoreCase);
public String Awards { get; set; }
public SysId RegionIdNation { get; set; } public SysId RegionIdNation { get; set; }
public SysId RegionIdProvince { get; set; } public SysId RegionIdProvince { get; set; }
public String UserSportExperienceData { get; set; } public String UserSportExperienceData { get; set; }
@@ -146,6 +148,11 @@ namespace Saxonite.Net.Standard.Base.Bus
} }
} }
} }
public String Awards
{
get { return data.Awards; }
set { CheckChanged(data.Awards, value); data.Awards = value; }
}
public SysId RegionIdNation public SysId RegionIdNation
{ {
get { return data.RegionIdNation; } get { return data.RegionIdNation; }
@@ -173,6 +180,7 @@ namespace Saxonite.Net.Standard.Base.Bus
League = data.League; League = data.League;
Speciality = data.Speciality; Speciality = data.Speciality;
SpecialitiesOther = data.GetSpecialitiesOther().ToList(); SpecialitiesOther = data.GetSpecialitiesOther().ToList();
Awards = data.Awards;
RegionIdNation = data.RegionIdNation; RegionIdNation = data.RegionIdNation;
RegionIdProvince = data.RegionIdProvince; RegionIdProvince = data.RegionIdProvince;
UserSportExperienceData = data.UserSportExperienceData; UserSportExperienceData = data.UserSportExperienceData;
@@ -201,6 +209,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public ValidValue League { get; set; } = ValidValue.Valid; public ValidValue League { get; set; } = ValidValue.Valid;
public ValidValue Speciality { get; set; } = ValidValue.Valid; public ValidValue Speciality { get; set; } = ValidValue.Valid;
public ValidValue SpecialitiesOther { get; set; } = ValidValue.Valid; public ValidValue SpecialitiesOther { get; set; } = ValidValue.Valid;
public ValidValue Awards { get; set; } = ValidValue.Valid;
public ValidValue RegionIdNation { get; set; } = ValidValue.Valid; public ValidValue RegionIdNation { get; set; } = ValidValue.Valid;
public ValidValue RegionIdProvince { get; set; } = ValidValue.Valid; public ValidValue RegionIdProvince { get; set; } = ValidValue.Valid;
public ValidValue UserSportExperienceData { get; set; } = ValidValue.Valid; public ValidValue UserSportExperienceData { get; set; } = ValidValue.Valid;
@@ -311,6 +320,11 @@ namespace Saxonite.Net.Standard.Base.Bus
{ {
set { data.SpecialitiesOther = value; } set { data.SpecialitiesOther = value; }
} }
public String Awards
{
get { return data.Awards; }
set { data.Awards = value; }
}
public SysId RegionIdNation public SysId RegionIdNation
{ {
get { return data.RegionIdNation; } get { return data.RegionIdNation; }
@@ -113,6 +113,13 @@ namespace Saxonite.Net.Standard.Base.Mgr
return false; return false;
} }
// Awards.
if (errField.Awards != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Awards, "Awards", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Awards)))
{
errField.Awards = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
//--------------------------------------------------------------- //---------------------------------------------------------------
// Regions. // Regions.
if (errField.RegionIdNation != SacsHierarchyItem.ValidValue.Ignore) if (errField.RegionIdNation != SacsHierarchyItem.ValidValue.Ignore)
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -32,6 +32,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public ColumnDataString _SpecialitiesOther { get; } = new ColumnDataString("SpecialitiesOther"); public ColumnDataString _SpecialitiesOther { get; } = new ColumnDataString("SpecialitiesOther");
public ColumnDataInt32 _RegionIdNation { get; } = new ColumnDataInt32("RegionIdNation"); public ColumnDataInt32 _RegionIdNation { get; } = new ColumnDataInt32("RegionIdNation");
public ColumnDataInt32 _RegionIdProvince { get; } = new ColumnDataInt32("RegionIdProvince"); public ColumnDataInt32 _RegionIdProvince { get; } = new ColumnDataInt32("RegionIdProvince");
public ColumnDataString _Awards { get; } = new ColumnDataString("Awards");
public ColumnDataString _UserSportExperienceData { get; } = new ColumnDataString("UserSportExperienceData"); public ColumnDataString _UserSportExperienceData { get; } = new ColumnDataString("UserSportExperienceData");
public ColumnDataString _Notes { get; } = new ColumnDataString("Notes"); public ColumnDataString _Notes { get; } = new ColumnDataString("Notes");
public ColumnDataInt16 _Flags { get; } = new ColumnDataInt16("Flags"); public ColumnDataInt16 _Flags { get; } = new ColumnDataInt16("Flags");
@@ -61,6 +62,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
"SpecialitiesOther", "SpecialitiesOther",
"RegionIdNation", "RegionIdNation",
"RegionIdProvince", "RegionIdProvince",
"Awards",
"UserSportExperienceData", "UserSportExperienceData",
"Notes", "Notes",
"Flags", "Flags",
@@ -116,6 +118,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public String _SpecialitiesOther { get { return Cols._SpecialitiesOther.Value; } set { Cols._SpecialitiesOther.Value = value; } } public String _SpecialitiesOther { get { return Cols._SpecialitiesOther.Value; } set { Cols._SpecialitiesOther.Value = value; } }
public Int32 _RegionIdNation { get { return Cols._RegionIdNation.Value; } set { Cols._RegionIdNation.Value = value; } } public Int32 _RegionIdNation { get { return Cols._RegionIdNation.Value; } set { Cols._RegionIdNation.Value = value; } }
public Int32 _RegionIdProvince { get { return Cols._RegionIdProvince.Value; } set { Cols._RegionIdProvince.Value = value; } } public Int32 _RegionIdProvince { get { return Cols._RegionIdProvince.Value; } set { Cols._RegionIdProvince.Value = value; } }
public String _Awards { get { return Cols._Awards.Value; } set { Cols._Awards.Value = value; } }
public String _UserSportExperienceData { get { return Cols._UserSportExperienceData.Value; } set { Cols._UserSportExperienceData.Value = value; } } public String _UserSportExperienceData { get { return Cols._UserSportExperienceData.Value; } set { Cols._UserSportExperienceData.Value = value; } }
public String _Notes { get { return Cols._Notes.Value; } set { Cols._Notes.Value = value; } } public String _Notes { get { return Cols._Notes.Value; } set { Cols._Notes.Value = value; } }
public Int16 _Flags { get { return Cols._Flags.Value; } set { Cols._Flags.Value = value; } } public Int16 _Flags { get { return Cols._Flags.Value; } set { Cols._Flags.Value = value; } }
@@ -160,6 +163,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
_SpecialitiesOther = GetFieldString(dbDataReader, "SpecialitiesOther", _SpecialitiesOther); _SpecialitiesOther = GetFieldString(dbDataReader, "SpecialitiesOther", _SpecialitiesOther);
_RegionIdNation = GetFieldInt32(dbDataReader, "RegionIdNation", _RegionIdNation); _RegionIdNation = GetFieldInt32(dbDataReader, "RegionIdNation", _RegionIdNation);
_RegionIdProvince = GetFieldInt32(dbDataReader, "RegionIdProvince", _RegionIdProvince); _RegionIdProvince = GetFieldInt32(dbDataReader, "RegionIdProvince", _RegionIdProvince);
_Awards = GetFieldString(dbDataReader, "Awards", _Awards);
_UserSportExperienceData = GetFieldString(dbDataReader, "UserSportExperienceData", _UserSportExperienceData); _UserSportExperienceData = GetFieldString(dbDataReader, "UserSportExperienceData", _UserSportExperienceData);
_Notes = GetFieldString(dbDataReader, "Notes", _Notes); _Notes = GetFieldString(dbDataReader, "Notes", _Notes);
_Flags = GetFieldInt16(dbDataReader, "Flags", _Flags); _Flags = GetFieldInt16(dbDataReader, "Flags", _Flags);
@@ -203,6 +207,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
if (columnNames.ContainsCI("SpecialitiesOther")) AddCommandParameter(dbCommand, "@SpecialitiesOther", _SpecialitiesOther); if (columnNames.ContainsCI("SpecialitiesOther")) AddCommandParameter(dbCommand, "@SpecialitiesOther", _SpecialitiesOther);
if (columnNames.ContainsCI("RegionIdNation")) AddCommandParameter(dbCommand, "@RegionIdNation", _RegionIdNation); if (columnNames.ContainsCI("RegionIdNation")) AddCommandParameter(dbCommand, "@RegionIdNation", _RegionIdNation);
if (columnNames.ContainsCI("RegionIdProvince")) AddCommandParameter(dbCommand, "@RegionIdProvince", _RegionIdProvince); if (columnNames.ContainsCI("RegionIdProvince")) AddCommandParameter(dbCommand, "@RegionIdProvince", _RegionIdProvince);
if (columnNames.ContainsCI("Awards")) AddCommandParameter(dbCommand, "@Awards", _Awards);
if (columnNames.ContainsCI("UserSportExperienceData")) AddCommandParameter(dbCommand, "@UserSportExperienceData", _UserSportExperienceData); if (columnNames.ContainsCI("UserSportExperienceData")) AddCommandParameter(dbCommand, "@UserSportExperienceData", _UserSportExperienceData);
if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes); if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes);
if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags); if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags);
@@ -261,6 +266,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
if (columnNames.ContainsCI("SpecialitiesOther")) AddCommandParameter(dbCommand, "@SpecialitiesOther", _SpecialitiesOther); if (columnNames.ContainsCI("SpecialitiesOther")) AddCommandParameter(dbCommand, "@SpecialitiesOther", _SpecialitiesOther);
if (columnNames.ContainsCI("RegionIdNation")) AddCommandParameter(dbCommand, "@RegionIdNation", _RegionIdNation); if (columnNames.ContainsCI("RegionIdNation")) AddCommandParameter(dbCommand, "@RegionIdNation", _RegionIdNation);
if (columnNames.ContainsCI("RegionIdProvince")) AddCommandParameter(dbCommand, "@RegionIdProvince", _RegionIdProvince); if (columnNames.ContainsCI("RegionIdProvince")) AddCommandParameter(dbCommand, "@RegionIdProvince", _RegionIdProvince);
if (columnNames.ContainsCI("Awards")) AddCommandParameter(dbCommand, "@Awards", _Awards);
if (columnNames.ContainsCI("UserSportExperienceData")) AddCommandParameter(dbCommand, "@UserSportExperienceData", _UserSportExperienceData); if (columnNames.ContainsCI("UserSportExperienceData")) AddCommandParameter(dbCommand, "@UserSportExperienceData", _UserSportExperienceData);
if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes); if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes);
if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags); if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags);
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq; using System.Linq;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Fri 10-Jun-2022 07:59:42 // Code generated by Sarand Database Utilities Wed 12-Oct-2022 13:01:58
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal namespace Saxonite.Net.Standard.Dbas.Internal
{ {
@@ -223,6 +223,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
dbUserSportExperience._League = StringUtil.EmptyOnNull(userSportExperience.League); dbUserSportExperience._League = StringUtil.EmptyOnNull(userSportExperience.League);
dbUserSportExperience._Speciality = StringUtil.EmptyOnNull(userSportExperience.Speciality); dbUserSportExperience._Speciality = StringUtil.EmptyOnNull(userSportExperience.Speciality);
dbUserSportExperience._SpecialitiesOther = userSportExperience.GetSpecialitiesOther().ToList().Concat(SaxUserSportExperience.SpecialitiesOtherDelim); dbUserSportExperience._SpecialitiesOther = userSportExperience.GetSpecialitiesOther().ToList().Concat(SaxUserSportExperience.SpecialitiesOtherDelim);
dbUserSportExperience._Awards = StringUtil.EmptyOnNull(userSportExperience.Awards);
dbUserSportExperience._RegionIdNation = SysId.ToInt(userSportExperience.RegionIdNation); dbUserSportExperience._RegionIdNation = SysId.ToInt(userSportExperience.RegionIdNation);
dbUserSportExperience._RegionIdProvince = SysId.ToInt(userSportExperience.RegionIdProvince); dbUserSportExperience._RegionIdProvince = SysId.ToInt(userSportExperience.RegionIdProvince);
dbUserSportExperience._UserSportExperienceData = StringUtil.EmptyOnNull(userSportExperience.UserSportExperienceData); dbUserSportExperience._UserSportExperienceData = StringUtil.EmptyOnNull(userSportExperience.UserSportExperienceData);
@@ -253,6 +254,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
userSportExperience.League = dbUserSportExperience._League; userSportExperience.League = dbUserSportExperience._League;
userSportExperience.Speciality = dbUserSportExperience._Speciality; userSportExperience.Speciality = dbUserSportExperience._Speciality;
userSportExperience.SpecialitiesOther = StringListUtil.Split(dbUserSportExperience._SpecialitiesOther, SaxUserSportExperience.SpecialitiesOtherDelim); userSportExperience.SpecialitiesOther = StringListUtil.Split(dbUserSportExperience._SpecialitiesOther, SaxUserSportExperience.SpecialitiesOtherDelim);
userSportExperience.Awards = dbUserSportExperience._Awards;
userSportExperience.RegionIdNation = new SysId(dbUserSportExperience._RegionIdNation); userSportExperience.RegionIdNation = new SysId(dbUserSportExperience._RegionIdNation);
userSportExperience.UserSportExperienceData = dbUserSportExperience._UserSportExperienceData; userSportExperience.UserSportExperienceData = dbUserSportExperience._UserSportExperienceData;
// Common. // Common.
@@ -1880,8 +1880,8 @@
<Primary>false</Primary> <Primary>false</Primary>
<Clustered>false</Clustered> <Clustered>false</Clustered>
<Nullable>false</Nullable> <Nullable>false</Nullable>
<Pages>0</Pages> <Pages>1</Pages>
<UniqueValues>0</UniqueValues> <UniqueValues>2</UniqueValues>
<HasColumns>false</HasColumns> <HasColumns>false</HasColumns>
<Columns> <Columns>
<DbDfnIndexColumn> <DbDfnIndexColumn>
@@ -2373,8 +2373,8 @@
<Primary>false</Primary> <Primary>false</Primary>
<Clustered>false</Clustered> <Clustered>false</Clustered>
<Nullable>false</Nullable> <Nullable>false</Nullable>
<Pages>1</Pages> <Pages>4</Pages>
<UniqueValues>33</UniqueValues> <UniqueValues>39</UniqueValues>
<HasColumns>false</HasColumns> <HasColumns>false</HasColumns>
<Columns> <Columns>
<DbDfnIndexColumn> <DbDfnIndexColumn>
@@ -7338,6 +7338,23 @@
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>14</Pos> <Pos>14</Pos>
<Name>Awards</Name>
<DataType>VarChar</DataType>
<DataTypeName />
<DataTypeNative>-9</DataTypeNative>
<DataTypeNameNative>nvarchar</DataTypeNameNative>
<IsIdentity>false</IsIdentity>
<Size>2000</Size>
<BufferLen>4000</BufferLen>
<DecimalDigits>0</DecimalDigits>
<Nullable>Nullable</Nullable>
<IsNullable>true</IsNullable>
<Remarks />
</DbDfnColumn>
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSportExperience</Table>
<Pos>15</Pos>
<Name>UserSportExperienceData</Name> <Name>UserSportExperienceData</Name>
<DataType>VarChar</DataType> <DataType>VarChar</DataType>
<DataTypeName /> <DataTypeName />
@@ -7354,7 +7371,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>15</Pos> <Pos>16</Pos>
<Name>Notes</Name> <Name>Notes</Name>
<DataType>VarChar</DataType> <DataType>VarChar</DataType>
<DataTypeName /> <DataTypeName />
@@ -7371,7 +7388,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>16</Pos> <Pos>17</Pos>
<Name>Flags</Name> <Name>Flags</Name>
<DataType>SmallInt</DataType> <DataType>SmallInt</DataType>
<DataTypeName /> <DataTypeName />
@@ -7388,7 +7405,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>17</Pos> <Pos>18</Pos>
<Name>Status</Name> <Name>Status</Name>
<DataType>VarChar</DataType> <DataType>VarChar</DataType>
<DataTypeName /> <DataTypeName />
@@ -7405,7 +7422,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>18</Pos> <Pos>19</Pos>
<Name>CreateOn</Name> <Name>CreateOn</Name>
<DataType>DateTime</DataType> <DataType>DateTime</DataType>
<DataTypeName /> <DataTypeName />
@@ -7422,7 +7439,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>19</Pos> <Pos>20</Pos>
<Name>CreateBy</Name> <Name>CreateBy</Name>
<DataType>Int</DataType> <DataType>Int</DataType>
<DataTypeName /> <DataTypeName />
@@ -7439,7 +7456,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>20</Pos> <Pos>21</Pos>
<Name>CreateHost</Name> <Name>CreateHost</Name>
<DataType>VarChar</DataType> <DataType>VarChar</DataType>
<DataTypeName /> <DataTypeName />
@@ -7456,7 +7473,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>21</Pos> <Pos>22</Pos>
<Name>UpdateOn</Name> <Name>UpdateOn</Name>
<DataType>DateTime</DataType> <DataType>DateTime</DataType>
<DataTypeName /> <DataTypeName />
@@ -7473,7 +7490,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>22</Pos> <Pos>23</Pos>
<Name>UpdateBy</Name> <Name>UpdateBy</Name>
<DataType>Int</DataType> <DataType>Int</DataType>
<DataTypeName /> <DataTypeName />
@@ -7490,7 +7507,7 @@
<DbDfnColumn> <DbDfnColumn>
<Schema>dbo</Schema> <Schema>dbo</Schema>
<Table>UserSportExperience</Table> <Table>UserSportExperience</Table>
<Pos>23</Pos> <Pos>24</Pos>
<Name>UpdateHost</Name> <Name>UpdateHost</Name>
<DataType>VarChar</DataType> <DataType>VarChar</DataType>
<DataTypeName /> <DataTypeName />