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/notification/TextTemplateFormatter.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/notification/TextTemplateFormatter.java')
-rw-r--r-- | src/main/java/org/traccar/notification/TextTemplateFormatter.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/notification/TextTemplateFormatter.java b/src/main/java/org/traccar/notification/TextTemplateFormatter.java index 469de2d4a..06375afac 100644 --- a/src/main/java/org/traccar/notification/TextTemplateFormatter.java +++ b/src/main/java/org/traccar/notification/TextTemplateFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2021 - 2022 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,8 +23,9 @@ import org.apache.velocity.tools.generic.NumberTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.Context; +import org.traccar.helper.UserUtil; +import org.traccar.model.Server; import org.traccar.model.User; -import org.traccar.reports.common.ReportUtils; import java.io.StringWriter; import java.nio.charset.StandardCharsets; @@ -38,13 +39,13 @@ public final class TextTemplateFormatter { private TextTemplateFormatter() { } - public static VelocityContext prepareContext(User user) { + public static VelocityContext prepareContext(Server server, User user) { VelocityContext velocityContext = new VelocityContext(); if (user != null) { velocityContext.put("user", user); - velocityContext.put("timezone", ReportUtils.getTimezone(user.getId())); + velocityContext.put("timezone", UserUtil.getTimezone(server, user)); } velocityContext.put("webUrl", Context.getVelocityEngine().getProperty("web.url")); |