From 8569e396f7bdafd49a974b35a2e83a57164c6c62 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 13 Jun 2022 18:49:01 -0700
Subject: Remove report template path key

---
 src/main/java/org/traccar/reports/TripsReportProvider.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/main/java/org/traccar/reports/TripsReportProvider.java')

diff --git a/src/main/java/org/traccar/reports/TripsReportProvider.java b/src/main/java/org/traccar/reports/TripsReportProvider.java
index a8e0e3dde..bff559664 100644
--- a/src/main/java/org/traccar/reports/TripsReportProvider.java
+++ b/src/main/java/org/traccar/reports/TripsReportProvider.java
@@ -18,6 +18,8 @@ package org.traccar.reports;
 
 import org.apache.poi.ss.util.WorkbookUtil;
 import org.traccar.Context;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
 import org.traccar.helper.model.PositionUtil;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
@@ -28,21 +30,25 @@ import org.traccar.storage.Storage;
 import org.traccar.storage.StorageException;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 
 public class TripsReportProvider {
 
+    private final Config config;
     private final ReportUtils reportUtils;
     private final Storage storage;
 
     @Inject
-    public TripsReportProvider(ReportUtils reportUtils, Storage storage) {
+    public TripsReportProvider(Config config, ReportUtils reportUtils, Storage storage) {
+        this.config = config;
         this.reportUtils = reportUtils;
         this.storage = storage;
     }
@@ -88,9 +94,9 @@ public class TripsReportProvider {
             deviceTrips.setObjects(trips);
             devicesTrips.add(deviceTrips);
         }
-        String templatePath = Context.getConfig().getString("report.templatesPath",
-                "templates/export/");
-        try (InputStream inputStream = new FileInputStream(templatePath + "/trips.xlsx")) {
+
+        File file = Paths.get(config.getString(Keys.TEMPLATES_ROOT), "export", "trips.xlsx").toFile();
+        try (InputStream inputStream = new FileInputStream(file)) {
             var context = reportUtils.initializeContext(userId);
             context.putVar("devices", devicesTrips);
             context.putVar("sheetNames", sheetNames);
-- 
cgit v1.2.3