alsmanager_lib 1.0.25 → 1.0.27

package/lib/modules.js

@@ -3485,6 +3485,21 @@ function queryFloorsByPlaceMySQL(id_place) {
     return query;
 }
 
+function queryFloorsByPlace(db_used, id_place) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryFloorsByPlaceSQLite(id_place);
+                break;
+            case 'MYSQL':
+                query = queryFloorsByPlaceMySQL(id_place);
+                break;
+        }
+    }
+    return query;
+}
+
 function queryFunzioneByPlaceAndFloorSQLite(id_place, piano) {
     var query = "";
     query = "SELECT DISTINCT sd.type as funzione from site_destinations sd";
@@ -3517,6 +3532,22 @@ function queryFunzioneByPlaceAndFloorMySQL(id_place, piano) {
 
 }
 
+function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryFunzioneByPlaceAndFloorSQLite(id_place, piano);
+                break;
+            case 'MYSQL':
+                query = queryFunzioneByPlaceAndFloorMySQL(id_place, piano);
+                break;
+        }
+    }
+    return query;
+
+}
+
 
 function querySitesSQLite(place, piano, funzione) {
     var query = "SELECT site_destinations.id_site as id, sites.id_place as Plesso, site_destinations.name as Nome, sites.mark as Codice, sites.floor as Piano, site_destinations.type as Funzione from site_destinations";
@@ -3556,6 +3587,24 @@ function querySitesMySQL(place, piano, funzione) {
     return query;
 }
 
+function querySites(db_used, place, piano, funzione) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = alsmgr.querySitesSQLite(place, piano, funzione);
+                break;
+            case 'MYSQL':
+                query = alsmgr.querySitesMySQL(place, piano, funzione);
+                break;
+        }
+    }
+    else {
+        query = alsmgr.querySitesSQLite(place, piano, funzione);
+    }
+    return query;
+
+}
 
 //Sites by devices
 function getSitesFromDeviceSQLite(id_device, prec_pos) {
@@ -4489,6 +4538,7 @@ module.exports = {
     removeConsegnaMySQL,
     queryLastConsegnaIdSQLite,
     queryLastConsegnaIdMySQL,
+    //
     removeSiteBySetSQLite,
     removeSiteBySetMySQL,
     updateSiteBySetSQLite,
@@ -4516,12 +4566,9 @@ module.exports = {
     removeDeviceSiteSQLite,
     removeDeviceSiteMySQL,
     queryPlaces,
-    queryFloorsByPlaceSQLite,
-    queryFloorsByPlaceMySQL,
-    queryFunzioneByPlaceAndFloorSQLite,
-    queryFunzioneByPlaceAndFloorMySQL,
-    querySitesSQLite,
-    querySitesMySQL,
+    queryFloorsByPlace,
+    queryFunzioneByPlaceAndFloor,
+    querySites,
     getSitesFromDeviceSQLite,
     getSitesFromDeviceMySQL,
     getSitesWithDatesFromDeviceSQLite,
@@ -4530,6 +4577,7 @@ module.exports = {
     querySitesWithDefaultsMySQL,
     getPorteByIdSiteSQLite,
     getPorteByIdSiteMySQL,
+    //
     queryStatisticSQLite,
     queryStatisticMySQL,
     queryStatisticInventarySQLite,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "alsmanager_lib",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",
   "type": "commonjs",
-  "main": "./lib/*.js",
+  "main": "./lib/modules.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   }

package/lib/doubledb.js

@@ -1,25 +0,0 @@
-// Metodi di gestione doppio motore DB
-import { queryFloorsByPlaceSQLite, queryFloorsByPlaceMySQL } from './modules';
-
-function queryFloorsByPlace(db_used, id_place) {
-    var query = "";
-    if (db_used) {
-        switch (db_used) {
-            case 'SQLITE':
-                query = alsmgr.queryFloorsByPlaceSQLite(id_place);
-                break;
-            case 'MYSQL':
-                query = alsmgr.queryFloorsByPlaceMySQL(id_place);
-                break;
-        }
-    }
-    return query;
-}
-
-
-
-// Exports
-module.exports = 
-{
-    queryFloorsByPlace
-}