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
SaxoniteStandardDbas/Dbas/Internal/ActivityIndex_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/Article_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/ItemAddress_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/ItemImage_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/ItemSport_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/OrganisationOpportunity_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/Organisation_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/Region_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/Sport_Db.cs
+7 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
@@ -21,6 +21,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
{
public ColumnDataInt32 _Id { get; } = new ColumnDataInt32("Id", true);
public ColumnDataString _Name { get; } = new ColumnDataString("Name");
public ColumnDataInt16 _SpecialityLabel { get; } = new ColumnDataInt16("SpecialityLabel");
public ColumnDataString _Notes { get; } = new ColumnDataString("Notes");
public ColumnDataInt16 _Flags { get; } = new ColumnDataInt16("Flags");
public ColumnDataString _Status { get; } = new ColumnDataString("Status");
@@ -38,6 +39,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
{
"Id",
"Name",
"SpecialityLabel",
"Notes",
"Flags",
"Status",
@@ -81,6 +83,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public ColumnsData Cols { get; } = new ColumnsData();
public Int32 _Id { get { return Cols._Id.Value; } set { Cols._Id.Value = value; } }
public String _Name { get { return Cols._Name.Value; } set { Cols._Name.Value = value; } }
public Int16 _SpecialityLabel { get { return Cols._SpecialityLabel.Value; } set { Cols._SpecialityLabel.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 String _Status { get { return Cols._Status.Value; } set { Cols._Status.Value = value; } }
@@ -113,6 +116,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
{
_Id = GetFieldInt32(dbDataReader, "Id", _Id);
_Name = GetFieldString(dbDataReader, "Name", _Name);
_SpecialityLabel = GetFieldInt16(dbDataReader, "SpecialityLabel", _SpecialityLabel);
_Notes = GetFieldString(dbDataReader, "Notes", _Notes);
_Flags = GetFieldInt16(dbDataReader, "Flags", _Flags);
_Status = GetFieldString(dbDataReader, "Status", _Status);
@@ -144,6 +148,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
// Populate parameters.
dbCommand.Parameters.Clear();
if (columnNames.ContainsCI("Name")) AddCommandParameter(dbCommand, "@Name", _Name);
if (columnNames.ContainsCI("SpecialityLabel")) AddCommandParameter(dbCommand, "@SpecialityLabel", _SpecialityLabel);
if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes);
if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags);
if (columnNames.ContainsCI("Status")) AddCommandParameter(dbCommand, "@Status", _Status);
@@ -190,6 +195,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
// Populate parameters.
dbCommand.Parameters.Clear();
if (columnNames.ContainsCI("Name")) AddCommandParameter(dbCommand, "@Name", _Name);
if (columnNames.ContainsCI("SpecialityLabel")) AddCommandParameter(dbCommand, "@SpecialityLabel", _SpecialityLabel);
if (columnNames.ContainsCI("Notes")) AddCommandParameter(dbCommand, "@Notes", _Notes);
if (columnNames.ContainsCI("Flags")) AddCommandParameter(dbCommand, "@Flags", _Flags);
if (columnNames.ContainsCI("Status")) AddCommandParameter(dbCommand, "@Status", _Status);
SaxoniteStandardDbas/Dbas/Internal/UserAccount_Db.cs
+7 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
@@ -25,6 +25,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public ColumnDataString _FirstName { get; } = new ColumnDataString("FirstName");
public ColumnDataString _Initials { get; } = new ColumnDataString("Initials");
public ColumnDataString _LastName { get; } = new ColumnDataString("LastName");
public ColumnDataString _About { get; } = new ColumnDataString("About");
public ColumnDataString _PhoneMain { get; } = new ColumnDataString("PhoneMain");
public ColumnDataString _PhoneMobile { get; } = new ColumnDataString("PhoneMobile");
public ColumnDataString _PhoneAlt { get; } = new ColumnDataString("PhoneAlt");
@@ -62,6 +63,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
"FirstName",
"Initials",
"LastName",
"About",
"PhoneMain",
"PhoneMobile",
"PhoneAlt",
@@ -125,6 +127,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public String _FirstName { get { return Cols._FirstName.Value; } set { Cols._FirstName.Value = value; } }
public String _Initials { get { return Cols._Initials.Value; } set { Cols._Initials.Value = value; } }
public String _LastName { get { return Cols._LastName.Value; } set { Cols._LastName.Value = value; } }
public String _About { get { return Cols._About.Value; } set { Cols._About.Value = value; } }
public String _PhoneMain { get { return Cols._PhoneMain.Value; } set { Cols._PhoneMain.Value = value; } }
public String _PhoneMobile { get { return Cols._PhoneMobile.Value; } set { Cols._PhoneMobile.Value = value; } }
public String _PhoneAlt { get { return Cols._PhoneAlt.Value; } set { Cols._PhoneAlt.Value = value; } }
@@ -177,6 +180,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
_FirstName = GetFieldString(dbDataReader, "FirstName", _FirstName);
_Initials = GetFieldString(dbDataReader, "Initials", _Initials);
_LastName = GetFieldString(dbDataReader, "LastName", _LastName);
_About = GetFieldString(dbDataReader, "About", _About);
_PhoneMain = GetFieldString(dbDataReader, "PhoneMain", _PhoneMain);
_PhoneMobile = GetFieldString(dbDataReader, "PhoneMobile", _PhoneMobile);
_PhoneAlt = GetFieldString(dbDataReader, "PhoneAlt", _PhoneAlt);
@@ -228,6 +232,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
if (columnNames.ContainsCI("FirstName")) AddCommandParameter(dbCommand, "@FirstName", _FirstName);
if (columnNames.ContainsCI("Initials")) AddCommandParameter(dbCommand, "@Initials", _Initials);
if (columnNames.ContainsCI("LastName")) AddCommandParameter(dbCommand, "@LastName", _LastName);
if (columnNames.ContainsCI("About")) AddCommandParameter(dbCommand, "@About", _About);
if (columnNames.ContainsCI("PhoneMain")) AddCommandParameter(dbCommand, "@PhoneMain", _PhoneMain);
if (columnNames.ContainsCI("PhoneMobile")) AddCommandParameter(dbCommand, "@PhoneMobile", _PhoneMobile);
if (columnNames.ContainsCI("PhoneAlt")) AddCommandParameter(dbCommand, "@PhoneAlt", _PhoneAlt);
@@ -294,6 +299,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
if (columnNames.ContainsCI("FirstName")) AddCommandParameter(dbCommand, "@FirstName", _FirstName);
if (columnNames.ContainsCI("Initials")) AddCommandParameter(dbCommand, "@Initials", _Initials);
if (columnNames.ContainsCI("LastName")) AddCommandParameter(dbCommand, "@LastName", _LastName);
if (columnNames.ContainsCI("About")) AddCommandParameter(dbCommand, "@About", _About);
if (columnNames.ContainsCI("PhoneMain")) AddCommandParameter(dbCommand, "@PhoneMain", _PhoneMain);
if (columnNames.ContainsCI("PhoneMobile")) AddCommandParameter(dbCommand, "@PhoneMobile", _PhoneMobile);
if (columnNames.ContainsCI("PhoneAlt")) AddCommandParameter(dbCommand, "@PhoneAlt", _PhoneAlt);
SaxoniteStandardDbas/Dbas/Internal/UserActivity_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/UserOrganisation_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/UserRole_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/UserSession_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/UserSportExperience_Db.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
SaxoniteStandardDbas/Dbas/Internal/UserSport_Db.cs
+7 -1
View File
@@ -9,7 +9,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Thu 19-Aug-2021 17:19:49
// Code generated by Sarand Database Utilities Thu 26-Aug-2021 12:36:27
//---------------------------------------------------------------------------
namespace Saxonite.Net.Standard.Dbas.Internal
{
@@ -22,6 +22,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public ColumnDataInt64 _Id { get; } = new ColumnDataInt64("Id", true);
public ColumnDataInt32 _UserAccountId { get; } = new ColumnDataInt32("UserAccountId");
public ColumnDataInt32 _SportId { get; } = new ColumnDataInt32("SportId");
public ColumnDataString _About { get; } = new ColumnDataString("About");
public ColumnDataInt16 _Participation { get; } = new ColumnDataInt16("Participation");
public ColumnDataInt16 _Officiating { get; } = new ColumnDataInt16("Officiating");
public ColumnDataString _UserSportData { get; } = new ColumnDataString("UserSportData");
@@ -43,6 +44,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
"Id",
"UserAccountId",
"SportId",
"About",
"Participation",
"Officiating",
"UserSportData",
@@ -90,6 +92,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
public Int64 _Id { get { return Cols._Id.Value; } set { Cols._Id.Value = value; } }
public Int32 _UserAccountId { get { return Cols._UserAccountId.Value; } set { Cols._UserAccountId.Value = value; } }
public Int32 _SportId { get { return Cols._SportId.Value; } set { Cols._SportId.Value = value; } }
public String _About { get { return Cols._About.Value; } set { Cols._About.Value = value; } }
public Int16 _Participation { get { return Cols._Participation.Value; } set { Cols._Participation.Value = value; } }
public Int16 _Officiating { get { return Cols._Officiating.Value; } set { Cols._Officiating.Value = value; } }
public String _UserSportData { get { return Cols._UserSportData.Value; } set { Cols._UserSportData.Value = value; } }
@@ -126,6 +129,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
_Id = GetFieldInt64(dbDataReader, "Id", _Id);
_UserAccountId = GetFieldInt32(dbDataReader, "UserAccountId", _UserAccountId);
_SportId = GetFieldInt32(dbDataReader, "SportId", _SportId);
_About = GetFieldString(dbDataReader, "About", _About);
_Participation = GetFieldInt16(dbDataReader, "Participation", _Participation);
_Officiating = GetFieldInt16(dbDataReader, "Officiating", _Officiating);
_UserSportData = GetFieldString(dbDataReader, "UserSportData", _UserSportData);
@@ -161,6 +165,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
dbCommand.Parameters.Clear();
if (columnNames.ContainsCI("UserAccountId")) AddCommandParameter(dbCommand, "@UserAccountId", _UserAccountId);
if (columnNames.ContainsCI("SportId")) AddCommandParameter(dbCommand, "@SportId", _SportId);
if (columnNames.ContainsCI("About")) AddCommandParameter(dbCommand, "@About", _About);
if (columnNames.ContainsCI("Participation")) AddCommandParameter(dbCommand, "@Participation", _Participation);
if (columnNames.ContainsCI("Officiating")) AddCommandParameter(dbCommand, "@Officiating", _Officiating);
if (columnNames.ContainsCI("UserSportData")) AddCommandParameter(dbCommand, "@UserSportData", _UserSportData);
@@ -211,6 +216,7 @@ namespace Saxonite.Net.Standard.Dbas.Internal
dbCommand.Parameters.Clear();
if (columnNames.ContainsCI("UserAccountId")) AddCommandParameter(dbCommand, "@UserAccountId", _UserAccountId);
if (columnNames.ContainsCI("SportId")) AddCommandParameter(dbCommand, "@SportId", _SportId);
if (columnNames.ContainsCI("About")) AddCommandParameter(dbCommand, "@About", _About);
if (columnNames.ContainsCI("Participation")) AddCommandParameter(dbCommand, "@Participation", _Participation);
if (columnNames.ContainsCI("Officiating")) AddCommandParameter(dbCommand, "@Officiating", _Officiating);
if (columnNames.ContainsCI("UserSportData")) AddCommandParameter(dbCommand, "@UserSportData", _UserSportData);
SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserAccount.cs
+2
View File
@@ -216,6 +216,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
dbUserAccount._FirstName = userAccount.FirstName;
dbUserAccount._Initials = userAccount.Initials;
dbUserAccount._LastName = userAccount.LastName;
dbUserAccount._About = userAccount.About;
dbUserAccount._PhoneMain = StringUtil.EmptyOnNull(userAccount.PhoneMain);
dbUserAccount._PhoneMobile = StringUtil.EmptyOnNull(userAccount.PhoneMobile);
dbUserAccount._Gender = (byte)userAccount.Gender;
@@ -255,6 +256,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
userAccount.FirstName = dbUserAccount._FirstName;
userAccount.Initials = dbUserAccount._Initials;
userAccount.LastName = dbUserAccount._LastName;
userAccount.About = dbUserAccount._About;
userAccount.PhoneMain = dbUserAccount._PhoneMain;
userAccount.PhoneMobile = dbUserAccount._PhoneMobile;
userAccount.Gender = (Sax.Gender)dbUserAccount._Gender;
SaxoniteStandardDbas/Dbas/Mgr/SaxAccountMgr_Dbas-UserSportExperience.cs
+31 -7
View File
@@ -265,13 +265,15 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
//-------------------------------------------------------------------
// Item column definitions.
private static readonly String aliasUserSportExperience = "UsrSpt";
private static readonly String aliasUserSportExperience_Organisation = "UsrSpt_Org";
private static readonly String prefixUserSportExperience_Organisation = "UsrSpt_Org_";
private static readonly String aliasUserSportExperience_Region_Nation = "UsrSpt_Rgn_Nat";
private static readonly String prefixUserSportExperience_Region_Nation = "UsrSpt_Rgn_Nat_";
private static readonly String aliasUserSportExperience_Region_Province = "UsrSpt_Rgn_Pro";
private static readonly String prefixUserSportExperience_Region_Province = "UsrSpt_Rgn_Pro_";
private static readonly String aliasUserSportExperience = "SptExp";
private static readonly String aliasUserSportExperience_UserSport = "SptExp_UsrSpt";
private static readonly String prefixUserSportExperience_UserSport = "SptExp_UsrSpt_";
private static readonly String aliasUserSportExperience_Organisation = "SptExp_Org";
private static readonly String prefixUserSportExperience_Organisation = "SptExp_Org_";
private static readonly String aliasUserSportExperience_Region_Nation = "SptExp_Rgn_Nat";
private static readonly String prefixUserSportExperience_Region_Nation = "SptExp_Rgn_Nat_";
private static readonly String aliasUserSportExperience_Region_Province = "SptExp_Rgn_Pro";
private static readonly String prefixUserSportExperience_Region_Province = "SptExp_Rgn_Pro_";
private void SetUserSportExperienceColDfn
(ColumnDfn col, String caption, int width, SaxDbDfn_Core.ColumnIdx dbCol,
ColumnAlignment align = ColumnAlignment.Default, DataValue.DataType dataType = DataValue.DataType.String,
@@ -307,6 +309,13 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
columnDfn.ReadOnly = true;
break;
//-------------------------------------------------------
// Sport.
case SaxUserSportExperience.Column.Sport_Id:
SetUserSportExperienceColDfn(columnDfn, "Sport Id", 80, SaxDbDfn_Core.ColumnIdx.UserSport_SportId, ColumnAlignment.Right, DataValue.DataType.Long, aliasUserSportExperience_UserSport, prefixUserSportExperience_UserSport);
columnDfn.ReadOnly = true;
break;
//-------------------------------------------------------
// Period.
case SaxUserSportExperience.Column.PeriodFrom:
@@ -550,6 +559,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
// Add columns as defined in query list.
if (columns.HasId(SaxUserSportExperience.Column.Id))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserSportExperience_Id, aliasUserSportExperience));
bool hasUserSportCols = (columns.HasId(SaxUserSportExperience.Column.Sport_Id));
if (columns.HasId(SaxUserSportExperience.Column.UserSportId))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserSportExperience_UserSportId, aliasUserSportExperience));
if (columns.HasId(SaxUserSportExperience.Column.PeriodFrom))
@@ -587,6 +597,20 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
if (columns.HasId(SaxUserSportExperience.Column.UpdateOn_Date))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserSportExperience_UpdateOn, aliasUserSportExperience));
//---------------------------------------------------------------------
// User Sport.
if (hasUserSportCols)
{
DbQueryJoin joinUserSport = new DbQueryJoin(DbJoinType.LeftOuter);
joinUserSport.Table = new StringPair(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserSport), aliasUserSportExperience_UserSport);
joinUserSport.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserSport_Id, aliasUserSportExperience_UserSport) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserSportExperience_UserSportId, aliasUserSportExperience));
query.Joins.Add(joinUserSport);
List<SaxDbDfn_Core.ColumnIdx> cols = new List<SaxDbDfn_Core.ColumnIdx>();
cols.Add(SaxDbDfn_Core.ColumnIdx.UserSport_SportId);
foreach (var col in cols)
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(col, aliasUserSportExperience_UserSport), prefixUserSportExperience_UserSport + SaxDbDfn_Core.GetColumnName(col, false));
}
//---------------------------------------------------------------------
// Organisation.
if (hasOrganisationCols)
SaxoniteStandardDbas/Dbas/Mgr/SaxReferenceMgr_Dbas-Sport.cs
+19
View File
@@ -212,6 +212,8 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
{
dbSport._Id = SysId.ToInt(sport.Id);
dbSport._Name = sport.Name;
dbSport._SpecialityLabel = (short)sport.SpecialityLabel;
// Common properties.
dbSport._Notes = sport.Notes;
dbSport._Status = SacsSystem.GetStatusCode(sport.Status);
dbSport._Flags = (short)sport.Flags;
@@ -229,6 +231,8 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
{
//sport.Id = new SysId(dbSport._Id);
sport.Name = dbSport._Name;
sport.SpecialityLabel = (Sax.SportSpecialityLabel)dbSport._SpecialityLabel;
// Common properties.
sport.Notes = dbSport._Notes;
sport.Status = SacsSystem.GetStatusForCode(dbSport._Status);
sport.SetCreateStamp(dbSport._CreateOn, new SysId(dbSport._CreateBy), dbSport._CreateHost);
@@ -257,6 +261,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
switch (columnId)
{
//-----------------------------------------------------------
// Identification.
case SaxSport.Column.Pos:
SetSportColDfn(columnDfn, "Pos", 60, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Right);
columnDfn.SortMode = ColumnDfn.ColumnSortMode.Off;
@@ -267,11 +272,22 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
SetSportColDfn(columnDfn, "Id", 80, SaxDbDfn_Core.ColumnIdx.Sport_Id, ColumnAlignment.Right, DataValue.DataType.Long);
columnDfn.ReadOnly = true;
break;
//-----------------------------------------------------------
// Properties.
case SaxSport.Column.Name:
SetSportColDfn(columnDfn, "Name", 120, SaxDbDfn_Core.ColumnIdx.Sport_Name);
break;
case SaxSport.Column.SpecialityLabel:
SetSportColDfn(columnDfn, "Speciality label", 80, SaxDbDfn_Core.ColumnIdx.Sport_SpecialityLabel, ColumnAlignment.Center, DataValue.DataType.Long);
break;
case SaxSport.Column.SpecialityLabel_Desc:
SetSportColDfn(columnDfn, "Speciality label", 100, SaxDbDfn_Core.ColumnIdx.Sport_SpecialityLabel, ColumnAlignment.Center);
break;
//-----------------------------------------------------------
// Derived properties.
//-----------------------------------------------------------
// Common properties.
case SaxSport.Column.Notes:
@@ -298,6 +314,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
SetSportColDfn(columnDfn, "Updated", 80, SaxDbDfn_Core.ColumnIdx.Sport_UpdateOn, ColumnAlignment.Center, DataValue.DataType.Date);
columnDfn.ReadOnly = true;
break;
//-----------------------------------------------------------
}
if (!String.IsNullOrEmpty(caption))
@@ -465,6 +482,8 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Sport_Id, aliasSport));
if (columns.HasId(SaxSport.Column.Name))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Sport_Name, aliasSport));
if (columns.HasId(SaxSport.Column.SpecialityLabel) || columns.HasId(SaxSport.Column.SpecialityLabel_Desc))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Sport_SpecialityLabel, aliasSport));
// Common properties.
if (columns.HasId(SaxSport.Column.Notes))
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Sport_Notes, aliasSport));
SaxoniteStandardDbas/Resources/Database/SaxDbDfn_Core.xml
+94 -43
View File
@@ -3342,6 +3342,23 @@
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>3</Pos>
<Name>SpecialityLabel</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
<DataTypeNative>5</DataTypeNative>
<DataTypeNameNative>smallint</DataTypeNameNative>
<IsIdentity>false</IsIdentity>
<Size>5</Size>
<BufferLen>2</BufferLen>
<DecimalDigits>0</DecimalDigits>
<Nullable>Nullable</Nullable>
<IsNullable>true</IsNullable>
<Remarks />
</DbDfnColumn>
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>4</Pos>
<Name>Notes</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3358,7 +3375,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>4</Pos>
<Pos>5</Pos>
<Name>Flags</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -3375,7 +3392,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>5</Pos>
<Pos>6</Pos>
<Name>Status</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3392,7 +3409,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>6</Pos>
<Pos>7</Pos>
<Name>CreateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3409,7 +3426,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>7</Pos>
<Pos>8</Pos>
<Name>CreateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -3426,7 +3443,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>8</Pos>
<Pos>9</Pos>
<Name>CreateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3443,7 +3460,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>9</Pos>
<Pos>10</Pos>
<Name>UpdateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3460,7 +3477,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>10</Pos>
<Pos>11</Pos>
<Name>UpdateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -3477,7 +3494,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>Sport</Table>
<Pos>11</Pos>
<Pos>12</Pos>
<Name>UpdateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3646,6 +3663,23 @@
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>7</Pos>
<Name>About</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>UserAccount</Table>
<Pos>8</Pos>
<Name>PhoneMain</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3662,7 +3696,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>8</Pos>
<Pos>9</Pos>
<Name>PhoneMobile</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3679,7 +3713,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>9</Pos>
<Pos>10</Pos>
<Name>PhoneAlt</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3696,7 +3730,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>10</Pos>
<Pos>11</Pos>
<Name>Gender</Name>
<DataType>TinyInt</DataType>
<DataTypeName />
@@ -3713,7 +3747,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>11</Pos>
<Pos>12</Pos>
<Name>DateOfBirthDay</Name>
<DataType>TinyInt</DataType>
<DataTypeName />
@@ -3730,7 +3764,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>12</Pos>
<Pos>13</Pos>
<Name>DateOfBirthMonth</Name>
<DataType>TinyInt</DataType>
<DataTypeName />
@@ -3747,7 +3781,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>13</Pos>
<Pos>14</Pos>
<Name>DateOfBirthYear</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -3764,7 +3798,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>14</Pos>
<Pos>15</Pos>
<Name>RegionIdCountry</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -3781,7 +3815,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>15</Pos>
<Pos>16</Pos>
<Name>RegionIdProvince</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -3798,7 +3832,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>16</Pos>
<Pos>17</Pos>
<Name>PasswordToken</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3815,7 +3849,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>17</Pos>
<Pos>18</Pos>
<Name>PasswordHashed</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3832,7 +3866,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>18</Pos>
<Pos>19</Pos>
<Name>PasswordHistory</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3849,7 +3883,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>19</Pos>
<Pos>20</Pos>
<Name>PasswordChangedAt</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3866,7 +3900,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>20</Pos>
<Pos>21</Pos>
<Name>LastLoginAt</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3883,7 +3917,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>21</Pos>
<Pos>22</Pos>
<Name>LastInvalidLoginAt</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3900,7 +3934,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>22</Pos>
<Pos>23</Pos>
<Name>InvalidLoginCount</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -3917,7 +3951,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>23</Pos>
<Pos>24</Pos>
<Name>Notes</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3934,7 +3968,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>24</Pos>
<Pos>25</Pos>
<Name>Flags</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -3951,7 +3985,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>25</Pos>
<Pos>26</Pos>
<Name>Status</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -3968,7 +4002,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>26</Pos>
<Pos>27</Pos>
<Name>CreateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -3985,7 +4019,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>27</Pos>
<Pos>28</Pos>
<Name>CreateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -4002,7 +4036,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>28</Pos>
<Pos>29</Pos>
<Name>CreateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -4019,7 +4053,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>29</Pos>
<Pos>30</Pos>
<Name>UpdateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -4036,7 +4070,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>30</Pos>
<Pos>31</Pos>
<Name>UpdateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -4053,7 +4087,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserAccount</Table>
<Pos>31</Pos>
<Pos>32</Pos>
<Name>UpdateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -5497,6 +5531,23 @@
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>4</Pos>
<Name>About</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>UserSport</Table>
<Pos>5</Pos>
<Name>Participation</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -5513,7 +5564,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>5</Pos>
<Pos>6</Pos>
<Name>Officiating</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -5530,7 +5581,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>6</Pos>
<Pos>7</Pos>
<Name>UserSportData</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -5547,7 +5598,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>7</Pos>
<Pos>8</Pos>
<Name>Notes</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -5564,7 +5615,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>8</Pos>
<Pos>9</Pos>
<Name>Flags</Name>
<DataType>SmallInt</DataType>
<DataTypeName />
@@ -5581,7 +5632,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>9</Pos>
<Pos>10</Pos>
<Name>Status</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -5598,7 +5649,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>10</Pos>
<Pos>11</Pos>
<Name>CreateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -5615,7 +5666,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>11</Pos>
<Pos>12</Pos>
<Name>CreateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -5632,7 +5683,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>12</Pos>
<Pos>13</Pos>
<Name>CreateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />
@@ -5649,7 +5700,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>13</Pos>
<Pos>14</Pos>
<Name>UpdateOn</Name>
<DataType>DateTime</DataType>
<DataTypeName />
@@ -5666,7 +5717,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>14</Pos>
<Pos>15</Pos>
<Name>UpdateBy</Name>
<DataType>Int</DataType>
<DataTypeName />
@@ -5683,7 +5734,7 @@
<DbDfnColumn>
<Schema>dbo</Schema>
<Table>UserSport</Table>
<Pos>15</Pos>
<Pos>16</Pos>
<Name>UpdateHost</Name>
<DataType>VarChar</DataType>
<DataTypeName />