alsmanager_lib 3.0.238 → 3.0.240

package/lib/modules.js

@@ -1537,6 +1537,28 @@ function getDocenteById(db_used, id_docente) {
 
 
 // End Anagrafica docenti
+// Anagrafica alunni
+function getAlunniCombo(id_place, id_site) {
+    var query = "select id, concat(cognome, ' ', nome) as nominativo from anagrafica_alunni al ";
+    query += "join anagrafica_alunni_site als on als.id_alunno = al.id "
+    query += "where al.is_attivo = 1 "
+    if (id_place) {
+        query += "and als.id_place = '" + id_place + "' ";
+    }
+    if (id_site) {
+        query += "and als.id_site = " + id_site + " ";
+    }
+    query += "order by cognome, nome";
+    return query;
+}
+
+function getAlunnoById(id_alunno) {
+    var query = "select id, cognome, nome, email, is_attivo from anagrafica_alunni ";
+    query += "where id = " + id_alunno;
+    return query;
+}
+
+//End anagrafica alunni
 // Device configurations
 function getDeviceConfigurationsSQLite(id_device) {
     var query = "select id, date_conf, note from device_changes ";
@@ -13963,7 +13985,7 @@ function removeDeviceFromAllSites(db_used, id_device) {
 //Get Sites for Combo
 function getSitesSelectComboSQLite(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where date('now') >= sd.date_start and date('now') <= sd.date_end ";
     if (id_place || tipo_aula) {
@@ -13984,7 +14006,7 @@ function getSitesSelectComboSQLite(id_place, tipo_aula) {
 
 function getSitesSelectComboMySQL(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
     if (id_place || tipo_aula) {
@@ -14005,7 +14027,7 @@ function getSitesSelectComboMySQL(id_place, tipo_aula) {
 
 function getSitesSelectComboMySQL2(id_place, tipo_aula) {
     var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
-    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join site_destinations sd on sd.id_site = s.id and sd.id_place = s.id_place ";
     query += "join places p on p.mark = s.id_place ";
     query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
     if (id_place || tipo_aula) {
@@ -17679,6 +17701,9 @@ module.exports = {
     getDocentiCombo,
     getDocenteById,
     //
+    getAlunniCombo,
+    getAlunnoById,
+    //
     getDeviceConfigurations,
     getLastDeviceConfiguration,
     getDeviceConfigurationById,

package/package.json

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