alsmanager_lib 3.0.89 → 3.0.90

package/lib/modules.js

@@ -6823,7 +6823,7 @@ function getDatesRangeConsegne() {
 }
 
 
-function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open) {
+function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate) {
     var query = "SELECT c.id, c.data_richiesta as Richiesta, c.data_consegna as Consegna, c.richiedente_adulto as Adulto, c.richiedente_alunno as Alunno, c.richiedente_genitore as Genitore, c.is_home as Casa, c.note as Note, c.email_adulto, c.email_genitore from consegne c ";
     query += "where (removed is null or removed = 0) ";
     if (adulto && adulto.trim() != '') {
@@ -6856,6 +6856,9 @@ function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still
         if (still_open) {
             query += " and (select count(*) from consegna_beni where id_consegna = c.id and stato_restituzione in(0,1)) > 0"
         }
+        if (only_outofdate && only_outofdate > 0) {
+            query += " and date('now') >= c.data_limite ";
+        }
     }
     if (data_filter == "RICHIESTA")
         query += " order by data_richiesta desc";
@@ -6864,7 +6867,7 @@ function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still
     return query;    
 }
 
-function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open) {
+function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate) {
     var query = "SELECT id, data_richiesta as Richiesta, data_consegna as Consegna, richiedente_adulto as Adulto, richiedente_alunno as Alunno, richiedente_genitore as Genitore, is_home as Casa, note as Note, email_adulto, email_genitore from consegne ";
     query += "where (removed is null or removed = 0) ";
     if (adulto && adulto.trim() != '') {
@@ -6893,6 +6896,9 @@ function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_
         if (still_open) {
             query += " and (select count(*) from consegna_beni where id_consegna = c.id and stato_restituzione in(0,1)) > 0"
         }
+        if (only_outofdate && only_outofdate > 0) {
+            query += " and date('now') >= c.data_limite ";
+        }
     }
     if (data_filter == "RICHIESTA")
         query += " order by data_richiesta desc";
@@ -6901,18 +6907,18 @@ function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_
 
     return query;
 }
-function queryConsegne(db_used,data_da, data_a, data_filter, adulto, alunno, still_open) {
+function queryConsegne(db_used,data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open);
+                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate);
                 break;
             case 'MYSQL':
-                query = queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open);
+                query = queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate);
                 break;
             case 'MYSQL2':
-                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open);
+                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open, only_outofdate);
                 break;
         }
     }
@@ -10923,12 +10929,17 @@ function queryFloorsByPlace(db_used, id_place) {
     return query;
 }
 
-function queryFunzioneByPlaceAndFloorSQLite(id_place, piano) {
+function queryFunzioneByPlaceAndFloorSQLite(id_place, piano, date_ref) {
     var query = "";
     query = "SELECT DISTINCT sd.type as funzione from site_destinations sd";
     query += " JOIN sites s ON s.id = sd.id_site"
     if (id_place) {
-        query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
+        if (date_ref) {
+            query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+        }
+        else {
+            query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
+        }
         query += " and sd.id_place = '" + id_place + "'";
         if (piano) {
             query += " and s.floor = '" + piano + "'";
@@ -10939,12 +10950,17 @@ function queryFunzioneByPlaceAndFloorSQLite(id_place, piano) {
 
 }
 
-function queryFunzioneByPlaceAndFloorMySQL(id_place, piano) {
+function queryFunzioneByPlaceAndFloorMySQL(id_place, piano, date_ref) {
     var query = "";
     query = "SELECT DISTINCT sd.type as funzione from site_destinations sd";
     query += " JOIN sites s ON s.id = sd.id_site"
     if (id_place) {
-        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        if (date_ref) {
+            query += " where :date_ref >= sd.date_start and :date_ref <= sd.date_end";
+        }
+        else {
+            query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        }
         query += " and sd.id_place = :id_place";
         if (piano) {
             query += " and s.floor = :piano";
@@ -10955,12 +10971,17 @@ function queryFunzioneByPlaceAndFloorMySQL(id_place, piano) {
 
 }
 
-function queryFunzioneByPlaceAndFloorMySQL2(id_place, piano) {
+function queryFunzioneByPlaceAndFloorMySQL2(id_place, piano, date_ref) {
     var query = "";
     query = "SELECT DISTINCT sd.type as funzione from site_destinations sd";
     query += " JOIN sites s ON s.id = sd.id_site"
     if (id_place) {
-        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        if (date_ref) {
+            query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+        }
+        else {
+            query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        }
         query += " and sd.id_place = '" + id_place + "'";
         if (piano) {
             query += " and s.floor = '" + piano + "'";
@@ -10971,18 +10992,18 @@ function queryFunzioneByPlaceAndFloorMySQL2(id_place, piano) {
 
 }
 
-function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
+function queryFunzioneByPlaceAndFloor(db_used, id_place, piano, date_ref) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryFunzioneByPlaceAndFloorSQLite(id_place, piano);
+                query = queryFunzioneByPlaceAndFloorSQLite(id_place, piano, date_ref);
                 break;
             case 'MYSQL':
-                query = queryFunzioneByPlaceAndFloorMySQL(id_place, piano);
+                query = queryFunzioneByPlaceAndFloorMySQL(id_place, piano, date_ref);
                 break;
             case 'MYSQL2':
-                query = queryFunzioneByPlaceAndFloorMySQL2(id_place, piano);
+                query = queryFunzioneByPlaceAndFloorMySQL2(id_place, piano, date_ref);
                 break;
         }
     }
@@ -10991,11 +11012,15 @@ function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
 }
 
 
-function querySitesSQLite(place, piano, funzione) {
+function querySitesSQLite(place, piano, funzione, date_ref) {
     var query = "SELECT DISTINCT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd";
     query += " LEFT JOIN sites s ON s.id = sd.id_site"
-    query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
-
+    if (date_ref) {
+        query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+    }
+    else {
+        query += " where date('now') >= sd.date_start and date('now') <= sd.date_end";
+    }   
     if (place) {
         query += " and s.id_place = '" + place + "'";
     }
@@ -11010,11 +11035,16 @@ function querySitesSQLite(place, piano, funzione) {
     return query;
 }
 
-function querySitesMySQL(place, piano, funzione) {
+function querySitesMySQL(place, piano, funzione, date_ref) {
     var query = "SELECT DISTINCT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd ";
     query += " LEFT JOIN sites s ON s.id = sd.id_site"
-    query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
-
+    if (date_ref) {
+        query += " where :date_ref >= sd.date_start and :date_ref <= sd.date_end";
+    }
+    else {
+        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+    }       
+   
     if (place) {
         query += " and s.id_place = :id_place";
     }
@@ -11029,10 +11059,15 @@ function querySitesMySQL(place, piano, funzione) {
     return query;
 }
 
-function querySitesMySQL2(place, piano, funzione) {
+function querySitesMySQL2(place, piano, funzione, date_ref) {
     var query = "SELECT DISTINCT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd";
     query += " LEFT JOIN sites s ON s.id = sd.id_site"
-    query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+    if (date_ref) {
+        query += " where " + date_ref + " >= sd.date_start and " + date_ref + " <= sd.date_end";
+    }
+    else {
+        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+    }   
 
     if (place) {
         query += " and s.id_place = '" + place + "'";
@@ -11048,18 +11083,18 @@ function querySitesMySQL2(place, piano, funzione) {
     return query;
 }
 
-function querySites(db_used, place, piano, funzione) {
+function querySites(db_used, place, piano, funzione, date_ref) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = querySitesSQLite(place, piano, funzione);
+                query = querySitesSQLite(place, piano, funzione, date_ref);
                 break;
             case 'MYSQL':
-                query = querySitesMySQL(place, piano, funzione);
+                query = querySitesMySQL(place, piano, funzione, date_ref);
                 break;
             case 'MYSQL2':
-                query = querySitesMySQL2(place, piano, funzione);
+                query = querySitesMySQL2(place, piano, funzione, date_ref);
                 break;
         }
     }
@@ -14340,6 +14375,45 @@ function removeDismissioneAltroBeneFromDismissione(db_used, id_benedismiss, id_d
 
 
 //End Manage altri beni
+function getMapScript(map_tag) {
+    var text = "<script>";
+    text += "(function($scope) {";
+
+    text += "$('#Maps_MAPPA_cards').on('touchstart touchmove',function(e){";
+    text += "e.preventDefault();";
+    text += "const map = document.getElementById(\"" + map_tag +"\");";
+    text += "let rect = map.getBoundingClientRect();";
+    text += "let xCoordinate = ((e.touches[0].clientX - rect.left)/ (rect.right- rect.left)).toFixed(4);";
+    text += "let yCoordinate = ((e.touches[0].clientY - rect.top)/(rect.bottom - rect.top)).toFixed(4);";
+    text += "if (xCoordinate < 1 && xCoordinate > 0 && yCoordinate < 1 && yCoordinate > 0){";
+    text += "$(\"#coords\").text( \"X: \" + xCoordinate + \", Y: \" + yCoordinate);";
+    text += "$(\"#imgcursor\").css( \"left\", (e.touches[0].clientX - rect.left) - 20 ); // offset to half of the cursor's width";
+    text += "$(\"#imgcursor\").css( \"top\", (e.touches[0].clientY - rect.top) - 20 );  // offset to half of the cursor's height";
+    text += "$scope.send({\"payload\":{\"coordX\": xCoordinate, \"coordY\": yCoordinate}});";
+    text += "}";
+    text += "});";
+
+    text += "$('#Maps_MAPPA_cards').on('mousemove mousedown mouseup',function(e){";
+    text += "e.preventDefault();";
+    text += "const map = document.getElementById(\"" + map_tag +"\");";
+    text += "let rect = map.getBoundingClientRect();";
+    text += "let xCoordinate = ((e.clientX - rect.left)/ (rect.right- rect.left)).toFixed(4);";
+    text += "let yCoordinate = ((e.clientY - rect.top)/(rect.bottom - rect.top)).toFixed(4);";
+    text += "if (xCoordinate < 1 && xCoordinate > 0 && yCoordinate < 1 && yCoordinate > 0 && e.buttons == 1){ ";
+    text += "$(\"#coords\").text( \"X: \" + xCoordinate + \", Y: \" + yCoordinate);";
+    text += "$(\"#imgcursor\").css( \"left\", (e.clientX - rect.left)  - 20); // offset to half of the cursor's width";
+    text += "$(\"#imgcursor\").css( \"top\", (e.clientY - rect.top) - 20 ); // offset to half of the cursor's height";
+        
+    text += "$scope.send({\"payload\":{\"coordX\": xCoordinate, \"coordY\": yCoordinate}});";
+    text += "}";
+    text += "});";
+
+    text += "})(scope);";
+    text += "</script>";
+    return text;
+}
+
+
 
 // Exports
 
@@ -14724,6 +14798,8 @@ module.exports = {
     loadAltroBeneDaDismettereCombo,
     assignAltriBeniToDismissione,
     removeAltriBeniFromDismissione,
-    removeDismissioneAltroBeneFromDismissione
+    removeDismissioneAltroBeneFromDismissione,
+    //
+    getMapScript
 };
 // end of source

package/package.json

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