diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index ad1736c..84d6faa 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index 9e811ae..a94839b 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index ad1736c..84d6faa 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS_SC/DettScheda.aspx.cs b/CMS_SC/DettScheda.aspx.cs index 853cde2..b2f289d 100644 --- a/CMS_SC/DettScheda.aspx.cs +++ b/CMS_SC/DettScheda.aspx.cs @@ -18,6 +18,29 @@ namespace CMS_SC mod_DettScheda.pageSize = mod_righePag.numRowPag; } mod_righePag.eh_newNum += mod_righePag_eh_newNum; + mod_DettScheda.eh_selezioneValore += mod_DettScheda_eh_selezioneValore; + updateControls(); + } + /// + /// se c'è selezione valore MOSTROschema parametri validazione + /// + /// + /// + void mod_DettScheda_eh_selezioneValore(object sender, EventArgs e) + { + updateControls(); + } + + private void updateControls() + { + if (mod_DettScheda.CodMisuraSel != "") + { + mod_validVal.Visible = true; + } + else + { + mod_validVal.Visible = false; + } } void mod_righePag_eh_newNum(object sender, EventArgs e) diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx b/CMS_SC/WebUserControls/mod_DettScheda.ascx index 6380af9..9c50572 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx @@ -1,11 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_DettScheda.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_DettScheda" %> - + + + <%: traduci("Reset") %> +   diff --git a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs index 59acba6..816536c 100644 --- a/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs +++ b/CMS_SC/WebUserControls/mod_DettScheda.ascx.cs @@ -11,6 +11,26 @@ namespace CMS_SC.WebUserControls { public partial class mod_DettScheda : System.Web.UI.UserControl { + /// + /// selezione valore in DettScheda + /// + public event EventHandler eh_selezioneValore; + /// + /// sollevo evento selezione + /// + protected void raiseEvent() + { + // sollevo evento nuovo valore... + if (eh_selezioneValore != null) + { + eh_selezioneValore(this, new EventArgs()); + } + } + /// + /// caricamento macchina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { } @@ -68,6 +88,38 @@ namespace CMS_SC.WebUserControls { return user_std.UtSn.Traduci(lemma); } + /// + /// Misura selezionata + /// + public string CodMisuraSel + { + get + { + string answ = ""; + try + { + answ = grView.SelectedDataKey["CodMisura"].ToString(); + } + catch + { } + return answ; + } + } + /// + /// selezionato valore + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + raiseEvent(); + } + protected void btnReset_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; + grView.DataBind(); + raiseEvent(); + } } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_validVal.ascx b/CMS_SC/WebUserControls/mod_validVal.ascx index a438316..4faf869 100644 --- a/CMS_SC/WebUserControls/mod_validVal.ascx +++ b/CMS_SC/WebUserControls/mod_validVal.ascx @@ -1 +1,2 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_validVal.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_validVal" %> +elenco parametri validazione.. \ No newline at end of file diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index ad1736c..84d6faa 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index d2da910..914c8dc 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 9e811ae..a94839b 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs index 987f335..2b6f548 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.015.332")] -[assembly: AssemblyFileVersion("1.1.015.332")] +[assembly: AssemblyVersion("1.2.021.335")] +[assembly: AssemblyFileVersion("1.2.021.335")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index cb3a6e9..108861d 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.015.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.1.015.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.2.021.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.2.021.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 5051614..ae15a8d 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ