diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index bc41d69..43fda30 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 adf8600..bffea6a 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 bc41d69..43fda30 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/Collaudi.aspx.cs b/CMS_SC/Collaudi.aspx.cs index 42d43af..a2aa2f2 100644 --- a/CMS_SC/Collaudi.aspx.cs +++ b/CMS_SC/Collaudi.aspx.cs @@ -26,14 +26,11 @@ namespace CMS_SC ddlFase.DataBind(); ddlDossier.DataBind(); ddlSelScheda.DataBind(); - //ddlFasePrev.DataBind(); - //ddlSelSchedaPrev.DataBind(); fixControls(); fixControlsPrev(); } mod_righePag.eh_newNum += mod_righePag_eh_newNum; mod_righePagPrev.eh_newNum += mod_righePagPrev_eh_newNum; - //mod_collaudi.eh_selezioneValore += mod_collaudi_eh_selezioneValore; } void mod_righePag_eh_newNum(object sender, EventArgs e) { @@ -171,6 +168,8 @@ namespace CMS_SC { ddlSelScheda.DataBind(); fixControls(); + ddlSelSchedaPrev.DataBind(); + fixControlsPrev(); } protected void ddlSelScheda_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/CMS_SC/WebUserControls/mod_righePag.ascx.cs b/CMS_SC/WebUserControls/mod_righePag.ascx.cs index eb6c562..bb5e663 100644 --- a/CMS_SC/WebUserControls/mod_righePag.ascx.cs +++ b/CMS_SC/WebUserControls/mod_righePag.ascx.cs @@ -25,6 +25,17 @@ public partial class mod_righePag : System.Web.UI.UserControl } } /// + /// UID formattato con "_" + /// + public string uid + { + get + { + // fix brutale: nelle pagine master c'è un ctl00_ iniziale di troppo... + return this.UniqueID.Replace("$", "_").Replace("ctl00_", "").Replace("ctl01_", ""); + } + } + /// /// effettua traduzione del lemma /// /// @@ -58,7 +69,8 @@ public partial class mod_righePag : System.Web.UI.UserControl int answ = 10; try { - answ = memLayer.ML.IntSessionObj("numRowPag"); + answ = memLayer.ML.IntSessionObj("numRowPag_" + uid); + //if (answ == 0) answ = 10; } catch { @@ -68,7 +80,7 @@ public partial class mod_righePag : System.Web.UI.UserControl } set { - memLayer.ML.setSessionVal("numRowPag", value); + memLayer.ML.setSessionVal("numRowPag_" + uid, value); numRowReq = value; } } diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index bc41d69..43fda30 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 e8d0f5c..7eabd6a 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 adf8600..bffea6a 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 f82f930..8538e60 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.065.349")] -[assembly: AssemblyFileVersion("1.8.065.349")] +[assembly: AssemblyVersion("1.8.067.349")] +[assembly: AssemblyFileVersion("1.8.067.349")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index 57801af..3aca459 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.8.065.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.8.065.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.8.067.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.8.067.<#= 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 8ccffd9..5e42e5d 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ