aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/reports/Summary.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-10-19 18:35:28 +0500
committerAbyss777 <abyss@fox5.ru>2016-10-19 18:35:28 +0500
commit17f5a899a08b992507b574eeb4047b1f6bfa8629 (patch)
tree38044c918384b21e9533452d6a408f0935c96a1e /src/org/traccar/reports/Summary.java
parentc613143105d9f7c898dd3fb236d683b76cf8a42c (diff)
downloadtrackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.tar.gz
trackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.tar.bz2
trackermap-server-17f5a899a08b992507b574eeb4047b1f6bfa8629.zip
- Filter events on server side
- Use common path for templates - Filter events about geofences that user do not have access (minor security fix) - Removed unused function - Visual templates improvements
Diffstat (limited to 'src/org/traccar/reports/Summary.java')
-rw-r--r--src/org/traccar/reports/Summary.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/reports/Summary.java b/src/org/traccar/reports/Summary.java
index e7f41bcd6..14f8b7839 100644
--- a/src/org/traccar/reports/Summary.java
+++ b/src/org/traccar/reports/Summary.java
@@ -92,9 +92,9 @@ public final class Summary {
Context.getPermissionsManager().checkDevice(userId, deviceId);
summaries.add(calculateSummaryResult(deviceId, from, to));
}
- String templatePath = Context.getConfig().getString("report.summary.template.excel",
- "templates/export/summary.xlsx");
- try (InputStream inputStream = new FileInputStream(templatePath)) {
+ String templatePath = Context.getConfig().getString("report.templatesPath",
+ "templates/export/");
+ try (InputStream inputStream = new FileInputStream(templatePath + "/summary.xlsx")) {
org.jxls.common.Context jxlsContext = PoiTransformer.createInitialContext();
jxlsContext.putVar("summaries", summaries);
jxlsContext.putVar("from", from);