Compare commits

..

6 Commits

Author SHA1 Message Date
Samuele Locatelli 9e8e885ef9 Merge branch 'release/FixSelReprtoAndSelEnabled' 2022-07-05 09:56:59 +02:00
Samuele Locatelli 1f964ded92 Fix selezione gruppi
- prende SOLO reparto
- escluso gruppi con selEnabled
2022-07-05 09:56:28 +02:00
Samuele Locatelli eeba41cb5c Merge tag 'FixQrCodeJsConsoleLog' into develop
Eliminato console log inutile
2022-07-04 19:14:20 +02:00
Samuele Locatelli c418812ba2 Merge branch 'release/FixQrCodeJsConsoleLog' 2022-07-04 19:14:10 +02:00
Samuele Locatelli 6169d8cfcc Correzione jscript: niente console log 2022-07-04 19:13:28 +02:00
Samuele Locatelli 75596c61bc Merge tag 'FixQrUserDisplay' into develop
Fix comportamento display QrCode user
2022-07-04 19:12:39 +02:00
2 changed files with 3 additions and 6 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ namespace MP.AppAuth.Controllers
{ {
dbResult = localDbCtx dbResult = localDbCtx
.DbSetAnagraficaGruppi .DbSetAnagraficaGruppi
.Where(x => x.TipoGruppo == codTipo || x.SelEnabled) .Where(x => x.TipoGruppo == codTipo && x.SelEnabled)
.ToList(); .ToList();
} }
return dbResult; return dbResult;
+2 -5
View File
@@ -1,11 +1,11 @@
function clearContent(elementID) { function clearContent(elementID) {
console.log("Remove " + elementID); //console.log("Remove " + elementID);
document.getElementById(elementID).innerHTML = ""; document.getElementById(elementID).innerHTML = "";
} }
// gestione qrcode... da https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-enable-qrcodes?view=aspnetcore-5.0 // gestione qrcode... da https://docs.microsoft.com/en-us/aspnet/core/security/authentication/identity-enable-qrcodes?view=aspnetcore-5.0
//var qrcode = new QRCode("qrCodeImg"); //var qrcode = new QRCode("qrCodeImg");
function displayQr(elementName, rawData) { function displayQr(elementName, rawData) {
console.log("Add " + elementName); //console.log("Add " + elementName);
try { try {
if (elementName != "" && rawData != "") { if (elementName != "" && rawData != "") {
qrcode = new QRCode(document.getElementById(elementName), qrcode = new QRCode(document.getElementById(elementName),
@@ -14,9 +14,6 @@ function displayQr(elementName, rawData) {
width: 200, width: 200,
height: 200 height: 200
}); });
//qrcode = new QRCode(document.getElementById(elementName));
//qrcode.clear();
//qrcode.makeCode(rawData);
} }
} }
catch catch