diff --git a/XPS/AjaxSearch.master.cs b/XPS/AjaxSearch.master.cs index e0734e5..4c3de9b 100644 --- a/XPS/AjaxSearch.master.cs +++ b/XPS/AjaxSearch.master.cs @@ -15,7 +15,7 @@ public partial class AjaxSearch : System.Web.UI.MasterPage protected override void OnLoad(EventArgs e) { base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadstring("_titoloPagina"); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); } protected override void OnInit(EventArgs e) diff --git a/XPS/AjaxSimple.master.cs b/XPS/AjaxSimple.master.cs index 3791fd0..adf692f 100644 --- a/XPS/AjaxSimple.master.cs +++ b/XPS/AjaxSimple.master.cs @@ -15,6 +15,6 @@ public partial class AjaxSimple : System.Web.UI.MasterPage protected override void OnLoad(EventArgs e) { base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadstring("_titoloPagina"); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); } } diff --git a/XPS/AjaxSimpleUpload.master.cs b/XPS/AjaxSimpleUpload.master.cs index c10da7d..38e0982 100644 --- a/XPS/AjaxSimpleUpload.master.cs +++ b/XPS/AjaxSimpleUpload.master.cs @@ -15,6 +15,6 @@ public partial class AjaxSimpleUpload : System.Web.UI.MasterPage protected override void OnLoad(EventArgs e) { base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadstring("_titoloPagina"); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); } } diff --git a/XPS/AjaxTitle.master.cs b/XPS/AjaxTitle.master.cs index 591fed4..011838c 100644 --- a/XPS/AjaxTitle.master.cs +++ b/XPS/AjaxTitle.master.cs @@ -16,7 +16,7 @@ public partial class AjaxTitle : System.Web.UI.MasterPage protected override void OnLoad(EventArgs e) { base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadstring("_titoloPagina"); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); } protected override void OnInit(EventArgs e) diff --git a/XPS/App_Code/XPS.cs b/XPS/App_Code/XPS.cs index 56d0155..650566c 100644 --- a/XPS/App_Code/XPS.cs +++ b/XPS/App_Code/XPS.cs @@ -49,10 +49,10 @@ public class XPS string url, urlFormat, opzPdf, nomeRep; try { - urlFormat = SteamWare.memLayer.ML.confReadstring("urlReporting"); + urlFormat = SteamWare.memLayer.ML.confReadString("urlReporting"); if (outputRich == "PDF") { - opzPdf = SteamWare.memLayer.ML.confReadstring("reportOpzPdf"); + opzPdf = SteamWare.memLayer.ML.confReadString("reportOpzPdf"); } else { @@ -60,13 +60,13 @@ public class XPS } if (tipoReport == "label") { - nomeRep = SteamWare.memLayer.ML.confReadstring("reportName_lbl"); + nomeRep = SteamWare.memLayer.ML.confReadString("reportName_lbl"); } else // (tipoReport == "module") { - nomeRep = SteamWare.memLayer.ML.confReadstring("reportName_mod"); + nomeRep = SteamWare.memLayer.ML.confReadString("reportName_mod"); } - url = string.Format(urlFormat, SteamWare.memLayer.ML.confReadstring("reportingServerAddress"), SteamWare.memLayer.ML.confReadstring("reportDir"), nomeRep, Cod, opzPdf); + url = string.Format(urlFormat, SteamWare.memLayer.ML.confReadString("reportingServerAddress"), SteamWare.memLayer.ML.confReadString("reportDir"), nomeRep, Cod, opzPdf); } catch { diff --git a/XPS/Bin/SteamWare.dll b/XPS/Bin/SteamWare.dll index fbf9e05..15fb199 100644 Binary files a/XPS/Bin/SteamWare.dll and b/XPS/Bin/SteamWare.dll differ diff --git a/XPS/MasterAjax.master.cs b/XPS/MasterAjax.master.cs index e459ec8..5a34c14 100644 --- a/XPS/MasterAjax.master.cs +++ b/XPS/MasterAjax.master.cs @@ -16,7 +16,7 @@ public partial class MasterAjax : System.Web.UI.MasterPage protected override void OnLoad(EventArgs e) { base.OnLoad(e); - Page.Title = SteamWare.memLayer.ML.confReadstring("_titoloPagina"); + Page.Title = SteamWare.memLayer.ML.confReadString("_titoloPagina"); } protected override void OnInit(EventArgs e) diff --git a/XPS/ReportSchedaIdentificazione.rdlc b/XPS/ReportSchedaIdentificazione.rdlc index 0322748..7b4f0a4 100644 --- a/XPS/ReportSchedaIdentificazione.rdlc +++ b/XPS/ReportSchedaIdentificazione.rdlc @@ -646,7 +646,7 @@ tABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUhGfWloo Peso - 6.75cm + 7cm 5cm 3 true - 16.75cm + 19.75cm 0.4cm =First(Fields!IdxObj.Value) @@ -774,14 +775,15 @@ tABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUhGfWloo 2 true - 6.75cm + 0.25cm ="*"&(First(Fields!IdxObj.Value))&"*" - 5.5cm + 5.75cm 5cm