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

v1.2.6.1

Browse Source
This commit is contained in:
andy
2022-05-19 13:41:22 +01:00
parent d17cce340e
commit 56f6b0bb7e
48 changed files with 850 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteStandardBase/Base/App/Sax-Version.cs
+3 -2
View File
@@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App
//-------------------------------------------------------------------
public static class Version
{
private static String version { get; } = "1.2.6.0";
private static String version { get; } = "1.2.6.1";
// Retrieve version.
public static String GetFullVersion () { return version; }
public static String GetAppVersion ()
@@ -40,8 +40,9 @@ namespace Saxonite.Net.Standard.Base.App
//-------------------------------------------------------------------
// Version history.
//-------------------------------------------------------------------
// 1.2.6 ??-May-2022 Image resizing
// 1.2.6 16-May-2022 Image resizing
// - Profile and article images resized to maximum width/height.
// - Organisation About and Facilities properties.
// 1.2.5 20-Apr-2022 Article feedback
// - Online Activity/Article feedback 5 stars, summary on Article list/popup.
// - Online Activity filter.
SaxoniteStandardBase/Base/App/Sax.cs
+1
View File
@@ -220,6 +220,7 @@ namespace Saxonite.Net.Standard.Base.App
Club,
Society,
Education,
SportDepartment,
Syndicate,
/// <summary>Commercial partner</summary>
Partner,
SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs
+8 -2
View File
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Mon 11-Apr-2022 17:51:44
// Code generated by Sarand Database Utilities Wed 18-May-2022 18:33:47
//---------------------------------------------------------------------------
namespace Saxonite.Base.App
{
@@ -160,6 +160,9 @@ namespace Saxonite.Base.App
Organisation_OrganisationCategory,
Organisation_SportIdPrimary,
Organisation_RegionIdPrimary,
Organisation_About,
Organisation_Facilities,
Organisation_ContactData,
Organisation_CountryIso2Code,
Organisation_PhoneMain,
Organisation_PhoneAlt,
@@ -377,7 +380,7 @@ namespace Saxonite.Base.App
//-------------------------------------------------------------------
// Data members.
private static readonly int tableCount = 19;
private static readonly int columnCount = 329;
private static readonly int columnCount = 332;
private static ulong maxTextLen = 0;
//-------------------------------------------------------------------
@@ -685,6 +688,9 @@ namespace Saxonite.Base.App
new ColumnDfn(7,"OrganisationCategory",0,12,false,3),
new ColumnDfn(7,"SportIdPrimary",4,4,false,10),
new ColumnDfn(7,"RegionIdPrimary",4,4,false,10),
new ColumnDfn(7,"About",0,-9,false,2000),
new ColumnDfn(7,"Facilities",0,-9,false,2000),
new ColumnDfn(7,"ContactData",0,-9,false,0),
new ColumnDfn(7,"CountryIso2Code",0,12,false,2),
new ColumnDfn(7,"PhoneMain",0,-9,false,50),
new ColumnDfn(7,"PhoneAlt",0,-9,false,50),
SaxoniteStandardBase/Base/App/SaxSystem-Statics.cs
+1
View File
@@ -139,6 +139,7 @@ namespace Saxonite.Net.Standard.Base.App
organisationCategoryCodes.Add(Sax.OrganisationCategory.Club, "CLB", "Club");
organisationCategoryCodes.Add(Sax.OrganisationCategory.Society, "SOC", "Society");
organisationCategoryCodes.Add(Sax.OrganisationCategory.Education, "EDU", "Education");
organisationCategoryCodes.Add(Sax.OrganisationCategory.SportDepartment, "SPD", "Sport Department");
organisationCategoryCodes.Add(Sax.OrganisationCategory.Syndicate, "SYN", "Syndicate");
organisationCategoryCodes.Add(Sax.OrganisationCategory.Partner, "PRT", "Partner");
organisationCategoryCodes.Add(Sax.OrganisationCategory.Other, "OTH", "Other");
SaxoniteStandardBase/Base/Bus/SaxOrganisation.cs
+66 -27
View File
@@ -54,10 +54,13 @@ namespace Saxonite.Net.Standard.Base.Bus
public String Name { get; set; } = String.Empty;
public Sax.OrganisationType OrganisationType { get; set; }
public Sax.OrganisationCategory OrganisationCategory { get; set; }
public String PhoneMain { get; set; } = String.Empty;
public String PhoneAlt { get; set; } = String.Empty;
public SysId SportIdPrimary { get; set; }
public SysId RegionIdPrimary { get; set; }
public String About { get; set; } = String.Empty;
public String Facilities { get; set; } = String.Empty;
public String ContactData { get; set; } = String.Empty;
public String PhoneMain { get; set; } = String.Empty;
public String PhoneAlt { get; set; } = String.Empty;
}
//-------------------------------------------------------------------
@@ -87,16 +90,6 @@ namespace Saxonite.Net.Standard.Base.Bus
get { return data.OrganisationCategory; }
set { CheckChangedEnum(data.OrganisationCategory, value); data.OrganisationCategory = value; }
}
public String PhoneMain
{
get { return data.PhoneMain; }
set { CheckChanged(data.PhoneMain, value); data.PhoneMain = value; }
}
public String PhoneAlt
{
get { return data.PhoneAlt; }
set { CheckChanged(data.PhoneAlt, value); data.PhoneAlt = value; }
}
public SysId SportIdPrimary
{
get { return data.SportIdPrimary; }
@@ -107,16 +100,44 @@ namespace Saxonite.Net.Standard.Base.Bus
get { return data.RegionIdPrimary; }
set { CheckChanged(data.RegionIdPrimary, value); data.RegionIdPrimary = value; }
}
public String About
{
get { return data.About; }
set { CheckChanged(data.About, value); data.About = value; }
}
public String Facilities
{
get { return data.Facilities; }
set { CheckChanged(data.Facilities, value); data.Facilities = value; }
}
public String ContactData
{
get { return data.ContactData; }
set { CheckChanged(data.ContactData, value); data.ContactData = value; }
}
public String PhoneMain
{
get { return data.PhoneMain; }
set { CheckChanged(data.PhoneMain, value); data.PhoneMain = value; }
}
public String PhoneAlt
{
get { return data.PhoneAlt; }
set { CheckChanged(data.PhoneAlt, value); data.PhoneAlt = value; }
}
// Population.
internal void PopulateFrom(Data data)
{
Name = data.Name;
OrganisationType = data.OrganisationType;
OrganisationCategory = data.OrganisationCategory;
PhoneMain = data.PhoneMain;
PhoneAlt = data.PhoneAlt;
SportIdPrimary = data.SportIdPrimary;
RegionIdPrimary = data.RegionIdPrimary;
About = data.About;
Facilities = data.Facilities;
ContactData = data.ContactData;
PhoneMain = data.PhoneMain;
PhoneAlt = data.PhoneAlt;
base.PopulateFrom(data);
}
public Data Clone()
@@ -135,10 +156,13 @@ namespace Saxonite.Net.Standard.Base.Bus
public ValidValue Name { get; set; } = ValidValue.Valid;
public ValidValue OrganisationType { get; set; } = ValidValue.Valid;
public ValidValue OrganisationCategory { get; set; } = ValidValue.Valid;
public ValidValue PhoneMain { get; set; } = ValidValue.Valid;
public ValidValue PhoneAlt { get; set; } = ValidValue.Valid;
public ValidValue SportIdPrimary { get; set; } = ValidValue.Valid;
public ValidValue RegionIdPrimary { get; set; } = ValidValue.Valid;
public ValidValue About { get; set; } = ValidValue.Valid;
public ValidValue Facilities { get; set; } = ValidValue.Valid;
public ValidValue ContactData { get; set; } = ValidValue.Valid;
public ValidValue PhoneMain { get; set; } = ValidValue.Valid;
public ValidValue PhoneAlt { get; set; } = ValidValue.Valid;
}
//-------------------------------------------------------------------
@@ -185,7 +209,7 @@ namespace Saxonite.Net.Standard.Base.Bus
{
if (organisationCategory == Sax.OrganisationCategory.Club) return true;
if (organisationCategory == Sax.OrganisationCategory.Association) return true;
if (organisationCategory == Sax.OrganisationCategory.Education) return true;
if (organisationCategory == Sax.OrganisationCategory.SportDepartment) return true;
return false;
}
@@ -215,16 +239,6 @@ namespace Saxonite.Net.Standard.Base.Bus
get { return data.OrganisationCategory; }
set { data.OrganisationCategory = value; }
}
public String PhoneMain
{
get { return data.PhoneMain; }
set { data.PhoneMain = value; }
}
public String PhoneAlt
{
get { return data.PhoneAlt; }
set { data.PhoneAlt = value; }
}
public SysId SportIdPrimary
{
get { return data.SportIdPrimary; }
@@ -235,6 +249,31 @@ namespace Saxonite.Net.Standard.Base.Bus
get { return data.RegionIdPrimary; }
set { data.RegionIdPrimary = value; }
}
public String About
{
get { return data.About; }
set { data.About = value; }
}
public String Facilities
{
get { return data.Facilities; }
set { data.Facilities = value; }
}
public String ContactData
{
get { return data.ContactData; }
set { data.ContactData = value; }
}
public String PhoneMain
{
get { return data.PhoneMain; }
set { data.PhoneMain = value; }
}
public String PhoneAlt
{
get { return data.PhoneAlt; }
set { data.PhoneAlt = value; }
}
//-------------------------------------------------------------------
// Flags - positions 1-16 available.
SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-Organisation.cs
+32 -10
View File
@@ -105,6 +105,36 @@ namespace Saxonite.Net.Standard.Base.Mgr
errField.OrganisationCategory = SacsHierarchyItem.ValidValue.Invalid;
return SetErrorState("Organisation category must be specified.");
}
// Sport.
if (errField.SportIdPrimary != SacsHierarchyItem.ValidValue.Ignore)
{
if (!SysId.IsValid(data.SportIdPrimary) && SaxOrganisation.IsSportMandatory(data.OrganisationCategory))
{
errField.SportIdPrimary = SacsHierarchyItem.ValidValue.Invalid;
return SetErrorState("Sport must be specified.");
}
}
// Region.
if (errField.RegionIdPrimary != SacsHierarchyItem.ValidValue.Ignore)
{
if (!SysId.IsValid(data.RegionIdPrimary))
{
errField.RegionIdPrimary = SacsHierarchyItem.ValidValue.Invalid;
return SetErrorState("Region must be specified.");
}
}
// About.
if (errField.About != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.About, "about", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_About)))
{
errField.About = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
// Facilities.
if (errField.Facilities != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Facilities, "facilities", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_Facilities)))
{
errField.Facilities = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
// Main phone.
if (errField.PhoneMain != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.PhoneMain, "phone", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_PhoneMain)))
{
@@ -117,14 +147,6 @@ namespace Saxonite.Net.Standard.Base.Mgr
errField.PhoneAlt = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
// Sport.
if (errField.SportIdPrimary != SacsHierarchyItem.ValidValue.Ignore)
{
}
// Region.
if (errField.RegionIdPrimary != SacsHierarchyItem.ValidValue.Ignore)
{
}
// Common properties.
if (errField.Notes != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Notes, "notes", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_Notes)))
@@ -170,10 +192,10 @@ namespace Saxonite.Net.Standard.Base.Mgr
errField.RegionIdPrimary = SacsHierarchyItem.ValidValue.Invalid;
return SetErrorState("Invalid region specified");
}
if (region.RegionType != App.Sax.RegionType.Country)
if (region.RegionType != App.Sax.RegionType.Country && region.RegionType != App.Sax.RegionType.Continent && region.RegionType != App.Sax.RegionType.World)
{
errField.RegionIdPrimary = SacsHierarchyItem.ValidValue.Invalid;
return SetErrorState("Region must be a country");
return SetErrorState("Region must be a country or international region");
}
}