aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
Diffstat (limited to 'setup')
-rw-r--r--setup/unix/traccar.xml17
-rw-r--r--setup/windows/traccar.xml17
2 files changed, 18 insertions, 16 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index 39519890d..2ddf6551f 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -75,7 +75,8 @@
speedUnit = :speedUnit,
latitude = :latitude,
longitude = :longitude,
- zoom = :zoom
+ zoom = :zoom,
+ twelveHourFormat = :twelveHourFormat
WHERE id = :id;
</entry>
@@ -87,24 +88,24 @@
DELETE FROM users WHERE id = :id;
</entry>
- <entry key='database.getPermissionsAll'>
+ <entry key='database.selectDevicePermissions'>
SELECT userId, deviceId FROM user_device;
</entry>
- <entry key='database.selectDevicesAll'>
- SELECT * FROM devices;
+ <entry key='database.selectGroupPermissions'>
+ SELECT userId, groupId FROM user_group;
</entry>
- <entry key='database.selectDevices'>
- SELECT * FROM devices d INNER JOIN user_device ud ON d.id = ud.deviceId WHERE ud.userId = :userId;
+ <entry key='database.selectDevicesAll'>
+ SELECT * FROM devices;
</entry>
<entry key='database.insertDevice'>
- INSERT INTO devices (name, uniqueId) VALUES (:name, :uniqueId);
+ INSERT INTO devices (name, uniqueId, groupId) VALUES (:name, :uniqueId, :groupId);
</entry>
<entry key='database.updateDevice'>
- UPDATE devices SET name = :name, uniqueId = :uniqueId WHERE id = :id;
+ UPDATE devices SET name = :name, uniqueId = :uniqueId, groupId = :groupId WHERE id = :id;
</entry>
<entry key='database.updateDeviceStatus'>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index 719857e94..bf1b216af 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -75,7 +75,8 @@
speedUnit = :speedUnit,
latitude = :latitude,
longitude = :longitude,
- zoom = :zoom
+ zoom = :zoom,
+ twelveHourFormat = :twelveHourFormat
WHERE id = :id;
</entry>
@@ -87,24 +88,24 @@
DELETE FROM users WHERE id = :id;
</entry>
- <entry key='database.getPermissionsAll'>
+ <entry key='database.selectDevicePermissions'>
SELECT userId, deviceId FROM user_device;
</entry>
- <entry key='database.selectDevicesAll'>
- SELECT * FROM devices;
+ <entry key='database.selectGroupPermissions'>
+ SELECT userId, groupId FROM user_group;
</entry>
- <entry key='database.selectDevices'>
- SELECT * FROM devices d INNER JOIN user_device ud ON d.id = ud.deviceId WHERE ud.userId = :userId;
+ <entry key='database.selectDevicesAll'>
+ SELECT * FROM devices;
</entry>
<entry key='database.insertDevice'>
- INSERT INTO devices (name, uniqueId) VALUES (:name, :uniqueId);
+ INSERT INTO devices (name, uniqueId, groupId) VALUES (:name, :uniqueId, :groupId);
</entry>
<entry key='database.updateDevice'>
- UPDATE devices SET name = :name, uniqueId = :uniqueId WHERE id = :id;
+ UPDATE devices SET name = :name, uniqueId = :uniqueId, groupId = :groupId WHERE id = :id;
</entry>
<entry key='database.updateDeviceStatus'>