Merge remote-tracking branch 'refs/remotes/tananaev/master'

1 files changed, 37 insertions, 9 deletions

diff --git a/debug.xml b/debug.xml
index e641bda56..8e0b70fbf 100644
--- a/debug.xml
+++ b/debug.xml
@@ -14,6 +14,7 @@
     <entry key='web.path'>web</entry>
     <entry key='web.debug'>true</entry>
     <entry key='web.console'>true</entry>
+    <entry key='web.timeout'>30000</entry>
 
     <entry key='geocoder.enable'>true</entry>
     <entry key='geocoder.type'>nominatim</entry>
@@ -48,7 +49,7 @@
     <entry key='database.user'>sa</entry>
     <entry key='database.password'></entry>
     <entry key='database.xml'>false</entry>
-    <entry key='database.changelog'>./database/db.changelog-master.xml</entry>
+    <entry key='database.changelog'>./database/changelog-master.xml</entry>
 
     <entry key='database.selectServers'>
         SELECT * FROM server;
@@ -112,24 +113,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'>
@@ -148,6 +149,30 @@
         DELETE FROM user_device WHERE userId = :userId AND deviceId = :deviceId;
     </entry>
 
+    <entry key='database.selectGroupsAll'>
+        SELECT * FROM groups;
+    </entry>
+
+    <entry key='database.insertGroup'>
+        INSERT INTO groups (name) VALUES (:name);
+    </entry>
+
+    <entry key='database.updateGroup'>
+        UPDATE groups SET name = :name, groupId = :groupId WHERE id = :id;
+    </entry>
+
+    <entry key='database.deleteGroup'>
+        DELETE FROM groups WHERE id = :id;
+    </entry>
+
+    <entry key='database.linkGroup'>
+        INSERT INTO user_group (userId, groupId) VALUES (:userId, :groupId);
+    </entry>
+
+    <entry key='database.unlinkGroup'>
+        DELETE FROM user_group WHERE userId = :userId AND groupId = :groupId;
+    </entry>
+
     <entry key='database.selectPositions'>
         SELECT * FROM positions WHERE deviceId = :deviceId AND fixTime BETWEEN :from AND :to ORDER BY fixTime;
     </entry>
@@ -235,7 +260,7 @@
     <entry key='eelink.port'>5064</entry>
     <entry key='box.port'>5065</entry>
     <entry key='freedom.port'>5066</entry>
-    <entry key='telik.port'>5067</entry>
+    <entry key='telic.port'>5067</entry>
     <entry key='trackbox.port'>5068</entry>
     <entry key='visiontek.port'>5069</entry>
     <entry key='orion.port'>5070</entry>
@@ -247,6 +272,7 @@
     <entry key='xt013.port'>5076</entry>
     <entry key='autofon.port'>5077</entry>
     <entry key='gosafe.port'>5078</entry>
+    <entry key='tt8850.port'>5079</entry>
     <entry key='bce.port'>5080</entry>
     <entry key='xirgo.port'>5081</entry>
     <entry key='calamp.port'>5082</entry>
@@ -270,5 +296,7 @@
     <entry key='arnavi.port'>5100</entry>
     <entry key='nvs.port'>5101</entry>
     <entry key='kenji.port'>5102</entry>
+    <entry key='astra.port'>5103</entry>
+    <entry key='homtecs.port'>5104</entry>
 
 </properties>