admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-01-16 00:45:36 +00:00
parent 8d39767e9d
commit 3c8bcdb7a9
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/AyaNova/biz/ObjectFields.cs
View File

@@ -153,10 +153,10 @@ namespace AyaNova.Biz
*/ */
case WIDGET_KEY: case WIDGET_KEY:
#region WIDGET_KEY #region WIDGET_KEY
//first column is the non visible Default Id column so that the client knows what to open when there is no field with ID selected that matches underlying record type //first column is the non visible Default Id column so that the client knows what to open when there is no field with ID selected that matches underlying record type
//in this case the default of id is sufficient for this list //in this case the default of id is sufficient for this list
l.Add(new ObjectField { Key = "_df_", AyObjectType=(int)AyaType.Widget }); l.Add(new ObjectField { Key = "_df_", AyObjectType = (int)AyaType.Widget });
l.Add(new ObjectField { Key = "WidgetName", PropertyName = "Name", DataType = (int)AyaDataType.Text, Hideable = false }); l.Add(new ObjectField { Key = "WidgetName", PropertyName = "Name", DataType = (int)AyaDataType.Text, Hideable = false });
l.Add(new ObjectField { Key = "WidgetSerial", PropertyName = "Serial", DataType = (int)AyaDataType.Integer }); l.Add(new ObjectField { Key = "WidgetSerial", PropertyName = "Serial", DataType = (int)AyaDataType.Integer });
l.Add(new ObjectField { Key = "WidgetDollarAmount", PropertyName = "DollarAmount", DataType = (int)AyaDataType.Currency }); l.Add(new ObjectField { Key = "WidgetDollarAmount", PropertyName = "DollarAmount", DataType = (int)AyaDataType.Currency });
@@ -188,7 +188,7 @@ namespace AyaNova.Biz
#endregion #endregion
case USER_KEY: case USER_KEY:
#region USER_KEY #region USER_KEY
l.Add(new ObjectField { Key = "_df_", AyObjectType=(int)AyaType.User }); l.Add(new ObjectField { Key = "_df_", AyObjectType = (int)AyaType.User });
l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, DataType = (int)AyaDataType.Text, Hideable = false }); l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, DataType = (int)AyaDataType.Text, Hideable = false });
l.Add(new ObjectField { Key = "UserEmployeeNumber", PropertyName = "EmployeeNumber", DataType = (int)AyaDataType.Text }); l.Add(new ObjectField { Key = "UserEmployeeNumber", PropertyName = "EmployeeNumber", DataType = (int)AyaDataType.Text });
l.Add(new ObjectField { Key = "AuthorizationRoles", PropertyName = "Roles", Hideable = false, DataType = (int)AyaDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() }); l.Add(new ObjectField { Key = "AuthorizationRoles", PropertyName = "Roles", Hideable = false, DataType = (int)AyaDataType.Enum, EnumType = typeof(AuthorizationRoles).ToString() });
@@ -267,8 +267,16 @@ namespace AyaNova.Biz
foreach (string s in fullFields) foreach (string s in fullFields)
{ {
ObjectField o = fields.FirstOrDefault(x => x.Key == s); ObjectField o = fields.FirstOrDefault(x => x.Key == s);
#if (DEBUG)
//Developers little helper
if (o == null)
{
throw new System.ArgumentNullException($"DEV ERROR in objectFields::GenerateListColumnsJSONFromTemplate - field {s} specified in template was NOT found in ObjectFields list for key \"{ObjectKey}\"");
}
#endif
if (o != null) if (o != null)
{//Here is where we can vet the field name, if it doesn't exist though, for now we'll just ignore those ones {//Here is where we can vet the field name, if it doesn't exist. For production we'll just ignore those ones
sb.Append(","); sb.Append(",");
sb.Append("{"); sb.Append("{");

9
server/AyaNova/biz/SqlSelectBuilder.cs
View File

@@ -47,7 +47,14 @@ namespace AyaNova.Biz
foreach (string ColumnName in templateFieldList) foreach (string ColumnName in templateFieldList)
{ {
ObjectField o = objectFieldsList.FirstOrDefault(x => x.Key == s); ObjectField o = objectFieldsList.FirstOrDefault(x => x.Key == ColumnName);
#if (DEBUG)
//Developers little helper
if (o == null)
{
throw new System.ArgumentNullException($"DEV ERROR in SqlSelectBuilder.cs: field {ColumnName} specified in template was NOT found in ObjectFields list for key \"{objectKey}\"");
}
#endif
if (o != null) if (o != null)
{//Here is where we can vet the field name, if it doesn't exist though, for now we'll just ignore those ones {//Here is where we can vet the field name, if it doesn't exist though, for now we'll just ignore those ones