From ce26a0768ace197cc9afdfc3ee04f970699d3c5e Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 7 May 2018 15:00:21 +0500 Subject: Add basic support of overspeeding inside geofences. --- templates/mail/deviceOverspeed.vm | 2 +- templates/sms/deviceOverspeed.vm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') 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 @@ Device: $device.name
-Exceeds the speed: $speedString
+Exceeds the speed: $speedString#{if}($geofence) in $geofence.name#{else}#{end}
Time: $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
Point: #{if}($position.address)$position.address#{else}$position.latitude°, $position.longitude°#{end}
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) -- cgit v1.2.3