diff --git a/SaBusMgrStandardBase/Base/App/Sbm-Version.cs b/SaBusMgrStandardBase/Base/App/Sbm-Version.cs
index cdab7f3..3ac211f 100644
--- a/SaBusMgrStandardBase/Base/App/Sbm-Version.cs
+++ b/SaBusMgrStandardBase/Base/App/Sbm-Version.cs
@@ -15,7 +15,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
//-------------------------------------------------------------------
public static class Version
{
- private static String version { get; } = "3.0.0.5";
+ private static String version { get; } = "3.0.0.6";
// Retrieve version.
public static String GetFullVersion() { return version; }
public static String GetAppVersion()
@@ -44,6 +44,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
// 3.0.0.3 10-Feb-25 Osie feedback #1. Control Repository Schema, Logs.
// 3.0.0.4 11-Feb-25 Portal Commodity Sales properties. Control Index population.
// 3.0.0.5 12-Feb-25 Portal Security forms tidy. Default Commodity type. Code Types and Codes.
+ // 3.0.0.6 13-Feb-25 Main page layouts. Demo Account registration.
//-------------------------------------------------------------------
}
//=======================================================================
diff --git a/SaBusMgrStandardBase/Base/App/SbmDbDfn_Control.cs b/SaBusMgrStandardBase/Base/App/SbmDbDfn_Control.cs
index c0d5f57..9679353 100644
--- a/SaBusMgrStandardBase/Base/App/SbmDbDfn_Control.cs
+++ b/SaBusMgrStandardBase/Base/App/SbmDbDfn_Control.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Base.App
{
@@ -35,7 +35,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
AccountRegistration_LastName,
AccountRegistration_PhoneMain,
AccountRegistration_PhoneAlt,
- AccountRegistration_InstanceContext,
+ AccountRegistration_RepositoryContext,
AccountRegistration_RequestAccountAt,
AccountRegistration_RegisterAccountToken,
AccountRegistration_RegisterAccountAt,
@@ -342,7 +342,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.App
new ColumnDfn(1,"LastName",0,-9,false,100),
new ColumnDfn(1,"PhoneMain",0,-9,false,100),
new ColumnDfn(1,"PhoneAlt",0,-9,false,100),
- new ColumnDfn(1,"InstanceContext",0,-9,false,100),
+ new ColumnDfn(1,"RepositoryContext",0,-9,false,100),
new ColumnDfn(1,"RequestAccountAt",9,93,false,23),
new ColumnDfn(1,"RegisterAccountToken",10,-11,false,36),
new ColumnDfn(1,"RegisterAccountAt",9,93,false,23),
diff --git a/SaBusMgrStandardBase/Base/Bus/Control/SbmcAccountRegistration.cs b/SaBusMgrStandardBase/Base/Bus/Control/SbmcAccountRegistration.cs
index 11f9a5e..b6b85e9 100644
--- a/SaBusMgrStandardBase/Base/Bus/Control/SbmcAccountRegistration.cs
+++ b/SaBusMgrStandardBase/Base/Bus/Control/SbmcAccountRegistration.cs
@@ -29,7 +29,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
LastName,
PhoneMain,
PhoneAlt,
- InstanceContext,
+ RepositoryContext,
RequestAccountAt,
RegisterAccountToken,
RegisterAccountAt,
@@ -52,7 +52,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
public String LastName { get; set; } = "";
public String PhoneMain { get; set; } = "";
public String PhoneAlt { get; set; } = "";
- public String InstanceContext { get; set; } = "";
+ public String RepositoryContext { get; set; } = "";
public DateTime RequestAccountAt { get; set; }
public Guid RegisterAccountToken { get; set; }
public DateTime? RegisterAccountAt { get; set; }
@@ -96,10 +96,10 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
get { return data.PhoneAlt; }
set { CheckChanged(data.PhoneAlt, value); data.PhoneAlt = value; }
}
- public String InstanceContext
+ public String RepositoryContext
{
- get { return data.InstanceContext; }
- set { CheckChanged(data.InstanceContext, value); data.InstanceContext = value; }
+ get { return data.RepositoryContext; }
+ set { CheckChanged(data.RepositoryContext, value); data.RepositoryContext = value; }
}
public DateTime RequestAccountAt
{
@@ -134,7 +134,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
FirstName = data.FirstName;
PhoneMain = data.PhoneMain;
PhoneAlt = data.PhoneAlt;
- InstanceContext = data.InstanceContext;
+ RepositoryContext = data.RepositoryContext;
RequestAccountAt = data.RequestAccountAt;
RegisterAccountToken = data.RegisterAccountToken;
RegisterAccountAt = data.RegisterAccountAt;
@@ -157,7 +157,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
public ValidValue LastName { get; set; } = ValidValue.Valid;
public ValidValue PhoneMain { get; set; } = ValidValue.Valid;
public ValidValue PhoneAlt { get; set; } = ValidValue.Valid;
- public ValidValue InstanceContext { get; set; } = ValidValue.Valid;
+ public ValidValue RepositoryContext { get; set; } = ValidValue.Valid;
public ValidValue RequestAccountAt { get; set; } = ValidValue.Valid;
public ValidValue RegisterAccountToken { get; set; } = ValidValue.Valid;
public ValidValue RegisterAccountAt { get; set; } = ValidValue.Valid;
@@ -276,10 +276,10 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus.Control
// Registration.
- public String InstanceContext
+ public String RepositoryContext
{
- get { return data.InstanceContext; }
- set { data.InstanceContext = value; }
+ get { return data.RepositoryContext; }
+ set { data.RepositoryContext = value; }
}
public DateTime RequestAccountAt
{
diff --git a/SaBusMgrStandardBase/Base/Consoles/SbmCoreInstanceConsole.cs b/SaBusMgrStandardBase/Base/Consoles/SbmCoreInstanceConsole.cs
index 17f099e..31fdb45 100644
--- a/SaBusMgrStandardBase/Base/Consoles/SbmCoreInstanceConsole.cs
+++ b/SaBusMgrStandardBase/Base/Consoles/SbmCoreInstanceConsole.cs
@@ -493,6 +493,20 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Consoles
//-------------------------------------------------------------------
+ ///
+ /// Check whether User Account already exists, ie. Security Item with matching code/email.
+ ///
+ public bool UserAccountExists(SbmRepositoryPopulationData.UserAccount userAccount)
+ {
+ String userCode = StringUtil.OnBlank(userAccount.UserCode, userAccount.Email);
+ SaSecurityItem securityItemUser = SecurityConsole.GetSecurityItemByCode(SaSecurity.ItemType.User, userCode);
+ if (securityItemUser != null)
+ return true;
+ return false;
+ }
+
+ //-------------------------------------------------------------------
+
///
/// Add User Account.
///
diff --git a/SaBusMgrStandardBase/Base/Consoles/SbmDemoInstanceConsole.cs b/SaBusMgrStandardBase/Base/Consoles/SbmDemoInstanceConsole.cs
index 7615702..533b900 100644
--- a/SaBusMgrStandardBase/Base/Consoles/SbmDemoInstanceConsole.cs
+++ b/SaBusMgrStandardBase/Base/Consoles/SbmDemoInstanceConsole.cs
@@ -117,6 +117,15 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Consoles
//-------------------------------------------------------------------
// User Accounts.
+ ///
+ /// Check whether User Account already exists, ie. Security Item with matching code/email.
+ ///
+ public bool UserAccountExists(SbmRepositoryPopulationData.UserAccount userAccount)
+ {
+ ClearErrorState();
+ return InstanceConsole.UserAccountExists(userAccount);
+ }
+
///
/// Add User Account.
///
diff --git a/SaBusMgrStandardBase/Base/Core/ISbmCoreInstanceConsole.cs b/SaBusMgrStandardBase/Base/Core/ISbmCoreInstanceConsole.cs
index 11108f2..08b6c65 100644
--- a/SaBusMgrStandardBase/Base/Core/ISbmCoreInstanceConsole.cs
+++ b/SaBusMgrStandardBase/Base/Core/ISbmCoreInstanceConsole.cs
@@ -47,6 +47,13 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Core
///
bool InitialiseRepository(SbmRepositoryInitialisationData initData);
+ //-------------------------------------------------------------------
+
+ ///
+ /// Check whether User Account already exists, ie. Security Item with matching code/email.
+ ///
+ abstract bool UserAccountExists(SbmRepositoryPopulationData.UserAccount userAccount);
+
///
/// Add User Account.
///
diff --git a/SaBusMgrStandardBase/Base/Core/ISbmDemoInstanceConsole.cs b/SaBusMgrStandardBase/Base/Core/ISbmDemoInstanceConsole.cs
index 594226c..0fdb628 100644
--- a/SaBusMgrStandardBase/Base/Core/ISbmDemoInstanceConsole.cs
+++ b/SaBusMgrStandardBase/Base/Core/ISbmDemoInstanceConsole.cs
@@ -42,6 +42,14 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Core
///
abstract bool PopulateRepository(SbmRepositoryPopulationData data);
+ ///
+ /// Get Affiliate Owner Ids for Internal Associations.
+ ///
+ abstract HashSet GetInternalAssociationAffiliateIdsOwner();
+
+ //-------------------------------------------------------------------
+ // User Security.
+
public enum SecurityGroup { Standard, Super }
///
/// Security Group codes - as set up during initialisation.
@@ -49,9 +57,9 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Core
abstract String GetSecurityGroupCode(SecurityGroup group);
///
- /// Get Affiliate Owner Ids for Internal Associations.
+ /// Check whether User Account already exists, ie. Security Item with matching code/email.
///
- abstract HashSet GetInternalAssociationAffiliateIdsOwner();
+ abstract bool UserAccountExists(SbmRepositoryPopulationData.UserAccount userAccount);
///
/// Add User Account.
diff --git a/SaBusMgrStandardBase/Base/Mgr/Control/SbmcAccountMgr_AccountRegistration.cs b/SaBusMgrStandardBase/Base/Mgr/Control/SbmcAccountMgr_AccountRegistration.cs
index e919ea1..0072b6f 100644
--- a/SaBusMgrStandardBase/Base/Mgr/Control/SbmcAccountMgr_AccountRegistration.cs
+++ b/SaBusMgrStandardBase/Base/Mgr/Control/SbmcAccountMgr_AccountRegistration.cs
@@ -121,6 +121,11 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr.Control
}
// Registration.
+ if (errField.RepositoryContext != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.RepositoryContext, "context", (long)SbmDbDfn_Control.GetColTextLen(SbmDbDfn_Control.ColumnIdx.AccountRegistration_RepositoryContext)))
+ {
+ errField.RepositoryContext = SacsHierarchyItem.ValidValue.Invalid;
+ return false;
+ }
if (errField.RequestAccountAt != SacsHierarchyItem.ValidValue.Ignore && !DateUtil.IsValid(data.RequestAccountAt))
{
errField.AccountPasswordSalt = SacsHierarchyItem.ValidValue.Invalid;
diff --git a/SaBusMgrStandardBase/Base/Mgr/Control/SbmcInstanceMgr_Repository.cs b/SaBusMgrStandardBase/Base/Mgr/Control/SbmcInstanceMgr_Repository.cs
index a1a953d..45077b9 100644
--- a/SaBusMgrStandardBase/Base/Mgr/Control/SbmcInstanceMgr_Repository.cs
+++ b/SaBusMgrStandardBase/Base/Mgr/Control/SbmcInstanceMgr_Repository.cs
@@ -49,12 +49,12 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Mgr.Control
prmRepository.StatusCat = SbmcRepository.StatusCat.Any;
return GetRepository(prmRepository);
}
- public SbmcRepository GetRepositoryByContext(String context)
+ public SbmcRepository GetRepositoryByContext(String repositoryContext)
{
ClearErrorState();
- if (StringUtil.IsBlank(context)) return null;
+ if (StringUtil.IsBlank(repositoryContext)) return null;
SbmcRepository.Params prmRepository = new SbmcRepository.Params();
- prmRepository.ContextsIncluded.Add(context);
+ prmRepository.ContextsIncluded.Add(repositoryContext);
prmRepository.StatusCat = SbmcRepository.StatusCat.Any;
return GetRepository(prmRepository);
}
diff --git a/SaBusMgrStandardDbas/Dbas/Internal/Control/AccountRegistration_Db.cs b/SaBusMgrStandardDbas/Dbas/Internal/Control/AccountRegistration_Db.cs
index 711ecab..90d6501 100644
--- a/SaBusMgrStandardDbas/Dbas/Internal/Control/AccountRegistration_Db.cs
+++ b/SaBusMgrStandardDbas/Dbas/Internal/Control/AccountRegistration_Db.cs
@@ -10,7 +10,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
{
@@ -26,7 +26,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
public ColumnDataString _LastName { get; } = new ColumnDataString("LastName");
public ColumnDataString _PhoneMain { get; } = new ColumnDataString("PhoneMain");
public ColumnDataString _PhoneAlt { get; } = new ColumnDataString("PhoneAlt");
- public ColumnDataString _InstanceContext { get; } = new ColumnDataString("InstanceContext");
+ public ColumnDataString _RepositoryContext { get; } = new ColumnDataString("RepositoryContext");
public ColumnDataDateTime _RequestAccountAt { get; } = new ColumnDataDateTime("RequestAccountAt");
public ColumnDataGuid _RegisterAccountToken { get; } = new ColumnDataGuid("RegisterAccountToken");
public ColumnDataDateTimeNullable _RegisterAccountAt { get; } = new ColumnDataDateTimeNullable("RegisterAccountAt");
@@ -53,7 +53,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
"LastName",
"PhoneMain",
"PhoneAlt",
- "InstanceContext",
+ "RepositoryContext",
"RequestAccountAt",
"RegisterAccountToken",
"RegisterAccountAt",
@@ -114,7 +114,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
public String _LastName { get { return Cols._LastName.Value; } set { Cols._LastName.Value = value; } }
public String _PhoneMain { get { return Cols._PhoneMain.Value; } set { Cols._PhoneMain.Value = value; } }
public String _PhoneAlt { get { return Cols._PhoneAlt.Value; } set { Cols._PhoneAlt.Value = value; } }
- public String _InstanceContext { get { return Cols._InstanceContext.Value; } set { Cols._InstanceContext.Value = value; } }
+ public String _RepositoryContext { get { return Cols._RepositoryContext.Value; } set { Cols._RepositoryContext.Value = value; } }
public DateTime _RequestAccountAt { get { return Cols._RequestAccountAt.Value; } set { Cols._RequestAccountAt.Value = value; } }
public Guid _RegisterAccountToken { get { return Cols._RegisterAccountToken.Value; } set { Cols._RegisterAccountToken.Value = value; } }
public DateTime? _RegisterAccountAt { get { return Cols._RegisterAccountAt.Value; } set { Cols._RegisterAccountAt.Value = value; } }
@@ -157,7 +157,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
_LastName = GetFieldString(dbDataReader, "LastName", _LastName);
_PhoneMain = GetFieldString(dbDataReader, "PhoneMain", _PhoneMain);
_PhoneAlt = GetFieldString(dbDataReader, "PhoneAlt", _PhoneAlt);
- _InstanceContext = GetFieldString(dbDataReader, "InstanceContext", _InstanceContext);
+ _RepositoryContext = GetFieldString(dbDataReader, "RepositoryContext", _RepositoryContext);
_RequestAccountAt = GetFieldDateTime(dbDataReader, "RequestAccountAt", _RequestAccountAt);
_RegisterAccountToken = GetFieldGuid(dbDataReader, "RegisterAccountToken", _RegisterAccountToken);
_RegisterAccountAt = GetFieldDateTimeNullable(dbDataReader, "RegisterAccountAt", _RegisterAccountAt);
@@ -198,7 +198,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
if (columnNames.ContainsCI("LastName")) AddCommandParameter(dbCommand, "@LastName", _LastName);
if (columnNames.ContainsCI("PhoneMain")) AddCommandParameter(dbCommand, "@PhoneMain", _PhoneMain);
if (columnNames.ContainsCI("PhoneAlt")) AddCommandParameter(dbCommand, "@PhoneAlt", _PhoneAlt);
- if (columnNames.ContainsCI("InstanceContext")) AddCommandParameter(dbCommand, "@InstanceContext", _InstanceContext);
+ if (columnNames.ContainsCI("RepositoryContext")) AddCommandParameter(dbCommand, "@RepositoryContext", _RepositoryContext);
if (columnNames.ContainsCI("RequestAccountAt")) AddCommandParameter(dbCommand, "@RequestAccountAt", _RequestAccountAt);
if (columnNames.ContainsCI("RegisterAccountToken")) AddCommandParameter(dbCommand, "@RegisterAccountToken", _RegisterAccountToken);
if (columnNames.ContainsCI("RegisterAccountAt")) AddCommandParameter(dbCommand, "@RegisterAccountAt", _RegisterAccountAt);
@@ -259,7 +259,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
if (columnNames.ContainsCI("LastName")) AddCommandParameter(dbCommand, "@LastName", _LastName);
if (columnNames.ContainsCI("PhoneMain")) AddCommandParameter(dbCommand, "@PhoneMain", _PhoneMain);
if (columnNames.ContainsCI("PhoneAlt")) AddCommandParameter(dbCommand, "@PhoneAlt", _PhoneAlt);
- if (columnNames.ContainsCI("InstanceContext")) AddCommandParameter(dbCommand, "@InstanceContext", _InstanceContext);
+ if (columnNames.ContainsCI("RepositoryContext")) AddCommandParameter(dbCommand, "@RepositoryContext", _RepositoryContext);
if (columnNames.ContainsCI("RequestAccountAt")) AddCommandParameter(dbCommand, "@RequestAccountAt", _RequestAccountAt);
if (columnNames.ContainsCI("RegisterAccountToken")) AddCommandParameter(dbCommand, "@RegisterAccountToken", _RegisterAccountToken);
if (columnNames.ContainsCI("RegisterAccountAt")) AddCommandParameter(dbCommand, "@RegisterAccountAt", _RegisterAccountAt);
diff --git a/SaBusMgrStandardDbas/Dbas/Internal/Control/ItemParam_Db.cs b/SaBusMgrStandardDbas/Dbas/Internal/Control/ItemParam_Db.cs
index c6a0108..0aa9ab4 100644
--- a/SaBusMgrStandardDbas/Dbas/Internal/Control/ItemParam_Db.cs
+++ b/SaBusMgrStandardDbas/Dbas/Internal/Control/ItemParam_Db.cs
@@ -10,7 +10,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
{
diff --git a/SaBusMgrStandardDbas/Dbas/Internal/Control/Owner_Db.cs b/SaBusMgrStandardDbas/Dbas/Internal/Control/Owner_Db.cs
index 04c764d..8c33604 100644
--- a/SaBusMgrStandardDbas/Dbas/Internal/Control/Owner_Db.cs
+++ b/SaBusMgrStandardDbas/Dbas/Internal/Control/Owner_Db.cs
@@ -10,7 +10,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
{
diff --git a/SaBusMgrStandardDbas/Dbas/Internal/Control/Repository_Db.cs b/SaBusMgrStandardDbas/Dbas/Internal/Control/Repository_Db.cs
index c07bf44..7af18ef 100644
--- a/SaBusMgrStandardDbas/Dbas/Internal/Control/Repository_Db.cs
+++ b/SaBusMgrStandardDbas/Dbas/Internal/Control/Repository_Db.cs
@@ -10,7 +10,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
{
diff --git a/SaBusMgrStandardDbas/Dbas/Internal/Control/UserAccount_Db.cs b/SaBusMgrStandardDbas/Dbas/Internal/Control/UserAccount_Db.cs
index c83fbb2..009d56f 100644
--- a/SaBusMgrStandardDbas/Dbas/Internal/Control/UserAccount_Db.cs
+++ b/SaBusMgrStandardDbas/Dbas/Internal/Control/UserAccount_Db.cs
@@ -10,7 +10,7 @@ using System.Data.Common;
using System.Linq;
//---------------------------------------------------------------------------
-// Code generated by Sarand Database Utilities Thu 6-Feb-2025 13:02:19
+// Code generated by Sarand Database Utilities Thu 13-Feb-2025 11:12:01
//---------------------------------------------------------------------------
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Internal.Control
{
diff --git a/SaBusMgrStandardDbas/Dbas/Mgr/Control/SbmcAccountMgr_Dbas-AccountRegistration.cs b/SaBusMgrStandardDbas/Dbas/Mgr/Control/SbmcAccountMgr_Dbas-AccountRegistration.cs
index 08b7b79..543cc4f 100644
--- a/SaBusMgrStandardDbas/Dbas/Mgr/Control/SbmcAccountMgr_Dbas-AccountRegistration.cs
+++ b/SaBusMgrStandardDbas/Dbas/Mgr/Control/SbmcAccountMgr_Dbas-AccountRegistration.cs
@@ -207,7 +207,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
dbAccountRegistration._PhoneMain = accountRegistration.PhoneMain;
dbAccountRegistration._PhoneAlt = accountRegistration.PhoneAlt;
// Registration.
- dbAccountRegistration._InstanceContext = accountRegistration.InstanceContext;
+ dbAccountRegistration._RepositoryContext = accountRegistration.RepositoryContext;
dbAccountRegistration._RequestAccountAt = accountRegistration.RequestAccountAt;
dbAccountRegistration._RegisterAccountToken = accountRegistration.RegisterAccountToken;
dbAccountRegistration._RegisterAccountAt = accountRegistration.RegisterAccountAt;
@@ -238,7 +238,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
accountRegistration.PhoneMain = dbAccountRegistration._PhoneMain;
accountRegistration.PhoneAlt = dbAccountRegistration._PhoneAlt;
// Registration.
- accountRegistration.InstanceContext = dbAccountRegistration._InstanceContext;
+ accountRegistration.RepositoryContext = dbAccountRegistration._RepositoryContext;
accountRegistration.RequestAccountAt = dbAccountRegistration._RequestAccountAt;
//accountRegistration.RegisterAccountToken = dbAccountRegistration._RegisterAccountToken;
accountRegistration.RegisterAccountAt = dbAccountRegistration._RegisterAccountAt;
@@ -304,8 +304,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
break;
// Registration.
- case SbmcAccountRegistration.Column.InstanceContext:
- SetAccountRegistrationColDfn(columnDfn, "Instance context", 100, SbmDbDfn_Control.ColumnIdx.AccountRegistration_InstanceContext);
+ case SbmcAccountRegistration.Column.RepositoryContext:
+ SetAccountRegistrationColDfn(columnDfn, "Repository context", 100, SbmDbDfn_Control.ColumnIdx.AccountRegistration_RepositoryContext);
columnDfn.ReadOnly = true;
break;
case SbmcAccountRegistration.Column.RequestAccountAt:
@@ -539,8 +539,8 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
query.Columns.Add(SbmDbDfn_Control.GetColumnNameQual(SbmDbDfn_Control.ColumnIdx.AccountRegistration_PhoneAlt, aliasAccountRegistration));
// Registration.
- if (columns.HasId(SbmcAccountRegistration.Column.InstanceContext))
- query.Columns.Add(SbmDbDfn_Control.GetColumnNameQual(SbmDbDfn_Control.ColumnIdx.AccountRegistration_InstanceContext, aliasAccountRegistration));
+ if (columns.HasId(SbmcAccountRegistration.Column.RepositoryContext))
+ query.Columns.Add(SbmDbDfn_Control.GetColumnNameQual(SbmDbDfn_Control.ColumnIdx.AccountRegistration_RepositoryContext, aliasAccountRegistration));
if (columns.HasId(SbmcAccountRegistration.Column.RequestAccountAt))
query.Columns.Add(SbmDbDfn_Control.GetColumnNameQual(SbmDbDfn_Control.ColumnIdx.AccountRegistration_RequestAccountAt, aliasAccountRegistration));
if (columns.HasId(SbmcAccountRegistration.Column.RegisterAccountToken))
diff --git a/SaBusMgrStandardDbas/Resources/Database/SbmDbDfn_Control.xml b/SaBusMgrStandardDbas/Resources/Database/SbmDbDfn_Control.xml
index b7f0a7a..77690df 100644
--- a/SaBusMgrStandardDbas/Resources/Database/SbmDbDfn_Control.xml
+++ b/SaBusMgrStandardDbas/Resources/Database/SbmDbDfn_Control.xml
@@ -112,7 +112,7 @@
dbo
7
- InstanceContext
+ RepositoryContext
VarChar
-9
@@ -375,7 +375,7 @@
false
false
1
- 1
+ 3
false
@@ -1386,7 +1386,7 @@
false
false
1
- 7
+ 8
false
diff --git a/SaBusMgrTest_Control/Web/Control/App/SbmApplication_Tester_Base.cs b/SaBusMgrTest_Control/Web/Control/App/SbmApplication_Tester_Base.cs
index 7b7254d..c0d86dc 100644
--- a/SaBusMgrTest_Control/Web/Control/App/SbmApplication_Tester_Base.cs
+++ b/SaBusMgrTest_Control/Web/Control/App/SbmApplication_Tester_Base.cs
@@ -71,12 +71,12 @@ namespace Sarand.BusinessMgr.Test.Web.Control.App
//-------------------------------------------------------------------
// Core Instance Console.
- protected SbmCoreInstanceConsole_Control CreateCoreInstanceConsole(String instanceContext)
+ protected SbmCoreInstanceConsole_Control CreateCoreInstanceConsole(String repositoryContext)
{
// Record disposable items as they are created so all can be disposed when needed.
using (DisposableCollection disposables = new DisposableCollection())
{
- SbmcRepository repository = Internals_Control.ControlInstanceMgr.GetRepositoryByContext(instanceContext);
+ SbmcRepository repository = Internals_Control.ControlInstanceMgr.GetRepositoryByContext(repositoryContext);
disposables.Add(repository);
return new SbmCoreInstanceConsole_Control(SessionData_Control, repository);
}
diff --git a/SaBusMgrTest_Portal/Web/Portal/App/SbmApplication_Tester_Base.cs b/SaBusMgrTest_Portal/Web/Portal/App/SbmApplication_Tester_Base.cs
index 5520a6f..42c9eb8 100644
--- a/SaBusMgrTest_Portal/Web/Portal/App/SbmApplication_Tester_Base.cs
+++ b/SaBusMgrTest_Portal/Web/Portal/App/SbmApplication_Tester_Base.cs
@@ -70,9 +70,9 @@ namespace Sarand.BusinessMgr.Test.Web.Portal.App
//-------------------------------------------------------------------
// Session Context.
- protected SbmSessionContext GetCoreSessionContext(String instanceContext)
+ protected SbmSessionContext GetCoreSessionContext(String repositoryContext)
{
- return AppPortal.GetControlSessionContextByRepositoryContext(instanceContext);
+ return AppPortal.GetControlSessionContextByRepositoryContext(repositoryContext);
}
//-------------------------------------------------------------------
diff --git a/SaBusinessMgrCoreWebControl/Control/App/SbmApplication_Control.cs b/SaBusinessMgrCoreWebControl/Control/App/SbmApplication_Control.cs
index c5614b9..097d5a5 100644
--- a/SaBusinessMgrCoreWebControl/Control/App/SbmApplication_Control.cs
+++ b/SaBusinessMgrCoreWebControl/Control/App/SbmApplication_Control.cs
@@ -34,7 +34,7 @@ namespace Sarand.BusinessMgr.Web.Control.App
{
//-------------------------------------------------------------------
// Processing indicators.
- private bool generateDatabaseDefinitions_Control = false;
+ private bool generateDatabaseDefinitions_Control = true;
private bool generateDatabaseDefinitions_BusMgr = false;
private bool generateDatabaseDefinitions_Security = false;
private bool generateDatabaseDefinitions_CodeTypes = false;
diff --git a/SaBusinessMgrCoreWebControl/Control/App/SbmSessionData_Control.cs b/SaBusinessMgrCoreWebControl/Control/App/SbmSessionData_Control.cs
index 62ba912..f57a2ee 100644
--- a/SaBusinessMgrCoreWebControl/Control/App/SbmSessionData_Control.cs
+++ b/SaBusinessMgrCoreWebControl/Control/App/SbmSessionData_Control.cs
@@ -113,8 +113,8 @@ namespace Sarand.BusinessMgr.Web.Control.App
// Common filter.
public class FilterData
{
- /// Id for currently selected Association.
- public String InstanceContext { get; set; }
+ /// Currently selected Repository Context
+ public String RepositoryContext { get; set; }
}
///
/// Common filter properties.
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Account/UserAccountController-Ajax.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Account/UserAccountController-Ajax.cs
index 38720c4..791149f 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Account/UserAccountController-Ajax.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Account/UserAccountController-Ajax.cs
@@ -329,6 +329,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Account
SaLogger.Warn($"{SysUtil.Fn} Failed to insert user: " + ControlAccountMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ControlAccountMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.created"]);
}
else
{
@@ -337,6 +338,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Account
SaLogger.Warn($"{SysUtil.Fn} Failed to update user [Id:" + SysId.ToString(user.Id) + "]: " + ControlAccountMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ControlAccountMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.updated"]);
}
// Construct response.
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/OwnerController-Ajax.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/OwnerController-Ajax.cs
index 66a561a..daefe2d 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/OwnerController-Ajax.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/OwnerController-Ajax.cs
@@ -264,6 +264,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
SaLogger.Warn($"{SysUtil.Fn} Failed to insert owner: " + ControlInstanceMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ControlInstanceMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.created"]);
}
else
{
@@ -272,6 +273,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
SaLogger.Warn($"{SysUtil.Fn} Failed to update owner [Id:" + SysId.ToString(owner.Id) + "]: " + ControlInstanceMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ControlInstanceMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.updated"]);
}
// Construct response.
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryController-Ajax.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryController-Ajax.cs
index a634154..0bc1676 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryController-Ajax.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryController-Ajax.cs
@@ -362,6 +362,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
SaLogger.Warn($"{SysUtil.Fn} Failed to insert repository: " + ControlInstanceMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ControlInstanceMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.created"]);
}
else
{
@@ -370,6 +371,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
SaLogger.Warn($"{SysUtil.Fn} Failed to update repository [Id:" + SysId.ToString(repository.Id) + "]: " + ControlInstanceMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ControlInstanceMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.updated"]);
}
// Construct response.
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController-Ajax.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController-Ajax.cs
index 0547e12..49f2e20 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController-Ajax.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController-Ajax.cs
@@ -63,10 +63,10 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
{
// Validate Repository.
- SessionData_Control.Profile.Filter.InstanceContext = model.DatabaseFilter.Context;
+ SessionData_Control.Profile.Filter.RepositoryContext = model.DatabaseFilter.Context;
if (StringUtil.IsBlank(model.DatabaseFilter.Context))
{
- SaLogger.Warn($"{SysUtil.Fn} Instance Context not supplied.");
+ SaLogger.Warn($"{SysUtil.Fn} Repository Context not supplied.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(model.DatabaseFilter.Context);
@@ -169,10 +169,10 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
{
// Validate Repository.
- SessionData_Control.Profile.Filter.InstanceContext = model.DatabaseFilter.Context;
+ SessionData_Control.Profile.Filter.RepositoryContext = model.DatabaseFilter.Context;
if (StringUtil.IsBlank(model.DatabaseFilter.Context))
{
- SaLogger.Warn($"{SysUtil.Fn} Instance Context not supplied.");
+ SaLogger.Warn($"{SysUtil.Fn} Repository Context not supplied.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(model.DatabaseFilter.Context);
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController.cs
index 7813b9b..257c8ba 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController.cs
@@ -36,7 +36,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
// Refresh model.
RefreshModel(model);
- model.DatabaseFilter.Context = SessionData_Control.Profile.Filter.InstanceContext;
+ model.DatabaseFilter.Context = SessionData_Control.Profile.Filter.RepositoryContext;
// Core Database view.
return View("Views/Instance/Repository/Database/Tables.cshtml", model);
@@ -59,7 +59,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
// Refresh model.
Model_System model = new Model_System(Localiser);
RefreshModel(model);
- model.DatabaseFilter.Instance = SessionData_Control.Profile.Filter.InstanceContext;
+ model.DatabaseFilter.Context = SessionData_Control.Profile.Filter.RepositoryContext;
// Core Database view.
return View("Views/Instance/Repository/Database/Schema.cshtml", model);
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/Param/ParamController-Ajax.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/Param/ParamController-Ajax.cs
index a427166..15eef0c 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/Param/ParamController-Ajax.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/Param/ParamController-Ajax.cs
@@ -414,6 +414,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Param
SaLogger.Warn($"{SysUtil.Fn} Failed to insert Item Param: " + ControlItemMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.insert.failed"] + "\n\n" + ControlItemMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.created"]);
}
else
{
@@ -422,6 +423,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Param
SaLogger.Warn($"{SysUtil.Fn} Failed to update Item Param [Id:" + SysId.ToString(itemParam.Id) + "]: " + ControlItemMgr.ErrorStateMessage);
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.item.update.failed"] + "\n\n" + ControlItemMgr.ErrorStateMessage));
}
+ responseData.SetNotification(messageTitle, Localiser["msg.item.updated"]);
}
// Construct response.
diff --git a/SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController-Ajax-Database.cs b/SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController-Ajax-Database.cs
index 3317acb..921d0f9 100644
--- a/SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController-Ajax-Database.cs
+++ b/SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController-Ajax-Database.cs
@@ -147,11 +147,11 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.System
return null;
}
///
- /// Get database by Instance Context.
+ /// Get database by Repository Context.
///
- private ISacsDatabase GetDatabaseByContext(String instanceContext)
+ private ISacsDatabase GetDatabaseByContext(String repositoryContext)
{
- SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(instanceContext);
+ SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(repositoryContext);
if (repository != null)
{
SacsDatabaseConsole.OdbcConfig config = SbmCoreInstanceConsole_Dbas.GetRepositoryOdbcConfig(repository);
diff --git a/SaBusinessMgrCoreWebControl/Localisation/SbmControlProperties.resx b/SaBusinessMgrCoreWebControl/Localisation/SbmControlProperties.resx
index 576a6c7..12f11db 100644
--- a/SaBusinessMgrCoreWebControl/Localisation/SbmControlProperties.resx
+++ b/SaBusinessMgrCoreWebControl/Localisation/SbmControlProperties.resx
@@ -543,4 +543,10 @@
Repository Database
+
+ Item updated.
+
+
+ Item created.
+
\ No newline at end of file
diff --git a/SaBusinessMgrCoreWebControl/Views/Shared/_Layout.cshtml b/SaBusinessMgrCoreWebControl/Views/Shared/_Layout.cshtml
index 3654e9a..50e2489 100644
--- a/SaBusinessMgrCoreWebControl/Views/Shared/_Layout.cshtml
+++ b/SaBusinessMgrCoreWebControl/Views/Shared/_Layout.cshtml
@@ -93,11 +93,11 @@
@* Header *@
-