From 847689b2116a1916fd0e72cea402ea55cbfe5c20 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 21 Sep 2018 23:19:58 +0200 Subject: [PATCH] aggiunto note x bcode reset comm e logout operatore --- C-TRACK/barcode.aspx.cs | 4 ++-- Jenkinsfile | 2 +- Setup_Files/ElettronicaScalvina/DaFare.txt | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 Setup_Files/ElettronicaScalvina/DaFare.txt diff --git a/C-TRACK/barcode.aspx.cs b/C-TRACK/barcode.aspx.cs index 912f11c..655b324 100644 --- a/C-TRACK/barcode.aspx.cs +++ b/C-TRACK/barcode.aspx.cs @@ -480,7 +480,7 @@ namespace C_TRACK // verifico se cmd setup utente... if (mod_barcode1.comandoRegistrato.prevCmdIn == "RESOP") { - // rimuovo OPR da POST corrente + // rimuovo OPR da POST occupate dataLayer.man.taAP.resetOpr(CodOpr); // rimuovo OPR da sessione CodOpr = ""; @@ -497,7 +497,7 @@ namespace C_TRACK CurrNumTask = ""; // torno a pagina base... Response.Redirect("~/barcode"); - } + } else if (mod_barcode1.comandoRegistrato.valore.Contains("OPR.")) { // imposto operatore diff --git a/Jenkinsfile b/Jenkinsfile index def8f5a..97070b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=60']) { + withEnv(['NEXT_BUILD_NUMBER=61']) { // 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' diff --git a/Setup_Files/ElettronicaScalvina/DaFare.txt b/Setup_Files/ElettronicaScalvina/DaFare.txt new file mode 100644 index 0000000..d91244b --- /dev/null +++ b/Setup_Files/ElettronicaScalvina/DaFare.txt @@ -0,0 +1,4 @@ +Preparare BCode x operatori: reset OP e reset COMMESSA + +E_BC BC * resCOM * resCOM resCOM Rimozione commessa impostata +E_BC BC * resOP * resOP resOP Rimuove Operatore da sessione e da postazione corrente \ No newline at end of file