This commit is contained in:
2020-01-17 00:32:57 +00:00
parent 1be338546f
commit 05427f2f98
2 changed files with 21 additions and 11 deletions

View File

@@ -248,11 +248,20 @@ namespace AyaNova.Biz
public string SqlColumn { get; set; } public string SqlColumn { get; set; }
*/ */
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", UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false, });//not hideable for strictly list must mean it has to be in template? l.Add(new ObjectField
{
Key = "WidgetName",
PropertyName = "widgetname",
UiFieldDataType = (int)AyaUiFieldDataType.Text,
Hideable = false,
AyObjectType = (int)AyaType.Widget,
SqlIdColumn = "widgetid",
SqlDisplayColumn = "widgetname"
});//not hideable for strictly list must mean it has to be in template?
l.Add(new ObjectField { Key = "User", PropertyName = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyObjectType = (int)AyaType.User }); l.Add(new ObjectField { Key = "User", PropertyName = "userid", UiFieldDataType = (int)AyaUiFieldDataType.Text, AyObjectType = (int)AyaType.User });
l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false }); l.Add(new ObjectField { Key = "Name", PropertyName = "Name", SharedLTKey = true, UiFieldDataType = (int)AyaUiFieldDataType.Text, Hideable = false });
l.Add(new ObjectField { Key = "UserEmailAddress", PropertyName = "Emailaddress", UiFieldDataType = (int)AyaUiFieldDataType.EmailAddress, SqlColumn = "emailaddress" }); l.Add(new ObjectField { Key = "UserEmailAddress", PropertyName = "Emailaddress", UiFieldDataType = (int)AyaUiFieldDataType.EmailAddress, SqlDisplayColumn = "emailaddress" });
break; break;
#endregion #endregion
@@ -349,7 +358,9 @@ namespace AyaNova.Biz
public bool Custom { get; set; } public bool Custom { get; set; }
public bool Filterable { get; set; } public bool Filterable { get; set; }
public bool Sortable { get; set; } public bool Sortable { get; set; }
public bool MiniAvailable { get; set; } //had this but don't know why
//if a user wants to shove a bunch of notes into a single column with other shit that's their lookout surely
//public bool MiniAvailable { get; set; }
public int UiFieldDataType { get; set; } public int UiFieldDataType { get; set; }
//If it's an enum DataType then this is the specific enum type which sb the name of the class that holds the enum in the server project //If it's an enum DataType then this is the specific enum type which sb the name of the class that holds the enum in the server project
public string EnumType { get; set; } public string EnumType { get; set; }
@@ -360,7 +371,7 @@ namespace AyaNova.Biz
//For query building //For query building
//This is the equivalent of the v7 SqlColumnNameAttribute //This is the equivalent of the v7 SqlColumnNameAttribute
public string SqlIdColumn { get; set; } public string SqlIdColumn { get; set; }
public string SqlColumn { get; set; } public string SqlDisplayColumn { get; set; }
public ObjectField() public ObjectField()
@@ -369,23 +380,22 @@ namespace AyaNova.Biz
SharedLTKey = false; SharedLTKey = false;
Hideable = true; Hideable = true;
Custom = false; Custom = false;
Filterable = true; Filterable = true;
Sortable = true; Sortable = true;
MiniAvailable = true;
//Set openable object type to no type which is the default and means it's not a link to another object //Set openable object type to no type which is the default and means it's not a link to another object
AyObjectType = (int)AyaType.NoType; AyObjectType = (int)AyaType.NoType;
} }
public string GetSqlColumnName() public string GetSqlDisplayColumnName()
{ {
if (string.IsNullOrEmpty(SqlColumn)) if (string.IsNullOrEmpty(SqlDisplayColumn))
{ {
return PropertyName.ToLowerInvariant(); return PropertyName.ToLowerInvariant();
} }
else else
{ {
return SqlColumn; return SqlDisplayColumn;
} }
} }

View File

@@ -67,7 +67,7 @@ namespace AyaNova.Biz
{//Ignore missing fields in production {//Ignore missing fields in production
sb.Append(", "); sb.Append(", ");
sb.Append(o.GetSqlColumnName()); sb.Append(o.GetSqlDisplayColumnName());
} }
} }