avanzamento su filtraggio x fornitore...

This commit is contained in:
Samuele E. Locatelli
2018-08-08 18:10:27 +02:00
parent d133b0b247
commit 3aba200efc
10 changed files with 74 additions and 46 deletions
+14 -7
View File
@@ -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<int> idxAmm, global::System.Nullable<int> idxCond, global::System.Nullable<int> minStato, global::System.Nullable<int> maxStato) {
public virtual DS_app.ElencolRichDataTable getByCondStato(global::System.Nullable<int> idxAmm, global::System.Nullable<int> idxFornitore, global::System.Nullable<int> idxCond, global::System.Nullable<int> minStato, global::System.Nullable<int> 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;
+1
View File
@@ -521,6 +521,7 @@ FROM v_AssF2C</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxAmm" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxFornitore" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idxCond" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@minStato" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@maxStato" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
+10 -10
View File
@@ -9,17 +9,17 @@
<Shape ID="DesignTable:AnagAmministratori" ZOrder="19" X="55" Y="106" Height="296" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:AnagCondomini" ZOrder="18" X="440" Y="70" Height="342" Width="283" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="237" />
<Shape ID="DesignTable:AnagAree" ZOrder="13" X="802" Y="1133" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="145" />
<Shape ID="DesignTable:AnagFornitori" ZOrder="16" X="811" Y="495" Height="365" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:AssF2A" ZOrder="10" X="807" Y="913" Height="181" Width="298" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
<Shape ID="DesignTable:AssF2C" ZOrder="9" X="815" Y="36" Height="388" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:PBO_DashStats" ZOrder="8" X="90" Y="465" Height="273" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:ElencolRich" ZOrder="3" X="58" Y="1104" Height="503" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagStati" ZOrder="1" X="446" Y="1542" Height="204" Width="292" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:StatoRich" ZOrder="7" X="431" Y="743" Height="252" Width="319" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="193" />
<Shape ID="DesignTable:PAM_DashStats" ZOrder="6" X="456" Y="472" Height="250" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:AnagFornitori" ZOrder="16" X="811" Y="495" Height="388" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="260" />
<Shape ID="DesignTable:AssF2A" ZOrder="10" X="807" Y="913" Height="181" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
<Shape ID="DesignTable:AssF2C" ZOrder="9" X="815" Y="36" Height="388" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:PBO_DashStats" ZOrder="8" X="90" Y="465" Height="273" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="214" />
<Shape ID="DesignTable:ElencolRich" ZOrder="1" X="58" Y="1104" Height="457" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:AnagStati" ZOrder="2" X="446" Y="1542" Height="204" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="122" />
<Shape ID="DesignTable:StatoRich" ZOrder="7" X="431" Y="743" Height="250" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:PAM_DashStats" ZOrder="6" X="456" Y="472" Height="250" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:AnagPrior" ZOrder="5" X="858" Y="1438" Height="181" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="99" />
<Shape ID="DesignTable:ER_Acts" ZOrder="4" X="444" Y="1115" Height="411" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="306" />
<Shape ID="DesignTable:PAZ_DashStats" ZOrder="2" X="89" Y="758" Height="250" Width="299" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
<Shape ID="DesignTable:PAZ_DashStats" ZOrder="3" X="89" Y="758" Height="250" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="191" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_AnagCondomini_AnagAmministratori" ZOrder="17" LineWidth="11">
@@ -42,7 +42,7 @@
</Point>
<Point>
<X>900</X>
<Y>860</Y>
<Y>883</Y>
</Point>
</RoutePoints>
</Connector>
-19
View File
@@ -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;
+1
View File
@@ -20,6 +20,7 @@ namespace PUB.PAM
catch
{ }
memLayer.ML.setSessionVal("idxAmm", idxAmm);
memLayer.ML.setSessionVal("idxFornitore", "0");
}
lbtMyDashboard.Visible = userAuth;
divReqLink.Visible = !userAuth;
+1
View File
@@ -20,6 +20,7 @@ namespace PUB.PAM
catch
{ }
memLayer.ML.setSessionVal("idxAmm", idxAmm);
memLayer.ML.setSessionVal("idxFornitore", "0");
}
divDash.Visible = userAuth;
divAuthError.Visible = !userAuth;
+1
View File
@@ -19,6 +19,7 @@ namespace PUB.PAZ
}
catch
{ }
memLayer.ML.setSessionVal("idxAmm", "0");
memLayer.ML.setSessionVal("idxFornitore", idxFornitore);
}
lbtMyDashboard.Visible = userAuth;
+1
View File
@@ -20,6 +20,7 @@ namespace PUB.PAZ
}
catch
{ }
memLayer.ML.setSessionVal("idxAmm", "0");
memLayer.ML.setSessionVal("idxFornitore", idxFornitore);
}
divDash.Visible = userAuth;
+4 -3
View File
@@ -35,7 +35,7 @@
</div>
<div class="text-center">
<asp:Label CssClass='<%# getCssScad(Eval("dataScad")) %>' ID="Label2" runat="server" ToolTip='<%# Eval("dataScad","Risposta entro {0:dd.MM.yyyy HH:mm}") %>'>Urg: <b><%# Eval("idxPriorita") %></b> </asp:Label>
</div>
</ItemTemplate>
</asp:TemplateField>
@@ -120,7 +120,8 @@
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="odsElRich" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByCondStato" TypeName="Data.DS_appTableAdapters.ElencolRichTableAdapter" UpdateMethod="UpdateText">
<SelectParameters>
<asp:SessionParameter DefaultValue="1" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxAmm" SessionField="idxAmm" Type="Int32" />
<asp:SessionParameter DefaultValue="0" Name="idxFornitore" SessionField="idxFornitore" Type="Int32" />
<asp:ControlParameter ControlID="hfCondominio" DefaultValue="0" Name="idxCond" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfStatoMin" DefaultValue="0" Name="minStato" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfStatoMax" DefaultValue="200" Name="maxStato" PropertyName="Value" Type="Int32" />
@@ -130,7 +131,7 @@
<asp:Parameter Name="messaggio" Type="String" />
<asp:Parameter Name="note" Type="String" />
</UpdateParameters>
</asp:ObjectDataSource>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfCondominio" />
<asp:HiddenField runat="server" ID="hfStatoMin" />
<asp:HiddenField runat="server" ID="hfStatoMax" />
+41 -7
View File
@@ -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;
}
/// <summary>
/// modalità edit corrente
/// </summary>
public ER_EditMode currMode
{
get
{
return (ER_EditMode)memLayer.ML.objSessionObj("ER_EditMode");
}
set
{
memLayer.ML.setSessionVal("ER_EditMode", value);
}
}
/// <summary>
/// Imposta metodo sel condomini...
/// </summary>
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)
{