diff --git a/Jenkinsfile b/Jenkinsfile
index 9bd069d..e630675 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=341']) {
+ withEnv(['NEXT_BUILD_NUMBER=342']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'B2BCONDOMINI'
diff --git a/PUB/PAM/MyHome.aspx b/PUB/PAM/MyHome.aspx
index c214fe7..60070ce 100644
--- a/PUB/PAM/MyHome.aspx
+++ b/PUB/PAM/MyHome.aspx
@@ -25,7 +25,7 @@
Preventivi In Corso
-
Interventi Congelati
+
Interventi Congelati
Fatturati (da pagare)
diff --git a/PUB/PAZ/MyHome.aspx b/PUB/PAZ/MyHome.aspx
index 7cca974..a14851f 100644
--- a/PUB/PAZ/MyHome.aspx
+++ b/PUB/PAZ/MyHome.aspx
@@ -22,7 +22,7 @@
Fornitori
--%>
-
Preventivi In Corso
+
Preventivi In Corso
<%--
Interventi Conclusi
@@ -31,7 +31,7 @@
Fatturati (da pagare)
--%>
-
Interventi
+
Interventi in corso
Tutti
diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs
index 5b6cc97..226e643 100644
--- a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs
+++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs
@@ -104,13 +104,22 @@ namespace PUB.WebUserContols
}
protected void lbtResetCond_Click(object sender, EventArgs e)
{
+ Response.Redirect(titolo);
+#if false
+ // preseleziono gruppo SE disponibile...
+ preselGroup();
+ // fix condominio
+ fixSelCondomini();
+#endif
+#if false
// resetto gruppi..
ddlGruppo.SelectedIndex = 0;
currGroup = "";
// sistemo il resto...
ddlCondominio.DataBind();
ddlCondominio.SelectedIndex = 0;
- saveSelections();
+ saveSelections();
+#endif
}
public string condSelected