alsmanager_lib 3.0.3 → 3.0.4

package/lib/modules.js

@@ -12127,12 +12127,37 @@ function getAltroBeneManifacturerCombo() {
     return query;
 }
 
-function getAltroBeneModelCombo(manifacturer) {
+function getAltroBeneModelComboSQLite(manifacturer) {
     var query = "select DISTINCT model from altri_beni ";
-    query += "where manifacturer = '" + manifacturer + "'";
+    query += "where manifacturer = '" + manifacturer + "' ";
+    query += "order by model";    
     return query;
 }
 
+function getAltroBeneModelComboMySQL(manifacturer) {
+    var query = "select DISTINCT model from altri_beni ";
+    query += "where manifacturer = :manifacturer ";
+    query += "order by model";
+    return query;
+}
+
+function getAltroBeneModelCombo(db_used, manifacturer) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getAltroBeneModelComboSQLite(manifacturer);
+                break;
+            case 'MYSQL':
+                query = getAltroBeneModelComboMySQL(manifacturer);
+                break;
+            case 'MYSQL2':
+                query = getAltroBeneModelComboSQLite(manifacturer);
+                break;
+        }
+    }
+    return query;    
+}
 
 function getAltroBeneByIdSQLite(id_bene) {
     var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ";
@@ -12163,7 +12188,14 @@ function getAltroBeneById(db_used, id_bene) {
 }
 
 function getAltriBeniSQLite(id_type, manifacturer, model, id_site, id_place) {
-    var query = "select ab.id, ab.inv_ict3_number, ab.inv_comune_prov, a.name as tipo, ab.descrizione, ab.manifacturer, ab.model, ab.note from altri_beni ab ";
+    var query = "select ab.id, ";
+    query += "case ";
+    query += "when ab.inv_ict3_number is not null and trim(ab.inv_ict3_number) <> '' then concat(ab.inv_ict3_number, ' (inv.)') ";
+    query += "when ab.inv_comune_prov is not null and trim(ab.inv_comune_prov) <> '' then concat(ab.inv_comune_prov, ' (TN/Prov)') ";
+    query += "when ab.serial_no is not null and trim(ab.serial_no) <> '' then concat(ab.serial_no, ' (S/N)') ";
+    query += "else '' ";
+    query += "end as codice, ";
+    query += "a.name as tipo, ab.descrizione, ab.manifacturer, ab.model, ab.note from altri_beni ab ";
     query += "join altro_tipi a on a.id = ab.id_type "
     if ((id_site && id_site > 0) || (id_place && id_place != '')) {
         query += "left join altri_beni_site s on ab.id = s.id_bene ";
@@ -12198,7 +12230,14 @@ function getAltriBeniSQLite(id_type, manifacturer, model, id_site, id_place) {
     return query;
 }
 function getAltriBeniMySQL(id_type, manifacturer, model, id_site, id_place) {
-    var query = "select ab.id, ab.inv_ict3_number, ab.inv_comune_prov, a.name as tipo, ab.descrizione, ab.manifacturer, ab.model, note from altri_beni ";
+    var query = "select ab.id, ";
+    query += "case ";
+    query += "when ab.inv_ict3_number is not null and trim(ab.inv_ict3_number) <> '' then concat(ab.inv_ict3_number, ' (inv.)') ";
+    query += "when ab.inv_comune_prov is not null and trim(ab.inv_comune_prov) <> '' then concat(ab.inv_comune_prov, ' (TN/Prov)') ";
+    query += "when ab.serial_no is not null and trim(ab.serial_no) <> '' then concat(ab.serial_no, ' (S/N)') ";
+    query += "else '' ";
+    query += "end as codice, ";
+    query += "a.name as tipo, ab.descrizione, ab.manifacturer, ab.model, ab.note from altri_beni ab ";
     query += "join altro_tipi a on a.id = ab.id_type "
     if ((id_site && id_site > 0) || (id_place && id_place != '')) {
         query += "left join altri_beni_site s on ab.id = s.id_bene ";

package/package.json

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