This commit is contained in:
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -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",
|
||||||
|
|||||||
@@ -10,7 +10,14 @@ namespace AyaNova.KPI
|
|||||||
private string _dataQuery = null;
|
private string _dataQuery = null;
|
||||||
private string _errorMessage = null;
|
private string _errorMessage = null;
|
||||||
|
|
||||||
public AuthorizationRoles AllowedRoles { get => AuthorizationRoles.Tech | AuthorizationRoles.TechRestricted; }
|
public AuthorizationRoles AllowedRoles
|
||||||
|
{
|
||||||
|
get => AuthorizationRoles.BizAdmin |
|
||||||
|
AuthorizationRoles.BizAdminRestricted |
|
||||||
|
AuthorizationRoles.ServiceRestricted |
|
||||||
|
AuthorizationRoles.Service |
|
||||||
|
AuthorizationRoles.Accounting;
|
||||||
|
}
|
||||||
|
|
||||||
public string MetaQuery => _metaQuery;
|
public string MetaQuery => _metaQuery;
|
||||||
public string DataQuery => _dataQuery;
|
public string DataQuery => _dataQuery;
|
||||||
@@ -62,18 +69,19 @@ namespace AyaNova.KPI
|
|||||||
|
|
||||||
|
|
||||||
_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('day', AWORKORDERITEMLABOR.SERVICESTOPDATE) X, AUSER.ID Z
|
||||||
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} AND {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere}
|
LEFT JOIN AUSER ON AWORKORDERITEMLABOR.USERID = AUSER.ID
|
||||||
GROUP BY x
|
WHERE {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere}
|
||||||
ORDER BY x ASC
|
GROUP BY Z, X
|
||||||
|
ORDER BY X ASC
|
||||||
|
) t";
|
||||||
|
_metaQuery =
|
||||||
|
@"SELECT row_to_json(t) as res from (
|
||||||
|
select name from auser where id = 10
|
||||||
) t";
|
) t";
|
||||||
_metaQuery = string.Empty;
|
|
||||||
// @"SELECT row_to_json(t) as res from (
|
|
||||||
// select name from auser where id = 10
|
|
||||||
// ) t";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user