alsmanager_lib 3.0.169 → 3.0.170
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/modules.js +18 -6
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -9729,9 +9729,15 @@ function getLaboratorioByIdSiteSQLite(id_site, id_place) {
|
|
|
9729
9729
|
query += "from postazione_lab pl ";
|
|
9730
9730
|
query += "join devices d on d.id = pl.id_device ";
|
|
9731
9731
|
query += "left join device_pc dp on d.id = dp.id_device ";
|
|
9732
|
-
query += "where
|
|
9733
|
-
|
|
9734
|
-
|
|
9732
|
+
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
9733
|
+
if ((id_site && id_site != 0) || (id_place && id_place != "")) {
|
|
9734
|
+
if (id_site && id_site != 0) {
|
|
9735
|
+
query += "and pl.id_site = " + id_site + " ";
|
|
9736
|
+
}
|
|
9737
|
+
if (id_place && id_place != "") {
|
|
9738
|
+
query += "and pl.id_place = '" + id_place + "' ";
|
|
9739
|
+
}
|
|
9740
|
+
}
|
|
9735
9741
|
query += "order by pl.Bancata asc, pl.num_pos desc ";
|
|
9736
9742
|
return query;
|
|
9737
9743
|
}
|
|
@@ -9756,9 +9762,15 @@ function getLaboratorioByIdSiteMySQL(id_site, id_place) {
|
|
|
9756
9762
|
query += "from postazione_lab pl ";
|
|
9757
9763
|
query += "join devices d on d.id = pl.id_device ";
|
|
9758
9764
|
query += "left join device_pc dp on d.id = dp.id_device ";
|
|
9759
|
-
query += "where
|
|
9760
|
-
|
|
9761
|
-
|
|
9765
|
+
query += "where (d.is_removed is null or d.is_removed = 0) "
|
|
9766
|
+
if ((id_site && id_site != 0) || (id_place && id_place != "")) {
|
|
9767
|
+
if (id_site && id_site != 0) {
|
|
9768
|
+
query += "and pl.id_site = :id_site ";
|
|
9769
|
+
}
|
|
9770
|
+
if (id_place && id_place != "") {
|
|
9771
|
+
query += "and pl.id_place = :id_place ";
|
|
9772
|
+
}
|
|
9773
|
+
}
|
|
9762
9774
|
query += "order by pl.Bancata asc, pl.num_pos desc ";
|
|
9763
9775
|
return query;
|
|
9764
9776
|
}
|