alsmanager_lib 1.0.45 → 1.0.47

package/lib/modules.js

@@ -5300,7 +5300,7 @@ function queryLastDismissioneId(db_used) {
 }
 
 function selectDocumentiByIdDismissioneSQLite(id_dismiss) {
-    var query = "select distinct doc.id, doc.descrizione, doc.data_emissione from device_dismissioni ds ";
+    var query = "select distinct doc.id_doc, doc.descrizione, doc.data_emissione from device_dismissioni ds ";
     query += "join devices d on d.id = ds.id_device ";
     query += "join device_doc dc on dc.id_device = ds.id_device ";
     query += "join dismissioni dm on dm.id = ds.id_dismissione ";
@@ -5578,25 +5578,27 @@ function insertDocumentoDevice(db_used, id_device, id_doc, scopo) {
 }
 
 
-function removeDocumentoDeviceSQLite(id_docdev) {
+function removeDocumentoDeviceSQLite(id_device, id_doc) {
     var query = "delete from device_doc ";
-    query += "where id = " + id_docdev;
+    query += "where id_device = " + id_device + " and ";
+    query += "id_doc = " + id_doc;
     return query;
 }
-function removeDocumentoDeviceMySQL(id_docdev) {
+function removeDocumentoDeviceMySQL(id_device, id_doc) {
     var query = "delete from device_doc ";
-    query += "where id = :id_docdev";
+    query += "where id_device = :id_device and ";
+    query += "id_doc = :id_doc";
     return query;    
 }
-function removeDocumentoDevice(db_used, id_docdev) {
+function removeDocumentoDevice(db_used, id_device, id_doc) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = removeDocumentoDeviceSQLite(id_docdev);
+                query = removeDocumentoDeviceSQLite(id_device, id_doc);
                 break;
             case 'MYSQL':
-                query = removeDocumentoDeviceMySQL(id_docdev);
+                query = removeDocumentoDeviceMySQL(id_device, id_doc);
                 break;
         }
     }
@@ -5680,16 +5682,12 @@ function getDocumentByIdDoc(db_used, id_doc) {
     return query;
 }
 
-function selectDocumentoByIdSQLite(id_doc) {
-    var query = "select id, tipo, data_emissione, descrizione, riferimento, nome_originale, nome_uuid from documenti ";
-    query += "where id = " + id_doc;
-    return query;
+function selectDocumentoByIdSQLite(id_doc) {    
+    return getDocumentByIdDocSQLite(id_doc);
 }
 
 function selectDocumentoByIdMySQL(id_doc) {
-    var query = "select id, tipo, data_emissione, descrizione, riferimento, nome_originale, nome_uuid from documenti ";
-    query += "where id = :id_doc";
-    return query;
+    return getDocumentByIdDocMySQL(id_doc);
 }
 function selectDocumentoById(db_used, id_doc) {
     var query = "";
@@ -5710,6 +5708,10 @@ function queryDocumentoTypes() {
     return "select tipo, descrizione from documento_types order by tipo";
 } 
 
+function queryDocumentoMotivo() {
+    return "select scopo, descrizione from documento_scopo order by scopo";
+} 
+
 function selectDocumentiComboSQLite(tipo, anno_emissione) {
     var where_clause = "";
     var query = "select id, concat(tipo, ' - ', descrizione, ' - ', data_emissione, ' - ', riferimento) as doc from documenti ";
@@ -7451,6 +7453,7 @@ module.exports = {
     removeDocumento,
     getDocumentByIdDoc,
     queryDocumentoTypes,
+    queryDocumentoMotivo,
     checkDocumentoDevice,
     selectDocumentoDeviceById,
     //

package/package.json

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