diff --git a/Jenkinsfile b/Jenkinsfile index f3cda57..527ee6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=329']) { + withEnv(['NEXT_BUILD_NUMBER=330']) { // env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index acd3b3d..cba8a56 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -292,8 +292,12 @@ - - + + Always + + + Always + diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config index af03bc1..097e881 100644 --- a/NKC_WF/Web.config +++ b/NKC_WF/Web.config @@ -36,7 +36,8 @@ - + + diff --git a/NKC_WF/site/Contact.aspx b/NKC_WF/site/Contact.aspx index bddf06d..acef28f 100644 --- a/NKC_WF/site/Contact.aspx +++ b/NKC_WF/site/Contact.aspx @@ -10,30 +10,35 @@
-
+
Egaltech srl
+
Via Cremasca 24
24052 Azzano San Paolo
Bergamo – Italy
- +39035 0444806 + + +39 035-0444806
- Support: info@egaltech.com + info@egaltech.com
-
+
+
Steamware srl
- via Briolo Fuori, 27
- 24015 San Giovanni Bianco
+
+ via Nazionale 93
+ 24068 Seriate
Bergamo – Italy
- +39 035-460560 + + +39 035-460560
- Support: info@steamware.net + info@steamware.net
diff --git a/NKC_WF/site/Default.aspx.cs b/NKC_WF/site/Default.aspx.cs index 8edae34..7fc9251 100644 --- a/NKC_WF/site/Default.aspx.cs +++ b/NKC_WF/site/Default.aspx.cs @@ -7,6 +7,9 @@ namespace NKC_WF { protected void Page_Load(object sender, EventArgs e) { + // resetto sessione utente + Session.Clear(); + // vado a login Response.Redirect("Login"); } /// diff --git a/NKC_WF/site/UpdMan.aspx b/NKC_WF/site/UpdMan.aspx index 79b440a..64ca2f6 100644 --- a/NKC_WF/site/UpdMan.aspx +++ b/NKC_WF/site/UpdMan.aspx @@ -45,6 +45,16 @@
+
+
+
+

LPA

+
+
+ STABLE +
+
+
diff --git a/NKC_WF/site/UpdMan.aspx.designer.cs b/NKC_WF/site/UpdMan.aspx.designer.cs index 02a7432..9a21335 100644 --- a/NKC_WF/site/UpdMan.aspx.designer.cs +++ b/NKC_WF/site/UpdMan.aspx.designer.cs @@ -41,6 +41,15 @@ namespace NKC_WF.site /// protected global::System.Web.UI.WebControls.LinkButton lbtDownloadZCode; + /// + /// Controllo hlLPA. + /// + /// + /// 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.HyperLink hlLPA; + /// /// Controllo UpdateProgressDisplay. ///