Update con fix x errore su eventi con nuovo merge...
#fixed 848 git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@16 43c8e981-f90d-406c-a89a-24a2c4268d51
This commit is contained in:
@@ -27,23 +27,17 @@ public partial class AnagraficaEventi : System.Web.UI.Page
|
||||
void Mod_filtroTipoObj_eh_selValore(object sender, EventArgs e)
|
||||
{
|
||||
// salvo in session
|
||||
SteamWare.memLayer.ML.setSessionVal("CodMappa_sel", Mod_filtroMappa.valore, false);
|
||||
#if false
|
||||
SteamWare.memLayer.ML.setSessionVal("IdxTipoObj_sel", Mod_filtroTipoObj.valoreInt, false);
|
||||
// update!
|
||||
//Mod_ev2stati1.doUpdate();
|
||||
//Mod_ev2step1.doUpdate();
|
||||
#endif
|
||||
Mod_ev2stati1.doUpdate();
|
||||
}
|
||||
|
||||
void Mod_filtroMappa_eh_selValore(object sender, EventArgs e)
|
||||
{
|
||||
// salvo in session
|
||||
SteamWare.memLayer.ML.setSessionVal("IdxTipoObj_sel", Mod_filtroTipoObj.valoreInt, false);
|
||||
#if false
|
||||
SteamWare.memLayer.ML.setSessionVal("CodMappa_sel", Mod_filtroMappa.valore, false);
|
||||
// update!
|
||||
//Mod_ev2stati1.doUpdate();
|
||||
//Mod_ev2step1.doUpdate();
|
||||
#endif
|
||||
Mod_ev2stati1.doUpdate();
|
||||
}
|
||||
|
||||
void Mod_anagraficaEventi1_eh_resetSelezione(object sender, EventArgs e)
|
||||
@@ -53,10 +47,11 @@ public partial class AnagraficaEventi : System.Web.UI.Page
|
||||
|
||||
void Mod_anagraficaEventi1_eh_selValore(object sender, EventArgs e)
|
||||
{
|
||||
pnlDet.Visible = true;
|
||||
// salvo valore iniziale filtro...
|
||||
SteamWare.memLayer.ML.setSessionVal("CodMappa_sel", Mod_filtroMappa.valore, false);
|
||||
SteamWare.memLayer.ML.setSessionVal("IdxTipoObj_sel", Mod_filtroTipoObj.valoreInt, false);
|
||||
// mostro panel...
|
||||
pnlDet.Visible = true;
|
||||
}
|
||||
|
||||
protected override void OnUnload(EventArgs e)
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
|
||||
SelectMethod="GetData" TypeName="DS_XPSTableAdapters.AnagTipoObjTableAdapter"
|
||||
OnInserting="recuperaFooter" FilterExpression=" DescrObj LIKE '%{0}%'" DeleteMethod="DeleteQuery"
|
||||
InsertMethod="Insert" UpdateMethod="UpdateQuery">
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
|
||||
SelectMethod="GetData" TypeName="DS_XPSTableAdapters.EventiTableAdapter" OnInserting="recuperaFooter"
|
||||
FilterExpression=" DescrEvento LIKE '%{0}%'" DeleteMethod="DeleteQuery" InsertMethod="Insert"
|
||||
UpdateMethod="UpdateQuery">
|
||||
@@ -128,4 +128,4 @@
|
||||
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label><br />
|
||||
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
|
||||
<asp:ObjectDataSource ID="odsTipoEvento" runat="server" SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selTipoEventoTableAdapter"
|
||||
OldValuesParameterFormatString="original_{0}"></asp:ObjectDataSource>
|
||||
OldValuesParameterFormatString="Original_{0}"></asp:ObjectDataSource>
|
||||
@@ -92,7 +92,7 @@
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
|
||||
SelectMethod="GetData" TypeName="DS_XPSTableAdapters.AnagMappeTableAdapter" OnInserting="recuperaFooter"
|
||||
FilterExpression=" CodMappa LIKE '%{0}%' OR DescrMappa LIKE '%{0}%' " DeleteMethod="DeleteQuery" InsertMethod="Insert"
|
||||
UpdateMethod="UpdateQuery">
|
||||
|
||||
@@ -142,4 +142,4 @@
|
||||
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label><br />
|
||||
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
|
||||
<asp:ObjectDataSource ID="odsTipoObj" runat="server" SelectMethod="GetData" TypeName="DS_utilityTableAdapters.v_selTipoObjTableAdapter"
|
||||
OldValuesParameterFormatString="original_{0}"></asp:ObjectDataSource>
|
||||
OldValuesParameterFormatString="Original_{0}"></asp:ObjectDataSource>
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
</asp:TemplateField>
|
||||
</Columns>
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="Original_{0}"
|
||||
SelectMethod="getByMappaTipoObj" TypeName="DS_XPSTableAdapters.StatiTableAdapter"
|
||||
OnInserting="recuperaFooter" FilterExpression=" DescrStato LIKE '%{0}%'" DeleteMethod="DeleteQuery"
|
||||
InsertMethod="Insert" UpdateMethod="UpdateQuery">
|
||||
|
||||
+29
-19
@@ -1,10 +1,11 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_ev2stati.ascx.cs"
|
||||
Inherits="mod_ev2stati" %>
|
||||
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
|
||||
<%@ Register Src="mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc1" %>
|
||||
<%@ Register Src="mod_selettore_ajax.ascx" TagName="mod_selettore_ajax" TagPrefix="uc2" %>
|
||||
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
|
||||
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
|
||||
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
|
||||
DataKeyNames="IdxTipoObj,IdxStato,IdxEvento" DataSourceID="ods">
|
||||
DataKeyNames="CodMappa,IdxTipoObj,CodStato,IdxEvento" DataSourceID="ods">
|
||||
<RowStyle CssClass="ctrRowStyle" />
|
||||
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
|
||||
<EditRowStyle CssClass="ctrEditRowStyle" />
|
||||
@@ -21,7 +22,7 @@
|
||||
<asp:TemplateField ShowHeader="False">
|
||||
<HeaderTemplate>
|
||||
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
|
||||
Visible="false" />
|
||||
Visible="true" />
|
||||
</HeaderTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
|
||||
@@ -67,31 +68,31 @@
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="StatoCurr" SortExpression="StatoCurr">
|
||||
<EditItemTemplate>
|
||||
<asp:DropDownList ID="dlIdxStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="IdxStato" SelectedValue='<%# Bind("IdxStato") %>'>
|
||||
<asp:DropDownList ID="dlCodStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="CodStato" SelectedValue='<%# Bind("CodStato") %>'>
|
||||
</asp:DropDownList>
|
||||
</EditItemTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label2" runat="server" Text='<%# Bind("StatoCurr") %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
<FooterTemplate>
|
||||
<asp:DropDownList ID="dlIdxStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="IdxStato" SelectedValue='<%# Bind("IdxStato") %>'>
|
||||
<asp:DropDownList ID="dlCodStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="CodStato" SelectedValue='<%# Bind("CodStato") %>'>
|
||||
</asp:DropDownList>
|
||||
</FooterTemplate>
|
||||
</asp:TemplateField>
|
||||
<asp:TemplateField HeaderText="StatoNext" SortExpression="StatoNext">
|
||||
<EditItemTemplate>
|
||||
<asp:DropDownList ID="dlNextIdxStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="IdxStato" SelectedValue='<%# Bind("NextIdxStato") %>'>
|
||||
<asp:DropDownList ID="dlNextCodStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="CodStato" SelectedValue='<%# Bind("NextCodStato") %>'>
|
||||
</asp:DropDownList>
|
||||
</EditItemTemplate>
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="Label4" runat="server" Text='<%# Bind("StatoNext") %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
<FooterTemplate>
|
||||
<asp:DropDownList ID="dlNextIdxStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="IdxStato" SelectedValue='<%# Bind("NextIdxStato") %>'>
|
||||
<asp:DropDownList ID="dlNextCodStato" runat="server" DataSourceID="odsStati" DataTextField="DescrStato"
|
||||
DataValueField="CodStato" SelectedValue='<%# Bind("NextCodStato") %>'>
|
||||
</asp:DropDownList>
|
||||
</FooterTemplate>
|
||||
</asp:TemplateField>
|
||||
@@ -124,37 +125,46 @@
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}"
|
||||
SelectMethod="getFiltered" TypeName="DS_XPSTableAdapters.v_ev2statiTableAdapter"
|
||||
OnInserting="recuperaFooter" DeleteMethod="DeleteQuery" InsertMethod="InsertQuery" UpdateMethod="UpdateQuery">
|
||||
OnInserting="recuperaFooter" DeleteMethod="DeleteQuery" InsertMethod="InsertQuery"
|
||||
UpdateMethod="UpdateQuery">
|
||||
<SelectParameters>
|
||||
<asp:SessionParameter DefaultValue="0" Name="IdxEvento" SessionField="IdxEvento_sel"
|
||||
Type="Int32" />
|
||||
<asp:SessionParameter DefaultValue="0" Name="IdxTipoObj" SessionField="IdxTipoObj_sel"
|
||||
Type="Int32" />
|
||||
<asp:SessionParameter DefaultValue="" Name="CodMappa" SessionField="CodMappa_sel"
|
||||
Type="String" />
|
||||
</SelectParameters>
|
||||
<DeleteParameters>
|
||||
<asp:Parameter Name="Original_IdxTipoObj" Type="Int32" />
|
||||
<asp:Parameter Name="Original_IdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="Original_CodStato" Type="String" />
|
||||
<asp:Parameter Name="Original_IdxEvento" Type="Int32" />
|
||||
<asp:Parameter Name="Original_CodMappa" Type="String" />
|
||||
</DeleteParameters>
|
||||
<UpdateParameters>
|
||||
<asp:Parameter Name="IdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="NextIdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="CodStato" Type="String" />
|
||||
<asp:Parameter Name="NextCodStato" Type="Int32" />
|
||||
<asp:Parameter Name="Original_IdxTipoObj" Type="Int32" />
|
||||
<asp:Parameter Name="Original_IdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="Original_IdxEvento" Type="Int32" />
|
||||
<asp:Parameter Name="Original_CodStato" Type="String" />
|
||||
<asp:Parameter Name="Original_CodMappa" Type="String" />
|
||||
</UpdateParameters>
|
||||
<InsertParameters>
|
||||
<asp:Parameter Name="CodMappa" Type="String" />
|
||||
<asp:Parameter Name="CodStato" Type="String" />
|
||||
<asp:Parameter Name="IdxTipoObj" Type="Int32" />
|
||||
<asp:Parameter Name="IdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="IdxEvento" Type="Int32" />
|
||||
<asp:Parameter Name="NextIdxStato" Type="Int32" />
|
||||
<asp:Parameter Name="NextCodStato" Type="String" />
|
||||
</InsertParameters>
|
||||
</asp:ObjectDataSource>
|
||||
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini"></asp:Label><br />
|
||||
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
|
||||
<asp:ObjectDataSource ID="odsStati" runat="server" SelectMethod="getByTipoObj" TypeName="DS_XPSTableAdapters.StatiTableAdapter">
|
||||
<asp:ObjectDataSource ID="odsStati" runat="server" SelectMethod="getByMappaTipoObj"
|
||||
TypeName="DS_XPSTableAdapters.StatiTableAdapter">
|
||||
<SelectParameters>
|
||||
<asp:SessionParameter DefaultValue="0" Name="IdxTipoObj" SessionField="IdxTipoObj_sel"
|
||||
Type="Int32" />
|
||||
<asp:SessionParameter DefaultValue="" Name="CodMappa" SessionField="CodMappa_sel"
|
||||
Type="string" />
|
||||
</SelectParameters>
|
||||
</asp:ObjectDataSource>
|
||||
|
||||
@@ -202,7 +202,7 @@ public partial class mod_ev2stati : ApplicationUserControl
|
||||
protected override void OnInit(EventArgs e)
|
||||
{
|
||||
base.OnInit(e);
|
||||
_idxGridView = "IdxStato";
|
||||
_idxGridView = "CodStato";
|
||||
}
|
||||
void Mod_filtro1_eh_selValore(object sender, EventArgs e)
|
||||
{
|
||||
@@ -288,6 +288,7 @@ public partial class mod_ev2stati : ApplicationUserControl
|
||||
}
|
||||
tipoColonna = "";
|
||||
}
|
||||
e.InputParameters["CodMappa"] = memLayer.ML.StringSessionObj("CodMappa_sel");
|
||||
e.InputParameters["IdxTipoObj"] = memLayer.ML.IntSessionObj("IdxTipoObj_sel");
|
||||
e.InputParameters["IdxEvento"] = memLayer.ML.IntSessionObj("IdxEvento_sel");
|
||||
}
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user