This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using AyaNova.Biz;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using AyaNova.DataList;
|
||||
|
||||
namespace AyaNova.KPI
|
||||
{
|
||||
@@ -20,68 +21,38 @@ namespace AyaNova.KPI
|
||||
//build data and meta queries
|
||||
|
||||
//validate criteria exists
|
||||
if(!options.Criteria.ContainsKey("dateRange"))
|
||||
{
|
||||
_errorMessage="Missing 'dateRange' criteria";
|
||||
return;
|
||||
}
|
||||
if (!options.Criteria.ContainsKey("dateRange"))
|
||||
{
|
||||
_errorMessage = "Missing 'dateRange' criteria";
|
||||
return;
|
||||
}
|
||||
|
||||
if (!options.Criteria.ContainsKey("unit"))
|
||||
{
|
||||
_errorMessage = "Missing 'unit' criteria";
|
||||
return;
|
||||
}
|
||||
|
||||
var dateRange = (string)options.Criteria["dateRange"];
|
||||
var unit = (string)options.Criteria["unit"];
|
||||
|
||||
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", dateRange, options.ClientTimeStamp);
|
||||
|
||||
if(!options.Criteria.ContainsKey("unit"))
|
||||
{
|
||||
_errorMessage="Missing 'unit' criteria";
|
||||
return;
|
||||
}
|
||||
|
||||
var crit=(string)options.Criteria["dateRange"];
|
||||
var unit=(string)options.Criteria["unit"];
|
||||
|
||||
|
||||
// jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null
|
||||
|
||||
_dataQuery = @$"SELECT row_to_json(t) as res from (
|
||||
select SUM(AWORKORDERITEMLABOR.serviceratequantity) SERVICERATESUM, date_trunc('{unit}',AWORKORDERITEMLABOR.servicestopdate) timeframe
|
||||
FROM AWORKORDER
|
||||
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
|
||||
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
|
||||
WHERE AWORKORDERITEMLABOR.userid = {userId}
|
||||
GROUP BY timeframe
|
||||
ORDER BY timeframe ASC
|
||||
) t";
|
||||
|
||||
select SUM(AWORKORDERITEMLABOR.serviceratequantity) SERVICERATESUM, date_trunc('{unit}',AWORKORDERITEMLABOR.servicestopdate) timeframe
|
||||
FROM AWORKORDER
|
||||
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
|
||||
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
|
||||
WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere}
|
||||
GROUP BY timeframe
|
||||
ORDER BY timeframe ASC
|
||||
) t";
|
||||
_metaQuery = @"SELECT row_to_json(t) as res from (
|
||||
select name from auser where id = 10
|
||||
) t";
|
||||
select name from auser where id = 10
|
||||
) t";
|
||||
}
|
||||
|
||||
// public string GetVariantCriteria(string variant)
|
||||
// {
|
||||
// //Currently the only variant is a object type and id to indicate headoffice
|
||||
|
||||
// //ClientCriteria format for this list is "OBJECTID,AYATYPE"
|
||||
// var crit = (variant ?? "").Split(',').Select(z => z.Trim()).ToArray();
|
||||
// if (crit.Length > 1)
|
||||
// {
|
||||
// int nType = 0;
|
||||
// if (!int.TryParse(crit[1], out nType)) return string.Empty;
|
||||
// AyaType forType = (AyaType)nType;
|
||||
// if (forType != AyaType.HeadOffice) return string.Empty;
|
||||
|
||||
// long lId = 0;
|
||||
// if (!long.TryParse(crit[0], out lId)) return string.Empty;
|
||||
// if (lId == 0) return string.Empty;
|
||||
|
||||
// //Have valid type, have an id, so filter away
|
||||
// switch (forType)
|
||||
// {
|
||||
// case AyaType.HeadOffice:
|
||||
// {
|
||||
// return $"acustomer.headofficeid = {lId}";
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// return string.Empty;
|
||||
// }
|
||||
|
||||
|
||||
}//eoc
|
||||
}//eons
|
||||
Reference in New Issue
Block a user