diff --git a/Jenkinsfile b/Jenkinsfile index 531e4a98..ff5c859c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1030']) { + withEnv(['NEXT_BUILD_NUMBER=1031']) { // env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx b/MP-TAB/WebUserControls/mod_QRScanner.ascx index 65f377f2..bacc6b52 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx @@ -2,11 +2,12 @@
-

QR-Scan USER LOGIN

+

+ GO GO @@ -24,7 +25,8 @@ } else { // altrimenti salvo in textBox e processo - document.getElementById('<%= txtQRCode.ClientID %>').value = content; + document.getElementById('<%= txtQRCode.ClientID %>').value = content; + document.getElementById('<%= lbtGo.ClientID %>').click(); } }); Instascan.Camera.getCameras().then(function (cameras) { diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs b/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs index 008abafd..62282c5d 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx.cs @@ -20,6 +20,17 @@ namespace MoonProTablet.WebUserControls } protected void txtQRCode_TextChanged(object sender, EventArgs e) + { + checkloginPwdOnly(); + + //// rimando a pagina di login... + //Response.Redirect(txtQRCode.Text.Trim()); + //hlReload.NavigateUrl=txtQRCode.Text.Trim(); + //hlReload.Text = txtQRCode.Text.Trim(); + //hlReload.Enabled = true; + } + + private void checkloginPwdOnly() { // se abilitato login "pwdOnly" rimando a login... if (memLayer.ML.cdvb("loginPwdOnly")) @@ -31,16 +42,16 @@ namespace MoonProTablet.WebUserControls { // in questo caso rimando a jumper... int MatrOpr = results[0].MatrOpr; + string baseAuthUrl = memLayer.ML.CRS("baseAuthUrl"); // rimando a pagina login con pwdOnly... - Response.Redirect(string.Format("jumper?MatrOpr={0}&UserAuthKey={1}", MatrOpr, UserAuthKey)); + Response.Redirect(string.Format("{0}MatrOpr={1}&UserAuthKey={2}", baseAuthUrl, MatrOpr, UserAuthKey)); } } + } - //// rimando a pagina di login... - //Response.Redirect(txtQRCode.Text.Trim()); - //hlReload.NavigateUrl=txtQRCode.Text.Trim(); - //hlReload.Text = txtQRCode.Text.Trim(); - //hlReload.Enabled = true; + protected void lbtGo_Click(object sender, EventArgs e) + { + checkloginPwdOnly(); } } } \ No newline at end of file diff --git a/MP-TAB/WebUserControls/mod_QRScanner.ascx.designer.cs b/MP-TAB/WebUserControls/mod_QRScanner.ascx.designer.cs index dc087a9f..1f94829a 100644 --- a/MP-TAB/WebUserControls/mod_QRScanner.ascx.designer.cs +++ b/MP-TAB/WebUserControls/mod_QRScanner.ascx.designer.cs @@ -21,6 +21,15 @@ namespace MoonProTablet.WebUserControls { /// protected global::System.Web.UI.UpdatePanel upnDecode; + /// + /// Controllo lbtGo. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtGo; + /// /// Controllo txtQRCode. ///