Cleanup and some adjustments

18 files changed, 32 insertions, 0 deletions

diff --git a/templates/short/alarm.vm b/templates/short/alarm.vm
new file mode 100644
index 000000000..389341cf1
--- /dev/null
+++ b/templates/short/alarm.vm
@@ -0,0 +1 @@
+$device.name alarm: $position.getString("alarm") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/commandResult.vm b/templates/short/commandResult.vm
new file mode 100644
index 000000000..4a327d850
--- /dev/null
+++ b/templates/short/commandResult.vm
@@ -0,0 +1 @@
+$device.name command result received: $position.getString("result") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceFuelDrop.vm b/templates/short/deviceFuelDrop.vm
new file mode 100644
index 000000000..5e51396d4
--- /dev/null
+++ b/templates/short/deviceFuelDrop.vm
@@ -0,0 +1 @@
+$device.name fuel drop at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceMoving.vm b/templates/short/deviceMoving.vm
new file mode 100644
index 000000000..aaa72ab0d
--- /dev/null
+++ b/templates/short/deviceMoving.vm
@@ -0,0 +1 @@
+$device.name moving at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceOffline.vm b/templates/short/deviceOffline.vm
new file mode 100644
index 000000000..8c4a02335
--- /dev/null
+++ b/templates/short/deviceOffline.vm
@@ -0,0 +1 @@
+$device.name offline at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceOnline.vm b/templates/short/deviceOnline.vm
new file mode 100644
index 000000000..62854feb0
--- /dev/null
+++ b/templates/short/deviceOnline.vm
@@ -0,0 +1 @@
+$device.name online at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceOverspeed.vm b/templates/short/deviceOverspeed.vm
new file mode 100644
index 000000000..5e92f662c
--- /dev/null
+++ b/templates/short/deviceOverspeed.vm
@@ -0,0 +1,10 @@
+#if($speedUnit == 'kmh')
+#set($speedValue = $position.speed * 1.852)
+#set($speedString = $numberTool.format("0.0 km/h", $speedValue))
+#elseif($speedUnit == 'mph')
+#set($speedValue = $position.speed * 1.15078)
+#set($speedString = $numberTool.format("0.0 mph", $speedValue))
+#else
+#set($speedString = $numberTool.format("0.0 kn", $position.speed))
+#end
+$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)
diff --git a/templates/short/deviceStopped.vm b/templates/short/deviceStopped.vm
new file mode 100644
index 000000000..c2437b5f6
--- /dev/null
+++ b/templates/short/deviceStopped.vm
@@ -0,0 +1 @@
+$device.name stopped at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/deviceUnknown.vm b/templates/short/deviceUnknown.vm
new file mode 100644
index 000000000..07f39f3a9
--- /dev/null
+++ b/templates/short/deviceUnknown.vm
@@ -0,0 +1 @@
+$device.name status is unknown at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/driverChanged.vm b/templates/short/driverChanged.vm
new file mode 100644
index 000000000..50849df7c
--- /dev/null
+++ b/templates/short/driverChanged.vm
@@ -0,0 +1,6 @@
+#if($driver)
+#set($driverName = $driver.name)
+#else
+#set($driverName = $event.getString("driverUniqueId"))
+#end
+Driver $driverName has changed in $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/geofenceEnter.vm b/templates/short/geofenceEnter.vm
new file mode 100644
index 000000000..debdbf356
--- /dev/null
+++ b/templates/short/geofenceEnter.vm
@@ -0,0 +1 @@
+$device.name has entered geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/geofenceExit.vm b/templates/short/geofenceExit.vm
new file mode 100644
index 000000000..8553458f7
--- /dev/null
+++ b/templates/short/geofenceExit.vm
@@ -0,0 +1 @@
+$device.name has exited geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/ignitionOff.vm b/templates/short/ignitionOff.vm
new file mode 100644
index 000000000..ddf860413
--- /dev/null
+++ b/templates/short/ignitionOff.vm
@@ -0,0 +1 @@
+$device.name ignition OFF at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/ignitionOn.vm b/templates/short/ignitionOn.vm
new file mode 100644
index 000000000..00b365be9
--- /dev/null
+++ b/templates/short/ignitionOn.vm
@@ -0,0 +1 @@
+$device.name ignition ON at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/maintenance.vm b/templates/short/maintenance.vm
new file mode 100644
index 000000000..621beae46
--- /dev/null
+++ b/templates/short/maintenance.vm
@@ -0,0 +1 @@
+$device.name maintenance $maintenance.name is required at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/test.vm b/templates/short/test.vm
new file mode 100644
index 000000000..d25f218ce
--- /dev/null
+++ b/templates/short/test.vm
@@ -0,0 +1 @@
+Test message
diff --git a/templates/short/textMessage.vm b/templates/short/textMessage.vm
new file mode 100644
index 000000000..dc42f29f1
--- /dev/null
+++ b/templates/short/textMessage.vm
@@ -0,0 +1 @@
+Text message received from $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.serverTime, $locale, $timezone)
diff --git a/templates/short/unknown.vm b/templates/short/unknown.vm
new file mode 100644
index 000000000..fd20b50cc
--- /dev/null
+++ b/templates/short/unknown.vm
@@ -0,0 +1 @@
+Unknown type