diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index c970af61..fb619356 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 4aa5eab7..cdee0114 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 81a38dee..45c5b0bf 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 78a98233..7159b0cd 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 4aa5eab7..cdee0114 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 81a38dee..45c5b0bf 100644 Binary files a/GMW-UT/bin/SteamWare.dll and b/GMW-UT/bin/SteamWare.dll differ diff --git a/GMW/POST_FinitiMult_IN.aspx b/GMW/POST_FinitiMult_IN.aspx index b8efde89..af9491de 100644 --- a/GMW/POST_FinitiMult_IN.aspx +++ b/GMW/POST_FinitiMult_IN.aspx @@ -10,7 +10,7 @@ - +
diff --git a/GMW/POST_FinitiMult_OUT.aspx b/GMW/POST_FinitiMult_OUT.aspx index 6db667b1..c70bc8d3 100644 --- a/GMW/POST_FinitiMult_OUT.aspx +++ b/GMW/POST_FinitiMult_OUT.aspx @@ -10,7 +10,7 @@ - +
diff --git a/GMW/SbloccoUdcTrattati.aspx b/GMW/SbloccoUdcTrattati.aspx index 2c1dfc01..d7759fe9 100644 --- a/GMW/SbloccoUdcTrattati.aspx +++ b/GMW/SbloccoUdcTrattati.aspx @@ -1,4 +1,5 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="SbloccoUdcTrattati.aspx.cs" Inherits="GMW.SbloccoUdcTrattati" %> + <%@ Register Src="WebUserControls/mod_selLineaNtDt.ascx" TagName="mod_selLineaNtDt" TagPrefix="uc1" %> <%@ Register Src="WebUserControls/mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc2" %> <%@ Register Src="~/WebUserControls/mod_sbloccoUdc.ascx" TagPrefix="uc1" TagName="mod_sbloccoUdc" %> @@ -9,6 +10,18 @@ +
+
+ Linee origine UDC da sbloccare: + + + + + + + +
+
@@ -31,7 +44,7 @@
- +
diff --git a/GMW/SbloccoUdcTrattati.aspx.cs b/GMW/SbloccoUdcTrattati.aspx.cs index 96b4df6d..2082e79b 100644 --- a/GMW/SbloccoUdcTrattati.aspx.cs +++ b/GMW/SbloccoUdcTrattati.aspx.cs @@ -24,7 +24,8 @@ namespace GMW reportPrinter.obj.pulisciDir(); // imposto posizione e blocco da web.config mod_sbloccoUdc.idxPosizioneIn = memLayer.ML.CRI("IdxPosizioneTrattati"); - mod_sbloccoUdc.codBloccoIn = memLayer.ML.CRS("CodBloccoTrattati"); + //mod_sbloccoUdc.codBloccoIn = memLayer.ML.CRS("CodBloccoTrattati"); + refreshCodBloccoChild(); } // update vari... doUpdate(); @@ -121,5 +122,17 @@ namespace GMW lblWarning.Text = traduci("lblWarnPostNonConf"); } } + + protected void dlSelCodBlocco_SelectedIndexChanged(object sender, EventArgs e) + { + refreshCodBloccoChild(); + } + + private void refreshCodBloccoChild() + { + // cambio codBlocco x selettore e x modulo sblocco UDC trattati... + mod_selLineaNtDt1.preCodLineNT = dlSelCodBlocco.SelectedValue; + mod_sbloccoUdc.codBloccoIn = dlSelCodBlocco.SelectedValue; + } } } \ No newline at end of file diff --git a/GMW/SbloccoUdcTrattati.aspx.designer.cs b/GMW/SbloccoUdcTrattati.aspx.designer.cs index 29acde47..39090f3d 100644 --- a/GMW/SbloccoUdcTrattati.aspx.designer.cs +++ b/GMW/SbloccoUdcTrattati.aspx.designer.cs @@ -12,6 +12,15 @@ namespace GMW { public partial class SbloccoUdcTrattati { + /// + /// dlSelCodBlocco control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList dlSelCodBlocco; + /// /// mod_selLineaNtDt1 control. /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 9de9eb8b..293f49b4 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 4aa5eab7..cdee0114 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 81a38dee..45c5b0bf 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index af80fe4b..6b84b735 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("3.5.904.2442")] -[assembly: AssemblyFileVersion("3.5.904.2442")] +[assembly: AssemblyVersion("3.5.905.2446")] +[assembly: AssemblyFileVersion("3.5.905.2446")] [assembly: AssemblyCopyright("Steamware © 2007-2016")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index 40c16f36..f751d144 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("3.5.904.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("3.5.904.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("3.5.905.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("3.5.905.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+