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/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));