diff --git a/.vscode/launch.json b/.vscode/launch.json index f18b4927..d0cceaa8 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -48,7 +48,7 @@ "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", diff --git a/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs b/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs index 24b25b05..3a295c67 100644 --- a/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs +++ b/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs @@ -10,7 +10,14 @@ namespace AyaNova.KPI private string _dataQuery = 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 DataQuery => _dataQuery; @@ -62,18 +69,19 @@ namespace AyaNova.KPI _dataQuery = @$"SELECT row_to_json(t) as res from ( - 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 - WHERE AWORKORDERITEMLABOR.userid = {userId} AND {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere} - GROUP BY x - ORDER BY x ASC + SELECT SUM(AWORKORDERITEMLABOR.SERVICERATEQUANTITY) Y,DATE_TRUNC('day', AWORKORDERITEMLABOR.SERVICESTOPDATE) X, AUSER.ID Z +FROM AWORKORDER +LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID +LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID +LEFT JOIN AUSER ON AWORKORDERITEMLABOR.USERID = AUSER.ID +WHERE {dateWhere} {techTagsWhere} {woTagsWhere} {woItemTagsWhere} +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"; - _metaQuery = string.Empty; - // @"SELECT row_to_json(t) as res from ( - // select name from auser where id = 10 - // ) t"; }