diff --git a/Jenkinsfile b/Jenkinsfile index 3860071..e096816 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=113']) { + withEnv(['NEXT_BUILD_NUMBER=114']) { // env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SOSCONDOMINI' diff --git a/PUB/WebUserContols/mod_ER_inCorso.ascx b/PUB/WebUserContols/mod_ER_inCorso.ascx index 76d6077..9896111 100644 --- a/PUB/WebUserContols/mod_ER_inCorso.ascx +++ b/PUB/WebUserContols/mod_ER_inCorso.ascx @@ -1,23 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ER_inCorso.ascx.cs" Inherits="PUB.WebUserContols.mod_ER_inCorso" %> <%@ Register Src="~/WebUserContols/mod_ER_grid.ascx" TagPrefix="uc1" TagName="mod_ER_grid" %> +<%@ Register Src="~/WebUserContols/mod_ER_selCondominio.ascx" TagPrefix="uc1" TagName="mod_ER_selCondominio" %> +
Interventi
-
-
- -
- - - - - - - - -
+
Elenco degli interventi in corso
diff --git a/PUB/WebUserContols/mod_ER_inCorso.ascx.cs b/PUB/WebUserContols/mod_ER_inCorso.ascx.cs index d525b12..3609a29 100644 --- a/PUB/WebUserContols/mod_ER_inCorso.ascx.cs +++ b/PUB/WebUserContols/mod_ER_inCorso.ascx.cs @@ -17,6 +17,11 @@ namespace PUB.WebUserContols saveSelections(); } mod_ER_grid.eh_selCond += Mod_ER_grid_eh_selCond; + mod_ER_selCondominio.eh_selected += Mod_ER_selCondominio_eh_selected; + } + private void Mod_ER_selCondominio_eh_selected(object sender, EventArgs e) + { + saveSelections(); } private void Mod_ER_grid_eh_selCond(object sender, EventArgs e) { @@ -25,7 +30,7 @@ namespace PUB.WebUserContols // imposto! try { - ddlCondominio.SelectedValue = ce.idxCond.ToString(); + mod_ER_selCondominio.condSelected = ce.idxCond.ToString(); } catch { } @@ -34,7 +39,7 @@ namespace PUB.WebUserContols private void saveSelections() { - mod_ER_grid.idxCond = ddlCondominio.SelectedValue; + mod_ER_grid.idxCond = mod_ER_selCondominio.condSelected; } protected void ddlCondominio_SelectedIndexChanged(object sender, EventArgs e) @@ -43,8 +48,7 @@ namespace PUB.WebUserContols } protected void lbtResetCond_Click(object sender, EventArgs e) { - ddlCondominio.SelectedIndex = 0; - ddlCondominio.DataBind(); + mod_ER_selCondominio.condSelected = "0"; saveSelections(); } } diff --git a/PUB/WebUserContols/mod_ER_inCorso.ascx.designer.cs b/PUB/WebUserContols/mod_ER_inCorso.ascx.designer.cs index 7976f15..e6b4ee4 100644 --- a/PUB/WebUserContols/mod_ER_inCorso.ascx.designer.cs +++ b/PUB/WebUserContols/mod_ER_inCorso.ascx.designer.cs @@ -13,31 +13,13 @@ namespace PUB.WebUserContols { public partial class mod_ER_inCorso { /// - /// Controllo lbtResetCond. + /// Controllo mod_ER_selCondominio. /// /// /// 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 lbtResetCond; - - /// - /// Controllo ddlCondominio. - /// - /// - /// 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.DropDownList ddlCondominio; - - /// - /// Controllo odsCondomini. - /// - /// - /// 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.ObjectDataSource odsCondomini; + protected global::PUB.WebUserContols.mod_ER_selCondominio mod_ER_selCondominio; /// /// Controllo mod_ER_grid. diff --git a/PUB/WebUserContols/mod_ER_richieste.ascx b/PUB/WebUserContols/mod_ER_richieste.ascx index 5b85d17..741102b 100644 --- a/PUB/WebUserContols/mod_ER_richieste.ascx +++ b/PUB/WebUserContols/mod_ER_richieste.ascx @@ -6,19 +6,6 @@
Richieste
- <%--
-
- -
- - - - - - - - -
--%>