diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-07 18:04:24 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-07 18:04:24 -0700 |
commit | 104281f161f622df8fca0c65a5b9969ceb03c46f (patch) | |
tree | d9bc756c29a9088a762bb434c443fccbb1eb9e7e /src/main/java/org/traccar/reports/TripsReportProvider.java | |
parent | b745e3804950fefd24b38937c90c4d5c61219321 (diff) | |
download | trackermap-server-104281f161f622df8fca0c65a5b9969ceb03c46f.tar.gz trackermap-server-104281f161f622df8fca0c65a5b9969ceb03c46f.tar.bz2 trackermap-server-104281f161f622df8fca0c65a5b9969ceb03c46f.zip |
Extract user utils from reports
Diffstat (limited to 'src/main/java/org/traccar/reports/TripsReportProvider.java')
-rw-r--r-- | src/main/java/org/traccar/reports/TripsReportProvider.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/reports/TripsReportProvider.java b/src/main/java/org/traccar/reports/TripsReportProvider.java index 5ff31dbe2..bcd79ab25 100644 --- a/src/main/java/org/traccar/reports/TripsReportProvider.java +++ b/src/main/java/org/traccar/reports/TripsReportProvider.java @@ -27,6 +27,7 @@ import java.util.Date; import org.apache.poi.ss.util.WorkbookUtil; import org.traccar.Context; import org.traccar.Main; +import org.traccar.api.security.PermissionsService; import org.traccar.database.DeviceManager; import org.traccar.database.IdentityManager; import org.traccar.model.Device; @@ -41,10 +42,12 @@ import javax.inject.Inject; public class TripsReportProvider { + private final PermissionsService permissionsService; private final Storage storage; @Inject - public TripsReportProvider(Storage storage) { + public TripsReportProvider(PermissionsService permissionsService, Storage storage) { + this.permissionsService = permissionsService; this.storage = storage; } @@ -96,7 +99,8 @@ public class TripsReportProvider { String templatePath = Context.getConfig().getString("report.templatesPath", "templates/export/"); try (InputStream inputStream = new FileInputStream(templatePath + "/trips.xlsx")) { - org.jxls.common.Context jxlsContext = ReportUtils.initializeContext(userId); + var jxlsContext = ReportUtils.initializeContext( + permissionsService.getServer(), permissionsService.getUser(userId)); jxlsContext.putVar("devices", devicesTrips); jxlsContext.putVar("sheetNames", sheetNames); jxlsContext.putVar("from", from); |