diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo
index c7e3456..f666aa6 100644
Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ
diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx b/ETS-WS/ETS-WS/GestioneDocumenti.aspx
index e2ea342..9298470 100644
--- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx
+++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx
@@ -8,9 +8,17 @@
TagPrefix="uc1" %>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
index ec71dfb..1790076 100644
--- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
+++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.cs
@@ -26,6 +26,7 @@ namespace ETS_WS
void mod_filtroRicerca1_eh_pageResize(object sender, EventArgs e)
{
mod_archivioDocumenti1.pageSize = utils.obj.IntSessionObj("srcPageSize");
+ updPnlDocumenti.Update();
}
///
/// chiesta update x aggiornamento criteri ricerca
@@ -35,6 +36,7 @@ namespace ETS_WS
void mod_filtroRicerca1_eh_reqSearch(object sender, EventArgs e)
{
mod_archivioDocumenti1.doUpdate();
+ updPnlDocumenti.Update();
}
}
}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
index 96771d0..94ff975 100644
--- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
+++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx.designer.cs
@@ -12,6 +12,15 @@ namespace ETS_WS {
public partial class GestioneDocumenti {
+ ///
+ /// updPnlRicerca control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.UpdatePanel updPnlRicerca;
+
///
/// mod_filtroRicerca1 control.
///
@@ -21,6 +30,15 @@ namespace ETS_WS {
///
protected global::ETS_WS.WebUserControls.mod_filtroRicerca mod_filtroRicerca1;
+ ///
+ /// updPnlDocumenti control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.UpdatePanel updPnlDocumenti;
+
///
/// mod_archivioDocumenti1 control.
///
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
index 68abd34..54f7af9 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
@@ -15,7 +15,7 @@
-
+
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
index 304cf70..cc488a8 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
@@ -50,6 +50,10 @@
ServiceMethod="elencoOggettiByDoc" minCharAutocomplete="3" showKey="false" toolTip="Digitare per iniziare ricerca, min 3 char"
textEmWidht="15" Visible="false" />
+
-
+
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
index 0869891..c3b7956 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
@@ -25,11 +25,11 @@ namespace ETS_WS.WebUserControls
///
protected void Page_Load(object sender, EventArgs e)
{
- updateVisual();
tacCommesse.eh_valSelezionato += new EventHandler(tacCommesse_eh_valSelezionato);
tacFasi.eh_valSelezionato += new EventHandler(tacFasi_eh_valSelezionato);
tacFonti.eh_valSelezionato += new EventHandler(tacFonti_eh_valSelezionato);
tacOggetto.eh_valSelezionato += new EventHandler(tacOggetto_eh_valSelezionato);
+ displayResults();
}
///
/// salvo ricerca oggetto
@@ -105,6 +105,14 @@ namespace ETS_WS.WebUserControls
private void updateVisual()
{
// aggiorno label num records
+ displayResults();
+ btnUpdate.Visible = true;
+ }
+ ///
+ /// mostra num risultati ricerca
+ ///
+ private void displayResults()
+ {
lblTotRec.Text = utils.obj.taDoc.getBySearch_Count(0, 0, utils.obj.StringSessionObj("srcCommessa"), utils.obj.StringSessionObj("srcFase"), utils.obj.StringSessionObj("srcFonte"), utils.obj.StringSessionObj("srcOggetto"), "", txtSearchAll.Text.Trim(), 0, 0, "").ToString();
}
@@ -217,6 +225,19 @@ namespace ETS_WS.WebUserControls
eh_pageResize(this, new EventArgs());
}
}
+ ///
+ /// richiede update valori
+ ///
+ ///
+ ///
+ protected void btnUpdate_Click(object sender, EventArgs e)
+ {
+ btnUpdate.Visible = false;
+ if (eh_reqSearch != null)
+ {
+ eh_reqSearch(this, new EventArgs());
+ }
+ }
}
}
\ No newline at end of file
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
index 79f43d5..0382f12 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
@@ -102,6 +102,15 @@ namespace ETS_WS.WebUserControls {
///
protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacOggetto;
+ ///
+ /// btnUpdate control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnUpdate;
+
///
/// LabelblPageSize control.
///
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index 53206d0..52e7ac7 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS-WS.dll and b/ETS-WS/ETS-WS/bin/ETS-WS.dll differ
diff --git a/ETS-WS/ETS-WS/bin/ETS_Data.dll b/ETS-WS/ETS-WS/bin/ETS_Data.dll
index f0328de..75982f9 100644
Binary files a/ETS-WS/ETS-WS/bin/ETS_Data.dll and b/ETS-WS/ETS-WS/bin/ETS_Data.dll differ
diff --git a/ETS_Data/DS_WebScip.xsd b/ETS_Data/DS_WebScip.xsd
index dc664ab..7824aef 100644
--- a/ETS_Data/DS_WebScip.xsd
+++ b/ETS_Data/DS_WebScip.xsd
@@ -427,7 +427,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
+
@@ -499,7 +499,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
+
diff --git a/ETS_Data/DS_WebScip.xss b/ETS_Data/DS_WebScip.xss
index 5f28270..ff98ebf 100644
--- a/ETS_Data/DS_WebScip.xss
+++ b/ETS_Data/DS_WebScip.xss
@@ -1 +1,13 @@
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 8643ada..d7504cb 100644
Binary files a/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/ETS_Data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/ETS_Data/obj/Release/ETS_Data.csproj.FileListAbsolute.txt b/ETS_Data/obj/Release/ETS_Data.csproj.FileListAbsolute.txt
index 19a9605..f47f425 100644
--- a/ETS_Data/obj/Release/ETS_Data.csproj.FileListAbsolute.txt
+++ b/ETS_Data/obj/Release/ETS_Data.csproj.FileListAbsolute.txt
@@ -8,3 +8,12 @@ C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS_Data\bin\Release\ETS_
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS_Data\bin\Release\ETS_Data.pdb
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS_Data\obj\Release\ETS_Data.dll
C:\Users\samuele\Documents\Visual Studio 2010\Projects\ETS_Data\obj\Release\ETS_Data.pdb
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\NLog.config
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\ETS_Data.dll.config
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\ETS_Data.dll
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\ETS_Data.pdb
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\NLog.dll
+C:\Users\samuele\GIT\ETS\ETS_Data\bin\Release\NLog.xml
+C:\Users\samuele\GIT\ETS\ETS_Data\obj\Release\ETS_Data.csprojResolveAssemblyReference.cache
+C:\Users\samuele\GIT\ETS\ETS_Data\obj\Release\ETS_Data.dll
+C:\Users\samuele\GIT\ETS\ETS_Data\obj\Release\ETS_Data.pdb
diff --git a/ETS_Data/obj/Release/ETS_Data.csprojResolveAssemblyReference.cache b/ETS_Data/obj/Release/ETS_Data.csprojResolveAssemblyReference.cache
index 862ba85..14843a3 100644
Binary files a/ETS_Data/obj/Release/ETS_Data.csprojResolveAssemblyReference.cache and b/ETS_Data/obj/Release/ETS_Data.csprojResolveAssemblyReference.cache differ
diff --git a/ETS_Data/obj/Release/ETS_Data.dll b/ETS_Data/obj/Release/ETS_Data.dll
index 694e582..9b46e6d 100644
Binary files a/ETS_Data/obj/Release/ETS_Data.dll and b/ETS_Data/obj/Release/ETS_Data.dll differ
diff --git a/ETS_Data/obj/Release/TempPE/DS_WebScip.Designer.cs.dll b/ETS_Data/obj/Release/TempPE/DS_WebScip.Designer.cs.dll
index 303824f..d127272 100644
Binary files a/ETS_Data/obj/Release/TempPE/DS_WebScip.Designer.cs.dll and b/ETS_Data/obj/Release/TempPE/DS_WebScip.Designer.cs.dll differ
diff --git a/ETS_Data/obj/Release/TempPE/DS_utils.Designer.cs.dll b/ETS_Data/obj/Release/TempPE/DS_utils.Designer.cs.dll
index 6a3e080..d350691 100644
Binary files a/ETS_Data/obj/Release/TempPE/DS_utils.Designer.cs.dll and b/ETS_Data/obj/Release/TempPE/DS_utils.Designer.cs.dll differ