diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-09-06 13:43:51 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-09-06 13:43:51 +0500 |
| commit | fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25 (patch) | |
| tree | 778b00dd1a6162007cb08239d475884843a678ba /templates | |
| parent | 3e5167131c758dd6e75e0f5d9b265a1514baac0c (diff) | |
| download | trackermap-server-fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25.tar.gz trackermap-server-fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25.tar.bz2 trackermap-server-fe5e6f7e1aaa01dfe8d61af46c3b818f8c566a25.zip | |
Move units to attributes and add volume units
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/export/stops.xlsx | bin | 12855 -> 12870 bytes | |||
| -rw-r--r-- | templates/export/summary.xlsx | bin | 8735 -> 12564 bytes | |||
| -rw-r--r-- | templates/export/trips.xlsx | bin | 13239 -> 13154 bytes | |||
| -rw-r--r-- | templates/mail/deviceOverspeed.vm | 4 | ||||
| -rw-r--r-- | templates/sms/deviceOverspeed.vm | 4 |
5 files changed, 4 insertions, 4 deletions
diff --git a/templates/export/stops.xlsx b/templates/export/stops.xlsx Binary files differindex d6bb4c3b9..0c00b7bff 100644 --- a/templates/export/stops.xlsx +++ b/templates/export/stops.xlsx diff --git a/templates/export/summary.xlsx b/templates/export/summary.xlsx Binary files differindex 73e702a70..a71f013a9 100644 --- a/templates/export/summary.xlsx +++ b/templates/export/summary.xlsx diff --git a/templates/export/trips.xlsx b/templates/export/trips.xlsx Binary files differindex 4a6734850..c5fa73342 100644 --- a/templates/export/trips.xlsx +++ b/templates/export/trips.xlsx diff --git a/templates/mail/deviceOverspeed.vm b/templates/mail/deviceOverspeed.vm index 0715a3d60..b1f0a6734 100644 --- a/templates/mail/deviceOverspeed.vm +++ b/templates/mail/deviceOverspeed.vm @@ -1,8 +1,8 @@ #set($subject = "$device.name: exceeds the speed") -#if($speedUnits == 'kmh') +#if($speedUnit == 'kmh') #set($speedValue = $position.speed * 1.852) #set($speedString = $numberTool.format("0.0 km/h", $speedValue)) -#elseif($speedUnits == 'mph') +#elseif($speedUnit == 'mph') #set($speedValue = $position.speed * 1.15078) #set($speedString = $numberTool.format("0.0 mph", $speedValue)) #else diff --git a/templates/sms/deviceOverspeed.vm b/templates/sms/deviceOverspeed.vm index ef0d9d955..f0b03c9e7 100644 --- a/templates/sms/deviceOverspeed.vm +++ b/templates/sms/deviceOverspeed.vm @@ -1,7 +1,7 @@ -#if($speedUnits == 'kmh') +#if($speedUnit == 'kmh') #set($speedValue = $position.speed * 1.852) #set($speedString = $numberTool.format("0.0 km/h", $speedValue)) -#elseif($speedUnits == 'mph') +#elseif($speedUnit == 'mph') #set($speedValue = $position.speed * 1.15078) #set($speedString = $numberTool.format("0.0 mph", $speedValue)) #else |