alsmanager_lib 3.0.215 → 3.0.217

package/lib/modules.js

@@ -10111,7 +10111,7 @@ function getSoftwaresNotAllocatedComboSQLite() {
     query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
     query += "else '' "
     query += "end as Descrizione ";
-    query += "from Softwares s ";
+    query += "from softwares s ";
     query += "left join consegna_beni cb on s.id = cb.id_bene "
     query += "where (s.is_removed is null or s.is_removed = 0) "
     query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
@@ -10126,7 +10126,7 @@ function getSoftwaresNotAllocatedComboMySQL() {
     query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
     query += "else '' "
     query += "end as Descrizione ";
-    query += "from Softwares s ";
+    query += "from softwares s ";
     query += "left join consegna_beni cb on s.id = cb.id_bene "
     query += "where (s.is_removed is null or s.is_removed = 0) "
     query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
@@ -10141,7 +10141,7 @@ function getSoftwaresNotAllocatedComboMySQL2() {
     query += "when s.serial_no != '' and s.serial_no is not null then concat(s.serial_no,'(S/N)', ' - ', s.platform, ' - ', s.maker, ' - ', s.model) ";
     query += "else '' "
     query += "end as Descrizione ";
-    query += "from Softwares s ";
+    query += "from softwares s ";
     query += "left join consegna_beni cb on s.id = cb.id_bene "
     query += "where (s.is_removed is null or s.is_removed = 0) "
     query += "and (cb.id is null or (cb.tipo_bene = 'SOFTWARE' and cb.stato_restituzione = 2)) ";
@@ -12064,12 +12064,12 @@ function queryHiddenGroupByType(db_used,dev_type) {
 //End Get hidden groups by id
 // Define getConnectionSetById
 function getConnectionSetByIdSQLite(id_conn_set) {
-    var query = "select id, id_set, id_conn, id_adapter, verse from set_connections ";
+    var query = "select id, id_set, id_conn, id_adapter, verse, lunghezza_cm, in_canaletta from set_connections ";
     query += "where id = " + id_conn_set;
     return query;
 }
 function getConnectionSetByIdMySQL(id_conn_set) {
-    var query = "select id, id_set, id_conn, id_adapter, verse from set_connections ";
+    var query = "select id, id_set, id_conn, id_adapter, verse, lunghezza_cm, in_canaletta from set_connections ";
     query += "where id = :id_conn_set";
     return query;
 }
@@ -12099,7 +12099,12 @@ function getConnectionByIdSetSQLite(id_set) {
     query += "when sc.id_adapter is not null and sc.id_adapter > 0 then concat(ac1.conn_type, ' -> ', ac2.conn_type) ";
     query += "else '' ";
     query += "end as Adattatore, ";
-    query += "sc.verse  as Verso from set_connections sc ";
+    query += "sc.verse  as Verso, sc.lunghezza_cm as Lunghezza, "; 
+    query += "case ";
+    query += "when sc.in_canaletta is not null and sc.in_canaletta > 0 then 'SI' ";
+    query += "else 'NO' ";
+    query += "end as Incanalato ";
+    query += "from set_connections sc ";
     query += "join connection_types ct on ct.id = sc.id_conn ";
     query += "left join adapter_types at on sc.id_adapter = at.id ";
     query += "left join connection_types ac1 on at.adapt_type_in = ac1.id ";
@@ -12113,7 +12118,12 @@ function getConnectionByIdSetMySQL(id_set) {
     query += "when sc.id_adapter is not null and sc.id_adapter > 0 then concat(ac1.conn_type, ' -> ', ac2.conn_type) ";
     query += "else '' ";
     query += "end as Adattatore, ";
-    query += "sc.verse  as Verso from set_connections sc ";
+    query += "sc.verse  as Verso, sc.lunghezza_cm as Lunghezza, "; 
+    query += "case ";
+    query += "when sc.in_canaletta is not null and sc.in_canaletta > 0 then 'SI' ";
+    query += "else 'NO' ";
+    query += "end as Incanalato ";
+    query += "from set_connections sc ";
     query += "join connection_types ct on ct.id = sc.id_conn ";
     query += "left join adapter_types at on sc.id_adapter = at.id ";
     query += "left join connection_types ac1 on at.adapt_type_in = ac1.id ";
@@ -12139,24 +12149,30 @@ function getConnectionByIdSet(db_used, id_set) {
 }
 //End Define getConnectionByIdSet
 // Define updateConnectionSet
-function updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter) {
+function updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta) {
     var query = "update set_connections set ";
     if (id_set && id_set > 0) {
         query += "id_set = " + id_set + ", ";
     }
     if (id_conn && id_conn > 0) {
-        query += "id_conn = " + id_conn + ", ";
+        query += ", id_conn = " + id_conn;
     }
     if (id_adapter && id_adapter > 0) {
-        query += "id_adapter = " + id_adapter + ", ";
+        query += ", id_adapter = " + id_adapter;
     }
     if (verse) {
-        query += "verse = '" + verse + "' ";
+        query += ", verse = '" + verse;
+    }
+    if (lunghezza_cm) {
+        query += ", lunghezza_cm = " + lunghezza_cm;
+    }
+    if (in_canaletta) {
+        query += ", in_canaletta = " + in_canaletta;
     }
     query += "where id = " + id_conn_set;
     return query;
 }
-function updateConnectionSetMySQL(id_set, id_conn_set, id_conn, verse, id_adapter) {
+function updateConnectionSetMySQL(id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta) {
     var query = "update set_connections set ";
     if (id_set && id_set > 0) {
         query += "id_set = :id_set, ";
@@ -12173,18 +12189,18 @@ function updateConnectionSetMySQL(id_set, id_conn_set, id_conn, verse, id_adapte
     query += "where id = :id_conn_set";
     return query;
 }
-function updateConnectionSet(db_used, id_set, id_conn_set, id_conn, verse, id_adapter) {
+function updateConnectionSet(db_used, id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter);
+                query = updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
             case 'MYSQL':
-                query = updateConnectionSetMySQL(id_set, id_conn_set, id_conn, verse, id_adapter);
+                query = updateConnectionSetMySQL(id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
             case 'MYSQL2':
-                query = updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter);
+                query = updateConnectionSetSQLite(id_set, id_conn_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
         }
     }
@@ -12192,34 +12208,48 @@ function updateConnectionSet(db_used, id_set, id_conn_set, id_conn, verse, id_ad
 }
 // end define updateConnectionSet
 // Define insertConnectionSet
-function insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter) {
-    var query = "insert into set_connections (id_set, id_conn, id_adapter, verse) values ";
+function insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta, date_start) {
+    var dt_start_str = "2025-09-01";
+    if (date_start) {
+        dt_start_str = convertDateToStringDB(date_start);
+    }
+    var query = "insert into set_connections (id_set, id_conn, id_adapter, verse, lunghezza_cm, in_canaletta, date_start, date_end) values ";
     query += "(" + id_set + ", ";
     query += id_conn + ", ";
     query += id_adapter + ", ";
-    query += "'" + verse + "')";
+    query += "'" + verse + "', ";
+    query += "'" + dt_start_str + "', ";
+    query += "'2999-12-31'" 
+    query += ")";
     return query;
 }
-function insertConnectionSetMySQL(id_set, id_conn, verse, id_adapter) {
-    var query = "insert into set_connections (id_set, id_conn, id_adapter, verse) values ";
+function insertConnectionSetMySQL(id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta, date_start) {
+    var dt_start_str = "2025-09-01";
+    if (date_start) {
+        dt_start_str = convertDateToStringDB(date_start);
+    }
+    var query = "insert into set_connections (id_set, id_conn, id_adapter, verse, lunghezza_cm, in_canaletta, date_start, date_end) values ";
     query += "(:id_set, ";
     query += ":id_conn, ";
     query += ":id_adapter, ";
-    query += ":verse)";
+    query += ":verse, ";
+    query += "'" + dt_start_str + "', ";
+    query += "'2999-12-31'" 
+    query += ")";    
     return query;
 }
-function insertConnectionSet(db_used, id_set, id_conn, verse, id_adapter) {
+function insertConnectionSet(db_used, id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter);
+                query = insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
             case 'MYSQL':
-                query = insertConnectionSetMySQL(id_set, id_conn, verse, id_adapter);
+                query = insertConnectionSetMySQL(id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
             case 'MYSQL2':
-                query = insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter);
+                query = insertConnectionSetSQLite(id_set, id_conn, verse, id_adapter, lunghezza_cm, in_canaletta);
                 break;
         }
     }
@@ -12257,6 +12287,66 @@ function removeConnectionSet(db_used, id_set, id_conn_set) {
     return query;
 }
 
+function updateConnectionSetAfterRemoveSQLite(id_set) {
+    var query = "update set_connections set date_out = '2999-12-31' ";
+    query += "where id_set = " + id_set + " and date_start = (select max(date_start) from set_connections where id_set = " + id_set + ")";
+    return query;
+}
+function updateConnectionSetAfterRemoveMySQL(id_set) {
+    var query = "update set_connections set date_out = '2999-12-31' ";
+    query += "where id_set = :id_set and date_start = (select max(date_start) from set_connections where id_set = :id_set)";
+    return query;
+}
+function updateConnectionSetAfterRemove(db_used, id_set) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateConnectionSetAfterRemoveSQLite(id_set);
+                break;
+            case 'MYSQL':
+                query = updateConnectionSetAfterRemoveMySQL(id_set);
+                break;
+            case 'MYSQL2':
+                query = updateConnectionSetAfterRemoveSQLite(id_set);
+                break;
+        }
+    }
+    return query;
+}
+
+function updateConnectionSetDatesSQLite(id_set) {
+    var query = "update set_connections set date_end = date('now','-1 day') ";
+    query += "where id_set = " + id_set + " and date_start = (select max(date_start) from set_connections where id_set = " + id_set + ")";
+    return query;
+}
+function updateConnectionSetDatesMySQL(id_device) {
+    var query = "update set_connections set date_end = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id_set = :id_set and date_start = (select max(date_start) from set_connections where id_set = :id_set)";
+    return query;
+}
+function updateConnectionSetDatesMySQL2(id_device) {
+    var query = "update set_connections set date_end = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id_set = " + id_set + " and date_start = (select max(date_start) from set_connections where id_set = " + id_set + ")";
+    return query;
+}
+function updateConnectionSetDates(db_used,id_set) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateConnectionSetDatesSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = updateConnectionSetDatesMySQL(id_device);
+                break;
+            case 'MYSQL2':
+                query = updateConnectionSetDatesMySQL2(id_device);
+                break;
+        }
+    }
+    return query;
+}
 // end define removeConnectionSet
 
 function getBeniConsumoTypes() {
@@ -17097,6 +17187,8 @@ module.exports = {
     insertConnectionSet,
     updateConnectionSet,
     removeConnectionSet,
+    updateConnectionSetAfterRemove,
+    updateConnectionSetDates,
     getConnectionByIdSet,
     getConnectionSetById,
     queryDetailsByIdDevice,

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "3.0.215",
+  "version": "3.0.217",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",