This commit is contained in:
2022-05-19 13:41:22 +01:00
parent d17cce340e
commit 56f6b0bb7e
48 changed files with 850 additions and 319 deletions
@@ -216,6 +216,9 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
dbOrganisation._OrganisationCategory = OrganisationCategoryCodes.GetCodeForType(organisation.OrganisationCategory);
dbOrganisation._SportIdPrimary = SysId.ToInt(organisation.SportIdPrimary);
dbOrganisation._RegionIdPrimary = SysId.ToInt(organisation.RegionIdPrimary);
dbOrganisation._About = StringUtil.EmptyOnNull(organisation.About);
dbOrganisation._Facilities = StringUtil.EmptyOnNull(organisation.Facilities);
dbOrganisation._ContactData = StringUtil.EmptyOnNull(organisation.ContactData);
dbOrganisation._PhoneMain = StringUtil.EmptyOnNull(organisation.PhoneMain);
dbOrganisation._PhoneAlt = StringUtil.EmptyOnNull(organisation.PhoneAlt);
dbOrganisation._Notes = StringUtil.EmptyOnNull(organisation.Notes);
@@ -236,14 +239,15 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
//organisation.Id = new SysId(dbOrganisation._Id);
//organisation.UserAccountId = new SysId(dbOrganisation._UserAccountId);
organisation.Name = dbOrganisation._Name;
organisation.PhoneMain = dbOrganisation._PhoneMain;
organisation.PhoneAlt = dbOrganisation._PhoneAlt;
organisation.OrganisationType = (Sax.OrganisationType)OrganisationTypeCodes.GetTypeForCode(dbOrganisation._OrganisationType);
organisation.OrganisationCategory = (Sax.OrganisationCategory)OrganisationCategoryCodes.GetTypeForCode(dbOrganisation._OrganisationCategory);
organisation.PhoneMain = dbOrganisation._PhoneMain;
organisation.PhoneAlt = dbOrganisation._PhoneAlt;
organisation.SportIdPrimary = new SysId(dbOrganisation._SportIdPrimary);
organisation.RegionIdPrimary = new SysId(dbOrganisation._RegionIdPrimary);
organisation.About = dbOrganisation._About;
organisation.Facilities = dbOrganisation._Facilities;
organisation.ContactData = dbOrganisation._ContactData;
organisation.PhoneMain = dbOrganisation._PhoneMain;
organisation.PhoneAlt = dbOrganisation._PhoneAlt;
organisation.Notes = dbOrganisation._Notes;
organisation.Status = SacsSystem.GetStatusForCode(dbOrganisation._Status);
organisation.SetCreateStamp(dbOrganisation._CreateOn, new SysId(dbOrganisation._CreateBy), dbOrganisation._CreateHost);
@@ -670,7 +674,7 @@ namespace Saxonite.Net.Standard.Dbas.Mgr
queryUserCount.Columns.Add("Count(*)");
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);
query.Columns.Add("(" + queryUserCount.BuildQuery() + ")", colOrganisation_User_Count);
}
//---------------------------------------------------------------------