alsmanager_lib 3.0.229 → 3.0.231

package/lib/modules.js

@@ -17105,6 +17105,7 @@ function removeDismissioneAltroBeneFromDismissione(db_used, id_benedismiss, id_d
 
 
 //End Manage altri beni
+//Manage Maps
 function getMapScript(map_tag) {
     var text = "<script>";
     text += "(function($scope) {";
@@ -17192,6 +17193,25 @@ function getMapPointsById(id_point) {
     query += "where id = " + id_point;
     return query;
 }
+
+function getMapByPlaceAndFloor(id_place, floor) {
+    var query = "select id, id_place, piano, initial_zoom, filename from maps ";
+    query += "where id_place = '" + id_place + "' ";
+    query += "and piano = " + floor + " ";
+    query += "limit 1";
+    return query;
+}
+
+function getMapLastRefByIdMap(id_map) {
+    var query = "select date_ref from maps_cronology ";
+    query += "where id_map = " + id_map + " ";
+    query += "order by date_ref desc ";
+    query += "limit 1";
+    return query;   
+}
+
+
+//End Manage Maps
 // Printer management
 /*
 CREATE TABLE "printer_cost_per_copy" (
@@ -17384,46 +17404,81 @@ CREATE TABLE `printer_cartridges` (
   `descrizione` varchar(50) DEFAULT NULL,
   `color` char(20) DEFAULT NULL,
   `numero` int(11) NOT NULL,
-  `data_ultimo` char(10) NOT NULL,
+  `data_ultimo_acq` char(10) NOT NULL,
   `note` varchar(100) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 */
+    var query = "select id, tipo, marca, modello, color, numero, data_ultimo_acq, note from printer_cartridges ";    
+    query += "order by marca, modello";
+    return query;
 }
 
 function selectPrinterCartridgeById(id_cart) {
-    
+    var query = "select id, tipo, marca, modello, color, numero, data_ultimo_acq, note from printer_cartridges ";    
+    query += "where id = " + id_cart;
+    return query;
 }
 
-function insertPrinterCartridge() {
+function insertPrinterCartridge(tipo, marca, modello, color, numero, data_ultimo_acq, note) {
+    var query = "insert into printer_cartridges (tipo, marca, modello, color, numero, data_ultimo_acq, note) values ";
+    query += "(";
+    query += "'" + tipo + "', ";
+    query += "'" + marca + "', ";
+    query += "'" + modello + "', ";
+    query += "'" + color + "', ";
+    query += numero + ", ";
+    query += "'" + data_ultimo_acq + "', ";
+    query += "'" + note + "' ";
+    query += ")";    
+    return query;
     
 }
 
-function updatePrinterCartridge(id_cart) {
-    
+function updatePrinterCartridge(id_cart, tipo, marca, modello, color, numero, data_ultimo_acq, note) {
+    var query = "update printer_cartridges tipo, marca, modello, color, numero, data_ultimo_acq, note  ";
+    var dt_ultimo_acq_str = convertDateToStringDB(data_ultimo_acq);
+    query += "set ";
+    query += "tipo = '" + tipo + "', ";
+    query += "marca = '" + marca + "', ";
+    query += "modello = '" + modello + "', ";
+    query += "color = '" + color + "', ";
+    query += "numero = " + numero + ", ";
+    query += "data_ultimo_acq = '" + dt_ultimo_acq_str + "', ";
+    query += "note = '" + note + "' ";
+    query += "where id = " + id_cart;    
+    return query;
 }
 
 function removePrinterCartridge(id_cart) {
+    var query = "delete from printer_cartridges ";
+    query += "where id = " + id_cart; 
+    return query;
     
 }
 
 function installPrinterCartridge(id_cart, id_device, date_install) {
 /*
--- ALS.printer_cartridges definition
+-- ALS.printer_cart_install definition
 
-CREATE TABLE `printer_cartridges` (
+CREATE TABLE `printer_cart_install` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `tipo` text NOT NULL,
-  `marca` varchar(50) DEFAULT NULL,
-  `descrizione` varchar(50) DEFAULT NULL,
-  `color` char(20) DEFAULT NULL,
-  `numero` int(11) NOT NULL,
-  `data_ultimo` char(10) NOT NULL,
+  `id_cart` int(11) DEFAULT NULL,
+  `id_device` int(11) DEFAULT NULL,
   `note` varchar(100) DEFAULT NULL,
+  `date_install` char(10) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci;
  */
-
+    var date_install_str = convertDateToStringDB(date_install); 
+    var query = "insert into printer_cart_install (id_cart, id_device, note, date_install) values ";
+    query += "(";
+    query += id_cart + ", ";
+    query += id_device + ", ";
+    query += "'" + note + "', ";
+    query += "'" + date_install_str + "' ";
+    query += ")";
+    return query;
 }
 
 
@@ -17939,6 +17994,8 @@ module.exports = {
     removeMapPointByPlace,
     queryMapPointsByPlaceAndFloor,
     getMapPointsById,
+    getMapByPlaceAndFloor,
+    getMapLastRefByIdMap,
     //
     selectPrinters,
     selectCountersPrinters,
@@ -17956,6 +18013,13 @@ module.exports = {
     updateCountersPrinterRechargeUser,
     deleteCountersPrinterRechargeUser,
     //
+    selectPrinterCartridges,
+    selectPrinterCartridgeById,
+    insertPrinterCartridge,
+    updatePrinterCartridge,
+    removePrinterCartridge,
+    installPrinterCartridge,
+    //
     getNotesByIdDevice
 };
 // end of source

package/package.json

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