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-02-22 00:31:06 +00:00
parent 15daed1feb
commit 07740c3316
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/AyaNova/DataList/DataListSqlFilterOrderByBuilder.cs
View File

@@ -19,6 +19,7 @@ namespace AyaNova.DataList
//iterate the datafilter and concatenate a sql query from it //iterate the datafilter and concatenate a sql query from it
// [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}] // [{key:"COLUMN UNIQUE KEY ID",sort:"-" or "+",filter:{any:true/false,items:[{FILTER OBJECT SEE BELOW}]} }, {key:"second column unique key"},{...etc...}]
bool SortItemAdded = false;
for (int i = 0; i < listViewArray.Count; i++) for (int i = 0; i < listViewArray.Count; i++)
{ {
var cm = listViewArray[i]; var cm = listViewArray[i];
@@ -31,8 +32,9 @@ namespace AyaNova.DataList
var dir = cm["sort"].Value<string>(); var dir = cm["sort"].Value<string>();
//Get the correct sql column name //Get the correct sql column name
AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(x => x.FieldKey == fld); AyaDataListFieldDefinition DataListField = objectFieldsList.FirstOrDefault(x => x.FieldKey == fld);
//No sorting on custom fields! //No sorting on custom fields!
if(DataListField.IsCustomField){ if (DataListField.IsCustomField)
{
continue; continue;
} }
#if (DEBUG) #if (DEBUG)
@@ -44,15 +46,15 @@ namespace AyaNova.DataList
#endif #endif
var SQLValueColumnName = DataListField.GetSqlValueColumnName(); var SQLValueColumnName = DataListField.GetSqlValueColumnName();
sb.Append(" "); if (SortItemAdded)
sb.Append(", ");
else
sb.Append(" ");
sb.Append(SQLValueColumnName); sb.Append(SQLValueColumnName);
sb.Append(" "); sb.Append(" ");
sb.Append(dir == "+" ? "ASC" : "DESC"); sb.Append(dir == "+" ? "ASC" : "DESC");
if (i < listViewArray.Count - 1) SortItemAdded = true;
{
sb.Append(",");
}
} }
if (sb.Length == 0) if (sb.Length == 0)