Fix controlli x gest doppia tavola...
This commit is contained in:
Vendored
+1
-1
@@ -17,7 +17,7 @@ pipeline {
|
||||
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=847']) {
|
||||
withEnv(['NEXT_BUILD_NUMBER=848']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'MAPO'
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
using MapoDb;
|
||||
using SteamWare;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
|
||||
namespace MoonProTablet.WebUserControls
|
||||
{
|
||||
@@ -68,6 +64,7 @@ namespace MoonProTablet.WebUserControls
|
||||
private void fixSelMacc()
|
||||
{
|
||||
divSelMacc.Visible = isMulti;
|
||||
fixSelMaccControlli();
|
||||
}
|
||||
/// <summary>
|
||||
/// restituisce css disabled SE odl NON OK...
|
||||
@@ -172,7 +169,7 @@ namespace MoonProTablet.WebUserControls
|
||||
{
|
||||
eh_reset(this, new EventArgs());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// salvo produzione
|
||||
@@ -202,9 +199,22 @@ namespace MoonProTablet.WebUserControls
|
||||
protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
subMaccSel = ddlSubMacc.SelectedValue;
|
||||
fixSelMaccControlli();
|
||||
checkAll();
|
||||
}
|
||||
|
||||
private void fixSelMaccControlli()
|
||||
{
|
||||
if (isMulti)
|
||||
{
|
||||
memLayer.ML.setSessionVal("IdxMacchinaControlli", subMaccSel);
|
||||
}
|
||||
else
|
||||
{
|
||||
memLayer.ML.setSessionVal("IdxMacchinaControlli", idxMacchinaSession);
|
||||
}
|
||||
}
|
||||
|
||||
protected void ddlSubMacc_DataBound(object sender, EventArgs e)
|
||||
{
|
||||
// se ho in memoria un valore LO REIMPOSTO...
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
</asp:GridView>
|
||||
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_ProdTempiTableAdapters.RegistroControlliTableAdapter">
|
||||
<SelectParameters>
|
||||
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchina" Name="IdxMacchina" />
|
||||
<asp:SessionParameter Type="String" DefaultValue="0" SessionField="IdxMacchinaControlli" Name="IdxMacchina" />
|
||||
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_inizio" Name="DataFrom" />
|
||||
<asp:SessionParameter Type="DateTime" DefaultValue="" SessionField="_fine" Name="DataTo" />
|
||||
</SelectParameters>
|
||||
|
||||
Reference in New Issue
Block a user