alsmanager_lib 1.0.16 → 1.0.18

package/lib/modules.js

@@ -2530,7 +2530,7 @@ function getBeniConsumoByIdDeviceMySQL(id_device) {
 function selectDismissioniByYearSQLite(sel_year) {
     var query = "select id, data, descrizione from dismissioni ";
     if (sel_year && sel_year > 0) {
-        query += "where data >= concat(" + sel_year + ", '-01-01') && data <= concat(" + sel_year + ", '-12-31')"; 
+        query += "where data >= concat(" + sel_year + ", '-01-01') and data <= concat(" + sel_year + ", '-12-31')"; 
     }
     return query;
 }
@@ -2538,11 +2538,30 @@ function selectDismissioniByYearSQLite(sel_year) {
 function selectDismissioniByYearMySQL(sel_year) {
     var query = "select id, data, descrizione from dismissioni ";
     if (sel_year && sel_year > 0) {
-        query += "where data >= concat(:sel_year, '-01-01') && data <= concat(:sel_year, '-12-31')"; 
+        query += "where data >= concat(:sel_year, '-01-01') and data <= concat(:sel_year, '-12-31')"; 
     }
     return query;    
 }
 
+function selectDismissioniByYear(db_used, sel_year) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDismissioniByYearSQLite(sel_year);
+                break;
+            case 'MYSQL':
+                query = selectDismissioniByYearMySQL(sel_year);
+                break;
+        }
+    }
+    else {
+        query = selectDismissioniByYearSQLite(sel_year);
+    }
+    return query;
+}
+
+
 function selectDismissioneByIdSQLite(id_dismiss) {
     var query = "select id, data, descrizione from dismissioni ";
     query += "where id = " + id_dismiss;
@@ -2553,40 +2572,98 @@ function selectDismissioneByIdMySQL(id_dismiss) {
     query += "where id = :id_dismiss";
     return query;
 }
+
+function selectDismissioneById(db_used, id_dismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDismissioneByIdSQLite(id_dismiss);
+                break;
+            case 'MYSQL':
+                query = selectDismissioneByIdMySQL(id_dismiss);
+                break;
+        }
+    }
+    else {
+        query = selectDismissioneByIdSQLite(id_dismiss);
+    }
+    return query;
+}
 //
-function insertDismissioneSQLite(dismiss) {
+function insertDismissioneSQLite(data, descrizione, is_closed) {
     var query = "insert into dismissioni ";
-    query += "(data, descrizione) ";
-    query += " values ('" + dismiss.dr_str + "',";
-    query += "'" + dismiss.note + "')";
+    query += "(data, descrizione, is_closed) ";
+    query += " values ('" + data + "',";
+    query += "'" + descrizione + "', ";
+    query += is_closed + ")";
     return query;
 }
-function insertDismissioneMySQL(dismiss) {
+function insertDismissioneMySQL(data, descrizione, is_closed) {
     var query = "insert into dismissioni ";
-    query += "(data, descrizione) ";
-    query += ":dr_str, ";
-    query += ":note) ";
+    query += "(data, descrizione, is_closed) values ";
+    query += "(:data, ";
+    query += ":note, ";
+    query += ":is_closed) ";
+    return query;
+}
+
+function insertDismissione(db_used, data, descrizione, is_closed) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = insertDismissioneSQLite(data, descrizione, is_closed);
+                break;
+            case 'MYSQL':
+                query = insertDismissioneMySQL(data, descrizione, is_closed);
+                break;
+        }
+    }
+    else {
+        query = insertDismissioneSQLite(data, descrizione, is_closed);
+    }
     return query;
 }
+
 //
-function updateDismissioneSQLite(dismiss) {
+function updateDismissioneSQLite(id_dismiss, data, descrizione, is_closed) {
     var query = "update dismissioni ";
     query += "set ";
-    if (dismiss.dr_str.trim() != '')
-        query += "data = '" + dismiss.dr_str + "', ";
-    query += "descrizione = '" + dismiss.descrizione + "', ";
-    query += "where id = " + dismiss.id;
+    query += "data = '" + data + "', ";
+    query += "descrizione = '" + descrizione + "', ";
+    query += "is_closed = " + is_closed + " ";
+    query += "where id = " + id_dismiss;
     return query;
 }
-function updateDismissioneMySQL(dismiss) {
+function updateDismissioneMySQL(id_dismiss, data, descrizione, is_closed) {
     var query = "update dismissioni ";
     query += "set ";
-    if (dismiss.dr_str.trim() != '')
-        query += "data = :dr_str, ";
-    query += "descrizione = :descrizione, ";
-    query += "where id = :id";
+    query += "data = :data, ";
+    query += "descrizione = :descrizione ";
+    query += "is_closed = :is_closed, ";
+    query += "where id = :id_dismiss";
     return query;
 }
+
+function updateDismissione(db_used, data, descrizione, is_closed) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateDismissioneSQLite(id_dismiss, data, descrizione, is_closed);
+                break;
+            case 'MYSQL':
+                query = updateDismissioneMySQL(id_dismiss, data, descrizione, is_closed);
+                break;
+        }
+    }
+    else {
+        query = updateDismissioneSQLite(id_dismiss, data, descrizione, is_closed);
+    }
+    return query;
+}
+
 function removeDismissioneByIdSQLite(id_dismiss) {
     var query = "delete from dismissioni ";
     query += "where id = " + id_dismiss;
@@ -2598,6 +2675,24 @@ function removeDismissioneByIdMySQL(id_dismiss) {
     return query;    
 }
 
+function removeDismissioneById(db_used, id_dismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeDismissioneByIdSQLite(id_dismiss);
+                break;
+            case 'MYSQL':
+                query = removeDismissioneByIdMySQL(id_dismiss);
+                break;
+        }
+    }
+    else {
+        query = removeDismissioneByIdSQLite(id_dismiss);
+    }
+    return query;
+}
+
 
 function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
     var query = "select dm.id, ";
@@ -2639,17 +2734,6 @@ function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     return query;    
 }
 
-function selectDismissioneDevicesByIdSQLite(id_devdismiss) {
-    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissioni "
-    query += "where id = " + id_devdismiss;
-    return query;
-}
-
-function selectDismissioneDevicesByIdMySQL(id_devdismiss) {
-    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissioni "
-    query += "where id = :id_devdismiss";
-    return query;
-}
 function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
     var query = "";
     if (db_used) {
@@ -2668,6 +2752,19 @@ function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
     return query;
 }
 
+function selectDismissioneDevicesByIdSQLite(id_devdismiss) {
+    var query = "select id, id_device, id_dismissione, motivo, note, data from device_dismissioni "
+    query += "where id = " + id_devdismiss;
+    return query;
+}
+
+function selectDismissioneDevicesByIdMySQL(id_devdismiss) {
+    var query = "select id, id_device, id_dismissione, motivo, note, data from device_dismissioni "
+    query += "where id = :id_devdismiss";
+    return query;
+}
+
+
 function selectDismissioneDevicesById(db_used, id_devdismiss) {
     var query = "";
     if (db_used) {
@@ -2698,32 +2795,94 @@ function removeDismissioneDeviceByIdDismissioneMySQL(id_dismiss) {
     query += "where id_dismissione = :id_dismiss";
     return query;        
 }
-function insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note) {
-    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note ) values ";
-    query += "(" + id_dismiss + ", " + id_device +  ", " + motivo + ", " + note + ")";
+
+function removeDismissioneDeviceByIdDismissione(db_used, id_devdismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeDismissioneDeviceByIdDismissioneSQLite(id_devdismiss);
+                break;
+            case 'MYSQL':
+                query = removeDismissioneDeviceByIdDismissioneMySQL(id_devdismiss);
+                break;
+        }
+    }
+    else {
+        query = removeDismissioneDeviceByIdDismissioneSQLite(id_devdismiss);
+    }
+    return query;
+}
+
+
+function insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note, data) {
+    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note, data ) values ";
+    query += "(" + id_dismiss + ", " + id_device +  ", " + motivo + ", '" + note + "', '" + data + "')";
     return query;    
 }
-function insertDismissioneDeviceMySQL(id_dismiss, id_device, note) {
-    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note ) values ";
-    query += "(:id_dismiss, :id_device, :motivo, :note)";
+function insertDismissioneDeviceMySQL(id_dismiss, id_device, note, data) {
+    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note, data ) values ";
+    query += "(:id_dismiss, :id_device, :motivo, :note, :data)";
     return query;        
 }    
-function updateDismissioneDeviceSQLite(id_devdismiss, id_device, motivo, note) {
+
+function insertDismissioneDevice(db_used, id_dismiss, id_device, motivo, note, data) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note, data);
+                break;
+            case 'MYSQL':
+                query = insertDismissioneDeviceMySQL(id_dismiss, id_device, motivo, note, data);
+                break;
+        }
+    }
+    else {
+        query = insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note, data);
+    }
+    return query;
+}
+
+function updateDismissioneDeviceSQLite(id_devdismiss, id_dismiss, id_device, motivo, note, data) {
     var query = "update device_dismissioni ";
     query += "set id_device = " + id_device + ", ";
+    query += "id_dismissione = " + id_dismiss + ", "; 
     query += "motivo = " + motivo + ", "; 
-    query += "note = " + note + " ";
+    query += "note = '" + note + "', ";
+    query += "data = '" + data + "' ";
     query += "where id = " + id_devdismiss;    
     return query;    
 }
-function updateDismissioneDeviceMySQL(id_devdismiss, id_device, motivo, note) {
+function updateDismissioneDeviceMySQL(id_devdismiss, id_dismiss, id_device, motivo, note, data) {
     var query = "update device_dismissioni ";
     query += "set id_device = :id_device, ";
+    query += "id_dismissione = :id_dismiss, "; 
     query += "motivo = :motivo, "; 
-    query += "note = :note ";
+    query += "note = :note, ";
+    query += "data = :data ";
     query += "where id = :id_devdismiss";        
     return query;    
 }    
+
+function updateDismissioneDevice(db_used, id_devdismiss, id_dismiss, id_device, motivo, note, data) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateDismissioneDeviceSQLite(id_devdismiss, id_dismiss, id_device, motivo, note, data);
+                break;
+            case 'MYSQL':
+                query = updateDismissioneDeviceMySQL(id_devdismiss, id_dismiss, id_device, motivo, note, data);
+                break;
+        }
+    }
+    else {
+        query = updateDismissioneDeviceSQLite(id_devdismiss, id_dismiss, id_device, motivo, note, data);
+    }
+    return query;
+}
+
 function removeDismissioneDeviceSQLite(id_devdismiss) {
     var query = "delete from device_dismissioni ";
     query += "where id = " + id_devdismiss;
@@ -2734,6 +2893,26 @@ function removeDismissioneDeviceMySQL(id_devdismiss) {
     query += "where id = :id_devdismiss";
     return query;            
 }
+
+function removeDismissioneDevice(db_used, id_devdismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeDismissioneDeviceSQLite(id_devdismiss);
+                break;
+            case 'MYSQL':
+                query = removeDismissioneDeviceMySQL(id_devdismiss);
+                break;
+        }
+    }
+    else {
+        query = removeDismissioneDeviceSQLite(id_devdismiss);
+    }
+    return query;
+}
+
+
 function loadDismissioniAttiveCombo() {
     var query = "select id, concat(data, ' - ', descrizione) as Dismissione from dismissioni ";
     query += "where is_closed is null or is_closed = 0";
@@ -3755,7 +3934,7 @@ function getAllPropertiesFromBLOB(text) {
 
 //end complete parser
 // Reports
-function getDevicesInUse() {
+function getDevicesInUseSQLite() {
     var query = "select d.type as Tipo, count(*) as Numero from devices d  ";
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
@@ -3766,7 +3945,36 @@ function getDevicesInUse() {
     return query;
 }
 
-function getDevicesInUseByPlaces() {
+function getDevicesInUseMySQL() {
+    var query = "select d.type as Tipo, count(*) as Numero from devices d  ";
+    query += "left join device_site ds on d.id = ds.id_device ";
+    query += "left join site_destinations sd on ds.id_site = sd.id_site ";
+    query += "where ds.id_place is not null ";
+    query += "and ds.date_in <= CURDATE() and ds.date_out >= CURDATE() ";
+    query += "and sd.type not in ('MAGAZZINO') ";
+    query += "group by d.type";
+    return query;
+}
+
+function getDevicesInUse(db_used) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getDevicesInUseSQLite();
+                break;
+            case 'MYSQL':
+                query = getDevicesInUseMySQL();
+                break;
+        }
+    }
+    else {
+        query = getDevicesInUseSQLite();
+    }
+    return query;
+}
+
+function getDevicesInUseByPlacesSQLite() {
     var query = "select ds.id_place as Plesso, d.type as Tipo, count(*) as Numero from devices d  ";
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
@@ -3777,6 +3985,35 @@ function getDevicesInUseByPlaces() {
     return query;
 }
 
+function getDevicesInUseByPlacesMySQL() {
+    var query = "select ds.id_place as Plesso, d.type as Tipo, count(*) as Numero from devices d  ";
+    query += "left join device_site ds on d.id = ds.id_device ";
+    query += "left join site_destinations sd on ds.id_site = sd.id_site ";
+    query += "where ds.id_place is not null ";
+    query += "and ds.date_in <= CURDATE() and ds.date_out >= CURDATE() ";
+    query += "and sd.type not in ('MAGAZZINO') ";
+    query += "group by ds.id_place, d.type";
+    return query;
+}
+
+function getDevicesInUseByPlaces(db_used) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getDevicesInUseByPlacesSQLite();
+                break;
+            case 'MYSQL':
+                query = getDevicesInUseByPlacesMySQL();
+                break;
+        }
+    }
+    else {
+        query = getDevicesInUseByPlacesSQLite();
+    }
+    return query;
+}
+
 function getDatiAcquistoDeviceSQLite(id_device) {
     var query = "select id, data_acquisto, costo, valuta, id_fornitore, note, tipo_cespite, id_sap from device_acquisto ";
     query += "where id_Device = " + id_device;
@@ -3972,28 +4209,21 @@ module.exports = {
     removeDocumentoMySQL,
     getDocumentByIdDocSQLite,
     getDocumentByIdDocMySQL,
-    selectDismissioniByYearSQLite,
-    selectDismissioniByYearMySQL,
-    selectDismissioneByIdSQLite,
-    selectDismissioneByIdMySQL,
-    updateDismissioneSQLite,
-    updateDismissioneMySQL,
-    insertDismissioneSQLite,
-    insertDismissioneMySQL,
-    removeDismissioneByIdSQLite,
-    removeDismissioneByIdMySQL,
-    removeDismissioneDeviceByIdDismissioneSQLite,
-    removeDismissioneDeviceByIdDismissioneMySQL,
-    insertDismissioneDeviceSQLite,
-    insertDismissioneDeviceMySQL,    
-    updateDismissioneDeviceSQLite,
-    updateDismissioneDeviceMySQL, 
-    removeDismissioneDeviceSQLite,
-    removeDismissioneDeviceMySQL, 
+    //
+    selectDismissioniByYear,
+    selectDismissioneById,
+    updateDismissione,
+    insertDismissione,
+    removeDismissioneById,
+    removeDismissioneDeviceByIdDismissione,
+    insertDismissioneDevice,    
+    updateDismissioneDevice, 
+    removeDismissioneDevice, 
     selectDismissioneDevicesById,
     selectDismissioneDevicesByIdDismiss,
     loadDismissioniAttiveCombo,
     loadMotivoDismissioneCombo,  
+    //
     assignCategoryFromDBSQLite,
     assignCategoryFromDBMySQL,
     getBeniConsumoByIdDeviceSQLite,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alsmanager_lib",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",