v1.0.5.0
Activity Index. User Account country. Internals regions.
This commit is contained in:
@@ -81,7 +81,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
catch (Exception exc)
|
||||
{
|
||||
SetErrorState("Database query exception");
|
||||
SaLogger.Warn(GetType().Name + ".GetOrganisation\n\tQuery: " + dbCommand.CommandText + "\n\t" + exc.GetType().Name + ": " + exc.Message);
|
||||
SaLogger.Warn(GetType().Name + ".GetOrganisation\n\tQuery: " + dbCommand.CommandText + "\n\t" + ExceptionUtil.GetLogMessage(exc));
|
||||
}
|
||||
}
|
||||
return organisation;
|
||||
@@ -188,7 +188,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
dbOrganisation.PopulateFrom(dbCommand, aliasOrganisation, "Id=" + organisation.Id.ToString());
|
||||
// Delete organisation.
|
||||
dbCommand.CommandType = System.Data.CommandType.Text;
|
||||
dbCommand.CommandText = "DELETE FROM " + SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Organisation) + " WHERE Id=" + SysId.ToString(organisation.Id) + ";";
|
||||
dbCommand.CommandText = "DELETE FROM " + SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Organisation) + " WHERE Id=" + SysId.ToString(organisation.Id) + ";";
|
||||
dbCommand.ExecuteNonQuery();
|
||||
organisation.Changed = false;
|
||||
if (DebugMode) SaLogger.Debug(fn + " Deleted. " + GetLogProperties(organisation).Concat(": ").Concat("", "\n\t"));
|
||||
@@ -210,8 +210,8 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
dbOrganisation._OrganisationCategory = OrganisationCategories.GetCodeForType(organisation.OrganisationCategory);
|
||||
dbOrganisation._PhoneMain = organisation.PhoneMain;
|
||||
dbOrganisation._PhoneAlt = organisation.PhoneAlt;
|
||||
dbOrganisation._RegionIdPrimary = SysId.ToInt(organisation.RegionIdPrimary);
|
||||
dbOrganisation._SportIdPrimary = SysId.ToInt(organisation.SportIdPrimary);
|
||||
dbOrganisation._RegionIdPrimary = SysId.ToInt(organisation.RegionIdPrimary);
|
||||
dbOrganisation._Notes = organisation.Notes;
|
||||
dbOrganisation._Status = SacsSystem.GetStatusCode(organisation.Status);
|
||||
dbOrganisation._Flags = (short)organisation.Flags;
|
||||
@@ -236,8 +236,8 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
organisation.OrganisationCategory = (Sax.OrganisationCategory)OrganisationCategories.GetTypeForCode(dbOrganisation._OrganisationCategory);
|
||||
organisation.PhoneMain = dbOrganisation._PhoneMain;
|
||||
organisation.PhoneAlt = dbOrganisation._PhoneAlt;
|
||||
organisation.RegionIdPrimary = new SysId(dbOrganisation._RegionIdPrimary);
|
||||
organisation.SportIdPrimary = new SysId(dbOrganisation._SportIdPrimary);
|
||||
organisation.RegionIdPrimary = new SysId(dbOrganisation._RegionIdPrimary);
|
||||
organisation.Notes = dbOrganisation._Notes;
|
||||
organisation.Status = SacsSystem.GetStatusForCode(dbOrganisation._Status);
|
||||
organisation.SetCreateStamp(dbOrganisation._CreateOn, new SysId(dbOrganisation._CreateBy), dbOrganisation._CreateHost);
|
||||
@@ -248,22 +248,22 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
//-------------------------------------------------------------------
|
||||
// Item column definitions.
|
||||
private static readonly String aliasOrganisation = "Org";
|
||||
private static readonly String aliasOrganisation_Region = "Org_Rgn";
|
||||
private static readonly String prefixOrganisation_Region = "Org_Rgn_";
|
||||
private static readonly String aliasOrganisation_Sport = "Org_Spt";
|
||||
private static readonly String prefixOrganisation_Sport = "Org_Spt_";
|
||||
private static readonly String aliasOrganisation_Region = "Org_Rgn";
|
||||
private static readonly String prefixOrganisation_Region = "Org_Rgn_";
|
||||
private static readonly String colOrganisation_User_Count = "Org_Usr_Count";
|
||||
private static readonly String colOrganisation_Member_Count = "Org_Mbr_Count";
|
||||
private void SetOrganisationColDfn
|
||||
(ColumnDfn col, String caption, int width, SaxDbDfn.ColumnIdx dbCol,
|
||||
(ColumnDfn col, String caption, int width, SaxDbDfn_Core.ColumnIdx dbCol,
|
||||
ColumnAlignment align = ColumnAlignment.Default, DataValue.DataType dataType = DataValue.DataType.String,
|
||||
String alias = "", String prefix = "")
|
||||
{
|
||||
if (String.IsNullOrEmpty(alias) && SaxDbDfn.GetTableForColumn(dbCol) == SaxDbDfn.TableIdx.Organisation)
|
||||
if (String.IsNullOrEmpty(alias) && SaxDbDfn_Core.GetTableForColumn(dbCol) == SaxDbDfn_Core.TableIdx.Organisation)
|
||||
alias = aliasOrganisation;
|
||||
col.Set(caption, width, (int)dbCol, prefix + SaxDbDfn.GetColumnName(dbCol, false), SaxDbDfn.GetColumnNameQual(dbCol, alias), dataType, align);
|
||||
if (dataType == DataValue.DataType.String && dbCol != SaxDbDfn.ColumnIdx.Unknown)
|
||||
col.MaxLength = (int)SaxDbDfn.GetColTextLen(dbCol);
|
||||
col.Set(caption, width, (int)dbCol, prefix + SaxDbDfn_Core.GetColumnName(dbCol, false), SaxDbDfn_Core.GetColumnNameQual(dbCol, alias), dataType, align);
|
||||
if (dataType == DataValue.DataType.String && dbCol != SaxDbDfn_Core.ColumnIdx.Unknown)
|
||||
col.MaxLength = (int)SaxDbDfn_Core.GetColTextLen(dbCol);
|
||||
}
|
||||
public override ColumnDfn GetOrganisationColumnDfn(SaxOrganisation.Column columnId, string caption = "", int width = 0)
|
||||
{
|
||||
@@ -272,92 +272,92 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
//-----------------------------------------------------------
|
||||
case SaxOrganisation.Column.Pos:
|
||||
SetOrganisationColDfn(columnDfn, "Pos", 60, SaxDbDfn.ColumnIdx.Unknown, ColumnAlignment.Right);
|
||||
SetOrganisationColDfn(columnDfn, "Pos", 60, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Right);
|
||||
columnDfn.SortMode = ColumnDfn.ColumnSortMode.Off;
|
||||
columnDfn.ReadOnly = true;
|
||||
columnDfn.Resizable = false;
|
||||
break;
|
||||
case SaxOrganisation.Column.Id:
|
||||
SetOrganisationColDfn(columnDfn, "Id", 80, SaxDbDfn.ColumnIdx.Organisation_Id, ColumnAlignment.Right, DataValue.DataType.Long);
|
||||
SetOrganisationColDfn(columnDfn, "Id", 80, SaxDbDfn_Core.ColumnIdx.Organisation_Id, ColumnAlignment.Right, DataValue.DataType.Long);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
case SaxOrganisation.Column.Name:
|
||||
SetOrganisationColDfn(columnDfn, "Name", 120, SaxDbDfn.ColumnIdx.Organisation_Name);
|
||||
SetOrganisationColDfn(columnDfn, "Name", 120, SaxDbDfn_Core.ColumnIdx.Organisation_Name);
|
||||
break;
|
||||
case SaxOrganisation.Column.OrganisationType:
|
||||
SetOrganisationColDfn(columnDfn, "Type", 80, SaxDbDfn.ColumnIdx.Organisation_OrganisationType, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
SetOrganisationColDfn(columnDfn, "Type", 80, SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationType, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
break;
|
||||
case SaxOrganisation.Column.OrganisationType_Desc:
|
||||
SetOrganisationColDfn(columnDfn, "Type", 80, SaxDbDfn.ColumnIdx.Organisation_OrganisationType, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
SetOrganisationColDfn(columnDfn, "Type", 80, SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationType, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
break;
|
||||
case SaxOrganisation.Column.OrganisationCategory:
|
||||
SetOrganisationColDfn(columnDfn, "Category", 80, SaxDbDfn.ColumnIdx.Organisation_OrganisationCategory, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
SetOrganisationColDfn(columnDfn, "Category", 80, SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationCategory, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
break;
|
||||
case SaxOrganisation.Column.OrganisationCategory_Desc:
|
||||
SetOrganisationColDfn(columnDfn, "Category", 80, SaxDbDfn.ColumnIdx.Organisation_OrganisationCategory, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
SetOrganisationColDfn(columnDfn, "Category", 80, SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationCategory, ColumnAlignment.Center, DataValue.DataType.String);
|
||||
break;
|
||||
case SaxOrganisation.Column.PhoneMain:
|
||||
SetOrganisationColDfn(columnDfn, "Phone", 100, SaxDbDfn.ColumnIdx.Organisation_PhoneMain);
|
||||
SetOrganisationColDfn(columnDfn, "Phone", 100, SaxDbDfn_Core.ColumnIdx.Organisation_PhoneMain);
|
||||
break;
|
||||
case SaxOrganisation.Column.PhoneAlt:
|
||||
SetOrganisationColDfn(columnDfn, "Alt. phone", 100, SaxDbDfn.ColumnIdx.Organisation_PhoneAlt);
|
||||
break;
|
||||
|
||||
//-----------------------------------------------------------
|
||||
// Region.
|
||||
case SaxOrganisation.Column.RegionId:
|
||||
SetOrganisationColDfn(columnDfn, "Region Id", 80, SaxDbDfn.ColumnIdx.Region_Id, ColumnAlignment.Right, DataValue.DataType.Long, aliasOrganisation_Region, prefixOrganisation_Region);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
case SaxOrganisation.Column.Region_Name:
|
||||
SetOrganisationColDfn(columnDfn, "Region", 120, SaxDbDfn.ColumnIdx.Organisation_Name, ColumnAlignment.Left, DataValue.DataType.String, aliasOrganisation_Region, prefixOrganisation_Region);
|
||||
SetOrganisationColDfn(columnDfn, "Alt. phone", 100, SaxDbDfn_Core.ColumnIdx.Organisation_PhoneAlt);
|
||||
break;
|
||||
|
||||
//-----------------------------------------------------------
|
||||
// Sport.
|
||||
case SaxOrganisation.Column.SportId:
|
||||
SetOrganisationColDfn(columnDfn, "Sport Id", 80, SaxDbDfn.ColumnIdx.Sport_Id, ColumnAlignment.Right, DataValue.DataType.Long, aliasOrganisation_Sport, prefixOrganisation_Sport);
|
||||
SetOrganisationColDfn(columnDfn, "Sport Id", 80, SaxDbDfn_Core.ColumnIdx.Sport_Id, ColumnAlignment.Right, DataValue.DataType.Long, aliasOrganisation_Sport, prefixOrganisation_Sport);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
case SaxOrganisation.Column.Sport_Name:
|
||||
SetOrganisationColDfn(columnDfn, "Sport", 120, SaxDbDfn.ColumnIdx.Organisation_Name, ColumnAlignment.Left, DataValue.DataType.String, aliasOrganisation_Sport, prefixOrganisation_Sport);
|
||||
SetOrganisationColDfn(columnDfn, "Sport", 120, SaxDbDfn_Core.ColumnIdx.Organisation_Name, ColumnAlignment.Left, DataValue.DataType.String, aliasOrganisation_Sport, prefixOrganisation_Sport);
|
||||
break;
|
||||
|
||||
//-----------------------------------------------------------
|
||||
// Region.
|
||||
case SaxOrganisation.Column.RegionId:
|
||||
SetOrganisationColDfn(columnDfn, "Region Id", 80, SaxDbDfn_Core.ColumnIdx.Region_Id, ColumnAlignment.Right, DataValue.DataType.Long, aliasOrganisation_Region, prefixOrganisation_Region);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
case SaxOrganisation.Column.Region_Name:
|
||||
SetOrganisationColDfn(columnDfn, "Region", 120, SaxDbDfn_Core.ColumnIdx.Organisation_Name, ColumnAlignment.Left, DataValue.DataType.String, aliasOrganisation_Region, prefixOrganisation_Region);
|
||||
break;
|
||||
|
||||
//-----------------------------------------------------------
|
||||
// Derived properties.
|
||||
case SaxOrganisation.Column.User_Count:
|
||||
SetOrganisationColDfn(columnDfn, "Users", 80, SaxDbDfn.ColumnIdx.Unknown, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
SetOrganisationColDfn(columnDfn, "Users", 80, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
columnDfn.DataName = colOrganisation_User_Count;
|
||||
break;
|
||||
case SaxOrganisation.Column.Member_Count:
|
||||
SetOrganisationColDfn(columnDfn, "Members", 80, SaxDbDfn.ColumnIdx.Unknown, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
SetOrganisationColDfn(columnDfn, "Members", 80, SaxDbDfn_Core.ColumnIdx.Unknown, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
columnDfn.DataName = colOrganisation_Member_Count;
|
||||
break;
|
||||
|
||||
//-----------------------------------------------------------
|
||||
// Common properties.
|
||||
case SaxOrganisation.Column.Notes:
|
||||
SetOrganisationColDfn(columnDfn, "Notes", 240, SaxDbDfn.ColumnIdx.Organisation_Notes);
|
||||
SetOrganisationColDfn(columnDfn, "Notes", 240, SaxDbDfn_Core.ColumnIdx.Organisation_Notes);
|
||||
break;
|
||||
case SaxOrganisation.Column.Flags:
|
||||
SetOrganisationColDfn(columnDfn, "Flags", 60, SaxDbDfn.ColumnIdx.Organisation_Flags, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
SetOrganisationColDfn(columnDfn, "Flags", 60, SaxDbDfn_Core.ColumnIdx.Organisation_Flags, ColumnAlignment.Center, DataValue.DataType.Long);
|
||||
break;
|
||||
case SaxOrganisation.Column.Status:
|
||||
SetOrganisationColDfn(columnDfn, "Status", 80, SaxDbDfn.ColumnIdx.Organisation_Status, ColumnAlignment.Center);
|
||||
SetOrganisationColDfn(columnDfn, "Status", 80, SaxDbDfn_Core.ColumnIdx.Organisation_Status, ColumnAlignment.Center);
|
||||
break;
|
||||
case SaxOrganisation.Column.Status_Desc:
|
||||
SetOrganisationColDfn(columnDfn, "Status", 90, SaxDbDfn.ColumnIdx.Organisation_Status, ColumnAlignment.Center);
|
||||
SetOrganisationColDfn(columnDfn, "Status", 90, SaxDbDfn_Core.ColumnIdx.Organisation_Status, ColumnAlignment.Center);
|
||||
break;
|
||||
case SaxOrganisation.Column.Status_Ind:
|
||||
SetOrganisationColDfn(columnDfn, "Status", 80, SaxDbDfn.ColumnIdx.Organisation_Status, ColumnAlignment.Center, DataValue.DataType.TriState);
|
||||
SetOrganisationColDfn(columnDfn, "Status", 80, SaxDbDfn_Core.ColumnIdx.Organisation_Status, ColumnAlignment.Center, DataValue.DataType.TriState);
|
||||
columnDfn.TriStateFormat = ColumnTriStateFormat.Lights;
|
||||
break;
|
||||
case SaxOrganisation.Column.CreateOn_Date:
|
||||
SetOrganisationColDfn(columnDfn, "Created", 80, SaxDbDfn.ColumnIdx.Organisation_CreateOn, ColumnAlignment.Center, DataValue.DataType.Date);
|
||||
SetOrganisationColDfn(columnDfn, "Created", 80, SaxDbDfn_Core.ColumnIdx.Organisation_CreateOn, ColumnAlignment.Center, DataValue.DataType.Date);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
case SaxOrganisation.Column.UpdateOn_Date:
|
||||
SetOrganisationColDfn(columnDfn, "Updated", 80, SaxDbDfn.ColumnIdx.Organisation_UpdateOn, ColumnAlignment.Center, DataValue.DataType.Date);
|
||||
SetOrganisationColDfn(columnDfn, "Updated", 80, SaxDbDfn_Core.ColumnIdx.Organisation_UpdateOn, ColumnAlignment.Center, DataValue.DataType.Date);
|
||||
columnDfn.ReadOnly = true;
|
||||
break;
|
||||
|
||||
@@ -379,16 +379,16 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
// Item Ids.
|
||||
String idsIncluded = prm.IdsIncluded.Concat(",");
|
||||
if (!idsIncluded.IsEmpty())
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation) + " IN (" + idsIncluded + ")");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation) + " IN (" + idsIncluded + ")");
|
||||
String idsExcluded = prm.IdsExcluded.Concat(",");
|
||||
if (!idsExcluded.IsEmpty())
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation) + " NOT IN (" + idsExcluded + ")");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation) + " NOT IN (" + idsExcluded + ")");
|
||||
|
||||
// Name.
|
||||
if (!StringUtil.IsEmpty(prm.NameFull))
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Name, aliasOrganisation) + "='" + DbQuery.FormatForCondition(prm.NameFull) + "'");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Name, aliasOrganisation) + "='" + DbQuery.FormatForCondition(prm.NameFull) + "'");
|
||||
if (!StringUtil.IsEmpty(prm.NamePartial))
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Name, aliasOrganisation) + " Like '%" + DbQuery.FormatForLike(prm.NamePartial, true) + "%'");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Name, aliasOrganisation) + " Like '%" + DbQuery.FormatForLike(prm.NamePartial, true) + "%'");
|
||||
|
||||
// Organisation filter.
|
||||
if (!StringUtil.IsEmpty(prm.OrganisationFilter))
|
||||
@@ -400,30 +400,30 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
foreach (String filterWord in filterWords)
|
||||
{
|
||||
List<String> organisationFilter = new List<String>();
|
||||
organisationFilter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Name, aliasOrganisation) + " Like '%" + DbQuery.FormatForLike(filterWord, true) + "%'");
|
||||
organisationFilter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Name, aliasOrganisation) + " Like '%" + DbQuery.FormatForLike(filterWord, true) + "%'");
|
||||
filter.Add(organisationFilter.Concat(" OR ", "(", ")"));
|
||||
}
|
||||
}
|
||||
|
||||
// Region Ids.
|
||||
String regionIdsIncluded = prm.RegionIdsIncluded.Concat(",");
|
||||
if (!regionIdsIncluded.IsEmpty())
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation) + " IN (" + regionIdsIncluded + ")");
|
||||
|
||||
// Sport Ids.
|
||||
String sportIdsIncluded = prm.SportIdsIncluded.Concat(",");
|
||||
if (!sportIdsIncluded.IsEmpty())
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation) + " IN (" + sportIdsIncluded + ")");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation) + " IN (" + sportIdsIncluded + ")");
|
||||
|
||||
// Region Ids.
|
||||
String regionIdsIncluded = prm.RegionIdsIncluded.Concat(",");
|
||||
if (!regionIdsIncluded.IsEmpty())
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation) + " IN (" + regionIdsIncluded + ")");
|
||||
|
||||
// Notes.
|
||||
if (!StringUtil.IsEmpty(prm.NotesPartial))
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Notes, aliasOrganisation) + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Notes, aliasOrganisation) + " LIKE '%" + DbQuery.FormatForLike(prm.NotesPartial) + "%'");
|
||||
|
||||
// Status.
|
||||
if (prm.StatusCat == SaxOrganisation.StatusCat.ActiveOnly)
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Status, aliasOrganisation) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Status, aliasOrganisation) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
else if (prm.StatusCat == SaxOrganisation.StatusCat.NotDeleted)
|
||||
filter.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Status, aliasOrganisation) + "!='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'");
|
||||
filter.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Status, aliasOrganisation) + "!='" + SacsSystem.GetStatusCode(SaStatus.Deleted) + "'");
|
||||
|
||||
if (filter.Count < 1) filter.Add("1=1");
|
||||
return filter;
|
||||
@@ -437,9 +437,9 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
// Need to ensure correct alias used for Organisation columns in case of conflict.
|
||||
String sortCol = String.Empty;
|
||||
if (SaxDbDfn.GetTableForColumn((SaxDbDfn.ColumnIdx)columnDfn.DbColumn) == SaxDbDfn.TableIdx.Organisation)
|
||||
if (SaxDbDfn_Core.GetTableForColumn((SaxDbDfn_Core.ColumnIdx)columnDfn.DbColumn) == SaxDbDfn_Core.TableIdx.Organisation)
|
||||
{
|
||||
sortCol = SaxDbDfn.GetColumnNameQual((SaxDbDfn.ColumnIdx)columnDfn.DbColumn, aliasOrganisation);
|
||||
sortCol = SaxDbDfn_Core.GetColumnNameQual((SaxDbDfn_Core.ColumnIdx)columnDfn.DbColumn, aliasOrganisation);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -457,7 +457,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
if (sortColumnNames.IsEmpty())
|
||||
{
|
||||
// Default sort columns.
|
||||
sortColumnNames.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation) + " ASC");
|
||||
sortColumnNames.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation) + " ASC");
|
||||
}
|
||||
return sortColumnNames;
|
||||
}
|
||||
@@ -467,7 +467,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
private long GetOrganisationCount(String filter)
|
||||
{
|
||||
ClearErrorState();
|
||||
return CoreDatabase.GetRowCount(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Organisation) + " As " + aliasOrganisation, filter);
|
||||
return CoreDatabase.GetRowCount(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Organisation) + " As " + aliasOrganisation, filter);
|
||||
}
|
||||
public override long GetOrganisationCount(SaxOrganisation.Params prm)
|
||||
{
|
||||
@@ -481,7 +481,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
List<SaxOrganisation> userAccounts = new List<SaxOrganisation>();
|
||||
DbQuery qry = new DbQuery(CoreDatabase.DbmsType);
|
||||
qry.Tables.Add(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Organisation), aliasOrganisation);
|
||||
qry.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Organisation), aliasOrganisation);
|
||||
Organisation_Db dbOrganisation = new Organisation_Db(CoreDbInfo);
|
||||
qry.Columns.AddRange(dbOrganisation.ExistingColumnNames);
|
||||
qry.Filters.AddRange(GetOrganisationQueryFilter(prm));
|
||||
@@ -506,7 +506,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
SaLogger.Warn(GetType().Name + ".GetOrganisationList\n\tQuery: " + dbCommand.CommandText + "\n\t" + exc.GetType().Name + ": " + exc.Message);
|
||||
SaLogger.Warn(GetType().Name + ".GetOrganisationList\n\tQuery: " + dbCommand.CommandText + "\n\t" + ExceptionUtil.GetLogMessage(exc));
|
||||
}
|
||||
}
|
||||
return userAccounts;
|
||||
@@ -521,67 +521,67 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
//---------------------------------------------------------------------
|
||||
// Construct query.
|
||||
DbQuery query = new DbQuery(CoreDatabase.DbmsType);
|
||||
query.Tables.Add(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Organisation), aliasOrganisation);
|
||||
query.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Organisation), aliasOrganisation);
|
||||
|
||||
// Add columns as defined in query list.
|
||||
if (columns.HasId(SaxOrganisation.Column.Id))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.Name))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Name, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Name, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.PhoneMain))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_PhoneMain, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_PhoneMain, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.PhoneAlt))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_PhoneAlt, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_PhoneAlt, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.OrganisationType) || columns.HasId(SaxOrganisation.Column.OrganisationType_Desc))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_OrganisationType, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationType, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.OrganisationCategory) || columns.HasId(SaxOrganisation.Column.OrganisationCategory_Desc))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_OrganisationCategory, aliasOrganisation));
|
||||
// Region.
|
||||
bool hasRegionCols = columns.HasId(SaxOrganisation.Column.Region_Name);
|
||||
if (columns.HasId(SaxOrganisation.Column.RegionId) || hasRegionCols)
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_OrganisationCategory, aliasOrganisation));
|
||||
// Sport.
|
||||
bool hasSportCols = columns.HasId(SaxOrganisation.Column.Sport_Name);
|
||||
if (columns.HasId(SaxOrganisation.Column.SportId) || hasSportCols)
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation));
|
||||
// Region.
|
||||
bool hasRegionCols = columns.HasId(SaxOrganisation.Column.Region_Name);
|
||||
if (columns.HasId(SaxOrganisation.Column.RegionId) || hasRegionCols)
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation));
|
||||
// Common properties.
|
||||
if (columns.HasId(SaxOrganisation.Column.Notes))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Notes, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Notes, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.Flags))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Flags, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Flags, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.Status) || columns.HasId(SaxOrganisation.Column.Status_Desc) || columns.HasId(SaxOrganisation.Column.Status_Ind))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Status, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Status, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.CreateOn_Date))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_CreateOn, aliasOrganisation));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_CreateOn, aliasOrganisation));
|
||||
if (columns.HasId(SaxOrganisation.Column.UpdateOn_Date))
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_UpdateOn, aliasOrganisation));
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
// Region.
|
||||
if (hasRegionCols)
|
||||
{
|
||||
DbQueryJoin joinRegion = new DbQueryJoin(DbJoinType.LeftOuter);
|
||||
joinRegion.Table = new StringPair(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Region), aliasOrganisation_Region);
|
||||
joinRegion.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Region_Id, aliasOrganisation_Region) + "=" + SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation));
|
||||
query.Joins.Add(joinRegion);
|
||||
List<SaxDbDfn.ColumnIdx> cols = new List<SaxDbDfn.ColumnIdx>();
|
||||
cols.Add(SaxDbDfn.ColumnIdx.Region_Name);
|
||||
foreach (var col in cols)
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(col, aliasOrganisation_Region), prefixOrganisation_Region + SaxDbDfn.GetColumnName(col, false));
|
||||
}
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_UpdateOn, aliasOrganisation));
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
// Sport.
|
||||
if (hasSportCols)
|
||||
{
|
||||
DbQueryJoin joinSport = new DbQueryJoin(DbJoinType.LeftOuter);
|
||||
joinSport.Table = new StringPair(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.Sport), aliasOrganisation_Sport);
|
||||
joinSport.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Sport_Id, aliasOrganisation_Sport) + "=" + SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation));
|
||||
joinSport.Table = new StringPair(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Sport), aliasOrganisation_Sport);
|
||||
joinSport.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Sport_Id, aliasOrganisation_Sport) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_SportIdPrimary, aliasOrganisation));
|
||||
query.Joins.Add(joinSport);
|
||||
List<SaxDbDfn.ColumnIdx> cols = new List<SaxDbDfn.ColumnIdx>();
|
||||
cols.Add(SaxDbDfn.ColumnIdx.Sport_Name);
|
||||
List<SaxDbDfn_Core.ColumnIdx> cols = new List<SaxDbDfn_Core.ColumnIdx>();
|
||||
cols.Add(SaxDbDfn_Core.ColumnIdx.Sport_Name);
|
||||
foreach (var col in cols)
|
||||
query.Columns.Add(SaxDbDfn.GetColumnNameQual(col, aliasOrganisation_Sport), prefixOrganisation_Sport + SaxDbDfn.GetColumnName(col, false));
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(col, aliasOrganisation_Sport), prefixOrganisation_Sport + SaxDbDfn_Core.GetColumnName(col, false));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
// Region.
|
||||
if (hasRegionCols)
|
||||
{
|
||||
DbQueryJoin joinRegion = new DbQueryJoin(DbJoinType.LeftOuter);
|
||||
joinRegion.Table = new StringPair(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.Region), aliasOrganisation_Region);
|
||||
joinRegion.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Region_Id, aliasOrganisation_Region) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_RegionIdPrimary, aliasOrganisation));
|
||||
query.Joins.Add(joinRegion);
|
||||
List<SaxDbDfn_Core.ColumnIdx> cols = new List<SaxDbDfn_Core.ColumnIdx>();
|
||||
cols.Add(SaxDbDfn_Core.ColumnIdx.Region_Name);
|
||||
foreach (var col in cols)
|
||||
query.Columns.Add(SaxDbDfn_Core.GetColumnNameQual(col, aliasOrganisation_Region), prefixOrganisation_Region + SaxDbDfn_Core.GetColumnName(col, false));
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
@@ -590,10 +590,10 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
String aliasUserCount = "aUsrOrg_Count";
|
||||
DbQuery queryUserCount = new DbQuery(CoreDatabase.DbmsType);
|
||||
queryUserCount.Tables.Add(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.UserOrganisation), aliasUserCount);
|
||||
queryUserCount.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserOrganisation), aliasUserCount);
|
||||
queryUserCount.Columns.Add("Count(*)");
|
||||
queryUserCount.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.UserOrganisation_OrganisationId, aliasUserCount) + "=" + SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
queryUserCount.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.UserOrganisation_Status, aliasUserCount) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
queryUserCount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserOrganisation_OrganisationId, aliasUserCount) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
queryUserCount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserOrganisation_Status, aliasUserCount) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
query.Columns.Add("(" + queryUserCount.BuildQuery() + ")", colOrganisation_Member_Count);
|
||||
}
|
||||
|
||||
@@ -603,11 +603,11 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
String aliasMemberCount = "aUsrOrg_Count";
|
||||
DbQuery queryMemberCount = new DbQuery(CoreDatabase.DbmsType);
|
||||
queryMemberCount.Tables.Add(SaxDbDfn.GetTableName(SaxDbDfn.TableIdx.UserOrganisation), aliasMemberCount);
|
||||
queryMemberCount.Tables.Add(SaxDbDfn_Core.GetTableName(SaxDbDfn_Core.TableIdx.UserOrganisation), aliasMemberCount);
|
||||
queryMemberCount.Columns.Add("Count(*)");
|
||||
queryMemberCount.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.UserOrganisation_OrganisationId, aliasMemberCount) + "=" + SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
queryMemberCount.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.UserOrganisation_OrganisationRoleCount, aliasMemberCount) + ">0");
|
||||
queryMemberCount.Filters.Add(SaxDbDfn.GetColumnNameQual(SaxDbDfn.ColumnIdx.UserOrganisation_Status, aliasMemberCount) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
queryMemberCount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserOrganisation_OrganisationId, aliasMemberCount) + "=" + SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.Organisation_Id, aliasOrganisation));
|
||||
queryMemberCount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserOrganisation_OrganisationRoleCount, aliasMemberCount) + ">0");
|
||||
queryMemberCount.Filters.Add(SaxDbDfn_Core.GetColumnNameQual(SaxDbDfn_Core.ColumnIdx.UserOrganisation_Status, aliasMemberCount) + "='" + SacsSystem.GetStatusCode(SaStatus.Active) + "'");
|
||||
query.Columns.Add("(" + queryMemberCount.BuildQuery() + ")", colOrganisation_Member_Count);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user