v1.0.9.0

SaxoniteStandardBase/Base/App/Sax-Version.cs

@@ -18,7 +18,7 @@ namespace Saxonite.Net.Standard.Base.App
 		//-------------------------------------------------------------------
 		public static class Version
 		{
-			private static String version { get; } = "1.0.8.1";
+			private static String version { get; } = "1.0.9.0";
 			// Retrieve version.
 			public static String GetFullVersion () { return version; }
 			public static String GetAppVersion ()
@@ -40,6 +40,8 @@ namespace Saxonite.Net.Standard.Base.App
 		//-------------------------------------------------------------------
 		// Version history.
 		//-------------------------------------------------------------------
+		//    1.0.9   ?-Jun-2021   Journalist Articles
+		//            - Online Article Images.
 		//    1.0.8   15-Jun-2021   Online Article Content
 		//            - Journalist Articles styled content.
 		//            - Online home page click through activity for details with reaction.

SaxoniteStandardBase/Base/App/Sax.cs

@@ -227,8 +227,12 @@ namespace Saxonite.Net.Standard.Base.App
 			Unknown,
 			/// <summary>User's profile image.</summary>
 			Avatar = 100,
-			/// <summary>User's new profile image awaiting confirmation.</summary>
+			/// <summary>User's profile image, uploaded awaiting confirmation.</summary>
 			AvatarUpload = 101,
+			/// <summary>Journalist Article image.</summary>
+			Article = 200,
+			/// <summary>Journalist Article image uploaded, awaiting confirmation.</summary>
+			ArticleUpload = 201,
 		}
 
 		//-------------------------------------------------------------------

SaxoniteStandardBase/Base/App/SaxDbDfn_Core.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 //---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Fri 18-Jun-2021 11:08:40
+// Code generated by Sarand Database Utilities Tue 22-Jun-2021 08:56:11
 //---------------------------------------------------------------------------
 namespace Saxonite.Base.App
 {
@@ -57,6 +57,8 @@ namespace Saxonite.Base.App
 			ItemImage_ItemId,
 			ItemImage_ImageType,
 			ItemImage_ImageSeq,
+			ItemImage_SessionUid,
+			ItemImage_ImageUid,
 			ItemImage_Filename,
 			ItemImage_Mime,
 			ItemImage_ContentType,
@@ -269,7 +271,7 @@ namespace Saxonite.Base.App
 		//-------------------------------------------------------------------
 		// Data members.
 		private static readonly int tableCount  = 14;
-		private static readonly int columnCount = 226;
+		private static readonly int columnCount = 228;
 		private static ulong        maxTextLen  = 0;
 
 		//-------------------------------------------------------------------
@@ -474,6 +476,8 @@ namespace Saxonite.Base.App
 			new ColumnDfn(2,"ItemId",4,4,false,10),
 			new ColumnDfn(2,"ImageType",3,5,false,5),
 			new ColumnDfn(2,"ImageSeq",2,-6,false,3),
+			new ColumnDfn(2,"SessionUid",5,-5,false,19),
+			new ColumnDfn(2,"ImageUid",4,4,false,10),
 			new ColumnDfn(2,"Filename",0,-9,false,1024),
 			new ColumnDfn(2,"Mime",0,12,false,64),
 			new ColumnDfn(2,"ContentType",0,12,false,128),

SaxoniteStandardBase/Base/App/SaxSessionData.cs

@@ -10,6 +10,7 @@ using System.Text;
 using System.Diagnostics;
 using Sarand.Net.Standard.Base.Utils;
 using Newtonsoft.Json.Converters;
+using Sarand.Net.Standard.Base.Helpers;
 
 namespace Saxonite.Net.Standard.Base.App
 {
@@ -17,16 +18,15 @@ namespace Saxonite.Net.Standard.Base.App
 	public abstract class SaxSessionData
 	{
 		//-------------------------------------------------------------------
-		// Protected construction.
-		protected SaxSessionData()
-		{
-		}
+		private static long sessionIdxRoot = SacsRandomHelper.GetInt32(1000, 1999);
 
 		//-------------------------------------------------------------------
 		// Construction.
-		/// <summary>Hidden constructor for deserialisation only.</summary>
-		private SaxSessionData(SaxSessionContext sessionContext)
+		/// <summary>Protected constructor for deserialisation only.</summary>
+		protected SaxSessionData(long sessionIdx, int itemIdx, SaxSessionContext sessionContext)
 		{
+			SessionIdx = sessionIdx;
+			ItemIdx = itemIdx;
 			SessionContext = sessionContext;
 			userData = CreateUserData(SessionContext, null, null);
 		}
@@ -37,12 +37,20 @@ namespace Saxonite.Net.Standard.Base.App
 		/// </summary>
 		protected SaxSessionData(SaxSessionContext sessionContext, SaxUserAccount userAccount, List<SaxUserRole> userRoles)
 		{
+			SessionIdx = ++sessionIdxRoot;
+			ItemIdx = 1000;
 			SessionContext = sessionContext;
 			userData = CreateUserData(SessionContext, userAccount, userRoles);
 		}
 
 		//-------------------------------------------------------------------
 		// Properties.
+		// Session and Item indexers.
+		public long SessionIdx { get; }
+		public int ItemIdx { get; private set; }
+		[JsonIgnore]
+		public int NextItemIdx { get { return ++ItemIdx; } }
+		// Session context.
 		public SaxSessionContext SessionContext { get; }
 		[JsonIgnore]
 		public bool ValidUserSession { get { return SysId.IsValid(User.UserAccountId) && SysId.IsValid(User.UserAccountId); } }

SaxoniteStandardBase/Base/App/SaxSystem-Statics.cs

@@ -98,6 +98,8 @@ 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.Article, "Article", "Article");
+			imageTypeCodes.Add(Sax.ImageType.ArticleUpload, "ArticleUpload", "Article - upload");
 
 			//---------------------------------------------------------------
 			// Organisation types.