Egalware/C.TRACK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-19 11:56:36 +01:00
parent 43a1680844 9346810ec1
commit 2fccbb28a7
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MAG/SMART/prtFiniti.aspx
+1 -1
View File
@@ -3,5 +3,5 @@
<%@ Register Src="~/WebUserControls/cmp_prtFiniti.ascx" TagPrefix="uc1" TagName="cmp_prtFiniti" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:cmp_prtFiniti runat="server" id="cmp_prtFiniti" tipoStampa="FINITI" tipoLotto="M" codStatoIN="SL" codStatoOUT="FIN" Origine="INT" />
<uc1:cmp_prtFiniti runat="server" id="cmp_prtFiniti" tipoStampa="FINITI" tipoLotto="M" codStatoIN="SL" codStatoOUT="FIN" Origine="INT" flussoUdc="MFI" />
</asp:Content>
MP-MAG/SMART/prtSemilav.aspx
+1 -1
View File
@@ -3,5 +3,5 @@
<%@ Register Src="~/WebUserControls/cmp_prtSemilav.ascx" TagPrefix="uc1" TagName="cmp_prtSemilav" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<uc1:cmp_prtSemilav runat="server" ID="cmp_prtSemilav" tipoStampa="SEMILAVORATI" tipoLotto="M" codStatoIN="MP" codStatoOUT="SL" Origine="INT" />
<uc1:cmp_prtSemilav runat="server" ID="cmp_prtSemilav" tipoStampa="SEMILAVORATI" tipoLotto="M" codStatoIN="MP" codStatoOUT="SL" Origine="INT" flussoUdc="MSL" />
</asp:Content>
MP-MAG/WebUserControls/cmp_LottiIn.ascx
+2 -2
View File
@@ -12,7 +12,7 @@
</div>
</div>
<div class="card-body small px-0 py-1">
<asp:GridView ID="grViewLottoIn" runat="server" AutoGenerateColumns="False" DataKeyNames="Lotto" DataSourceID="odsLottiIn" CssClass="table table-striped table-condensed table-sm small" AllowPaging="True">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="Lotto" DataSourceID="ods" CssClass="table table-striped table-condensed table-sm small" AllowPaging="True">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -85,7 +85,7 @@
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="odsLottiIn" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByHashList" TypeName="MagData.DS_MagTableAdapters.ElencoLottiTableAdapter" FilterExpression="CodStato = '{0}'">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByHashList" TypeName="MagData.DS_MagTableAdapters.ElencoLottiTableAdapter" FilterExpression="CodStato = '{0}'">
<SelectParameters>
<asp:ControlParameter ControlID="hfHashList" DefaultValue="#" Name="elLotti" PropertyName="Value" Type="String" />
</SelectParameters>
MP-MAG/WebUserControls/cmp_LottiIn.ascx.cs
+8 -1
View File
@@ -40,7 +40,7 @@ namespace MP_MAG.WebUserControls
string eliString = $"#{string.Join("#", value)}#";
hfHashList.Value = eliString;
// update grView...
grViewLottoIn.DataBind();
grView.DataBind();
}
}
/// <summary>
@@ -70,6 +70,13 @@ namespace MP_MAG.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Update grid view
/// </summary>
public void doUpdate()
{
grView.DataBind();
}
/// <summary>
/// reset sel lottoIn
MP-MAG/WebUserControls/cmp_LottiIn.ascx.designer.cs
Generated
+4 -4
View File
@@ -24,22 +24,22 @@ namespace MP_MAG.WebUserControls
protected global::System.Web.UI.WebControls.LinkButton lbtResetLottoIn;
/// <summary>
/// Controllo grViewLottoIn.
/// Controllo grView.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grViewLottoIn;
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo odsLottiIn.
/// Controllo ods.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsLottiIn;
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo hfHashList.
MP-MAG/WebUserControls/cmp_prtFiniti.ascx.cs
+2
View File
@@ -216,6 +216,8 @@ namespace MP_MAG.WebUserControls
}
// nascondo creazione...
showCreaStampa(false, false);
cmp_LottiIn.doUpdate();
cmp_LottiOut.doUpdate();
}
private void Cmp_creaLottoOUT_eh_doRefresh(object sender, EventArgs e)
MP-MAG/WebUserControls/cmp_prtSemilav.ascx.cs
+2
View File
@@ -214,6 +214,8 @@ namespace MP_MAG.WebUserControls
}
// nascondo creazione...
showCreaStampa(false, false);
cmp_LottiIn.doUpdate();
cmp_LottiOut.doUpdate();
}
private void Cmp_creaLottoOUT_eh_doRefresh(object sender, EventArgs e)