alsmanager_lib 1.0.44 → 1.0.46

package/lib/modules.js

@@ -5300,15 +5300,21 @@ function queryLastDismissioneId(db_used) {
 }
 
 function selectDocumentiByIdDismissioneSQLite(id_dismiss) {
-    var query = "select dsc.id, dc.tipo, dc.data_emissione, dc.descrizione from dismissione_docs dsc ";
-    query += "join documenti dc on dc.id = dsc.id_documento ";
-    query += "where id_dismissione = " + id_dismiss;
+    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 ";
+    query += "join documenti doc on doc.id = dc.id_doc ";
+    query += "where dm.id = " + id_dismiss;
     return query;
 } 
 function selectDocumentiByIdDismissioneMySQL(id_dismiss) {
-    var query = "select dsc.id, dc.tipo, dc.data_emissione, dc.descrizione from dismissione_docs dsc ";
-    query += "join documenti dc on dc.id = dsc.id_documento ";
-    query += "where id_dismissione = :id_dismiss";
+    var query = "select distinct doc.id, 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 ";
+    query += "join documenti doc on doc.id = dc.id_doc ";
+    query += "where dm.id = :id_dismiss";
     return query;   
 }
 function selectDocumentiByIdDismissione(db_used,id_dismiss) {
@@ -5326,31 +5332,7 @@ function selectDocumentiByIdDismissione(db_used,id_dismiss) {
     return query;
 }
 
-function selectDocumentoDismissioneByIdSQLite(id_docdismiss) {
-    var query = "select id, tipo, data_emissione, descrizione, riferimento, nome_originale, nome_uuid from dismissione_docs ";
-    query += "where id = " + id_docdismiss;
-    return query;
-}
 
-function selectDocumentoDismissioneByIdMySQL(id_docdismiss) {
-    var query = "select id, id_dismissione, id_documento from dismissione_docs ";
-    query += "where id = :id_docdismiss";
-    return query;
-}
-function selectDocumentoDismissioneById(db_used, id_docdismiss) {
-    var query = "";
-    if (db_used) {
-        switch (db_used) {
-            case 'SQLITE':
-                query = selectDocumentoDismissioneByIdSQLite(id_docdismiss);
-                break;
-            case 'MYSQL':
-                query = selectDocumentoDismissioneByIdMySQL(id_docdismiss);
-                break;
-        }
-    }
-    return query;
-}
 
 
 function insertDocumentoDismissioneSQLite(id_dismiss, id_doc) {
@@ -5596,31 +5578,60 @@ 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;
         }
     }
     return query;
 }
 
+function selectDocumentoDeviceByIdSQLite(id_docdev) {
+    var query = "select id, id_device, id_doc, is_acquisto, is_collaudo, is_dismissione from device_doc ";
+    query += "where id = " + id_docdev;
+    return query;
+}
+
+function selectDocumentoDeviceByIdMySQL(id_docdev) {
+    var query = "select id, id_device, id_doc, is_acquisto, is_collaudo, is_dismissione from device_doc ";
+    query += "where id = :id_docdev";
+    return query;
+}
+function selectDocumentoDeviceById(db_used, id_docdev) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDocumentoDeviceByIdSQLite(id_docdev);
+                break;
+            case 'MYSQL':
+                query = selectDocumentoDeviceByIdMySQL(id_docdev);
+                break;
+        }
+    }
+    return query;
+}
+
+
 function checkDocumentoDeviceSQLite(id_device, id_doc) {
     var query = "select count(*) from device_doc ";
     query += "where id_dismissione = " + id_device + " and id_documento = " + id_doc;
@@ -5701,6 +5712,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 ";
@@ -7442,7 +7457,9 @@ module.exports = {
     removeDocumento,
     getDocumentByIdDoc,
     queryDocumentoTypes,
+    queryDocumentoMotivo,
     checkDocumentoDevice,
+    selectDocumentoDeviceById,
     //
     selectDismissioniByYear,
     selectDismissioneById,
@@ -7463,7 +7480,6 @@ module.exports = {
     removeDismissioneDeviceFromDismissione,
     queryLastDismissioneId,
     selectDocumentiByIdDismissione,
-    selectDocumentoDismissioneById,
     insertDocumentoDismissione,
     updateDocumentoDismissione,
     removeDocumentoDismissione,

package/package.json

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