-
+
-
diff --git a/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs
index 146ff09b..d8ab7b54 100644
--- a/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_search.ascx.designer.cs
@@ -22,6 +22,15 @@ namespace GMW_Term.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblInput;
+ ///
+ /// txtRicerca control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtRicerca;
+
///
/// btnLoginPage control.
///
@@ -40,15 +49,6 @@ namespace GMW_Term.WebUserControls {
///
protected global::System.Web.UI.WebControls.Button btnButtonsHome;
- ///
- /// txtRicerca control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.TextBox txtRicerca;
-
///
/// mod_searchResults1 control.
///
diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx
index ae9cfe1f..4f5fec13 100644
--- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx
+++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx
@@ -4,13 +4,13 @@
+ Width="90%" DataKeyNames="tipo,valore" DataSourceID="ods" OnRowUpdating="grView_RowUpdating" Font-Size="X-Small">
-
+
@@ -35,8 +35,8 @@
-
-
+ <%--
+
--%>
diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs
index 9ae2e317..4dbcf8af 100644
--- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.cs
@@ -123,11 +123,11 @@ namespace GMW_Term.WebUserControls
{ }
}
int totRecord = grView.Rows.Count + grView.PageSize * (grView.PageCount - 1);
- lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
+ //lblNumRec.Text = string.Format("{0} records of ~ {1}", grView.Rows.Count, totRecord);
}
else
{
- lblNumRec.Text = "";
+ //lblNumRec.Text = "";
}
}
///
@@ -241,7 +241,7 @@ namespace GMW_Term.WebUserControls
///
protected void aggiornaControlliDataGL()
{
- grView.PageSize = 4;
+ grView.PageSize = 3;
}
///
@@ -260,7 +260,7 @@ namespace GMW_Term.WebUserControls
SteamWare.memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView));
grView.SelectedIndex = -1;
grView.DataBind();
- lblWarning.Visible = false;
+ //lblWarning.Visible = false;
}
///
@@ -370,13 +370,13 @@ namespace GMW_Term.WebUserControls
switch (tipo)
{
case "UDC":
- answ = string.Format("~/images/UDC.png", codice);
+ answ = string.Format("~/images/Udc.jpg", codice);
break;
case "Particolare":
- answ = string.Format("~/images/Part.png", codice);
+ answ = string.Format("~/images/Part.jpg", codice);
break;
case "Cella":
- answ = string.Format("~/images/Cella.png", codice);
+ answ = string.Format("~/images/Cella.jpg", codice);
break;
default:
break;
diff --git a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs
index bfcc362a..cc247d87 100644
--- a/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_searchResults.ascx.designer.cs
@@ -22,24 +22,6 @@ namespace GMW_Term.WebUserControls {
///
protected global::System.Web.UI.WebControls.GridView grView;
- ///
- /// lblNumRec control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblNumRec;
-
- ///
- /// lblWarning control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblWarning;
-
///
/// ods control.
///
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 1b4f069b..87069ca1 100644
Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll
index cd2f1092..3df04868 100644
Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ
diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll
index 6294df7c..9c53cd5a 100644
Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt
index e67ad016..d08b65de 100644
--- a/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt
+++ b/GMW/GMW_Term/obj/Debug/GMW_Term.csproj.FileListAbsolute.txt
@@ -27,32 +27,32 @@ c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
c:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
-C:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_Term.pdb
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ICSharpCode.SharpZipLib.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\AjaxControlToolkit.pdb
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\GMW_data.pdb
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.pdb
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\SteamWare.xml
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ar\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\cs\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\de\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\es\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\fr\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\he\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\hi\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\it\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ja\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ko\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\nl\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\pt\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\ru\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\tr-TR\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHS\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\bin\zh-CHT\AjaxControlToolkit.resources.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\ResolveAssemblyReference.cache
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.dll
+c:\Users\ermanno.STEAMWAREWIN\Documents\Visual Studio 2008\Projects\GMW\GMW_Term\obj\Debug\GMW_Term.pdb
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll
index 1b4f069b..d1538979 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
index 8b4ed051..92b551af 100644
Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
index b0f98a3b..3ebce614 100644
--- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_Term"
- "ProductCode" = "8:{0E2CFBF4-7822-4419-AB79-3D0A1148B859}"
- "PackageCode" = "8:{94D57F74-FC98-49EF-BB93-1888C0CEFB4E}"
+ "ProductCode" = "8:{D6CB5F9E-4454-47AF-8422-A3B2797EF37E}"
+ "PackageCode" = "8:{BFD25881-4CD7-487F-8BB9-B9176FDF245E}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.0.260"
+ "ProductVersion" = "8:1.0.265"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -824,7 +824,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"
@@ -852,7 +852,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF"
diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi
index 4c734a8d..a31edcae 100644
Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ