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-28 22:47:33 +00:00
parent 6fbac46849
commit d052f3ce34
8 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/AyaNova/Controllers/EnumPickListController.cs
View File

@@ -64,8 +64,8 @@ namespace AyaNova.Api.Controllers
case "datatypes": case "datatypes":
{ {
//Iterate the enum and get the values //Iterate the enum and get the values
Type t = typeof(AyaUiFieldDataType); Type t = typeof(UiFieldDataType);
Enum.GetName(t, AyaUiFieldDataType.NoType); Enum.GetName(t, UiFieldDataType.NoType);
foreach (var dt in Enum.GetValues(t)) foreach (var dt in Enum.GetValues(t))
{ {
ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt }); ReturnList.Add(new NameIdItem() { Name = Enum.GetName(t, dt), Id = (int)dt });

2
server/AyaNova/DataList/AyaDataList.cs
View File

@@ -29,7 +29,7 @@ namespace AyaNova.DataList
public Newtonsoft.Json.Linq.JArray GenerateMINIListColumnsJSON() public Newtonsoft.Json.Linq.JArray GenerateMINIListColumnsJSON()
{ {
//return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"; //return $"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]";
return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)AyaUiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]"); return JArray.Parse($"[ {{\"cm\":\"df\",\"dt\":0,\"ay\":{(int)DefaultListObjectType}}},{{\"cm\":\"Widget\",\"dt\":{(int)UiFieldDataType.Text},\"ay\":{(int)DefaultListObjectType}}}]");
} }
public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template) public Newtonsoft.Json.Linq.JArray GenerateListColumnsJSONFromTemplate(string template)

32
server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs
View File

@@ -52,7 +52,7 @@ namespace AyaNova.DataList
} }
#endif #endif
var SQLValueColumnName = DataListField.GetSqlValueColumnName(); var SQLValueColumnName = DataListField.GetSqlValueColumnName();
sb.Append(DataFilterToColumnCriteria(SQLValueColumnName, (AyaUiFieldDataType)dataType, opType, val, tagList, userId)); sb.Append(DataFilterToColumnCriteria(SQLValueColumnName, (UiFieldDataType)dataType, opType, val, tagList, userId));
if (i < FilterArray.Count - 1) if (i < FilterArray.Count - 1)
{ {
sb.Append(") AND "); sb.Append(") AND ");
@@ -65,7 +65,7 @@ namespace AyaNova.DataList
/// <summary> /// <summary>
/// Translate DataFilter to Postgres friendly SQL criteria /// Translate DataFilter to Postgres friendly SQL criteria
/// </summary> /// </summary>
private static string DataFilterToColumnCriteria(string SqlColumnNameToFilter, AyaUiFieldDataType DataType, string sOperator, string sValue, List<string> sTags, long userId)//, bool IsCompound) private static string DataFilterToColumnCriteria(string SqlColumnNameToFilter, UiFieldDataType DataType, string sOperator, string sValue, List<string> sTags, long userId)//, bool IsCompound)
{ {
bool TagFilter = sTags.Count < 0; bool TagFilter = sTags.Count < 0;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -79,7 +79,7 @@ namespace AyaNova.DataList
{ {
switch (DataType) switch (DataType)
{ {
case AyaUiFieldDataType.Text: case UiFieldDataType.Text:
{ {
if (sOperator == DataListFilterComparisonOperator.Equality) if (sOperator == DataListFilterComparisonOperator.Equality)
{ {
@@ -156,7 +156,7 @@ namespace AyaNova.DataList
#region Build for specific type #region Build for specific type
switch (DataType) switch (DataType)
{ {
case AyaUiFieldDataType.Text: case UiFieldDataType.Text:
//escape any pre-existing apostrophes //escape any pre-existing apostrophes
//i.e. "O'Flaherty's pub" //i.e. "O'Flaherty's pub"
sValue = sValue.Replace("'", "''"); sValue = sValue.Replace("'", "''");
@@ -255,7 +255,7 @@ namespace AyaNova.DataList
} }
#endregion build text ops criteria #endregion build text ops criteria
break; break;
case AyaUiFieldDataType.Bool: case UiFieldDataType.Bool:
{ {
switch (sOperator) switch (sOperator)
{ {
@@ -283,9 +283,9 @@ namespace AyaNova.DataList
break; break;
//Note there are three types here for display purposes but all are stored in the db as a timestamp the same with date and time components //Note there are three types here for display purposes but all are stored in the db as a timestamp the same with date and time components
case AyaUiFieldDataType.Date: case UiFieldDataType.Date:
case AyaUiFieldDataType.DateTime: case UiFieldDataType.DateTime:
case AyaUiFieldDataType.Time: case UiFieldDataType.Time:
{ {
//Note: it is assumed all dates come into here from the CLIENT in UTC iso8601 format //Note: it is assumed all dates come into here from the CLIENT in UTC iso8601 format
//suitable for the database to handle as all database dates are in UTC //suitable for the database to handle as all database dates are in UTC
@@ -729,18 +729,18 @@ namespace AyaNova.DataList
} }
} }
break; break;
case AyaUiFieldDataType.Enum://enums are just ints to the db, but it's a special type so the client can recognize it case UiFieldDataType.Enum://enums are just ints to the db, but it's a special type so the client can recognize it
case AyaUiFieldDataType.Decimal: case UiFieldDataType.Decimal:
case AyaUiFieldDataType.Currency: case UiFieldDataType.Currency:
case AyaUiFieldDataType.Integer: //whole numbers, not only integer case UiFieldDataType.Integer: //whole numbers, not only integer
{ {
//case 1795 - it's numeric, convert to locale independant format //case 1795 - it's numeric, convert to locale independant format
//RAVEN NOTE: this code looks suspect to me, but I'll leave it in for now //RAVEN NOTE: this code looks suspect to me, but I'll leave it in for now
NumberFormatInfo nfi = System.Globalization.CultureInfo.CurrentCulture.NumberFormat; NumberFormatInfo nfi = System.Globalization.CultureInfo.CurrentCulture.NumberFormat;
switch (DataType) switch (DataType)
{ {
case AyaUiFieldDataType.Decimal: case UiFieldDataType.Decimal:
case AyaUiFieldDataType.Currency: case UiFieldDataType.Currency:
{ {
if (nfi.CurrencyDecimalSeparator != ".") if (nfi.CurrencyDecimalSeparator != ".")
{ {
@@ -749,7 +749,7 @@ namespace AyaNova.DataList
} }
} }
break; break;
case AyaUiFieldDataType.Integer: case UiFieldDataType.Integer:
{ {
if (nfi.NumberDecimalSeparator != ".") if (nfi.NumberDecimalSeparator != ".")
{ {
@@ -795,7 +795,7 @@ namespace AyaNova.DataList
} }
break; break;
} }
case AyaUiFieldDataType.Tags: case UiFieldDataType.Tags:
{ {
//Build tags filter fragment //Build tags filter fragment
//for initial release a tag filter is inclusive of all tags only //for initial release a tag filter is inclusive of all tags only

22
server/AyaNova/DataList/TestWidgetDataList.cs
View File

@@ -28,7 +28,7 @@ namespace AyaNova.DataList
LtKey = "WidgetName", LtKey = "WidgetName",
FieldKey = "widgetname", FieldKey = "widgetname",
AyaObjectType = (int)AyaType.Widget, AyaObjectType = (int)AyaType.Widget,
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "awidget.id", SqlIdColumnName = "awidget.id",
SqlValueColumnName = "awidget.name" SqlValueColumnName = "awidget.name"
}); });
@@ -36,28 +36,28 @@ namespace AyaNova.DataList
{ {
LtKey = "WidgetSerial", LtKey = "WidgetSerial",
FieldKey = "widgetserial", FieldKey = "widgetserial",
UiFieldDataType = (int)AyaUiFieldDataType.Integer, UiFieldDataType = (int)UiFieldDataType.Integer,
SqlValueColumnName = "awidget.serial" SqlValueColumnName = "awidget.serial"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "WidgetDollarAmount", LtKey = "WidgetDollarAmount",
FieldKey = "widgetdollaramount", FieldKey = "widgetdollaramount",
UiFieldDataType = (int)AyaUiFieldDataType.Currency, UiFieldDataType = (int)UiFieldDataType.Currency,
SqlValueColumnName = "awidget.dollaramount" SqlValueColumnName = "awidget.dollaramount"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "WidgetCount", LtKey = "WidgetCount",
FieldKey = "widgetcount", FieldKey = "widgetcount",
UiFieldDataType = (int)AyaUiFieldDataType.Integer, UiFieldDataType = (int)UiFieldDataType.Integer,
SqlValueColumnName = "awidget.count" SqlValueColumnName = "awidget.count"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "WidgetRoles", LtKey = "WidgetRoles",
FieldKey = "widgetroles", FieldKey = "widgetroles",
UiFieldDataType = (int)AyaUiFieldDataType.Enum, UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = typeof(AuthorizationRoles).ToString(), EnumType = typeof(AuthorizationRoles).ToString(),
SqlValueColumnName = "awidget.roles" SqlValueColumnName = "awidget.roles"
}); });
@@ -65,21 +65,21 @@ namespace AyaNova.DataList
{ {
LtKey = "WidgetStartDate", LtKey = "WidgetStartDate",
FieldKey = "widgetstartdate", FieldKey = "widgetstartdate",
UiFieldDataType = (int)AyaUiFieldDataType.DateTime, UiFieldDataType = (int)UiFieldDataType.DateTime,
SqlValueColumnName = "awidget.startdate" SqlValueColumnName = "awidget.startdate"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "WidgetEndDate", LtKey = "WidgetEndDate",
FieldKey = "widgetenddate", FieldKey = "widgetenddate",
UiFieldDataType = (int)AyaUiFieldDataType.DateTime, UiFieldDataType = (int)UiFieldDataType.DateTime,
SqlValueColumnName = "awidget.enddate" SqlValueColumnName = "awidget.enddate"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "WidgetNotes", LtKey = "WidgetNotes",
FieldKey = "widgetnotes", FieldKey = "widgetnotes",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlValueColumnName = "awidget.notes" SqlValueColumnName = "awidget.notes"
}); });
@@ -88,7 +88,7 @@ namespace AyaNova.DataList
{ {
FieldKey = "username", FieldKey = "username",
LtKey = "User", LtKey = "User",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
AyaObjectType = (int)AyaType.User, AyaObjectType = (int)AyaType.User,
SqlIdColumnName = "auser.id", SqlIdColumnName = "auser.id",
SqlValueColumnName = "auser.name" SqlValueColumnName = "auser.name"
@@ -97,14 +97,14 @@ namespace AyaNova.DataList
{ {
LtKey = "Active", LtKey = "Active",
FieldKey = "widgetactive", FieldKey = "widgetactive",
UiFieldDataType = (int)AyaUiFieldDataType.Bool, UiFieldDataType = (int)UiFieldDataType.Bool,
SqlValueColumnName = "awidget.active" SqlValueColumnName = "awidget.active"
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "Tags", LtKey = "Tags",
FieldKey = "widgettags", FieldKey = "widgettags",
UiFieldDataType = (int)AyaUiFieldDataType.Tags, UiFieldDataType = (int)UiFieldDataType.Tags,
SqlValueColumnName = "awidget.tags" SqlValueColumnName = "awidget.tags"
}); });

8
server/AyaNova/DataList/TestWidgetUserEmailDataList.cs
View File

@@ -33,7 +33,7 @@ namespace AyaNova.DataList
{ {
FieldKey = "widgetname", FieldKey = "widgetname",
LtKey = "WidgetName", LtKey = "WidgetName",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
AyaObjectType = (int)AyaType.Widget, AyaObjectType = (int)AyaType.Widget,
SqlIdColumnName = "awidget.id", SqlIdColumnName = "awidget.id",
SqlValueColumnName = "awidget.name" SqlValueColumnName = "awidget.name"
@@ -42,7 +42,7 @@ namespace AyaNova.DataList
{ {
FieldKey = "username", FieldKey = "username",
LtKey = "User", LtKey = "User",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
AyaObjectType = (int)AyaType.User, AyaObjectType = (int)AyaType.User,
SqlIdColumnName = "auser.id", SqlIdColumnName = "auser.id",
SqlValueColumnName = "auser.name" SqlValueColumnName = "auser.name"
@@ -52,14 +52,14 @@ namespace AyaNova.DataList
LtKey = "UserEmailAddress", LtKey = "UserEmailAddress",
FieldKey = "emailaddress", FieldKey = "emailaddress",
SqlValueColumnName = "auseroptions.emailaddress", SqlValueColumnName = "auseroptions.emailaddress",
UiFieldDataType = (int)AyaUiFieldDataType.EmailAddress UiFieldDataType = (int)UiFieldDataType.EmailAddress
}); });
FieldDefinitions.Add(new AyaDataListFieldDefinition FieldDefinitions.Add(new AyaDataListFieldDefinition
{ {
LtKey = "Active", LtKey = "Active",
FieldKey = "widgetactive", FieldKey = "widgetactive",
SqlValueColumnName = "awidget.active", SqlValueColumnName = "awidget.active",
UiFieldDataType = (int)AyaUiFieldDataType.Bool UiFieldDataType = (int)UiFieldDataType.Bool
}); });
} }

12
server/AyaNova/DataList/UserDataList.cs
View File

@@ -27,7 +27,7 @@ namespace AyaNova.DataList
LtKey = "User", LtKey = "User",
FieldKey = "username", FieldKey = "username",
AyaObjectType = (int)AyaType.User, AyaObjectType = (int)AyaType.User,
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlIdColumnName = "auser.id", SqlIdColumnName = "auser.id",
SqlValueColumnName = "auser.name" SqlValueColumnName = "auser.name"
}); });
@@ -36,7 +36,7 @@ namespace AyaNova.DataList
{ {
LtKey = "Active", LtKey = "Active",
FieldKey = "useractive", FieldKey = "useractive",
UiFieldDataType = (int)AyaUiFieldDataType.Bool, UiFieldDataType = (int)UiFieldDataType.Bool,
SqlValueColumnName = "auser.active" SqlValueColumnName = "auser.active"
}); });
@@ -44,7 +44,7 @@ namespace AyaNova.DataList
{ {
LtKey = "AuthorizationRoles", LtKey = "AuthorizationRoles",
FieldKey = "userroles", FieldKey = "userroles",
UiFieldDataType = (int)AyaUiFieldDataType.Enum, UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = typeof(AuthorizationRoles).ToString(), EnumType = typeof(AuthorizationRoles).ToString(),
SqlValueColumnName = "auser.roles" SqlValueColumnName = "auser.roles"
}); });
@@ -53,7 +53,7 @@ namespace AyaNova.DataList
{ {
LtKey = "UserUserType", LtKey = "UserUserType",
FieldKey = "usertype", FieldKey = "usertype",
UiFieldDataType = (int)AyaUiFieldDataType.Enum, UiFieldDataType = (int)UiFieldDataType.Enum,
EnumType = typeof(UserType).ToString(), EnumType = typeof(UserType).ToString(),
SqlValueColumnName = "auser.usertype" SqlValueColumnName = "auser.usertype"
}); });
@@ -62,7 +62,7 @@ namespace AyaNova.DataList
{ {
LtKey = "UserEmployeeNumber", LtKey = "UserEmployeeNumber",
FieldKey = "useremployeenumber", FieldKey = "useremployeenumber",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlValueColumnName = "auser.employeenumber" SqlValueColumnName = "auser.employeenumber"
}); });
@@ -70,7 +70,7 @@ namespace AyaNova.DataList
{ {
LtKey = "UserNotes", LtKey = "UserNotes",
FieldKey = "usernotes", FieldKey = "usernotes",
UiFieldDataType = (int)AyaUiFieldDataType.Text, UiFieldDataType = (int)UiFieldDataType.Text,
SqlValueColumnName = "auser.notes" SqlValueColumnName = "auser.notes"
}); });

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

@@ -18,14 +18,14 @@ namespace AyaNova.Biz
get get
{ {
var ret = new List<int>(); var ret = new List<int>();
ret.Add((int)AyaUiFieldDataType.Currency); ret.Add((int)UiFieldDataType.Currency);
ret.Add((int)AyaUiFieldDataType.Date); ret.Add((int)UiFieldDataType.Date);
ret.Add((int)AyaUiFieldDataType.Time); ret.Add((int)UiFieldDataType.Time);
ret.Add((int)AyaUiFieldDataType.DateTime); ret.Add((int)UiFieldDataType.DateTime);
ret.Add((int)AyaUiFieldDataType.Text); ret.Add((int)UiFieldDataType.Text);
ret.Add((int)AyaUiFieldDataType.Decimal); ret.Add((int)UiFieldDataType.Decimal);
ret.Add((int)AyaUiFieldDataType.Integer); ret.Add((int)UiFieldDataType.Integer);
ret.Add((int)AyaUiFieldDataType.Bool); ret.Add((int)UiFieldDataType.Bool);
return ret; return ret;
} }
} }

2
server/AyaNova/biz/AyaUiFieldDataType.cs → server/AyaNova/biz/UiFieldDataType.cs
View File

@@ -18,7 +18,7 @@ namespace AyaNova.Biz
// } // }
//DataTypes used to format display properly and for custom fields definition etc //DataTypes used to format display properly and for custom fields definition etc
public enum AyaUiFieldDataType : int public enum UiFieldDataType : int
{ {
NoType = 0, NoType = 0,
DateTime = 1, DateTime = 1,