diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj
index 7cb3df0..07bee6f 100644
--- a/GPW_Admin/GPW_Admin.csproj
+++ b/GPW_Admin/GPW_Admin.csproj
@@ -316,6 +316,9 @@
+
+
+
diff --git a/GPW_Commesse/WebUserControls/mod_ricercaGenerica.ascx.cs b/GPW_Commesse/WebUserControls/mod_ricercaGenerica.ascx.cs
index b1b6b49..5cbf4ac 100644
--- a/GPW_Commesse/WebUserControls/mod_ricercaGenerica.ascx.cs
+++ b/GPW_Commesse/WebUserControls/mod_ricercaGenerica.ascx.cs
@@ -12,39 +12,14 @@ using SteamWare;
public partial class mod_ricercaGenerica : ApplicationUserControl
{
-
- #region gestione eventi
+ #region Public Events
public event EventHandler eh_nuovaRicerca;
- #endregion
+ #endregion Public Events
- #region area protected
+ #region Protected Properties
- protected override void Page_Load(object sender, EventArgs e)
- {
- base.Page_Load(sender, e);
- updateText();
- btnCerca.Text = traduci("lblCerca");
- }
- ///
- /// cambiato valore in ricerca
- ///
- ///
- ///
- protected void txtCerca_TextChanged(object sender, EventArgs e)
- {
- salvaCerca();
- }
- ///
- /// pressione del button di ricerca
- ///
- ///
- ///
- protected void btnCerca_Click(object sender, EventArgs e)
- {
- salvaCerca();
- }
///
/// testo ricerca trimmato da spazi
///
@@ -59,6 +34,28 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
txtCerca.Text = value;
}
}
+
+ #endregion Protected Properties
+
+ #region Protected Methods
+
+ ///
+ /// pressione del button di ricerca
+ ///
+ ///
+ ///
+ protected void btnCerca_Click(object sender, EventArgs e)
+ {
+ salvaCerca();
+ }
+
+ protected override void Page_Load(object sender, EventArgs e)
+ {
+ base.Page_Load(sender, e);
+ updateText();
+ btnCerca.Text = traduci("lblCerca");
+ }
+
///
/// effettua salvataggio ricerca
///
@@ -66,11 +63,11 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
{
if (string.IsNullOrEmpty(testoRicerca))
{
- SteamWare.memLayer.ML.emptySessionVal("valoreCercato");
+ SteamWare.memLayer.ML.emptySessionVal("valoreSearch");
}
else
{
- SteamWare.memLayer.ML.setSessionVal("valoreCercato", testoRicerca);
+ SteamWare.memLayer.ML.setSessionVal("valoreSearch", testoRicerca);
// raise dell'evento
if (eh_nuovaRicerca != null)
{
@@ -79,21 +76,30 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
}
}
- #endregion
+ ///
+ /// cambiato valore in ricerca
+ ///
+ ///
+ ///
+ protected void txtCerca_TextChanged(object sender, EventArgs e)
+ {
+ salvaCerca();
+ }
- #region area public
+ #endregion Protected Methods
+
+ #region Public Methods
///
/// aggiorna il testo cercato
///
public void updateText()
{
- if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("valoreCercato")) && !Page.IsPostBack)
+ if (!string.IsNullOrEmpty(memLayer.ML.StringSessionObj("valoreSearch")) && !Page.IsPostBack)
{
- testoRicerca = SteamWare.memLayer.ML.StringSessionObj("valoreCercato");
+ testoRicerca = SteamWare.memLayer.ML.StringSessionObj("valoreSearch");
}
}
- #endregion
-
-}
+ #endregion Public Methods
+}
\ No newline at end of file
diff --git a/GPW_data/GPW_data.csproj b/GPW_data/GPW_data.csproj
index 9e6f93b..4fc2397 100644
--- a/GPW_data/GPW_data.csproj
+++ b/GPW_data/GPW_data.csproj
@@ -54,14 +54,14 @@
..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
-
- ..\packages\MongoDB.Bson.2.11.1\lib\net452\MongoDB.Bson.dll
+
+ ..\..\SHERPA\packages\MongoDB.Bson.2.11.2\lib\net452\MongoDB.Bson.dll
-
- ..\packages\MongoDB.Driver.2.11.1\lib\net452\MongoDB.Driver.dll
+
+ ..\..\SHERPA\packages\MongoDB.Driver.2.11.2\lib\net452\MongoDB.Driver.dll
-
- ..\packages\MongoDB.Driver.Core.2.11.1\lib\net452\MongoDB.Driver.Core.dll
+
+ ..\..\SHERPA\packages\MongoDB.Driver.Core.2.11.2\lib\net452\MongoDB.Driver.Core.dll
..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll
@@ -91,7 +91,7 @@
..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll
- ..\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll
+ ..\..\SHERPA\packages\SteamWare.4.1.2009.737\lib\net462\SteamWare.dll
@@ -251,10 +251,9 @@
-
-
-
-
+
+
+
@@ -300,9 +299,11 @@
+
+