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
2022-02-27 18:40:52 +00:00
parent 4556c21b6e
commit 98f8d26eb8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -957,7 +957,7 @@ namespace AyaNova.DataList
/// <summary>
/// Translate TAG DataFilter to PostgreSQL friendly SQL criteria
/// </summary>
private static string TagDataFilterToColumnCriteria(string SqlColumnNameToFilter, string sOperator, string sValue)
public static string TagDataFilterToColumnCriteria(string SqlColumnNameToFilter, string sOperator, string sValue)
{
/*

14
server/AyaNova/kpi/WorkOrderItemLaborQuantitySummary.cs
View File

@@ -42,11 +42,15 @@ namespace AyaNova.KPI
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
//optional tags
string tagsWhere = string.Empty;
string woTagsWhere = null;
if (wotags.Count > 0)
{
var q = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorder.tags", UiFieldDataType.Tags, DataListFilterComparisonOperator.Contains, string.Join(",", wotags), options.ClientTimeStamp);
}
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));
_dataQuery = @$"SELECT row_to_json(t) as res from (
@@ -54,7 +58,7 @@ namespace AyaNova.KPI
FROM AWORKORDER
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere}
WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere} {woTagsWhere} {woItemTagsWhere}
GROUP BY x
ORDER BY x ASC
) t";