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-03 20:25:33 +00:00
parent d06c3767c6
commit b5f95e6438
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/launch.json vendored
View File

@@ -48,7 +48,7 @@
"AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
"AYANOVA_USE_URLS": "http://*:7575;", "AYANOVA_USE_URLS": "http://*:7575;",
//"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
"AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE": "false",
"AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
//"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
"AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",

25
server/AyaNova/kpi/WorkOrderByStatusList.cs
View File

@@ -38,8 +38,26 @@ namespace AyaNova.KPI
if (wostatus != null) if (wostatus != null)
{ {
statusWhere = $"AND LASTSTATUSID = {wostatus}"; statusWhere = $"AND LASTSTATUSID = {wostatus}";
}else{
statusWhere= "AND LASTSTATUSID is null" ;
} }
if (!options.Criteria.ContainsKey("timeSpan"))
{
_errorMessage = "Missing 'timeSpan' criteria";
return;
}
if (!options.Criteria.ContainsKey("interval"))
{
_errorMessage = "Missing 'interval' criteria";
return;
}
var timeSpan = (string)options.Criteria["timeSpan"];
var interval = (string)options.Criteria["interval"];
var dateWhere = DataListSqlFilterCriteriaBuilder.DataFilterToColumnCriteria("aworkorder.createddate", UiFieldDataType.DateTime, "no-operator", timeSpan, options.ClientTimeStamp);
var wotags = options.Criteria["wotags"].ToObject<List<string>>(); var wotags = options.Criteria["wotags"].ToObject<List<string>>();
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>>();
@@ -51,14 +69,15 @@ namespace AyaNova.KPI
SELECT distinct(AWORKORDER.ID), AWORKORDER.SERIAL, SELECT distinct(AWORKORDER.ID), AWORKORDER.SERIAL,
AWORKORDER.SERVICEDATE, AWORKORDER.SERVICEDATE,
ACUSTOMER.NAME, ACUSTOMER.NAME,
AWORKORDER.NOTES AWORKORDER.NOTES,
AWORKORDER.LASTSTATUSID
FROM AWORKORDER FROM AWORKORDER
LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID
LEFT JOIN AWORKORDERITEMSCHEDULEDUSER ON AWORKORDERITEM.ID = AWORKORDERITEMSCHEDULEDUSER.WORKORDERITEMID LEFT JOIN AWORKORDERITEMSCHEDULEDUSER ON AWORKORDERITEM.ID = AWORKORDERITEMSCHEDULEDUSER.WORKORDERITEMID
LEFT JOIN AWORKORDERSTATUS ON (AWORKORDER.LASTSTATUSID = AWORKORDERSTATUS.ID) LEFT JOIN AWORKORDERSTATUS ON (AWORKORDER.LASTSTATUSID = AWORKORDERSTATUS.ID)
LEFT JOIN ACUSTOMER ON (AWORKORDER.CUSTOMERID = ACUSTOMER.ID) LEFT JOIN ACUSTOMER ON (AWORKORDER.CUSTOMERID = ACUSTOMER.ID)
WHERE {statusWhere} {woTagsWhere} {woItemTagsWhere} WHERE {dateWhere} {statusWhere} {woTagsWhere} {woItemTagsWhere}
ORDER BY AWORKORDER.ID ASC ORDER BY AWORKORDER.ID DESC
) t"; ) t";
_metaQuery = string.Empty; _metaQuery = string.Empty;
// @"SELECT row_to_json(t) as res from ( // @"SELECT row_to_json(t) as res from (