diff --git a/C-TRACK/WebUserControls/mod_userCards.ascx.cs b/C-TRACK/WebUserControls/mod_userCards.ascx.cs index 8f7f8cb..571b10a 100644 --- a/C-TRACK/WebUserControls/mod_userCards.ascx.cs +++ b/C-TRACK/WebUserControls/mod_userCards.ascx.cs @@ -2,6 +2,13 @@ namespace C_TRACK.WebUserControls { + /// + /// Struct x richiesta serializzata/deserializzata + /// + public struct qrRequest + { + public string valore; + } public partial class mod_userCards : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) @@ -11,7 +18,20 @@ namespace C_TRACK.WebUserControls public string getImgUrl(object codOpr) { - return string.Format(@"https://qrcode.steamware.net/Home/QR/{0}", codOpr); + string answ = ""; +#if false + //string targetUrl = string.Format(@"ctrack.steamware.net/elet-scal/jumper?USER_NAME=info@elettronicascalvina.it&UserAuthkey=asdfbqhewrqg7802345bhasdfg78&CodOpr="); + //targetUrl = HttpUtility.UrlEncode(targetUrl); + // genero obj + qrRequest richiesta = new qrRequest(); + richiesta.valore = answ; + // ora serializzo oggetto! + answ = JsonConvert.SerializeObject(richiesta); +#endif + string targetUrl = "CTRACK_ELET_SCAL"; + answ = string.Format(@"https://qrcode.steamware.net/Home/QR_site/{0}?val={1}", targetUrl, codOpr); + //answ = string.Format(@"http://localhost:59543//Home/QR_site/{0}?val={1}", targetUrl, codOpr); + return answ; } } } \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 268e689..59151da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=91']) { + withEnv(['NEXT_BUILD_NUMBER=95']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2018-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'C.TRACK'