diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-07-13 10:21:01 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-07-13 12:06:07 +0500 |
| commit | 48fee3a5e9c5f99a0195e4c06a058d33eba4e072 (patch) | |
| tree | 3a96d2c440a8fd5c11a02390ede2439abadbb4da | |
| parent | e776aa3351535f78c60ab9502dd1154e2b973227 (diff) | |
| download | traccar-server-48fee3a5e9c5f99a0195e4c06a058d33eba4e072.tar.gz traccar-server-48fee3a5e9c5f99a0195e4c06a058d33eba4e072.tar.bz2 traccar-server-48fee3a5e9c5f99a0195e4c06a058d33eba4e072.zip | |
Add Driver column to Trip report template
| -rw-r--r-- | src/org/traccar/reports/ReportUtils.java | 4 | ||||
| -rw-r--r-- | templates/export/trips.xlsx | bin | 13189 -> 13239 bytes |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 3a177300b..bc58d28df 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -114,7 +114,9 @@ public final class ReportUtils { public static String findDriverName(String driverUniqueId) { if (driverUniqueId != null && Context.getDriversManager() != null) { Driver driver = Context.getDriversManager().getDriverByUniqueId(driverUniqueId); - return driver != null ? driver.getName() : driverUniqueId; + if (driver != null) { + return driver.getName(); + } } return null; } diff --git a/templates/export/trips.xlsx b/templates/export/trips.xlsx Binary files differindex 0e0ab4494..4a6734850 100644 --- a/templates/export/trips.xlsx +++ b/templates/export/trips.xlsx |