diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-05-11 14:22:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 14:22:21 -0700 |
| commit | 662b774234298c38a38c172d1dcb4668996045ac (patch) | |
| tree | 7f46a605aabd630d3f07b7ec6f7d8713ed3be2ce /templates | |
| parent | a97c12829e99b63f1951bffc658c37ec180e5379 (diff) | |
| parent | 3639bc6d289fa137d5dc7aaa47b67cd6a6bcc47d (diff) | |
| download | trackermap-server-662b774234298c38a38c172d1dcb4668996045ac.tar.gz trackermap-server-662b774234298c38a38c172d1dcb4668996045ac.tar.bz2 trackermap-server-662b774234298c38a38c172d1dcb4668996045ac.zip | |
Merge pull request #3870 from Abyss777/geo_overspeed
Add basic support of overspeeding inside geofences.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/mail/deviceOverspeed.vm | 2 | ||||
| -rw-r--r-- | templates/sms/deviceOverspeed.vm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/mail/deviceOverspeed.vm b/templates/mail/deviceOverspeed.vm index b1f0a6734..e5e576f3a 100644 --- a/templates/mail/deviceOverspeed.vm +++ b/templates/mail/deviceOverspeed.vm @@ -12,7 +12,7 @@ <html> <body> Device: $device.name<br> -Exceeds the speed: $speedString<br> +Exceeds the speed: $speedString#{if}($geofence) in $geofence.name#{else}#{end}<br> Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)<br> Point: <a href="$webUrl?eventId=$event.id">#{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}</a><br> </body> diff --git a/templates/sms/deviceOverspeed.vm b/templates/sms/deviceOverspeed.vm index f0b03c9e7..5e92f662c 100644 --- a/templates/sms/deviceOverspeed.vm +++ b/templates/sms/deviceOverspeed.vm @@ -7,4 +7,4 @@ #else #set($speedString = $numberTool.format("0.0 kn", $position.speed)) #end -$device.name exceeds the speed $speedString at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone) +$device.name exceeds the speed $speedString#{if}($geofence) in $geofence.name#{else}#{end} at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone) |