alsmanager_lib 3.0.92 → 3.0.94

package/lib/modules.js

@@ -14478,20 +14478,22 @@ function getMapScript(map_tag) {
     return text;
 }
 
-function writeMapPoint(id_place, floor, id_site, x_coor, y_coor, map_scale) {
-    var query = "insert into map_points (id_place, floor, id_site, point_x, point_y, map_scale) values ";
-    query += "('" + id_place + "', " + floor + ", " + id_site + ", " + x_coor + ", " + y_coor + ", " + map_scale + ")";
+function writeMapPoint(id_place, floor, id_site, x_coor, y_coor, map_scale, range_x, range_y) {
+    var query = "insert into map_points (id_place, floor, id_site, point_x, point_y, map_scale, range_x, range_y) values ";
+    query += "('" + id_place + "', " + floor + ", " + id_site + ", " + x_coor + ", " + y_coor + ", " + map_scale + ", " + range_x + ", " + range_y + ")";
     return query;
 }
 
-function updateMapPoint(id_point, id_site, x_coor, y_coor, map_scale) {
-    var query = "update map_points set (id_place, floor, id_site, point_x, point_y, map_scale) values ";
+function updateMapPoint(id_point, id_site, x_coor, y_coor, map_scale, range_x, range_y) {
+    var query = "update map_points set ";
     query += "id_place = '" + id_place + "', ";
     query += "floor = " + floor + ", ";
     query += "id_site = " + id_site + ", ";
     query += "point_x = " + x_coor + ", ";
     query += "point_y = " + y_coor + ", ";
-    query += "map_scale = " + map_scale + " ";
+    query += "map_scale = " + map_scale + ", ";
+    query += "range_x = " + range_x + ", ";
+    query += "range_y = " + range_y + " ";
     query += "where id = " + id_point;
     return query;
 }
@@ -14513,14 +14515,18 @@ function removeMapPointByPlace(id_place, floor) {
 
 
 function queryMapPointsByPlaceAndFloor(id_place, floor, map_scale) {
-    var query = "select id, floor, id_site, from map_points ";
-    query += "";
+    var query = "select m.id, sd.name, sd.type, m.point_x, m.point_y, m.range_x, m.range_y from map_points m ";
+    query += "join site_destinations sd on sd.id_site = m.id_site ";
+    query += "where m.id_place = '" + id_place + "' ";
+    query += "and m.floor = " + floor + " ";
+    query += "and m.map_scale = " + map_scale + " ";
+    query += "order by sd.name";
     return query;
 }
 
 function getMapPointsById(id_point) {
-    var query = "";
-    query += "";
+    var query = "select id, id_place, floor, id_site, point_x, point_y, map_scale, range_x, range_y from map_points ";
+    query += "where id = " + id_point;
     return query;
 }
 

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "3.0.92",
+  "version": "3.0.94",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",