diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index afefdda0..c806c068 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index 596262ce..cfc4673c 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index 63827d4b..558e5ebe 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-UT/bin/GMW-UT.dll b/GMW-UT/bin/GMW-UT.dll index c3db947e..f1a591b7 100644 Binary files a/GMW-UT/bin/GMW-UT.dll and b/GMW-UT/bin/GMW-UT.dll differ diff --git a/GMW-UT/bin/GMW_data.dll b/GMW-UT/bin/GMW_data.dll index 596262ce..cfc4673c 100644 Binary files a/GMW-UT/bin/GMW_data.dll and b/GMW-UT/bin/GMW_data.dll differ diff --git a/GMW-UT/bin/SteamWare.dll b/GMW-UT/bin/SteamWare.dll index 63827d4b..558e5ebe 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW/POST_FinitiMult_OUT.aspx.cs b/GMW/POST_FinitiMult_OUT.aspx.cs index 48422a56..ba52a3a3 100644 --- a/GMW/POST_FinitiMult_OUT.aspx.cs +++ b/GMW/POST_FinitiMult_OUT.aspx.cs @@ -7,6 +7,8 @@ namespace GMW { public partial class POST_FinitiMult_OUT : System.Web.UI.Page { + protected string minTimeKey = "minTimeW25"; + protected string maxTimeKey = "maxTimeW25"; protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -16,6 +18,9 @@ namespace GMW Postazione.CssClass = "stileAttesa"; // imposto pos abilitata x cancellazione mod_storicoAzioniOperatore1.IdxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneFiniti"); + // imposto tempi MIN/MAX attraversamento + mod_PostFinMultOUT.minTime = memLayer.ML.CRI(minTimeKey); + mod_PostFinMultOUT.maxTime = memLayer.ML.CRI(maxTimeKey); // pulisco dir temp dai file dei cartellini stampati reportPrinter.obj.pulisciDir(); } diff --git a/GMW/POST_Finiti_OUT.aspx.cs b/GMW/POST_Finiti_OUT.aspx.cs index c938a7a4..d9d0cfd6 100644 --- a/GMW/POST_Finiti_OUT.aspx.cs +++ b/GMW/POST_Finiti_OUT.aspx.cs @@ -7,6 +7,8 @@ namespace GMW { public partial class POST_Finiti_OUT : System.Web.UI.Page { + protected string minTimeKey = "minTimeW24"; + protected string maxTimeKey = "maxTimeW24"; protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -16,6 +18,9 @@ namespace GMW Postazione.CssClass = "stileAttesa"; // imposto pos abilitata x cancellazione mod_storicoAzioniOperatore1.IdxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneFiniti"); + // imposto tempi MIN/MAX attraversamento + mod_PostFinMultOUT.minTime = memLayer.ML.CRI(minTimeKey); + mod_PostFinMultOUT.maxTime = memLayer.ML.CRI(maxTimeKey); // pulisco dir temp dai file dei cartellini stampati reportPrinter.obj.pulisciDir(); } diff --git a/GMW/Web.config b/GMW/Web.config index 0b58dd0f..193e996e 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -186,8 +186,10 @@ - - + + + + diff --git a/GMW/WebUserControls/mod_PostFinMultOUT.ascx.cs b/GMW/WebUserControls/mod_PostFinMultOUT.ascx.cs index 6ca28e91..0b2544e0 100644 --- a/GMW/WebUserControls/mod_PostFinMultOUT.ascx.cs +++ b/GMW/WebUserControls/mod_PostFinMultOUT.ascx.cs @@ -470,8 +470,8 @@ namespace GMW.WebUserControls lblUdcParent.Text = traduci("UdcParentEffett"); // salvo tutti i valori dei parametri attuali e cambio ods x grView... - minDt = DateTime.Now.AddMinutes(-memLayer.ML.CRI("maxTimeW25")); - maxDt = DateTime.Now.AddMinutes(-memLayer.ML.CRI("minTimeW25")); + minDt = DateTime.Now.AddMinutes(minTime); + maxDt = DateTime.Now.AddMinutes(maxTime); num4Cell = memLayer.ML.CRI("num4Cell"); // modifico per mostrare selezione degli UDC associabili a SX (non troppo vecchi ne nuovi, con num max x ogni linea) @@ -487,7 +487,14 @@ namespace GMW.WebUserControls } } - + /// + /// Valore negativo di minuti da sottrarre ad ADESSO x valore MASSIMO finestra dataOra ammissibile + /// + public int maxTime { get; set; } + /// + /// Valore negativo di minuti da sottrarre ad ADESSO x valore MINIMO finestra dataOra ammissibile + /// + public int minTime { get; set; } /// /// imposto i dati dal particolare corrente /// diff --git a/GMW/WebUserControls/mod_anagCelle.ascx b/GMW/WebUserControls/mod_anagCelle.ascx index 96434d5b..dbc1695a 100644 --- a/GMW/WebUserControls/mod_anagCelle.ascx +++ b/GMW/WebUserControls/mod_anagCelle.ascx @@ -23,10 +23,7 @@
- + diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 03662974..d4cf269b 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW.dll.config b/GMW/bin/GMW.dll.config index 18daa20e..470c6547 100644 --- a/GMW/bin/GMW.dll.config +++ b/GMW/bin/GMW.dll.config @@ -186,8 +186,10 @@ - - + + + + diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 596262ce..cfc4673c 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index 63827d4b..558e5ebe 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 002018c8..64d21ac0 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ