diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-01 19:11:22 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 19:11:22 +1300 |
| commit | 7adac25c304b046ebfc59b1197663625e862cc81 (patch) | |
| tree | e61c162edfe823f7f97226c097ac2173ccff3f96 /src/org/traccar/api/resource/StatisticsResource.java | |
| parent | 12ddac1b181692a1e32a1a26e9189ab3091dd4bc (diff) | |
| parent | fdc61388a4f86bbd7fc7034fcf672486910eb58c (diff) | |
| download | trackermap-server-7adac25c304b046ebfc59b1197663625e862cc81.tar.gz trackermap-server-7adac25c304b046ebfc59b1197663625e862cc81.tar.bz2 trackermap-server-7adac25c304b046ebfc59b1197663625e862cc81.zip | |
Merge pull request #2502 from Abyss777/reports_jsonconverter
Remove explicit JSON conversion from reports
Diffstat (limited to 'src/org/traccar/api/resource/StatisticsResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/StatisticsResource.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/api/resource/StatisticsResource.java b/src/org/traccar/api/resource/StatisticsResource.java index e737560ef..f63fc0ddb 100644 --- a/src/org/traccar/api/resource/StatisticsResource.java +++ b/src/org/traccar/api/resource/StatisticsResource.java @@ -17,8 +17,8 @@ package org.traccar.api.resource; import org.traccar.Context; import org.traccar.api.BaseResource; +import org.traccar.helper.DateUtil; import org.traccar.model.Statistics; -import org.traccar.web.JsonConverter; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -38,7 +38,7 @@ public class StatisticsResource extends BaseResource { public Collection<Statistics> get( @QueryParam("from") String from, @QueryParam("to") String to) throws SQLException { Context.getPermissionsManager().checkAdmin(getUserId()); - return Context.getDataManager().getStatistics(JsonConverter.parseDate(from), JsonConverter.parseDate(to)); + return Context.getDataManager().getStatistics(DateUtil.parseDate(from), DateUtil.parseDate(to)); } } |