diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index ef23761..63796c0 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -5918,6 +5918,8 @@ namespace Data { private global::System.Data.DataColumn columnnAperte; + private global::System.Data.DataColumn columnnSospese; + private global::System.Data.DataColumn columnnConcluse; private global::System.Data.DataColumn columnnFatturate; @@ -5989,6 +5991,14 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public global::System.Data.DataColumn nSospeseColumn { + get { + return this.columnnSospese; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public global::System.Data.DataColumn nConcluseColumn { @@ -6050,13 +6060,14 @@ namespace Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] - public PAZ_DashStatsRow AddPAZ_DashStatsRow(int nRichieste, int nPrevReq, int nPrevAppr, int nAperte, int nConcluse, int nFatturate, int nPagate) { + public PAZ_DashStatsRow AddPAZ_DashStatsRow(int nRichieste, int nPrevReq, int nPrevAppr, int nAperte, int nSospese, int nConcluse, int nFatturate, int nPagate) { PAZ_DashStatsRow rowPAZ_DashStatsRow = ((PAZ_DashStatsRow)(this.NewRow())); object[] columnValuesArray = new object[] { nRichieste, nPrevReq, nPrevAppr, nAperte, + nSospese, nConcluse, nFatturate, nPagate}; @@ -6086,6 +6097,7 @@ namespace Data { this.columnnPrevReq = base.Columns["nPrevReq"]; this.columnnPrevAppr = base.Columns["nPrevAppr"]; this.columnnAperte = base.Columns["nAperte"]; + this.columnnSospese = base.Columns["nSospese"]; this.columnnConcluse = base.Columns["nConcluse"]; this.columnnFatturate = base.Columns["nFatturate"]; this.columnnPagate = base.Columns["nPagate"]; @@ -6102,6 +6114,8 @@ namespace Data { base.Columns.Add(this.columnnPrevAppr); this.columnnAperte = new global::System.Data.DataColumn("nAperte", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnnAperte); + this.columnnSospese = new global::System.Data.DataColumn("nSospese", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnnSospese); this.columnnConcluse = new global::System.Data.DataColumn("nConcluse", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnnConcluse); this.columnnFatturate = new global::System.Data.DataColumn("nFatturate", typeof(int), null, global::System.Data.MappingType.Element); @@ -6112,6 +6126,7 @@ namespace Data { this.columnnPrevReq.ReadOnly = true; this.columnnPrevAppr.ReadOnly = true; this.columnnAperte.ReadOnly = true; + this.columnnSospese.ReadOnly = true; this.columnnConcluse.ReadOnly = true; this.columnnFatturate.ReadOnly = true; this.columnnPagate.ReadOnly = true; @@ -8817,6 +8832,22 @@ namespace Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public int nSospese { + get { + try { + return ((int)(this[this.tablePAZ_DashStats.nSospeseColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'nSospese\' nella tabella \'PAZ_DashStats\' è DBNull.", e); + } + } + set { + this[this.tablePAZ_DashStats.nSospeseColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public int nConcluse { @@ -8913,6 +8944,18 @@ namespace Data { this[this.tablePAZ_DashStats.nAperteColumn] = global::System.Convert.DBNull; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public bool IsnSospeseNull() { + return this.IsNull(this.tablePAZ_DashStats.nSospeseColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] + public void SetnSospeseNull() { + this[this.tablePAZ_DashStats.nSospeseColumn] = global::System.Convert.DBNull; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] public bool IsnConcluseNull() { @@ -13978,6 +14021,7 @@ SELECT idxPriorita, descrPriorita, scadenzaGg FROM AnagPrior WHERE (idxPriorita tableMapping.ColumnMappings.Add("nPrevReq", "nPrevReq"); tableMapping.ColumnMappings.Add("nPrevAppr", "nPrevAppr"); tableMapping.ColumnMappings.Add("nAperte", "nAperte"); + tableMapping.ColumnMappings.Add("nSospese", "nSospese"); tableMapping.ColumnMappings.Add("nConcluse", "nConcluse"); tableMapping.ColumnMappings.Add("nFatturate", "nFatturate"); tableMapping.ColumnMappings.Add("nPagate", "nPagate"); diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index 7a9fd3f..bb26408 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -871,7 +871,7 @@ FROM v_ER_Acts - + dbo.stp_PAZ_DashStats @@ -888,6 +888,7 @@ FROM v_ER_Acts + @@ -1443,6 +1444,7 @@ FROM v_ER_Acts + diff --git a/Data/DS_app.xss b/Data/DS_app.xss index 94e2608..4b4d69b 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -19,7 +19,7 @@ - + diff --git a/Jenkinsfile b/Jenkinsfile index e096816..0f15f8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=114']) { + withEnv(['NEXT_BUILD_NUMBER=115']) { // 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/PAM/MyDashboard.aspx b/PUB/PAM/MyDashboard.aspx index 74ce7c5..6f27a92 100644 --- a/PUB/PAM/MyDashboard.aspx +++ b/PUB/PAM/MyDashboard.aspx @@ -8,12 +8,12 @@

Auth Error

-
+
-
+
-
-
+
+
diff --git a/PUB/PAZ/Conclusi.aspx b/PUB/PAZ/Conclusi.aspx index 3755414..4ab0ace 100644 --- a/PUB/PAZ/Conclusi.aspx +++ b/PUB/PAZ/Conclusi.aspx @@ -2,7 +2,8 @@ <%@ Register Src="~/WebUserContols/mod_ER_conclusi.ascx" TagPrefix="uc1" TagName="mod_ER_conclusi" %> -
+ +
diff --git a/PUB/PAZ/Fatture.aspx b/PUB/PAZ/Fatture.aspx new file mode 100644 index 0000000..95e0335 --- /dev/null +++ b/PUB/PAZ/Fatture.aspx @@ -0,0 +1,13 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SitePAZ.master" AutoEventWireup="true" CodeBehind="Fatture.aspx.cs" Inherits="PUB.PAZ.Fatture" %> + +<%@ Register Src="~/WebUserContols/mod_ER_fatture.ascx" TagPrefix="uc1" TagName="mod_ER_fatture" %> + + +
+
+
+ +
+
+
+ diff --git a/PUB/PAZ/Fatture.aspx.cs b/PUB/PAZ/Fatture.aspx.cs new file mode 100644 index 0000000..750812a --- /dev/null +++ b/PUB/PAZ/Fatture.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace PUB.PAZ +{ + public partial class Fatture : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/PUB/PAZ/Fatture.aspx.designer.cs b/PUB/PAZ/Fatture.aspx.designer.cs new file mode 100644 index 0000000..8b37f7a --- /dev/null +++ b/PUB/PAZ/Fatture.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace PUB.PAZ { + + + public partial class Fatture { + + /// + /// Controllo mod_ER_fatture. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::PUB.WebUserContols.mod_ER_fatture mod_ER_fatture; + } +} diff --git a/PUB/PAZ/MyDashboard.aspx b/PUB/PAZ/MyDashboard.aspx index 93d99a4..950b5d5 100644 --- a/PUB/PAZ/MyDashboard.aspx +++ b/PUB/PAZ/MyDashboard.aspx @@ -10,12 +10,17 @@
-
- -
-
- +
+

Dashboard <%: nomeForn %>

+ <%--
+
+ +
+
+ +
+
--%>
diff --git a/PUB/PAZ/MyDashboard.aspx.cs b/PUB/PAZ/MyDashboard.aspx.cs index 5a438eb..8f61402 100644 --- a/PUB/PAZ/MyDashboard.aspx.cs +++ b/PUB/PAZ/MyDashboard.aspx.cs @@ -22,9 +22,37 @@ namespace PUB.PAZ { } memLayer.ML.setSessionVal("idxAmm", "0"); memLayer.ML.setSessionVal("idxFornitore", idxFornitore); + try + { + nomeForn = rigaFornitore(idxFornitore).nome; + } + catch + { } } divDash.Visible = userAuth; divAuthError.Visible = !userAuth; } + protected DS_app.AnagFornitoriRow rigaFornitore(int idxFornitore) + { + DS_app.AnagFornitoriRow answ = null; + try + { + answ = DtProxy.man.taAF.getByKey(idxFornitore)[0]; + } + catch + { } + return answ; + } + public string nomeForn + { + get + { + return memLayer.ML.StringSessionObj("nomeForn"); + } + set + { + memLayer.ML.setSessionVal("nomeForn", value); + } + } } } \ No newline at end of file diff --git a/PUB/PAZ/MyDashboard.aspx.designer.cs b/PUB/PAZ/MyDashboard.aspx.designer.cs index ef88a7b..1e220fc 100644 --- a/PUB/PAZ/MyDashboard.aspx.designer.cs +++ b/PUB/PAZ/MyDashboard.aspx.designer.cs @@ -31,21 +31,12 @@ namespace PUB.PAZ { protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDash; /// - /// Controllo mod_ER_richieste. + /// Controllo lblForn. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::PUB.WebUserContols.mod_ER_richieste mod_ER_richieste; - - /// - /// Controllo mod_ER_inCorso. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::PUB.WebUserContols.mod_ER_inCorso mod_ER_inCorso; + protected global::System.Web.UI.WebControls.Label lblForn; } } diff --git a/PUB/PAZ/Sospesi.aspx b/PUB/PAZ/Sospesi.aspx new file mode 100644 index 0000000..37a9e4f --- /dev/null +++ b/PUB/PAZ/Sospesi.aspx @@ -0,0 +1,13 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/SitePAZ.master" AutoEventWireup="true" CodeBehind="Sospesi.aspx.cs" Inherits="PUB.PAZ.Sospesi" %> + +<%@ Register Src="~/WebUserContols/mod_ER_sospesi.ascx" TagPrefix="uc1" TagName="mod_ER_sospesi" %> + + +
+
+
+ +
+
+
+ diff --git a/PUB/PAZ/Sospesi.aspx.cs b/PUB/PAZ/Sospesi.aspx.cs new file mode 100644 index 0000000..bdc5a3f --- /dev/null +++ b/PUB/PAZ/Sospesi.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace PUB.PAZ +{ + public partial class Sospesi : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/PUB/PAZ/Sospesi.aspx.designer.cs b/PUB/PAZ/Sospesi.aspx.designer.cs new file mode 100644 index 0000000..c356a5e --- /dev/null +++ b/PUB/PAZ/Sospesi.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace PUB.PAZ { + + + public partial class Sospesi { + + /// + /// Controllo mod_ER_sospesi. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::PUB.WebUserContols.mod_ER_sospesi mod_ER_sospesi; + } +} diff --git a/PUB/PUB.csproj b/PUB/PUB.csproj index cb53ba2..a1386a2 100644 --- a/PUB/PUB.csproj +++ b/PUB/PUB.csproj @@ -188,11 +188,13 @@ + + @@ -237,11 +239,13 @@ + + @@ -470,6 +474,13 @@ DettaglioIntervento.aspx + + Fatture.aspx + ASPXCodeBehind + + + Fatture.aspx + Interventi.aspx ASPXCodeBehind @@ -505,6 +516,13 @@ Richieste.aspx + + Sospesi.aspx + ASPXCodeBehind + + + Sospesi.aspx + AnagAmmin.aspx ASPXCodeBehind @@ -734,6 +752,13 @@ mod_ER_doAct.ascx + + mod_ER_fatture.ascx + ASPXCodeBehind + + + mod_ER_fatture.ascx + mod_ER_grid.ascx ASPXCodeBehind @@ -769,6 +794,13 @@ mod_ER_selCondominio.ascx + + mod_ER_sospesi.ascx + ASPXCodeBehind + + + mod_ER_sospesi.ascx + mod_F2C.ascx ASPXCodeBehind diff --git a/PUB/WebUserContols/mod_ER_conclusi.ascx b/PUB/WebUserContols/mod_ER_conclusi.ascx index 9430d56..4723c0d 100644 --- a/PUB/WebUserContols/mod_ER_conclusi.ascx +++ b/PUB/WebUserContols/mod_ER_conclusi.ascx @@ -2,15 +2,13 @@ <%@ 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" %> -
Conclusi
-
Elenco degli interventi conclusi
- + <%--Gestione Interventi--%>
diff --git a/PUB/WebUserContols/mod_ER_fatture.ascx b/PUB/WebUserContols/mod_ER_fatture.ascx new file mode 100644 index 0000000..215fd41 --- /dev/null +++ b/PUB/WebUserContols/mod_ER_fatture.ascx @@ -0,0 +1,14 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ER_fatture.ascx.cs" Inherits="PUB.WebUserContols.mod_ER_fatture" %> +<%@ 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" %> + +
+
+
Fatture/Pagamenti
+ +
+
+ + <%--Gestione Interventi--%> +
+
diff --git a/PUB/WebUserContols/mod_ER_fatture.ascx.cs b/PUB/WebUserContols/mod_ER_fatture.ascx.cs new file mode 100644 index 0000000..53f952e --- /dev/null +++ b/PUB/WebUserContols/mod_ER_fatture.ascx.cs @@ -0,0 +1,47 @@ +using System; +using System.Web.UI; + +namespace PUB.WebUserContols +{ + public partial class mod_ER_fatture : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // salvo le selezioni... + 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) + { + // recupero evento tipizzato + SelCondEventArgs ce = (SelCondEventArgs)e; + // imposto! + try + { + mod_ER_selCondominio.condSelected = ce.idxCond.ToString(); + } + catch + { } + saveSelections(); + } + + private void saveSelections() + { + mod_ER_grid.idxCond = mod_ER_selCondominio.condSelected; + } + + protected void lbtResetCond_Click(object sender, EventArgs e) + { + mod_ER_selCondominio.condSelected = "0"; + saveSelections(); + } + } +} \ No newline at end of file diff --git a/PUB/WebUserContols/mod_ER_fatture.ascx.designer.cs b/PUB/WebUserContols/mod_ER_fatture.ascx.designer.cs new file mode 100644 index 0000000..d9f04f9 --- /dev/null +++ b/PUB/WebUserContols/mod_ER_fatture.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace PUB.WebUserContols { + + + public partial class mod_ER_fatture { + + /// + /// 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::PUB.WebUserContols.mod_ER_selCondominio mod_ER_selCondominio; + + /// + /// Controllo mod_ER_grid. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::PUB.WebUserContols.mod_ER_grid mod_ER_grid; + } +} diff --git a/PUB/WebUserContols/mod_ER_inCorso.ascx b/PUB/WebUserContols/mod_ER_inCorso.ascx index 9896111..4f2c64f 100644 --- a/PUB/WebUserContols/mod_ER_inCorso.ascx +++ b/PUB/WebUserContols/mod_ER_inCorso.ascx @@ -10,7 +10,6 @@
-
Elenco degli interventi in corso
<%--Gestione Interventi--%>
diff --git a/PUB/WebUserContols/mod_ER_preventivi.ascx b/PUB/WebUserContols/mod_ER_preventivi.ascx index 11cae95..b13f2ef 100644 --- a/PUB/WebUserContols/mod_ER_preventivi.ascx +++ b/PUB/WebUserContols/mod_ER_preventivi.ascx @@ -10,7 +10,6 @@
-
Elenco preventivi aperti/approvati
<%--Gestione Interventi--%>
diff --git a/PUB/WebUserContols/mod_ER_richieste.ascx b/PUB/WebUserContols/mod_ER_richieste.ascx index 741102b..3a08518 100644 --- a/PUB/WebUserContols/mod_ER_richieste.ascx +++ b/PUB/WebUserContols/mod_ER_richieste.ascx @@ -16,7 +16,6 @@
-
Elenco Richieste Aperte Amministratore
diff --git a/PUB/WebUserContols/mod_ER_sospesi.ascx b/PUB/WebUserContols/mod_ER_sospesi.ascx new file mode 100644 index 0000000..4bdf5f9 --- /dev/null +++ b/PUB/WebUserContols/mod_ER_sospesi.ascx @@ -0,0 +1,15 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ER_sospesi.ascx.cs" Inherits="PUB.WebUserContols.mod_ER_sospesi" %> +<%@ 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" %> + +
+
+
Sospesi
+ +
+
+ + <%--Gestione Interventi--%> +
+
+ diff --git a/PUB/WebUserContols/mod_ER_sospesi.ascx.cs b/PUB/WebUserContols/mod_ER_sospesi.ascx.cs new file mode 100644 index 0000000..bca8c48 --- /dev/null +++ b/PUB/WebUserContols/mod_ER_sospesi.ascx.cs @@ -0,0 +1,47 @@ +using System; +using System.Web.UI; + +namespace PUB.WebUserContols +{ + public partial class mod_ER_sospesi : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + if (!Page.IsPostBack) + { + // salvo le selezioni... + 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) + { + // recupero evento tipizzato + SelCondEventArgs ce = (SelCondEventArgs)e; + // imposto! + try + { + mod_ER_selCondominio.condSelected = ce.idxCond.ToString(); + } + catch + { } + saveSelections(); + } + + private void saveSelections() + { + mod_ER_grid.idxCond = mod_ER_selCondominio.condSelected; + } + + protected void lbtResetCond_Click(object sender, EventArgs e) + { + mod_ER_selCondominio.condSelected = "0"; + saveSelections(); + } + } +} \ No newline at end of file diff --git a/PUB/WebUserContols/mod_ER_sospesi.ascx.designer.cs b/PUB/WebUserContols/mod_ER_sospesi.ascx.designer.cs new file mode 100644 index 0000000..50568b8 --- /dev/null +++ b/PUB/WebUserContols/mod_ER_sospesi.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace PUB.WebUserContols { + + + public partial class mod_ER_sospesi { + + /// + /// 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::PUB.WebUserContols.mod_ER_selCondominio mod_ER_selCondominio; + + /// + /// Controllo mod_ER_grid. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::PUB.WebUserContols.mod_ER_grid mod_ER_grid; + } +} diff --git a/PUB/WebUserContols/mod_statusRowPAZ.ascx b/PUB/WebUserContols/mod_statusRowPAZ.ascx index 585ffb6..f39068f 100644 --- a/PUB/WebUserContols/mod_statusRowPAZ.ascx +++ b/PUB/WebUserContols/mod_statusRowPAZ.ascx @@ -60,25 +60,54 @@ Interventi
- / - + in corso +
+
+
+ +
+
+ +
+
+ +
+
+ Sospesi +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ Chiusi +
+
-
- +
+
- Chiusi + Fatture
- / - + / +