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-03-02 19:27:18 +00:00
parent f18282de38
commit aed7c8aa33
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,22 +35,13 @@ namespace AyaNova.KPI
var timeSpan = (string)options.Criteria["timeSpan"]; var timeSpan = (string)options.Criteria["timeSpan"];
var interval = (string)options.Criteria["interval"]; var interval = (string)options.Criteria["interval"];
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); var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
var wotags = options.Criteria["wotags"].ToObject<List<string>>();
//optional tags bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
string woTagsWhere = null; var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
if (wotags.Count > 0) bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags)); string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
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 ( _dataQuery = @$"SELECT row_to_json(t) as res from (
select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{interval}',AWORKORDERITEMLABOR.servicestopdate) x select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{interval}',AWORKORDERITEMLABOR.servicestopdate) x

10
server/AyaNova/kpi/WorkOrderOverdueAllList.cs
View File

@@ -30,15 +30,9 @@ namespace AyaNova.KPI
bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>(); bool wotagsany = options.Criteria["wotagsany"].ToObject<bool>();
var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>(); var woitemtags = options.Criteria["woitemtags"].ToObject<List<string>>();
bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>(); bool woitemtagsany = options.Criteria["woitemtagsany"].ToObject<bool>();
string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
string woTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorder.tags", wotags, wotagsany);
// if (wotags.Count > 0)
// woTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorder.tags", DataListFilterComparisonOperator.Contains, string.Join(",", wotags));
string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ; string woItemTagsWhere = DataListSqlFilterCriteriaBuilder.KPITagFilterToSqlCriteria("aworkorderitem.tags", woitemtags, woitemtagsany); ;
// if (woitemtags.Count > 0)
// woItemTagsWhere = " AND " + DataListSqlFilterCriteriaBuilder.TagDataFilterToColumnCriteria("aworkorderitem.tags", DataListFilterComparisonOperator.Contains, string.Join(",", woitemtags));
_dataQuery = @$"SELECT row_to_json(t) as res from ( _dataQuery = @$"SELECT row_to_json(t) as res from (
SELECT distinct(AWORKORDER.ID), SELECT distinct(AWORKORDER.ID),
AWORKORDER.SERIAL, AWORKORDER.SERIAL,