This commit is contained in:
@@ -25,47 +25,35 @@ AuthorizationRoles.Accounting;
|
|||||||
|
|
||||||
public void BuildQuery(KPIRequestOptions options, long userId)
|
public void BuildQuery(KPIRequestOptions options, long userId)
|
||||||
{
|
{
|
||||||
//build data and meta queries
|
|
||||||
|
|
||||||
//validate criteria exists
|
|
||||||
if (!options.Criteria.ContainsKey("timeSpan"))
|
if (!options.Criteria.ContainsKey("timeSpan"))
|
||||||
{
|
{
|
||||||
_errorMessage = "Missing 'timeSpan' criteria";
|
_errorMessage = "Missing 'timeSpan' criteria";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!options.Criteria.ContainsKey("interval"))
|
if (!options.Criteria.ContainsKey("interval"))
|
||||||
{
|
{
|
||||||
_errorMessage = "Missing 'interval' criteria";
|
_errorMessage = "Missing 'interval' criteria";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var userid = (int?)options.Criteria["userid"];
|
var userid = (int?)options.Criteria["userid"];
|
||||||
var timeSpan = (string)options.Criteria["timeSpan"];
|
|
||||||
var interval = (string)options.Criteria["interval"];
|
|
||||||
var techtags = options.Criteria["techtags"].ToObject<List<string>>();
|
|
||||||
var wotags = options.Criteria["wotags"].ToObject<List<string>>();
|
|
||||||
var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
|
|
||||||
|
|
||||||
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
|
|
||||||
|
|
||||||
string techTagsWhere = null;
|
|
||||||
if (techtags.Count > 0)
|
|
||||||
techTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("auser.tags", DataListFilterComparisonOperator.Contains, string.Join(",", techtags));
|
|
||||||
|
|
||||||
string woTagsWhere = null;
|
|
||||||
if (wotags.Count > 0)
|
|
||||||
woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags));
|
|
||||||
|
|
||||||
string woItemTagsWhere = null;
|
|
||||||
if (woitemtags.Count > 0)
|
|
||||||
woItemTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorderitem.tags", DataListFilterComparisonOperator.Contains, string.Join(",", woitemtags));
|
|
||||||
|
|
||||||
string userWhere = string.Empty;
|
string userWhere = string.Empty;
|
||||||
if (userid != null)
|
if (userid != null)
|
||||||
{
|
{
|
||||||
userWhere = $"AND aworkorderitemlabor.userid = {userid}";
|
userWhere = $"AND aworkorderitemlabor.userid = {userid}";
|
||||||
}
|
}
|
||||||
|
var timeSpan = (string)options.Criteria["timeSpan"];
|
||||||
|
var interval = (string)options.Criteria["interval"];
|
||||||
|
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
|
||||||
|
var techtags = options.Criteria["techtags"].ToObject<List<string>>();
|
||||||
|
bool techtagsany = options.Criteria["techtagsany"].ToObject<bool>();
|
||||||
|
var wotags = options.Criteria["wotags"].ToObject<List<string>>();
|
||||||
|
bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
|
||||||
|
var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
|
||||||
|
bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
|
||||||
|
string techTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("auser.tags", techtags, techtagsany);
|
||||||
|
string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
|
||||||
|
string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
_dataQuery = @$"SELECT row_to_json(t) as res from (
|
_dataQuery = @$"SELECT row_to_json(t) as res from (
|
||||||
|
|||||||
Reference in New Issue
Block a user