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-25 18:07:55 +00:00
parent 4a1072d11d
commit 742f62f806
2 changed files with 32 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,11 @@ namespace AyaNova.DataList
/// <summary> /// <summary>
/// Translate DataFilter to PostgreSQL friendly SQL criteria /// Translate DataFilter to PostgreSQL friendly SQL criteria
/// </summary> /// </summary>
private static string DataFilterToColumnCriteria(string SqlColumnNameToFilter, UiFieldDataType DataType, string sOperator, string sValue, DateTimeOffset clientTimeStamp) public static string DataFilterToColumnCriteria(string SqlColumnNameToFilter,
UiFieldDataType DataType,
string sOperator,
string sValue,
DateTimeOffset clientTimeStamp)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

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

@@ -1,5 +1,6 @@
using AyaNova.Biz; using AyaNova.Biz;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using AyaNova.DataList;
namespace AyaNova.KPI namespace AyaNova.KPI
{ {
@@ -20,68 +21,38 @@ namespace AyaNova.KPI
//build data and meta queries //build data and meta queries
//validate criteria exists //validate criteria exists
if(!options.Criteria.ContainsKey("dateRange")) if (!options.Criteria.ContainsKey("dateRange"))
{ {
_errorMessage="Missing 'dateRange' criteria"; _errorMessage = "Missing 'dateRange' criteria";
return; return;
} }
if(!options.Criteria.ContainsKey("unit")) if (!options.Criteria.ContainsKey("unit"))
{ {
_errorMessage="Missing 'unit' criteria"; _errorMessage = "Missing 'unit' criteria";
return; return;
} }
var crit=(string)options.Criteria["dateRange"]; var dateRange = (string)options.Criteria["dateRange"];
var unit=(string)options.Criteria["unit"]; var unit = (string)options.Criteria["unit"];
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorderitemlabor.servicestopdate", UiFieldDataType.DateTime, "no-operator", dateRange, options.ClientTimeStamp);
// jobData.ContainsKey("toTag") ? (string)jobData["toTag"] : null
_dataQuery = @$"SELECT row_to_json(t) as res from ( _dataQuery = @$"SELECT row_to_json(t) as res from (
select SUM(AWORKORDERITEMLABOR.serviceratequantity) SERVICERATESUM, date_trunc('{unit}',AWORKORDERITEMLABOR.servicestopdate) timeframe select SUM(AWORKORDERITEMLABOR.serviceratequantity) SERVICERATESUM, date_trunc('{unit}',AWORKORDERITEMLABOR.servicestopdate) timeframe
FROM AWORKORDER FROM AWORKORDER
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID
WHERE AWORKORDERITEMLABOR.userid = {userId} WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere}
GROUP BY timeframe GROUP BY timeframe
ORDER BY timeframe ASC ORDER BY timeframe ASC
) t"; ) t";
_metaQuery = @"SELECT row_to_json(t) as res from ( _metaQuery = @"SELECT row_to_json(t) as res from (
select name from auser where id = 10 select name from auser where id = 10
) t"; ) 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 }//eoc
}//eons }//eons