diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index 01abc704..6c12b595 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -262,18 +262,21 @@
mod_anagBlocchi.ascx
+ ASPXCodeBehind
mod_anagBlocchi.ascx
mod_anagCelle.ascx
+ ASPXCodeBehind
mod_anagCelle.ascx
mod_anagMagazzini.ascx
+ ASPXCodeBehind
mod_anagMagazzini.ascx
@@ -287,12 +290,14 @@
mod_chLang.ascx
+ ASPXCodeBehind
mod_chLang.ascx
mod_confMag.ascx
+ ASPXCodeBehind
mod_confMag.ascx
@@ -306,6 +311,7 @@
mod_delibera.ascx
+ ASPXCodeBehind
mod_delibera.ascx
@@ -333,18 +339,21 @@
mod_detailParticolari.ascx
+ ASPXCodeBehind
mod_detailParticolari.ascx
mod_detailUDC.ascx
+ ASPXCodeBehind
mod_detailUDC.ascx
mod_dettaglioBlocco.ascx
+ ASPXCodeBehind
mod_dettaglioBlocco.ascx
@@ -358,6 +367,7 @@
mod_elencoListePrelievo.ascx
+ ASPXCodeBehind
mod_elencoListePrelievo.ascx
@@ -399,42 +409,49 @@
mod_filtro.ascx
+ ASPXCodeBehind
mod_filtro.ascx
mod_labAssStampaUdc.ascx
+ ASPXCodeBehind
mod_labAssStampaUdc.ascx
mod_labConsUdc.ascx
+ ASPXCodeBehind
mod_labConsUdc.ascx
mod_lemmiVocab.ascx
+ ASPXCodeBehind
mod_lemmiVocab.ascx
mod_listParticolari.ascx
+ ASPXCodeBehind
mod_listParticolari.ascx
mod_login.ascx
+ ASPXCodeBehind
mod_login.ascx
mod_main_help.ascx
+ ASPXCodeBehind
mod_main_help.ascx
@@ -455,12 +472,14 @@
mod_menuSx.ascx
+ ASPXCodeBehind
mod_menuSx.ascx
mod_menuTop.ascx
+ ASPXCodeBehind
mod_menuTop.ascx
@@ -488,18 +507,21 @@
mod_pageTitleAndSearch.ascx
+ ASPXCodeBehind
mod_pageTitleAndSearch.ascx
mod_paretoPartByFullSpec.ascx
+ ASPXCodeBehind
mod_paretoPartByFullSpec.ascx
mod_paretoUdcBlocco.ascx
+ ASPXCodeBehind
mod_paretoUdcBlocco.ascx
@@ -513,6 +535,7 @@
mod_ricercaGenerica.ascx
+ ASPXCodeBehind
mod_ricercaGenerica.ascx
@@ -526,6 +549,7 @@
mod_listImballi.ascx
+ ASPXCodeBehind
mod_listImballi.ascx
@@ -581,36 +605,42 @@
mod_selettore_ajax.ascx
+ ASPXCodeBehind
mod_selettore_ajax.ascx
mod_listUDC.ascx
+ ASPXCodeBehind
mod_listUDC.ascx
mod_statoMag.ascx
+ ASPXCodeBehind
mod_statoMag.ascx
mod_statoMagLogico.ascx
+ ASPXCodeBehind
mod_statoMagLogico.ascx
mod_tipoCella.ascx
+ ASPXCodeBehind
mod_tipoCella.ascx
mod_UdcCella.ascx
+ ASPXCodeBehind
mod_UdcCella.ascx
@@ -624,12 +654,14 @@
mod_viewRigheListaPrelievo.ascx
+ ASPXCodeBehind
mod_viewRigheListaPrelievo.ascx
mod_vocabolario.ascx
+ ASPXCodeBehind
mod_vocabolario.ascx
diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config
index eeb9122c..4b943875 100644
--- a/GMW/GMW/Web.config
+++ b/GMW/GMW/Web.config
@@ -98,6 +98,14 @@
+
+
+
+
+
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
index 02a1b2d3..14ea418a 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx
@@ -171,6 +171,11 @@
+
+
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
index c247b29f..3fd8fa0d 100644
--- a/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_elencoListePrelievo.ascx.cs
@@ -736,6 +736,30 @@ namespace GMW.WebUserControls
{ }
return answ;
}
+ ///
+ /// restituisce l'url formattato del il report della stampa come da web.config
+ ///
+ ///
+ ///
+ public string formattaUrlReport(object codLista)
+ {
+ string url, urlFormat, opzPdf, nomeRep, urlWebServer;
+ try
+ {
+ urlFormat = SteamWare.memLayer.ML.confReadString("urlReporting");
+ urlWebServer = SteamWare.memLayer.ML.confReadString("urlWebServer");
+ opzPdf = "";
+ nomeRep = SteamWare.memLayer.ML.confReadString("reportName");
+ // versione con reporting services
+ url = string.Format(urlFormat, SteamWare.memLayer.ML.confReadString("reportingServerAddress"), SteamWare.memLayer.ML.confReadString("reportDir"), nomeRep, codLista, opzPdf);
+
+ }
+ catch
+ {
+ url = "";
+ }
+ return url;
+ }
#endregion
}
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 90de12c2..9296b91a 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index fc1fa8c6..8621e1c8 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index a7952c22..40500144 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -43,6 +43,14 @@
+
+
+
+
+
+
+
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index ed25d09e..a19e9621 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index 1f2172a4..fe34fd61 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 90de12c2..9296b91a 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index b0b7f845..04d8523c 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index 770aac50..3878533e 100644
Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index fc1fa8c6..8621e1c8 100644
Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index 770aac50..3878533e 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index fc1fa8c6..8621e1c8 100644
Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ
diff --git a/GMW/GMW_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj
index 614d9119..fe522cbd 100644
--- a/GMW/GMW_installer/GMW_installer.vdproj
+++ b/GMW/GMW_installer/GMW_installer.vdproj
@@ -350,7 +350,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{8391B290-0F5F-41F0-A300-490F94C9E6DE}"
- "PackageCode" = "8:{C6A287BB-0A2A-4585-8D74-C4E0E875F318}"
+ "PackageCode" = "8:{F72157A1-30F2-4901-8A90-1F38739804EE}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 1ab64acd..57ce8b5b 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ