alsmanager_lib 1.0.81 → 1.0.83

package/ALS_sqliteSchema.sql

@@ -922,14 +922,76 @@ CREATE TABLE IF NOT EXISTS "device_usage" (
 	"note"	TEXT,
 	PRIMARY KEY("id" AUTOINCREMENT)
 );
-CREATE TABLE IF NOT EXISTS "device_config" (
+CREATE TABLE IF NOT EXISTS "device_changes" (
 	"id"	INTEGER,
 	"id_device"	INTEGER,
 	"date_conf"	TEXT,
-	"id_storage"	INTEGER,
-	"id_network"	INTEGER,
-	"id_addon"	INTEGER,
 	"note"	TEXT,
 	PRIMARY KEY("id" AUTOINCREMENT)
 );
+CREATE TABLE IF NOT EXISTS "log_exports" (
+	"id"	INTEGER,
+	"date_export"	TEXT,
+	"filename"	TEXT,
+	"hostname"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE TABLE IF NOT EXISTS "anagrafica_docenti" (
+	"id"	INTEGER,
+	"cognome"	TEXT,
+	"nome"	TEXT,
+	"email"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE TABLE IF NOT EXISTS "prn_stampe" (
+	"id"	INTEGER,
+	"id_docente"	INTEGER,
+	"num_stampe_bn"	INTEGER,
+	"num_stampe_color"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE TABLE IF NOT EXISTS "docenti_classi" (
+	"id"	INTEGER,
+	"id_docente"	INTEGER,
+	"id_place"	TEXT,
+	"id_site"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE TABLE IF NOT EXISTS "prn_ricariche" (
+	"id"	INTEGER,
+	"id_docente"	INTEGER,
+	"data_ricarica"	TEXT,
+	"num_stampe_bn"	INTEGER,
+	"num_stampa_c"	INTEGER,
+	"id_device"	INTEGER,
+	PRIMARY KEY("id")
+);
+CREATE TABLE IF NOT EXISTS "device_memory" (
+	"id"	INTEGER,
+	"id_device"	INTEGER,
+	"mem_type"	TEXT,
+	"manifacturer"	TEXT,
+	"model"	TEXT,
+	"mem_size"	INTEGER,
+	"mem_size_unit"	TEXT,
+	PRIMARY KEY("id")
+);
+CREATE TABLE IF NOT EXISTS "change_config" (
+	"id"	INTEGER,
+	"id_conf"	INTEGER,
+	"part_type"	TEXT,
+	"id_part"	INTEGER,
+	"operation"	TEXT,
+	"id_part_replaced"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+CREATE TABLE IF NOT EXISTS "disk_usage" (
+	"id"	INTEGER,
+	"date_ref"	TEXT,
+	"id_device"	INTEGER,
+	"id_storage"	INTEGER,
+	"size_unit"	TEXT,
+	"available_space"	REAL,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
 COMMIT;

package/lib/modules.js

@@ -156,14 +156,14 @@ function removeConnector(db_used, id_device, conn_obj) {
 //End Manage connectors
 // Manage Storage
 function getStorageByIdDeviceSQLite(id_device) {
-    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
     query += "join storage_types st on st.id = ds.storage_type ";
     query += "where id_device = " + id_device;
     return query;
 }
 
 function getStorageByIdDeviceMySQL(id_device) {
-    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
     query += "join storage_types st on st.id = ds.storage_type ";
     query += "where id_device = :id_device";
     return query;
@@ -252,13 +252,13 @@ function getStorageByIdPartAndIdConf(db_used, id_storage, id_conf) {
 
 
 function getStorageByIdSQLite(id_storage) {
-    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model from device_storages ";
+    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model from device_storages ";
     query += "where id = " + id_storage;
     return query;
 }
 
 function getStorageByIdMySQL() {
-    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model from device_storages ";
+    var query = "select id, id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model from device_storages ";
     query += "where id = :id_storage";
     return query;
 }
@@ -285,24 +285,21 @@ function createStorageObjMySQL(id_device, storage_obj) {
     obj.tipo = storage_obj.tipo;
     obj.unita = storage_obj.unita;
     obj.dimensione = storage_obj.dimensione;
-    obj.dim_disponibile = storage_obj.dim_disponibile;
     obj.marca = storage_obj.marca;
     obj.modello = storage_obj.modello;
-    obj.is_replaced = storage_obj.is_replaced;
-    obj.date_replaced = storage_obj.date_replaced;
     return obj;
 }
 
 function insertStorageSQLite(id_device, storage_obj) {
-    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model, is_replaced, date_replaced) values ";
-    query += "(" + id_device + ", " + storage_obj.tipo + ", '" + storage_obj.unita + "'," + storage_obj.dimensione + ", " + storage_obj.dim_disponibile + ", ";
-    query += "'" + storage_obj.marca + "', '" + storage_obj.modello + "', " + storage_obj.is_replaced + ", '" + storage_obj.date_replaced + "')";
+    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model) values ";
+    query += "(" + id_device + ", " + storage_obj.tipo + ", '" + storage_obj.unita + "'," + storage_obj.dimensione + ", ";
+    query += "'" + storage_obj.marca + "', '" + storage_obj.modello + "')";
     return query;
 }
 
 function insertStorageMySQL(id_device, storage_obj) {
-    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_available, storage_manifacturer, storage_model, is_replaced, date_replaced) values ";
-    query += "(:id_device, :tipo, :unita, :dimensione, :dim_disponibile, :marca, :modello, :is_replaced, :date_replaced)";
+    var query = "insert into device_storages (id_device, storage_type, storage_size_unit, storage_totsize, storage_manifacturer, storage_model) values ";
+    query += "(:id_device, :tipo, :unita, :dimensione, :marca, :modello)";
     return query;
 }
 
@@ -327,11 +324,8 @@ function updateStorageSQLite(id_device, storage_obj) {
     query += "storage_type = " + storage_obj.tipo + ", ";
     query += "storage_size_unit  = '" + storage_obj.unita + "', ";
     query += "storage_totsize = " + storage_obj.dimensione + ", ";
-    query += "storage_available  =  " + storage_obj.dim_disponibile + ", ";
     query += "storage_manifacturer = '" + storage_obj.marca + "', ";
-    query += "storage_model  = '" + storage_obj.modello + "', ";
-    query += "is_replaced = " + storage_obj.is_replaced + ", ";
-    query += "date_replaced  =  '" + storage_obj.date_replaced + "' ";
+    query += "storage_model  = '" + storage_obj.modello + "' ";
     query += "where id = " + storage_obj.id;
     return query;
 }
@@ -342,11 +336,8 @@ function updateStorageMySQL(id_device, storage_obj) {
     query += "storage_type = :tipo, ";
     query += "storage_size_unit = :unita, ";
     query += "storage_totsize = :dimensione, ";
-    query += "storage_available = :dim_disponibile ";
     query += "storage_manifacturer = :marca, ";
-    query += "storage_model  = :modello, ";
-    query += "is_replaced = :is_replaced, ";
-    query += "date_replaced  = :date_replaced ";
+    query += "storage_model  = :modello ";
     query += "where id = id_storage";
     return query;
 }
@@ -373,7 +364,7 @@ function removeStorageSQLite(id_device, storage_obj) {
 
 function removeStorageMySQL(id_device, storage_obj) {
     var query = "delete from device_storages ";
-    query += "where id = id_storage";
+    query += "where id = :id_storage";
     return query;
 }
 function removeStorage(db_used, id_device, storage_obj) {
@@ -392,14 +383,14 @@ function removeStorage(db_used, id_device, storage_obj) {
 }
 //
 function getStoragesByConfigSQLite(id_device, id_conf) {
-    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
     query += "join storage_types st on st.id = ds.storage_type ";
     query += "where id_device = " + id_device + " ";
     query += "and ds.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     return query;
 }
 function getStoragesByConfigMySQL(id_device, id_conf) {
-    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_available as Disponibile, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
+    var query = "select ds.id, st.name as Tipo, ds.storage_size_unit as Unit, ds.storage_totsize as Dimensione, ds.storage_manifacturer as Marca, ds.storage_model as Modello from device_storages ds ";
     query += "join storage_types st on st.id = ds.storage_type ";
     query += "where id_device = :id_device ";
     query += "and ds.id in (select id_part from change_config where id_conf = :id_conf)";
@@ -1255,10 +1246,16 @@ function getDiskUsageById(db_used, id_diskusage) {
 
 
 function insertDiskUsageSQLite(id_device, id_storage, date_ref, size_unit, available_space) {
+    var dr = date_ref;
+    var dr_str = "";
+    if (dr) {
+        var d = new Date(dr);
+        dr_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
+    }
     var query = "insert into disk_usage (id_device, id_storage, date_ref, size_unit, available_space) values (";
     query += id_device + ", ";
     query += id_storage + ", ";
-    query += "'" + date_ref + "', ";
+    query += "'" + dr_str + "', ";
     query += "'" + size_unit + "', ";
     query += available_space + ")";
     return query;
@@ -1291,7 +1288,13 @@ function insertDiskUsage(db_used, id_device, id_storage, date_ref, size_unit, av
 
 function updateDiskUsageSQLite(id_diskusage, date_ref, size_unit, available_space) {
     var query = "update disk_usage set ";
-    query += "date_ref = '" + date_ref + "', ";
+    var dr = date_ref;
+    var dr_str = "";
+    if (dr) {
+        var d = new Date(dr);
+        dr_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
+    }
+    query += "date_ref = '" + dr_str + "', ";
     query += "size_unit = '" + size_unit + "', ";
     query += "available_space = " + available_space + " ";
     query += "where id = " + id_diskusage; 

package/package.json

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