alsmanager_lib 1.0.1 → 1.0.3

package/lib/modules.js

@@ -1641,25 +1641,6 @@ function getDevicesNotAllocatedComboMySQL() {
     query += "order by d.inv_ict3_number";
     return query;
 }
-
-function getDevicesNotAllocatedCombo() {
-    var query = "";
-    var db_used = global.get("db_used");
-    if (db_used) {
-        switch (db_used) {
-            case 'SQLITE':
-                query = getDevicesNotAllocatedComboSQLite();
-                break;
-            case 'MYSQL':
-                query = getDevicesNotAllocatedComboMySQL();
-                break;
-        }
-    }
-    else {
-        query = getDevicesNotAllocatedComboSQLite();
-    }
-    return query;
-}
 // End getDevicesNotAllocatedCombo
 // Define getDevicesAllocatedCombo
 function getDevicesAllocatedComboSQLite(id_site, id_place) {
@@ -2546,81 +2527,136 @@ function getBeniConsumoByIdDeviceMySQL(id_device) {
 }
 
 //Manage dismissioni
-function selectDismissioni() {
-    var query = "select id, identificativo as Identificativo, tipo_identificativo as 'Tipo id',  tipo as 'Tipo disp', data as 'Data rilievo', note as 'Note dismiss' from dismissioni";
+function selectDismissioniByYearSQLite(sel_year) {
+    var query = "select id, data, note from dismissioni ";
+    if (sel_year && sel_year > 0) {
+        query += "where data >= concat(" + sel_year + ", '-01-01') && data <= concat(" + sel_year + ", '-12-31')"; 
+    }
     return query;
 }
 
+function selectDismissioniByYearMySQL(sel_year) {
+    var query = "select id, data, note from dismissioni ";
+    if (sel_year && sel_year > 0) {
+        query += "where data >= concat(:sel_year, '-01-01') && data <= concat(:sel_year, '-12-31')"; 
+    }
+    return query;    
+}
+
 function selectDismissioneByIdSQLite(id_dismiss) {
-    var query = "select id, identificativo, tipo_identificativo, tipo, id_device, data, note, motivo, id_place, id_site from dismissioni ";
+    var query = "select id, data, note, from dismissioni ";
     query += "where id = " + id_dismiss;
     return query;
 }
 function selectDismissioneByIdMySQL(id_dismiss) {
-    var query = "select id, identificativo, tipo_identificativo, tipo, id_device, data, note, motivo, id_place, id_site from dismissioni ";
+    var query = "select id, data, note from dismissioni ";
     query += "where id = :id_dismiss";
     return query;
 }
 //
 function insertDismissioneSQLite(dismiss) {
     var query = "insert into dismissioni ";
-    query += "(data, identificativo, tipo_identificativo, tipo, id_device, note, motivo, id_site, id_place) ";
+    query += "(data, note) ";
     query += " values ('" + dismiss.dr_str + "',";
-    query += "'" + dismiss.Identificativo + "',";
-    query += "'" + dismiss.tipo_identificativo + "',";
-    query += "'" + dismiss.tipo_device + "',";
-    query += dismiss.id_device + ",";
-    query += "'" + dismiss.note + "',";
-    query += "'" + dismiss.motivo + "',";
-    query += dismiss.id_site + ",";
-    query += "'" + dismiss.id_place + "')";
+    query += "'" + dismiss.note + "')";
     return query;
 }
 function insertDismissioneMySQL(dismiss) {
     var query = "insert into dismissioni ";
-    query += "(data, identificativo, tipo_identificativo, tipo, id_device, note, motivo, id_site, id_place) values (";
+    query += "(data, note) ";
     query += ":dr_str, ";
-    query += ":Identificativo, ";
-    query += ":tipo_identificativo, ";
-    query += ":tipo_device, ";
-    query += ":id_device, ";
-    query += ":note, ";
-    query += ":dismiss.motivo, ";
-    query += ":dismiss.id_site, ";
-    query += ":dismiss.id_place)";
+    query += ":note) ";
     return query;
 }
 //
 function updateDismissioneSQLite(dismiss) {
     var query = "update dismissioni ";
-    query += "set id_place = '" + dismiss.id_place + "', ";
-    query += "id_site = " + dismiss.id_site + ", ";
-    query += "id_device = " + dismiss.id_device + ", ";
-    query += "identificativo = '" + dismiss.Identificativo + "', ";
-    query += "tipo_identificativo = '" + dismiss.tipo_identificativo + "', ";
-    query += "tipo = '" + dismiss.tipo_device + "', ";
+    query += "set ";
     if (dismiss.dr_str.trim() != '')
         query += "data = '" + dismiss.dr_str + "', ";
     query += "note = '" + dismiss.note + "', ";
-    query += "motivo = '" + dismiss.motivo + "' ";
     query += "where id = " + dismiss.id;
     return query;
 }
 function updateDismissioneMySQL(dismiss) {
     var query = "update dismissioni ";
-    query += "set id_place = :id_place, ";
-    query += "id_site = :id_site, ";
-    query += "id_device = :id_device, ";
-    query += "identificativo = :Identificativo, ";
-    query += "tipo_identificativo = :tipo_identificativo, ";
-    query += "tipo = :tipo_device, ";
+    query += "set ";
     if (dismiss.dr_str.trim() != '')
         query += "data = :dr_str, ";
     query += "note = :note, ";
-    query += "motivo = :motivo ";
     query += "where id = :id";
     return query;
 }
+function removeDismissioneByIdSQLite(id_dismiss) {
+    var query = "delete from dismissioni ";
+    query += "where id = " + id_dismiss;
+    return query;
+}
+function removeDismissioneByIdMySQL(id_dismiss) {
+    var query = "delete from dismissioni ";
+    query += "where id = :id_dismiss";
+    return query;    
+}
+
+function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
+    var query = "select id, data, note from dismissioni ";
+    if (sel_year && sel_year > 0) {
+        query += "where data >= concat(" + sel_year + ", '-01-01') && data <= concat(" + sel_year + ", '-12-31')"; 
+    }
+    return query;
+}
+
+function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
+    var query = "select id, data, note from dismissioni ";
+    if (sel_year && sel_year > 0) {
+        query += "where data >= concat(:sel_year, '-01-01') && data <= concat(:sel_year, '-12-31')"; 
+    }
+    return query;    
+}
+function removeDismissioneDeviceByIdDismissioneSQLite(id_dismiss) {
+    var query = "delete from device_dismissioni ";
+    query += "where id_dismissione = " + id_dismiss;
+    return query;    
+}
+function removeDismissioneDeviceByIdDismissioneMySQL(id_dismiss) {
+    var query = "delete from device_dismissioni ";
+    query += "where id_dismissione = :id_dismiss";
+    return query;        
+}
+function insertDismissioneDeviceSQLite(id_dismiss, id_device, note) {
+    var query = "insert into device_dismissioni (id_dismissione, id_device, note ) values ";
+    query += "(" + id_dismiss + ", " + id_device +  ", " + note + ")";
+    return query;    
+}
+function insertDismissioneDeviceMySQL(id_dismiss, id_device, note) {
+    var query = "insert into device_dismissioni (id_dismissione, id_device, note ) values ";
+    query += "(:id_dismiss, :id_device, :note)";
+    return query;        
+}    
+function updateDismissioneDeviceSQLite(id_devdismiss, id_device, note) {
+    var query = "update device_dismissioni ";
+    query += "set id_device = " + id_device + ", ";
+    query += "note = " + note + " ";
+    query += "where id = " + id_devdismiss;    
+    return query;    
+}
+function updateDismissioneDeviceMySQL(id_devdismiss, id_device, note) {
+    var query = "update device_dismissioni ";
+    query += "set id_device = :id_device, ";
+    query += "note = :note ";
+    query += "where id = :id_devdismiss";        
+    return query;    
+}    
+function removeDismissioneDeviceSQLite(id_devdismiss) {
+    var query = "delete from device_dismissioni ";
+    query += "where id = " + id_devdismiss;
+    return query;            
+}
+function removeDismissioneDeviceMySQL(id_devdismiss) {
+    var query = "delete from device_dismissioni ";
+    query += "where id = :id_devdismiss";
+    return query;            
+}
 //End manage dismissioni
 
 
@@ -3558,7 +3594,8 @@ module.exports = {
     getDevicesInUseByPlaces,
     getDevicesAllocatedComboSQLite,
     getDevicesAllocatedComboMySQL,
-    getDevicesNotAllocatedCombo,
+    getDevicesNotAllocatedComboSQLite,
+    getDevicesNotAllocatedComboMySQL,
     queryDeviceTypes,
     queryDeviceManifactures,
     getDevicesSelectByRelatedSQLite,
@@ -3718,13 +3755,26 @@ module.exports = {
     queryDocumentsIdDeviceMySQL,
     getDocumentByIdDocSQLite,
     getDocumentByIdDocMySQL,
+    selectDismissioniByYearSQLite,
+    selectDismissioniByYearMySQL,
+    selectDismissioneByIdSQLite,
+    selectDismissioneByIdMySQL,
     updateDismissioneSQLite,
     updateDismissioneMySQL,
     insertDismissioneSQLite,
     insertDismissioneMySQL,
-    selectDismissioneByIdSQLite,
-    selectDismissioneByIdMySQL,
-    selectDismissioni,
+    removeDismissioneByIdSQLite,
+    removeDismissioneByIdMySQL,
+    selectDismissioneDevicesByIdDismissSQLite,
+    selectDismissioneDevicesByIdDismissMySQL,
+    removeDismissioneDeviceByIdDismissioneSQLite,
+    removeDismissioneDeviceByIdDismissioneMySQL,
+    insertDismissioneDeviceSQLite,
+    insertDismissioneDeviceMySQL,    
+    updateDismissioneDeviceSQLite,
+    updateDismissioneDeviceMySQL, 
+    removeDismissioneDeviceSQLite,
+    removeDismissioneDeviceMySQL,   
     assignCategoryFromDBSQLite,
     assignCategoryFromDBMySQL,
     getBeniConsumoByIdDeviceSQLite,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "alsmanager_lib",
-  "version": "1.0.1",
-  "description": "Funzioni per ALSNManager",
+  "version": "1.0.3",
+  "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",
   "type": "commonjs",