From 52b95952fea98e39295d846d94ab9d8f4c29fa34 Mon Sep 17 00:00:00 2001 From: j-dimension Date: Sun, 29 Oct 2023 23:07:10 +0100 Subject: [PATCH] added column for total of each entry. close #2159 --- .../src/java/com/jdimension/jlawyer/services/ReportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ReportService.java b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ReportService.java index 6650f0a8a..89470d379 100644 --- a/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ReportService.java +++ b/j-lawyer-server/j-lawyer-server-ejb/src/java/com/jdimension/jlawyer/services/ReportService.java @@ -877,7 +877,7 @@ public ReportResult invokeReport(String reportId, Object... params) throws Excep } else if (Reports.RPT_TSHEETS_OPEN_POSITIONS.equals(reportId)) { String query = "SELECT cases.id, cases.fileNumber as Aktenzeichen, cases.name as Rubrum, cases.reason as wegen, \n" + " ts.name as Projektname, ts.description as Projektbeschreibung, ts.interval_minutes as Taktung,\n" - + " DATE_FORMAT(tsp.time_started,'%Y-%m-%d %H:%i') as von, DATE_FORMAT(tsp.time_stopped,'%Y-%m-%d %H:%i') as bis, greatest(1, TIMESTAMPDIFF(MINUTE, tsp.time_started, tsp.time_stopped)) AS Minuten, greatest(1, CEILING(TIMESTAMPDIFF(MINUTE, tsp.time_started, tsp.time_stopped)/ts.interval_minutes))*ts.interval_minutes DIV 1 AS MinutenInTaktung, tsp.name as Aktivitaet, tsp.description as Taetigkeiten, tsp.principal as GebuchtDurch, tsp.tax_rate as Steuersatz, tsp.unit_price as Stundensatz\n" + + " DATE_FORMAT(tsp.time_started,'%Y-%m-%d %H:%i') as von, DATE_FORMAT(tsp.time_stopped,'%Y-%m-%d %H:%i') as bis, greatest(1, TIMESTAMPDIFF(MINUTE, tsp.time_started, tsp.time_stopped)) AS Minuten, greatest(1, CEILING(TIMESTAMPDIFF(MINUTE, tsp.time_started, tsp.time_stopped)/ts.interval_minutes))*ts.interval_minutes DIV 1 AS MinutenInTaktung, tsp.name as Aktivitaet, tsp.description as Taetigkeiten, tsp.principal as GebuchtDurch, tsp.tax_rate as Steuersatz, tsp.unit_price as Stundensatz, (greatest(1, CEILING(TIMESTAMPDIFF(MINUTE, tsp.time_started, tsp.time_stopped)/ts.interval_minutes))*ts.interval_minutes DIV 1) / 60 * tsp.unit_price as Positionsbetrag\n" + " FROM timesheet_positions tsp\n" + "left join timesheets ts on ts.id=tsp.timesheet_id \n" + "left join cases cases on ts.case_id=cases.id\n"