diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo
index f666aa6..3dc9b03 100644
Binary files a/ETS-WS/ETS-WS.suo and b/ETS-WS/ETS-WS.suo differ
diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config
index c95284d..0db3401 100644
--- a/ETS-WS/ETS-WS/Web.config
+++ b/ETS-WS/ETS-WS/Web.config
@@ -28,7 +28,7 @@
-
+
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
index 54f7af9..aa724bf 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx
@@ -76,7 +76,6 @@
Type="String" />
-
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
index cc488a8..acc8c74 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx
@@ -42,14 +42,7 @@
ServiceMethod="elencoFontiByDoc" minCharAutocomplete="2" showKey="false" toolTip="Digitare per iniziare ricerca, min 2 char"
textEmWidht="15" Visible="false" />
-
diff --git a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
index c3b7956..f779e60 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.cs
@@ -28,27 +28,9 @@ namespace ETS_WS.WebUserControls
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
- ///
- ///
- ///
- void tacOggetto_eh_valSelezionato(object sender, EventArgs e)
- {
- if (tacOggetto.valore != "")
- {
- utils.obj.setSessionVal("srcOggetto", tacOggetto.valore);
- }
- else
- {
- utils.obj.emptySessionVal("srcOggetto");
- }
- updateVisual();
- }
- ///
/// salvo ricerca fonte
///
///
@@ -113,7 +95,7 @@ namespace ETS_WS.WebUserControls
///
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();
+ lblTotRec.Text = utils.obj.taDoc.getBySearch_Count(0, 0, utils.obj.StringSessionObj("srcCommessa"), utils.obj.StringSessionObj("srcFase"), utils.obj.StringSessionObj("srcFonte"), "", txtSearchAll.Text.Trim(), 0, 0, "").ToString();
}
@@ -192,27 +174,6 @@ namespace ETS_WS.WebUserControls
updateVisual();
}
///
- /// imposto visibilità campo ricerca da selezione check
- ///
- ///
- ///
- protected void chkOggetto_CheckedChanged(object sender, EventArgs e)
- {
- if (chkOggetto.Checked)
- {
- chkOggetto.Text = "Elimina filtro Oggetto (autocomplete)";
- utils.obj.setSessionVal("srcOggetto", tacOggetto.valore);
- tacOggetto.setFocus();
- }
- else
- {
- chkOggetto.Text = "Filtra per Oggetto";
- utils.obj.emptySessionVal("srcOggetto");
- }
- tacOggetto.Visible = chkOggetto.Checked;
- updateVisual();
- }
- ///
/// selezionata nuova dim pagina
///
///
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 0382f12..c5f6c96 100644
--- a/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
+++ b/ETS-WS/ETS-WS/WebUserControls/mod_filtroRicerca.ascx.designer.cs
@@ -84,24 +84,6 @@ namespace ETS_WS.WebUserControls {
///
protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacFonti;
- ///
- /// chkOggetto control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.CheckBox chkOggetto;
-
- ///
- /// tacOggetto control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::ETS_WS.WebUserControls.mod_textAutocomplete tacOggetto;
-
///
/// btnUpdate control.
///
diff --git a/ETS-WS/ETS-WS/bin/ETS-WS.dll b/ETS-WS/ETS-WS/bin/ETS-WS.dll
index 52e7ac7..7c15cf6 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 75982f9..50d32cf 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.Designer.cs b/ETS_Data/DS_WebScip.Designer.cs
index 8489c3e..6581bb1 100644
--- a/ETS_Data/DS_WebScip.Designer.cs
+++ b/ETS_Data/DS_WebScip.Designer.cs
@@ -3615,7 +3615,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Oggetto", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
@@ -3628,7 +3627,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Oggetto", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startRowIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3644,7 +3642,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Commessa", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fase", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Fonte", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Oggetto", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InOut", global::System.Data.SqlDbType.NVarChar, 3, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@searchAll", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@startRowIndex", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -3697,7 +3694,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_WebScip.tbDocumentiDataTable getBySearch(global::System.Nullable
Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string Oggetto, string InOut, string searchAll) {
+ public virtual DS_WebScip.tbDocumentiDataTable getBySearch(global::System.Nullable Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string InOut, string searchAll) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((Numero.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Numero.Value));
@@ -3729,23 +3726,17 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fonte));
}
- if ((Oggetto == null)) {
+ if ((InOut == null)) {
this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.SelectCommand.Parameters[6].Value = ((string)(Oggetto));
+ this.Adapter.SelectCommand.Parameters[6].Value = ((string)(InOut));
}
- if ((InOut == null)) {
+ if ((searchAll == null)) {
this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.SelectCommand.Parameters[7].Value = ((string)(InOut));
- }
- if ((searchAll == null)) {
- this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.SelectCommand.Parameters[8].Value = ((string)(searchAll));
+ this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchAll));
}
DS_WebScip.tbDocumentiDataTable dataTable = new DS_WebScip.tbDocumentiDataTable();
this.Adapter.Fill(dataTable);
@@ -3756,7 +3747,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
- public virtual DS_WebScip.tbDocumentiDataTable getBySearch_paged(global::System.Nullable Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string Oggetto, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) {
+ public virtual DS_WebScip.tbDocumentiDataTable getBySearch_paged(global::System.Nullable Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((Numero.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Numero.Value));
@@ -3788,41 +3779,35 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Fonte));
}
- if ((Oggetto == null)) {
+ if ((InOut == null)) {
this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.SelectCommand.Parameters[6].Value = ((string)(Oggetto));
+ this.Adapter.SelectCommand.Parameters[6].Value = ((string)(InOut));
}
- if ((InOut == null)) {
+ if ((searchAll == null)) {
this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
}
else {
- this.Adapter.SelectCommand.Parameters[7].Value = ((string)(InOut));
- }
- if ((searchAll == null)) {
- this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.SelectCommand.Parameters[8].Value = ((string)(searchAll));
+ this.Adapter.SelectCommand.Parameters[7].Value = ((string)(searchAll));
}
if ((startRowIndex.HasValue == true)) {
- this.Adapter.SelectCommand.Parameters[9].Value = ((int)(startRowIndex.Value));
+ this.Adapter.SelectCommand.Parameters[8].Value = ((int)(startRowIndex.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
+ }
+ if ((maximumRows.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[9].Value = ((int)(maximumRows.Value));
}
else {
this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value;
}
- if ((maximumRows.HasValue == true)) {
- this.Adapter.SelectCommand.Parameters[10].Value = ((int)(maximumRows.Value));
- }
- else {
+ if ((SortExpression == null)) {
this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value;
}
- if ((SortExpression == null)) {
- this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value;
- }
else {
- this.Adapter.SelectCommand.Parameters[11].Value = ((string)(SortExpression));
+ this.Adapter.SelectCommand.Parameters[10].Value = ((string)(SortExpression));
}
DS_WebScip.tbDocumentiDataTable dataTable = new DS_WebScip.tbDocumentiDataTable();
this.Adapter.Fill(dataTable);
@@ -4792,7 +4777,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual object getBySearch_Count(global::System.Nullable Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string Oggetto, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) {
+ public virtual object getBySearch_Count(global::System.Nullable Numero, global::System.Nullable Anno, string Commessa, string Fase, string Fonte, string InOut, string searchAll, global::System.Nullable startRowIndex, global::System.Nullable maximumRows, string SortExpression) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((Numero.HasValue == true)) {
command.Parameters[1].Value = ((int)(Numero.Value));
@@ -4824,41 +4809,35 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
else {
command.Parameters[5].Value = ((string)(Fonte));
}
- if ((Oggetto == null)) {
+ if ((InOut == null)) {
command.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[6].Value = ((string)(Oggetto));
+ command.Parameters[6].Value = ((string)(InOut));
}
- if ((InOut == null)) {
+ if ((searchAll == null)) {
command.Parameters[7].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[7].Value = ((string)(InOut));
- }
- if ((searchAll == null)) {
- command.Parameters[8].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[8].Value = ((string)(searchAll));
+ command.Parameters[7].Value = ((string)(searchAll));
}
if ((startRowIndex.HasValue == true)) {
- command.Parameters[9].Value = ((int)(startRowIndex.Value));
+ command.Parameters[8].Value = ((int)(startRowIndex.Value));
+ }
+ else {
+ command.Parameters[8].Value = global::System.DBNull.Value;
+ }
+ if ((maximumRows.HasValue == true)) {
+ command.Parameters[9].Value = ((int)(maximumRows.Value));
}
else {
command.Parameters[9].Value = global::System.DBNull.Value;
}
- if ((maximumRows.HasValue == true)) {
- command.Parameters[10].Value = ((int)(maximumRows.Value));
- }
- else {
+ if ((SortExpression == null)) {
command.Parameters[10].Value = global::System.DBNull.Value;
}
- if ((SortExpression == null)) {
- command.Parameters[11].Value = global::System.DBNull.Value;
- }
else {
- command.Parameters[11].Value = ((string)(SortExpression));
+ command.Parameters[10].Value = ((string)(SortExpression));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
diff --git a/ETS_Data/DS_WebScip.xsd b/ETS_Data/DS_WebScip.xsd
index 7824aef..2868f38 100644
--- a/ETS_Data/DS_WebScip.xsd
+++ b/ETS_Data/DS_WebScip.xsd
@@ -346,7 +346,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
@@ -364,7 +363,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
@@ -385,7 +383,6 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
@@ -427,7 +424,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
+
@@ -499,7 +496,7 @@ SELECT idxFile, Nome, fullPath, userId, NrProtocollo, Numero, Anno, DataRic, Dat
-
+