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

v1.2.6.4

Browse Source
This commit is contained in:
andy
2022-05-29 13:45:22 +01:00
parent d631ad0223
commit 833798c9f8
93 changed files with 2063 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteStandardBase/Base/App/Sax-Config.cs
+53 -39
View File
@@ -43,6 +43,46 @@ namespace Saxonite.Net.Standard.Base.App
}
}
}
public static class User
{
public static class Image
{
// Physical image maximum dimensions - reduced on upload.
public static ushort WidthMax { get; } = 240;
public static ushort HeightMax { get; } = 320;
}
}
public static class Organisation
{
public static class Logo
{
// Physical image maximum dimensions - reduced on upload.
public static ushort WidthMax { get; } = 240;
public static ushort HeightMax { get; } = 240;
// Maximum image display dimensions - organisation list.
public static ushort DisplayWidthMax_List { get; } = 48;
public static ushort DisplayHeightMax_List { get; } = 48;
// Maximum image display dimensions - organisation edit etc.
public static ushort DisplayWidthMax_Item { get; } = 120;
public static ushort DisplayHeightMax_Item { get; } = 120;
}
}
public static class Articles
{
public static class Segments
{
public static ushort Max { get; } = 12;
public static ushort CharsMax { get; } = 8000;
}
public static class Images
{
// Physical image maximum dimensions - reduced on upload.
public static ushort WidthMax { get; } = 800;
public static ushort HeightMax { get; } = 640;
}
public static ushort PublishMaxDaysBefore { get; } = 7;
public static ushort PublishMaxDaysAhead { get; } = 10;
}
public class Online
{
public static class Session
@@ -73,45 +113,6 @@ namespace Saxonite.Net.Standard.Base.App
public static int Periodic { get; } = SacsSystem.DebugMode ? 120 : 1800;
}
}
public static class Profile
{
public static class User
{
public static class Image
{
public static ushort WidthMax { get; } = 320;
public static ushort HeightMax { get; } = 400;
}
}
}
public static class Links
{
public static class Targets
{
public static String Website { get; } = "sax-lnk-web";
public static String Wikipedia { get; } = "sax-lnk-wikip";
public static String Facebook { get; } = "sax-lnk-fbook";
public static String Twitter { get; } = "sax-lnk-twit";
public static String Instagram { get; } = "sax-lnk-insta";
public static String LinkedIn { get; } = "sax-lnk-lnkin";
public static String Article { get; } = "sax-art-lnk";
}
}
public static class Articles
{
public static class Segments
{
public static ushort Max { get; } = 12;
public static ushort CharsMax { get; } = 8000;
}
public static class Images
{
public static ushort WidthMax { get; } = 800;
public static ushort HeightMax { get; } = 640;
}
public static ushort PublishMaxDaysBefore { get; } = 7;
public static ushort PublishMaxDaysAhead { get; } = 10;
}
public static class Search
{
public static class Users
@@ -140,6 +141,19 @@ namespace Saxonite.Net.Standard.Base.App
}
}
}
public static class Links
{
public static class Targets
{
public static String Website { get; } = "sax-lnk-web";
public static String Wikipedia { get; } = "sax-lnk-wikip";
public static String Facebook { get; } = "sax-lnk-fbook";
public static String Twitter { get; } = "sax-lnk-twit";
public static String Instagram { get; } = "sax-lnk-insta";
public static String LinkedIn { get; } = "sax-lnk-lnkin";
public static String Article { get; } = "sax-art-lnk";
}
}
}
//-------------------------------------------------------------------
SaxoniteStandardBase/Base/App/Sax-Version.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App
//-------------------------------------------------------------------
public static class Version
{
private static String version { get; } = "1.2.6.3";
private static String version { get; } = "1.2.6.4";
// Retrieve version.
public static String GetFullVersion () { return version; }
public static String GetAppVersion ()
SaxoniteStandardBase/Base/App/Sax.cs
+6 -2
View File
@@ -191,11 +191,15 @@ namespace Saxonite.Net.Standard.Base.App
/// <summary>User's profile image.</summary>
Avatar = 100,
/// <summary>User's profile image, uploaded awaiting confirmation.</summary>
AvatarUpload = 101,
Avatar_Upload = 101,
/// <summary>Organisation's main logo.</summary>
OrganisationLogo = 120,
/// <summary>Organisation's main logo, uploaded awaiting confirmation.</summary>
OrganisationLogo_Upload = 121,
/// <summary>Article image.</summary>
Article = 200,
/// <summary>Article image uploaded, awaiting confirmation.</summary>
ArticleUpload = 201,
Article_Upload = 201,
}
//-------------------------------------------------------------------
SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs
+2 -6
View File
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
//---------------------------------------------------------------------------
// Code generated by Sarand Database Utilities Wed 18-May-2022 18:33:47
// Code generated by Sarand Database Utilities Wed 25-May-2022 20:26:17
//---------------------------------------------------------------------------
namespace Saxonite.Base.App
{
@@ -164,8 +164,6 @@ namespace Saxonite.Base.App
Organisation_Facilities,
Organisation_ContactData,
Organisation_CountryIso2Code,
Organisation_PhoneMain,
Organisation_PhoneAlt,
Organisation_Notes,
Organisation_Flags,
Organisation_Status,
@@ -380,7 +378,7 @@ namespace Saxonite.Base.App
//-------------------------------------------------------------------
// Data members.
private static readonly int tableCount = 19;
private static readonly int columnCount = 332;
private static readonly int columnCount = 330;
private static ulong maxTextLen = 0;
//-------------------------------------------------------------------
@@ -692,8 +690,6 @@ namespace Saxonite.Base.App
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),
new ColumnDfn(7,"Notes",0,-9,false,2000),
new ColumnDfn(7,"Flags",3,5,false,5),
new ColumnDfn(7,"Status",0,12,false,3),
SaxoniteStandardBase/Base/App/SaxSystem-CodeTypes.cs
+4 -2
View File
@@ -171,9 +171,11 @@ namespace Saxonite.Net.Standard.Base.App
//---------------------------------------------------------------
// Image types.
imageTypeCodes.Add(Sax.ImageType.Avatar, "Avatar", "Avatar");
imageTypeCodes.Add(Sax.ImageType.AvatarUpload, "AvatarUpload", "Avatar - upload");
imageTypeCodes.Add(Sax.ImageType.Avatar_Upload, "AvatarUpload", "Avatar - upload");
imageTypeCodes.Add(Sax.ImageType.OrganisationLogo, "OrganisationLogo", "Organisation logo");
imageTypeCodes.Add(Sax.ImageType.OrganisationLogo_Upload, "OrganisationLogoUpload", "Organisation logo - upload");
imageTypeCodes.Add(Sax.ImageType.Article, "Article", "Article");
imageTypeCodes.Add(Sax.ImageType.ArticleUpload, "ArticleUpload", "Article - upload");
imageTypeCodes.Add(Sax.ImageType.Article_Upload, "ArticleUpload", "Article - upload");
//---------------------------------------------------------------
// Organisation types.
SaxoniteStandardBase/Base/Bus/SaxOrganisation.cs
+2 -28
View File
@@ -25,8 +25,6 @@ namespace Saxonite.Net.Standard.Base.Bus
OrganisationType_Desc,
OrganisationCategory,
OrganisationCategory_Desc,
PhoneMain,
PhoneAlt,
// Sport.
SportId,
Sport_Name,
@@ -38,6 +36,8 @@ namespace Saxonite.Net.Standard.Base.Bus
User_Count,
/// <summary>Number of users who are 'members' of the organisation.</summary>
Member_Count,
/// <summary>Number of active logo images.</summary>
LogoImage_Count,
// Common.
Notes,
Flags,
@@ -60,8 +60,6 @@ namespace Saxonite.Net.Standard.Base.Bus
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;
}
//-------------------------------------------------------------------
@@ -116,16 +114,6 @@ namespace Saxonite.Net.Standard.Base.Bus
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)
{
@@ -137,8 +125,6 @@ namespace Saxonite.Net.Standard.Base.Bus
About = data.About;
Facilities = data.Facilities;
ContactData = data.ContactData;
PhoneMain = data.PhoneMain;
PhoneAlt = data.PhoneAlt;
base.PopulateFrom(data);
}
public Data Clone()
@@ -162,8 +148,6 @@ namespace Saxonite.Net.Standard.Base.Bus
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;
}
//-------------------------------------------------------------------
@@ -280,16 +264,6 @@ namespace Saxonite.Net.Standard.Base.Bus
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
+14 -13
View File
@@ -18,6 +18,7 @@ namespace Saxonite.Net.Standard.Base.Mgr
// Account Mgr - Organisation
//*******************************************************************
// Utilities.
/// <summary>Get number of active members for Organisation.</summary>
public long GetOrganisationMemberCount(SysId organisationId)
{
if (!SysId.IsValid(organisationId)) return 0;
@@ -28,6 +29,15 @@ namespace Saxonite.Net.Standard.Base.Mgr
prmUserOrganisation.StatusCat = SaxUserOrganisation.StatusCat.ActiveOnly;
return GetUserOrganisationCount(prmUserOrganisation);
}
/// <summary>Get number of active opportunities for organisation.</summary>
public long GetOrganisationOpportunityCount(SysId organisationId)
{
if (!SysId.IsValid(organisationId)) return 0;
SaxOrganisationOpportunity.Params prmOrganisationOpportunity = new SaxOrganisationOpportunity.Params();
prmOrganisationOpportunity.OrganisationIdsIncluded.Add(organisationId);
prmOrganisationOpportunity.StatusCat = SaxOrganisationOpportunity.StatusCat.ActiveOnly;
return ActivityMgr.GetOrganisationOpportunityCount(prmOrganisationOpportunity);
}
//-------------------------------------------------------------------
// Create item.
@@ -114,7 +124,7 @@ namespace Saxonite.Net.Standard.Base.Mgr
return SetErrorState("Sport must be specified.");
}
}
// Region.
// Primary Region.
if (errField.RegionIdPrimary != SacsHierarchyItem.ValidValue.Ignore)
{
if (!SysId.IsValid(data.RegionIdPrimary))
@@ -123,6 +133,7 @@ namespace Saxonite.Net.Standard.Base.Mgr
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)))
{
@@ -135,18 +146,8 @@ namespace Saxonite.Net.Standard.Base.Mgr
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)))
{
errField.PhoneMain = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
// Alt phone.
if (errField.PhoneAlt != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.PhoneAlt, "alt. phone", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_PhoneAlt)))
{
errField.PhoneAlt = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
// Contact data.
// Common properties.
if (errField.Notes != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Notes, "notes", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.Organisation_Notes)))
SaxoniteStandardBase/Base/Mgr/SaxItemDataMgr-ItemImage.cs
+10
View File
@@ -19,6 +19,16 @@ namespace Saxonite.Net.Standard.Base.Mgr
// Item Data Mgr - Item Image
//*******************************************************************
// Utilities.
public bool ItemHasActiveImage(ItemId itemId, Sax.ImageType imageType)
{
ClearErrorState();
if (!ItemId.IsValid(itemId) || (int)imageType < 1) return false;
SaxItemImage.Params prmItemImage = new SaxItemImage.Params();
prmItemImage.ItemIdsIncluded.Add(itemId);
prmItemImage.ImageTypesIncluded.Add(imageType);
prmItemImage.StatusCat = SaxItemImage.StatusCat.ActiveOnly;
return GetItemImageCount(prmItemImage) == 1;
}
//-------------------------------------------------------------------
// Create item.