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
2018-12-03 20:17:59 +00:00
parent 59beefd3a4
commit ee5cfd16ff
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
devdocs/specs/core-list-graph-datatable-filtering-paging.txt
View File

@@ -25,11 +25,14 @@ Filters are saved to the database:
- Could be compound for joins like "table.name" (no a prepends the table name) - Could be compound for joins like "table.name" (no a prepends the table name)
- Special indirect values such as "[TAGS]" which means cross filter with tags - Special indirect values such as "[TAGS]" which means cross filter with tags
- op=one of the values specified in the FilterComparisonOperator class in Biz namespace - op=one of the values specified in the FilterComparisonOperator class in Biz namespace
- value= straight up direct comparison value - value = string version of direct comparison value or could be a special token meaning more
- Never an empty string, empty string is invalid value
- All Tokens are a value surrounded by this fragment: "{[XXX]}" where XXX is the token
- if empty or null then will be a token "{[null]}"
- If string then a string fragment, case is sensitive - If string then a string fragment, case is sensitive
- If date then iso style date //RAVEN NOTE: it is my intention that dates come in iso8601 UTC format from the client - If date then iso style date //RAVEN NOTE: it is my intention that dates come in iso8601 UTC format from the client
- could be whole number or decimal number - could be whole number or decimal number
- Could be a special "macro" filter value like "[THIS_MONTH]" (always surrounded by square brackets, no need to disambiguate with a string because only applies to non string values) - Could be a special "macro" filter value like "{[THIS_MONTH]}"
- Could be a series of id values like this "[23,45,56,123]" as in tag id's or something related to that case. - Could be a series of id values like this "[23,45,56,123]" as in tag id's or something related to that case.
Upon user selecting a filter to use the list query string has the regular paging info but also the filter id as a query parameter Upon user selecting a filter to use the list query string has the regular paging info but also the filter id as a query parameter

4
server/AyaNova/biz/DataFilterBiz.cs
View File

@@ -292,8 +292,8 @@ namespace AyaNova.Biz
if (!FilterComparisonOperator.Operators.Contains(opType)) if (!FilterComparisonOperator.Operators.Contains(opType))
AddError(ValidationErrorType.InvalidValue, "Filter", $"Filter array item {i}, \"op\" property value of \"{opType}\" is not a valid FilterComparisonOperator type"); AddError(ValidationErrorType.InvalidValue, "Filter", $"Filter array item {i}, \"op\" property value of \"{opType}\" is not a valid FilterComparisonOperator type");
} }
if (filterItem["value"] == null) if (filterItem["value"] == null || string.IsNullOrWhiteSpace(filterItem["value"].Value<string>()))
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"value\" property "); AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property ");
//NOTE: value of nothing, null or empty is a valid value so no checking for it here //NOTE: value of nothing, null or empty is a valid value so no checking for it here
} }
} }

11
server/AyaNova/biz/FilterSqlCriteriaBuilder.cs
View File

@@ -51,16 +51,7 @@ namespace AyaNova.Biz
sb.Append(sColumn); sb.Append(sColumn);
sb.Append(" "); sb.Append(" ");
//Added: 13-July-2006 prior fix on the 6th either broke due to other changes or
//was not enough in the first place, oddly it was working then, but this is also needed
//now to make it work:
//Handle bools with null values
//this comes about from a user selecting blanks or nonblanks to filter a bool column
if (sValue == "" && sDataType == "System.Boolean")
{
sValue = "False";
}
//handle null values separately //handle null values separately
if (sValue == "") if (sValue == "")