andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.2.0

Browse Source
This commit is contained in:
andy
2021-07-10 14:23:14 +01:00
parent 03ea1058be
commit 10907d3aff
97 changed files with 2048 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteStandardBase/Base/App/Sax-Version.cs
+5 -2
View File
@@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App
//-------------------------------------------------------------------
public static class Version
{
private static String version { get; } = "1.1.1.0";
private static String version { get; } = "1.1.2.0";
// Retrieve version.
public static String GetFullVersion () { return version; }
public static String GetAppVersion ()
@@ -40,8 +40,11 @@ namespace Saxonite.Net.Standard.Base.App
//-------------------------------------------------------------------
// Version history.
//-------------------------------------------------------------------
// 1.1.2 ??-Jul-2021 Organisation Request.
// 1.1.3 ??-Jul-2021 Organisation Activation.
// - Admin organisation activation.
// 1.1.2 10-Jul-2021 Organisation Request.
// - Online Organisation Request.
// - Admin data maintenance paging, organisations filter.
// 1.1.1 2-Jul-2021 Add User fix.
// - Admin fix Internals Region cache issue on null value.
// - Optional user title.
SaxoniteStandardBase/Base/App/Sax.cs
+2 -1
View File
@@ -274,11 +274,12 @@ namespace Saxonite.Net.Standard.Base.App
public enum OrganisationRole
{
Unknown = 0,
/* Do not change the values - tied to database. */
/* Do not change the values/codes - tied to database. */
Member,
MemberAdmin,
ScheduleAdmin,
OpportunityAdmin,
ArticleAdmin,
}
//-------------------------------------------------------------------
SaxoniteStandardBase/Base/App/SaxSystem-Statics.cs
+1
View File
@@ -130,6 +130,7 @@ namespace Saxonite.Net.Standard.Base.App
organisationRoleCodes.Add(Sax.OrganisationRole.MemberAdmin, "MBA", "Member Admin");
organisationRoleCodes.Add(Sax.OrganisationRole.ScheduleAdmin, "SCA", "Schedule Admin");
organisationRoleCodes.Add(Sax.OrganisationRole.OpportunityAdmin, "OPA", "Opportunity Admin");
organisationRoleCodes.Add(Sax.OrganisationRole.ArticleAdmin, "ARA", "Article Admin");
//---------------------------------------------------------------
// Opportunity types.
SaxoniteStandardBase/Base/Bus/SaxItemAddress.cs
+4 -2
View File
@@ -441,9 +441,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -455,6 +456,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<ItemId> ItemIdsIncluded { get; } = new List<ItemId>();
public String AddressPartial { get; set; }
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
}
SaxoniteStandardBase/Base/Bus/SaxItemImage.cs
+4 -3
View File
@@ -296,10 +296,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
Deleted,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -311,6 +311,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<ItemId> ItemIdsIncluded { get; } = new List<ItemId>();
public List<Sax.ImageType> ImageTypesIncluded { get; } = new List<Sax.ImageType>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
}
SaxoniteStandardBase/Base/Bus/SaxItemSport.cs
+4 -2
View File
@@ -184,9 +184,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -198,6 +199,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<ItemId> ItemIdsIncluded { get; } = new List<ItemId>();
public List<SysId> SportIdsIncluded { get; } = new List<SysId>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
}
SaxoniteStandardBase/Base/Bus/SaxJournalistArticle.cs
+4 -2
View File
@@ -241,9 +241,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -260,6 +261,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public String SummaryPartial { get; set; }
/// <summary>General filter value - headline, summary, sport, body etc. </summary>
public String ArticleFilter { get; set; }
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.ActiveOnly;
}
SaxoniteStandardBase/Base/Bus/SaxOrganisation.cs
+23 -10
View File
@@ -66,7 +66,7 @@ namespace Saxonite.Net.Standard.Base.Bus
// Data members.
private readonly DataProperties data = new DataProperties();
// Construction.
public Data ()
public Data()
{
Status = DefaultStatus;
}
@@ -107,7 +107,7 @@ namespace Saxonite.Net.Standard.Base.Bus
set { CheckChanged(data.RegionIdPrimary, value); data.RegionIdPrimary = value; }
}
// Population.
internal void PopulateFrom (Data data)
internal void PopulateFrom(Data data)
{
Name = data.Name;
OrganisationType = data.OrganisationType;
@@ -118,7 +118,7 @@ namespace Saxonite.Net.Standard.Base.Bus
RegionIdPrimary = data.RegionIdPrimary;
base.PopulateFrom(data);
}
public Data Clone ()
public Data Clone()
{
Data data = new Data();
data.PopulateFrom(this);
@@ -146,7 +146,7 @@ namespace Saxonite.Net.Standard.Base.Bus
//-------------------------------------------------------------------
// Construction.
protected SaxOrganisation (SysId id) : base(id)
protected SaxOrganisation(SysId id) : base(id)
{
base.SetData(data);
Status = DefaultStatus;
@@ -156,6 +156,7 @@ namespace Saxonite.Net.Standard.Base.Bus
// Status.
private static readonly List<SaStatus> validStatuses = new List<SaStatus>()
{
SaStatus.Awaiting,
SaStatus.Active,
SaStatus.OnHold,
SaStatus.Inactive,
@@ -163,7 +164,7 @@ namespace Saxonite.Net.Standard.Base.Bus
};
public static SaStatus DefaultStatus { get { return SaStatus.Active; } }
public static List<SaStatus> ValidStatuses { get { return new List<SaStatus>(validStatuses); } }
public static DataValue.TriStateType GetStatusTriState (SaStatus status)
public static DataValue.TriStateType GetStatusTriState(SaStatus status)
{
if (status == SaStatus.Active) return DataValue.TriStateType.Green;
if (status == SaStatus.OnHold) return DataValue.TriStateType.Amber;
@@ -174,15 +175,23 @@ namespace Saxonite.Net.Standard.Base.Bus
//-------------------------------------------------------------------
// Utilities.
public ItemId GetItemId ()
public ItemId GetItemId()
{
return new ItemId((short)Sax.DataItemType.Organisation, Id);
}
// Sport is mandatory for certain organisation categories.
public static bool IsSportMandatory(Sax.OrganisationCategory organisationCategory)
{
if (organisationCategory == Sax.OrganisationCategory.Club) return true;
if (organisationCategory == Sax.OrganisationCategory.Association) return true;
if (organisationCategory == Sax.OrganisationCategory.Education) return true;
return false;
}
//-------------------------------------------------------------------
// Properties.
public Data GetData () { return data.Clone(); }
public void SetData (Data data)
public Data GetData() { return data.Clone(); }
public void SetData(Data data)
{
String fn = GetType().Name + ".SetData";
// Properties that cannot be changed if previously specified.
@@ -240,9 +249,11 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
AwaitingOnly,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -254,6 +265,8 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public String NameFull { get; set; }
public String NamePartial { get; set; }
public Sax.OrganisationCategory OrganisationCategory { get; set; } = Sax.OrganisationCategory.Unknown;
public Sax.OrganisationType OrganisationType { get; set; } = Sax.OrganisationType.Unknown;
/// <summary>Partial match on a number of fields, including name, sport, address, etc.</summary>
public String OrganisationFilter { get; set; }
public List<SysId> SportIdsIncluded { get; } = new List<SysId>();
SaxoniteStandardBase/Base/Bus/SaxOrganisationOpportunity.cs
+3 -2
View File
@@ -268,9 +268,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
SaxoniteStandardBase/Base/Bus/SaxRegion.cs
+4 -2
View File
@@ -257,9 +257,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -277,6 +278,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public String RegionFilter { get; set; }
public String NameFull { get; set; }
public String NamePartial { get; set; }
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.ActiveOnly;
}
SaxoniteStandardBase/Base/Bus/SaxSport.cs
+4 -2
View File
@@ -144,9 +144,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -160,6 +161,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public String SportFilter { get; set; }
public String NameFull { get; set; }
public String NamePartial { get; set; }
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.ActiveOnly;
}
SaxoniteStandardBase/Base/Bus/SaxUserAccount.cs
+5 -2
View File
@@ -420,9 +420,11 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
AwaitingOnly,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -437,6 +439,7 @@ namespace Saxonite.Net.Standard.Base.Bus
/// <summary>Partial match on various user account properties including name, countries etc.</summary>
public String UserAccountFilter { get; set; }
public List<Sax.UserRole> ActiveRoles { get; } = new List<Sax.UserRole>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.ActiveOnly;
}
SaxoniteStandardBase/Base/Bus/SaxUserActivity.cs
+5 -3
View File
@@ -298,9 +298,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -312,9 +313,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<SysId> UserAccountIdsIncluded { get; } = new List<SysId>();
public List<ItemId> ItemIdsIncluded { get; } = new List<ItemId>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
// Table aliases - blank if not linked.
// Table aliases - blank if not specified/linked.
public String Alias_UserActivity { get; set; }
}
SaxoniteStandardBase/Base/Bus/SaxUserOrganisation.cs
+9 -2
View File
@@ -238,9 +238,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -251,12 +252,18 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsIncluded { get; } = new List<SysId>();
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<SysId> UserAccountIdsIncluded { get; } = new List<SysId>();
public SaxUserAccount.StatusCat UserAccountStatusCat { get; set; } = SaxUserAccount.StatusCat.Any;
public List<SysId> OrganisationIdsIncluded { get; } = new List<SysId>();
/// <summary>Set true to restruct to User Organisations with at least one Organisation Role.</summary>
public bool OrganisationMembersOnly { get; set; }
public List<Sax.OrganisationRole> OrganisationRoles { get; } = new List<Sax.OrganisationRole>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
// Table aliases - blank if not specified/linked.
public String Alias_UserOrganisation{ get; set; }
public String Alias_UserAccount { get; set; }
public String Alias_Organisation { get; set; }
}
//-------------------------------------------------------------------
SaxoniteStandardBase/Base/Bus/SaxUserRole.cs
+4 -2
View File
@@ -178,9 +178,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -192,6 +193,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<SysId> UserAccountIdsIncluded { get; } = new List<SysId>();
public List<Sax.UserRole> UserRolesIncluded { get; } = new List<Sax.UserRole>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
}
SaxoniteStandardBase/Base/Bus/SaxUserSport.cs
+4 -2
View File
@@ -217,9 +217,10 @@ namespace Saxonite.Net.Standard.Base.Bus
public enum StatusCat
{
Any,
NotDeleted,
ActiveOnly,
InctiveOnly,
InactiveOnly,
NotDeleted,
DeletedOnly,
}
/// <summary>
/// Item list parameters.
@@ -231,6 +232,7 @@ namespace Saxonite.Net.Standard.Base.Bus
public List<SysId> IdsExcluded { get; } = new List<SysId>();
public List<SysId> UserAccountIdsIncluded { get; } = new List<SysId>();
public List<SysId> SportIdsIncluded { get; } = new List<SysId>();
// Common properties.
public String NotesPartial { get; set; }
public StatusCat StatusCat { get; set; } = StatusCat.NotDeleted;
}
SaxoniteStandardBase/Base/Helpers/SaxResourceHelper.cs
+5 -13
View File
@@ -21,10 +21,8 @@ namespace Saxonite.Net.Standard.Base.Helpers
Email_Header_Html,
Email_Footer_Html,
// Email templates.
Email_ContactUs_Html,
Email_Signup_Activate_Html,
Email_Signup_Welcome_Html,
Email_RequestPassword_Html,
Email_Security_AccountActivated_Html,
Email_Security_RequestPassword_Html,
// Data - countries etc.
Data_CountriesWithRegions_Txt,
}
@@ -53,16 +51,10 @@ namespace Saxonite.Net.Standard.Base.Helpers
resourceFilename = "sax-email-footer.html";
break;
// Email templates.
case TextResource.Email_ContactUs_Html:
resourceFilename = "sax-email-contact-us.html";
case TextResource.Email_Security_AccountActivated_Html:
resourceFilename = "sax-email-account-activated.html";
break;
case TextResource.Email_Signup_Activate_Html:
resourceFilename = "sax-email-signup-activate.html";
break;
case TextResource.Email_Signup_Welcome_Html:
resourceFilename = "sax-email-signup-welcome.html";
break;
case TextResource.Email_RequestPassword_Html:
case TextResource.Email_Security_RequestPassword_Html:
resourceFilename = "sax-email-request-password.html";
break;
// Data.
SaxoniteStandardBase/Resources/Email/Security/sax-email-account-activated.html
+24
View File
@@ -0,0 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>Account Activated</title>
[#Email.MainStylesheet]
</head>
<body>
[#Email.Header]
<div class="sax-email-body">
<div class="sax-email-panel-caption">
<div class="sax-caption">Account Activated</div>
</div>
<div class="sax-email-panel-content">
<div class="sax-para">Congratulations - yoru account has been activated.</div>
<div class="sax-para">Follow <span style="font-weight:bold;"><a href="[#Link.RequestPassword]">this link</a></span> to set a password against your account.</div>
<div class="sax-para">Once that's been done you'll be able to sign-in and participate on the platform.</div>
<div class="sax-para">The link will expire in [#Link.ExpiresMinutes] minutes.</div>
<div class="sax-para">Thank you.</div>
</div>
</div>
[#Email.Footer]
</body>
</html>
SaxoniteStandardBase/SaxoniteStandardBase.csproj
+1
View File
@@ -24,6 +24,7 @@
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Email\Security\sax-email-account-activated.html" />
<None Remove="Resources\Email\Shared\sax-email-footer.html" />
<None Remove="Resources\Email\Shared\sax-email-header.html" />
</ItemGroup>