This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#define AYSHOWKPIQUERYINFO
|
||||
//#define AYSHOWKPIQUERYINFO
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
@@ -21,26 +21,26 @@ namespace AyaNova.KPI
|
||||
//build data and meta queries
|
||||
|
||||
//validate criteria exists
|
||||
if (!options.Criteria.ContainsKey("dateRange"))
|
||||
if (!options.Criteria.ContainsKey("timeSpan"))
|
||||
{
|
||||
_errorMessage = "Missing 'dateRange' criteria";
|
||||
_errorMessage = "Missing 'timeSpan' criteria";
|
||||
return;
|
||||
}
|
||||
|
||||
if (!options.Criteria.ContainsKey("unit"))
|
||||
if (!options.Criteria.ContainsKey("interval"))
|
||||
{
|
||||
_errorMessage = "Missing 'unit' criteria";
|
||||
_errorMessage = "Missing 'interval' criteria";
|
||||
return;
|
||||
}
|
||||
|
||||
var dateRange = (string)options.Criteria["dateRange"];
|
||||
var unit = (string)options.Criteria["unit"];
|
||||
var timeSpan = (string)options.Criteria["timeSpan"];
|
||||
var interval = (string)options.Criteria["interval"];
|
||||
|
||||
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", dateRange, options.ClientTimeStamp);
|
||||
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
|
||||
|
||||
|
||||
_dataQuery = @$"SELECT row_to_json(t) as res from (
|
||||
select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{unit}',AWORKORDERITEMLABOR.servicestopdate) x
|
||||
select SUM(AWORKORDERITEMLABOR.serviceratequantity) y, date_trunc('{interval}',AWORKORDERITEMLABOR.servicestopdate) x
|
||||
FROM AWORKORDER
|
||||
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
|
||||
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
|
||||
|
||||
Reference in New Issue
Block a user