alsmanager_lib 2.0.98 → 2.0.100

package/lib/modules.js

@@ -2724,7 +2724,7 @@ function getDevicesByIdDocSQLite(id_doc) {
     query += "end as Codice ";
     query += "from devices d ";
     query += "left join device_doc dd on d.id = dd.id_device ";
-    query += "where dd.id = " + id_doc + " ";
+    query += "where dd.id_doc = " + id_doc + " ";
     query += "order by d.inv_ict3_number, d.inv_tn_number, d.inv_tndigit_number, d.serial_no";
     return query;
 }
@@ -2740,7 +2740,7 @@ function getDevicesByIdDocMySQL(id_doc) {
     query += "end as Codice ";
     query += "from devices d ";
     query += "left join device_doc dd on d.id = dd.id_device ";
-    query += "where dd.id = " + id_doc + " ";
+    query += "where dd.id_doc = :id_doc ";
     query += "order by d.inv_ict3_number, d.inv_tn_number, d.inv_tndigit_number, d.serial_no";
     return query;
 }

package/package.json

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

package/pythons/main.py

@@ -4,6 +4,7 @@ import socket
 import re
 import uuid
 import cpuinfo
+from hurry.filesize import size
 
 #Computer network name
 print(f"Computer network name: {platform.node()}")
@@ -55,5 +56,15 @@ print(f"Win32 Arch: {platform.architecture()}")
 #print(f"CpuInfo: {cpuinfo.get_cpu_info()}")
 print(f"CpuInfo: {cpuinfo.get_cpu_info()['brand_raw']}")
 
+#Disk 
+print(psutil.disk_usage('/'))
+total, used, free, percent = psutil.disk_usage('/')
+# Using size to have compact view
+print(size(total))
+# Battery - Array
+battery = psutil.sensors_battery()
+
+#Process
+print(psutil.users())