diff --git a/Data/DS_app.Designer.cs b/Data/DS_app.Designer.cs index 4ce432c..ef23761 100644 --- a/Data/DS_app.Designer.cs +++ b/Data/DS_app.Designer.cs @@ -12015,6 +12015,7 @@ SELECT idxFornitore, idxArea, Attivazione FROM AssF2A WHERE (idxArea = @idxArea) this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxAmm", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxFornitore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idxCond", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@minStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@maxStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -12107,7 +12108,7 @@ SELECT idxFornitore, idxArea, Attivazione FROM AssF2A WHERE (idxArea = @idxArea) [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_app.ElencolRichDataTable getByCondStato(global::System.Nullable idxAmm, global::System.Nullable idxCond, global::System.Nullable minStato, global::System.Nullable maxStato) { + public virtual DS_app.ElencolRichDataTable getByCondStato(global::System.Nullable idxAmm, global::System.Nullable idxFornitore, global::System.Nullable idxCond, global::System.Nullable minStato, global::System.Nullable maxStato) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((idxAmm.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((int)(idxAmm.Value)); @@ -12115,24 +12116,30 @@ SELECT idxFornitore, idxArea, Attivazione FROM AssF2A WHERE (idxArea = @idxArea) else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - if ((idxCond.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[2].Value = ((int)(idxCond.Value)); + if ((idxFornitore.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(idxFornitore.Value)); } else { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } - if ((minStato.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[3].Value = ((int)(minStato.Value)); + if ((idxCond.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[3].Value = ((int)(idxCond.Value)); } else { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } - if ((maxStato.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[4].Value = ((int)(maxStato.Value)); + if ((minStato.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[4].Value = ((int)(minStato.Value)); } else { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((maxStato.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[5].Value = ((int)(maxStato.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; + } DS_app.ElencolRichDataTable dataTable = new DS_app.ElencolRichDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/Data/DS_app.xsd b/Data/DS_app.xsd index b15e067..7a9fd3f 100644 --- a/Data/DS_app.xsd +++ b/Data/DS_app.xsd @@ -521,6 +521,7 @@ FROM v_AssF2C + diff --git a/Data/DS_app.xss b/Data/DS_app.xss index 5f9015c..94e2608 100644 --- a/Data/DS_app.xss +++ b/Data/DS_app.xss @@ -9,17 +9,17 @@ - - - - - - - - + + + + + + + + - + @@ -42,7 +42,7 @@ 900 - 860 + 883 diff --git a/PUB/Content/Site.css b/PUB/Content/Site.css index 19c034f..dcc59eb 100644 --- a/PUB/Content/Site.css +++ b/PUB/Content/Site.css @@ -13,7 +13,6 @@ body { .body-content { padding-left: 15px; padding-right: 15px; - font-size: 0.5em; } /* gestione icone */ .icona { @@ -81,7 +80,6 @@ body { } .body-content { padding: 0; - font-size: 0.5em; } .navbar-nav { font-size: 0.7em; @@ -99,7 +97,6 @@ body { } .body-content { padding: 0; - font-size: 0.6em; } .navbar-nav, .nav-footer { @@ -110,10 +107,6 @@ body { } } @media screen and (min-width: 1024px) { - .body-content { - padding: 0; - font-size: 0.7em; - } .navbar-nav, .nav-footer { font-size: 0.9em; @@ -123,10 +116,6 @@ body { } } @media screen and (min-width: 1366px) { - .body-content { - padding: 0; - font-size: 0.8em; - } .navbar-nav, .nav-footer { font-size: 1.0em; @@ -136,10 +125,6 @@ body { } } @media screen and (min-width: 1440px) { - .body-content { - padding: 0; - font-size: 0.9em; - } .navbar-nav, .nav-footer { font-size: 1.1em; @@ -149,10 +134,6 @@ body { } } @media screen and (min-width: 1920px) { - .body-content { - padding: 0; - font-size: 1.0em; - } .navbar-nav, .nav-footer { font-size: 1.2em; diff --git a/PUB/PAM/Login.aspx.cs b/PUB/PAM/Login.aspx.cs index 5982dcb..9ac0958 100644 --- a/PUB/PAM/Login.aspx.cs +++ b/PUB/PAM/Login.aspx.cs @@ -20,6 +20,7 @@ namespace PUB.PAM catch { } memLayer.ML.setSessionVal("idxAmm", idxAmm); + memLayer.ML.setSessionVal("idxFornitore", "0"); } lbtMyDashboard.Visible = userAuth; divReqLink.Visible = !userAuth; diff --git a/PUB/PAM/MyDashboard.aspx.cs b/PUB/PAM/MyDashboard.aspx.cs index 9e1fd91..2c8b0f2 100644 --- a/PUB/PAM/MyDashboard.aspx.cs +++ b/PUB/PAM/MyDashboard.aspx.cs @@ -20,6 +20,7 @@ namespace PUB.PAM catch { } memLayer.ML.setSessionVal("idxAmm", idxAmm); + memLayer.ML.setSessionVal("idxFornitore", "0"); } divDash.Visible = userAuth; divAuthError.Visible = !userAuth; diff --git a/PUB/PAZ/Login.aspx.cs b/PUB/PAZ/Login.aspx.cs index 07cf204..f8e1ab4 100644 --- a/PUB/PAZ/Login.aspx.cs +++ b/PUB/PAZ/Login.aspx.cs @@ -19,6 +19,7 @@ namespace PUB.PAZ } catch { } + memLayer.ML.setSessionVal("idxAmm", "0"); memLayer.ML.setSessionVal("idxFornitore", idxFornitore); } lbtMyDashboard.Visible = userAuth; diff --git a/PUB/PAZ/MyDashboard.aspx.cs b/PUB/PAZ/MyDashboard.aspx.cs index 7c215ac..5a438eb 100644 --- a/PUB/PAZ/MyDashboard.aspx.cs +++ b/PUB/PAZ/MyDashboard.aspx.cs @@ -20,6 +20,7 @@ namespace PUB.PAZ } catch { } + memLayer.ML.setSessionVal("idxAmm", "0"); memLayer.ML.setSessionVal("idxFornitore", idxFornitore); } divDash.Visible = userAuth; diff --git a/PUB/WebUserContols/mod_ER_grid.ascx b/PUB/WebUserContols/mod_ER_grid.ascx index e29cd18..e3c4097 100644 --- a/PUB/WebUserContols/mod_ER_grid.ascx +++ b/PUB/WebUserContols/mod_ER_grid.ascx @@ -35,7 +35,7 @@
Urg: <%# Eval("idxPriorita") %> - +
@@ -120,7 +120,8 @@ - + + @@ -130,7 +131,7 @@ - + diff --git a/PUB/WebUserContols/mod_ER_richieste.ascx.cs b/PUB/WebUserContols/mod_ER_richieste.ascx.cs index b943842..fdbcf77 100644 --- a/PUB/WebUserContols/mod_ER_richieste.ascx.cs +++ b/PUB/WebUserContols/mod_ER_richieste.ascx.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Data; +using Data; using SteamWare; +using System; +using System.Data; +using System.Web.UI; namespace PUB.WebUserContols { @@ -15,11 +12,48 @@ namespace PUB.WebUserContols { if (!Page.IsPostBack) { + fixSelCondomini(); // salvo le selezioni... saveSelections(); } mod_ER_grid.eh_selCond += Mod_ER_grid_eh_selCond; } + /// + /// modalità edit corrente + /// + public ER_EditMode currMode + { + get + { + return (ER_EditMode)memLayer.ML.objSessionObj("ER_EditMode"); + } + set + { + memLayer.ML.setSessionVal("ER_EditMode", value); + } + } + /// + /// Imposta metodo sel condomini... + /// + private void fixSelCondomini() + { + odsCondomini.SelectParameters.Clear(); + switch (currMode) + { + case ER_EditMode.mND: + break; + case ER_EditMode.mAmministratore: + odsCondomini.SelectMethod = "getByAmm"; + odsCondomini.SelectParameters.Add("idxAmm", DbType.Int32, memLayer.ML.StringSessionObj("idxAmm")); + break; + case ER_EditMode.mFornitore: + odsCondomini.SelectMethod = "getByForn"; + odsCondomini.SelectParameters.Add("idxFornitore", DbType.Int32, memLayer.ML.StringSessionObj("idxFornitore")); + break; + default: + break; + } + } private void Mod_ER_grid_eh_selCond(object sender, EventArgs e) {