alsmanager_lib 3.0.44 → 3.0.46

package/lib/modules.js

@@ -1395,7 +1395,7 @@ function getDocentiCombo(db_used, id_place, ordine_scuola, ruolo) {
     var query = "select id, concat(cognome, ' ', nome, ' - ', ordine, ' - ', ruolo) as nominativo from anagrafica_docenti ";
     query += "where is_attivo = 1 "
     if (ordine_scuola && ordine_scuola.trim() != '') {
-        query += "and ordine = '" + ordine + "' ";
+        query += "and (ordine = '" + ordine + "' or ruolo <> 'DOCENTE') ";
     }
     if (id_place && id_place.trim() != '') {
         query += "and id_place = '" + id_place + "' ";
@@ -10536,6 +10536,38 @@ function queryPlaces() {
     return query;
 }
 
+function queryPlaceByIdSQLite(id_place) {
+    var query = "SELECT mark, name, address, city, phone_number, type, coor_long, coor_lat, plus_code, dist_by_feet_m, dist_by_car_m, is_main from places ";
+    query += " where mark = '" + id_place + "'";
+    return query;
+}
+
+function queryPlaceByIdMySQL(id_place) {
+    var query = "SELECT mark, name, address, city, phone_number, type, coor_long, coor_lat, plus_code, dist_by_feet_m, dist_by_car_m, is_main from places ";
+    query += "where mark = :id_place";
+    return query;
+}
+
+function queryPlaceById(db_used, id_place) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryPlaceByIdSQLite(id_place);
+                break;
+            case 'MYSQL':
+                query = queryPlaceByIdMySQL(id_place);
+                break;
+            case 'MYSQL2':
+                query = queryPlaceByIdSQLite(id_place);
+                break;
+        }
+    }
+    return query;
+}
+
+
+
 function queryFloorsByPlaceSQLite(id_place) {
     var query = "SELECT DISTINCT floor from sites";
     query += " where id_place = '" + id_place + "'";
@@ -14279,6 +14311,7 @@ module.exports = {
     updateDeviceSiteAfterRemove,
     removeDeviceFromAllSites,
     queryPlaces,
+    queryPlaceById,
     queryFloorsByPlace,
     queryFunzioneByPlaceAndFloor,
     querySites,

package/package.json

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