alsmanager_lib 3.0.94 → 3.0.96

package/lib/modules.js

@@ -11706,6 +11706,68 @@ function getSitesSelectComboByPlace(db_used, id_place, floor, date_ref) {
     return query;
 }
 
+//End Site in Combo Parziale
+// Select Site in Combo Parziale
+function getSitesSelectComboExcludeIdSQLite(id_site, date_ref) {
+    var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    if (date_ref) { 
+        query += "where '" + date_ref + "' >= sd.date_start and '" + date_ref + "' <= sd.date_end ";
+    }
+    else { 
+        query += "where date('now') >= sd.date_start and date('now') <= sd.date_end ";
+    }
+    query += "and s.id <> " + id_site + " ";
+    query += "order by sd.name ";
+    return query;
+}
+
+function getSitesSelectComboExcludeIdMySQL(id_site, date_ref) {
+    var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    if (date_ref) { 
+        query += "where :date_ref >= sd.date_start and :date_ref <= sd.date_end ";
+    }
+    else { 
+        query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    }
+    query += "and s.id <> :id_site ";
+    query += "order by sd.name ";
+    return query;
+}
+
+function getSitesSelectComboExcludeIdMySQL2(id_site, date_ref) {
+    var query = "select s.id, concat(sd.name, ' - ', s.mark) as Descrizione from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    if (date_ref) { 
+        query += "where '" + date_ref + "' >= sd.date_start and '" + date_ref + "' <= sd.date_end ";
+    }
+    else { 
+        query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    }
+    query += "and s.id <> " + id_site + " ";
+    query += "order by sd.name ";
+    return query;
+}
+
+function getSitesSelectComboExcludeId(db_used, id_site, date_ref) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getSitesSelectComboExcludeIdSQLite(id_site, date_ref);
+                break;
+            case 'MYSQL':
+                query = getSitesSelectComboExcludeIdMySQL(id_site, date_ref);
+                break;
+            case 'MYSQL2':
+                query = getSitesSelectComboExcludeIdMySQL2(id_site, date_ref);
+                break;
+        }
+    }
+    return query;
+}
+
 //End Site in Combo Parziale
 //Get Sites by Id
 function getSiteByIdSQLite(id_site) {
@@ -14486,8 +14548,6 @@ function writeMapPoint(id_place, floor, id_site, x_coor, y_coor, map_scale, rang
 
 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 + ", ";
@@ -14835,6 +14895,7 @@ module.exports = {
     getSiteById,
     getSitesSelectCombo,
     getSitesSelectComboByPlace,
+    getSitesSelectComboExcludeId,
     verifyPrevDeviceSite,
     insertDeviceSite,
     updateDeviceSite,

package/package.json

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