diff --git a/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs b/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs index 2c335596..8cf1fcf5 100644 --- a/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs +++ b/server/AyaNova/kpi/WorkOrderItemLaborQuantityEveryoneSummary.cs @@ -69,7 +69,7 @@ AuthorizationRoles.Accounting; _dataQuery = @$"SELECT row_to_json(t) as res from ( - SELECT SUM(AWORKORDERITEMLABOR.SERVICERATEQUANTITY) Y,DATE_TRUNC('day', AWORKORDERITEMLABOR.SERVICESTOPDATE) X, AUSER.ID Z + SELECT SUM(AWORKORDERITEMLABOR.SERVICERATEQUANTITY) Y,DATE_TRUNC('{interval}', AWORKORDERITEMLABOR.SERVICESTOPDATE) X, AUSER.ID Z FROM AWORKORDER LEFT JOIN AWORKORDERITEM ON AWORKORDER.ID = AWORKORDERITEM.WORKORDERID LEFT JOIN AWORKORDERITEMLABOR ON AWORKORDERITEM.ID = AWORKORDERITEMLABOR.WORKORDERITEMID @@ -80,7 +80,7 @@ ORDER BY X ASC ) t"; _metaQuery = @"SELECT row_to_json(t) as res from ( - select auser.id as userid, name, uicolor, usertype from auser + select auser.id as userid, name, uicolor from auser left outer join auseroptions on auser.id=auseroptions.userid where auser.usertype=1 or auser.usertype=5 order by name