From 46a264c791a6ea7b8056e642a8aede9ba1c2a27b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 17 Apr 2016 23:29:36 +1200
Subject: Update release config files again

---
 setup/windows/traccar.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'setup/windows')

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'>
-- 
cgit v1.2.3