diff --git a/.vs/XPS_app/v15/sqlite3/storage.ide b/.vs/XPS_app/v15/sqlite3/storage.ide
index a4e9592..5b64118 100644
Binary files a/.vs/XPS_app/v15/sqlite3/storage.ide and b/.vs/XPS_app/v15/sqlite3/storage.ide differ
diff --git a/XPS/Web.config b/XPS/Web.config
index a198af6..684d4cd 100644
--- a/XPS/Web.config
+++ b/XPS/Web.config
@@ -77,7 +77,7 @@
-
+
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx
index e35c26e..ddc8a16 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx
+++ b/XPS/WebUserControls/mod_elencoComm.ascx
@@ -7,30 +7,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- del:
-
+ del:
-
-
-
-
+
-
-
-
-
+
@@ -238,9 +195,7 @@
-
@@ -271,9 +226,7 @@
-
-
-
+
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs
index 2f3a973..ea6fcb3 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx.cs
+++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs
@@ -127,9 +127,12 @@ namespace XPS.WebUserControls
_idxGridView = "CodDDT";
mf_clienti.eh_selValore += new EventHandler(mf_clienti_eh_selValore);
mf_tipoFiltro.eh_selValore += new EventHandler(mf_tipoFiltro_eh_selValore);
+ mf_ciclo.eh_selValore += Mf_ciclo_eh_selValore;
mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset);
setStatiRewindAmmessi();
}
+
+
///
/// imposta data minima x recupero dati...
///
@@ -264,6 +267,7 @@ namespace XPS.WebUserControls
lblPag.Text = devicesAuthProxy.pagCorrente;
mf_tipoFiltro.ods = odsTipoFiltro;
mf_clienti.ods = odsFiltroClienti;
+ mf_ciclo.ods = odsValLav;
fixControlliDaModoCorrente();
//}
}
@@ -283,6 +287,10 @@ namespace XPS.WebUserControls
}
}
+ private void Mf_ciclo_eh_selValore(object sender, EventArgs e)
+ {
+ checkFixOds();
+ }
void mf_clienti_eh_selValore(object sender, EventArgs e)
{
checkFixOds();
@@ -292,16 +300,20 @@ namespace XPS.WebUserControls
///
private void checkFixOds()
{
- // controllo se filtro attivo...
+ // imposto filtraggio base
+ string baseFilt = " ( Cliente LIKE '%{0}%' OR CodCliente LIKE '%{0}%' OR DDT LIKE '%{0}%' OR Descrizione LIKE '%{0}%' ) ";
+ string custFilt = "";
+ // controllo se filtri attivo...
if (mf_clienti.valore != "*")
{
- string filtroCliente = string.Format("AND CodCliente = '{0}'", mf_clienti.valore);
- ods.FilterExpression = " ( Cliente LIKE '%{0}%' OR CodCliente LIKE '%{0}%' OR DDT LIKE '%{0}%' OR Descrizione LIKE '%{0}%' ) " + filtroCliente;
+ custFilt += string.Format("AND CodCliente = '{0}'", mf_clienti.valore);
}
- else
+ if (mf_ciclo.valore != "*")
{
- ods.FilterExpression = " ( Cliente LIKE '%{0}%' OR CodCliente LIKE '%{0}%' OR DDT LIKE '%{0}%' OR Descrizione LIKE '%{0}%' ) ";
+ custFilt += string.Format("AND Ciclo = '{0}'", mf_ciclo.valore);
}
+ // ricompongo!
+ ods.FilterExpression = baseFilt + custFilt;
grView.DataBind();
}
diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs
index f4fec09..3c55e59 100644
--- a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs
@@ -48,6 +48,15 @@ namespace XPS.WebUserControls {
///
protected global::System.Web.UI.WebControls.Label lblPag;
+ ///
+ /// Controllo mf_ciclo.
+ ///
+ ///
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
+ ///
+ protected global::XPS.WebUserControls.mod_filtro mf_ciclo;
+
///
/// Controllo mf_clienti.
///
diff --git a/XPS/WebUserControls/mod_filtro.ascx b/XPS/WebUserControls/mod_filtro.ascx
index 74ffc99..5325e7a 100644
--- a/XPS/WebUserControls/mod_filtro.ascx
+++ b/XPS/WebUserControls/mod_filtro.ascx
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_filtro" Codebehind="mod_filtro.ascx.cs" %>
-
+
\ No newline at end of file
diff --git a/XPS/WebUserControls/mod_filtro.ascx.cs b/XPS/WebUserControls/mod_filtro.ascx.cs
index 7dabda9..141e00c 100644
--- a/XPS/WebUserControls/mod_filtro.ascx.cs
+++ b/XPS/WebUserControls/mod_filtro.ascx.cs
@@ -12,305 +12,309 @@ using SteamWare;
namespace XPS.WebUserControls
{
- public partial class mod_filtro : SteamWare.UserControl
+ public partial class mod_filtro : SteamWare.UserControl
+ {
+ protected override void OnInit(EventArgs e)
{
- protected override void OnInit(EventArgs e)
- {
- base.OnInit(e);
- if (!Page.IsPostBack)
- {
- traduciObj();
- }
- bindControlli();
- }
-
- protected ObjectDataSource _ods;
- protected string _valore
- {
- get
- {
- return memLayer.ML.StringSessionObj(string.Format("valFiltro_{0}", this.ID));
- }
- set
- {
- memLayer.ML.setSessionVal(string.Format("valFiltro_{0}", this.ID), value, false);
- }
- }
- protected bool _changeCheckEnabled = true;
- protected bool _changeCheckVisible = true;
- protected bool _changeSelEnabled = true;
- protected string _where = "";
- protected void traduciObj()
- {
- if (_changeCheckVisible)
- {
- if (!chkFilt.Checked)
- {
- chkFilt.Text = traduci("mostraSoloSelez");
- }
- else
- {
- chkFilt.Text = traduci("mostraTutti");
- }
- }
- }
- protected void chkFilt_CheckedChanged(object sender, EventArgs e)
- {
- // cambio modalità visualizzazione del filtro...
- dlFilt.Visible = !dlFilt.Visible;
- raiseSelEvent();
- }
-
- protected void raiseSelEvent()
- {
- if (!dlFilt.Visible)
- {
- memLayer.ML.setSessionVal(string.Format("valFiltro_{0}", this.ID), "", false);
- }
- else
- {
- _valore = dlFilt.SelectedValue;
- }
- if (eh_selValore != null)
- {
- eh_selValore(this, new EventArgs());
- }
- }
- protected void updateChk()
- {
- chkFilt.Enabled = _changeCheckEnabled;
- if (!_changeCheckEnabled)
- {
- chkFilt.Checked = true;
- dlFilt.Visible = true;
- }
- }
- protected void updateSel()
- {
- dlFilt.Enabled = _changeSelEnabled;
- }
- protected void updateChkLbl()
- {
- chkFilt.Visible = _changeCheckVisible;
- }
- protected void bindControlli()
- {
- updateChk();
- fixValore();
- where.Text = _where;
- traduciObj();
- }
- protected SteamWare.tipoVistaMod _modo = SteamWare.tipoVistaMod.editing;
-
-
- ///
- /// condizione where per ridurre elementi mostrati in selettore
- ///
- public string condizione
- {
- get
- {
- return _where;
- }
- set
- {
- _where = value;
- }
- }
-
- ///
- /// fornisce il valore scelto o "*" se nulla selezionato
- ///
- public string valore
- {
- get
- {
- string answ = "*";
- if (chkFilt.Checked)
- {
- answ = dlFilt.SelectedValue;
- }
- return answ;
- }
- set
- {
- _valore = value;
- fixValore();
- }
- }
-
- ///
- /// primo valore di una chiave multicampo
- ///
- public string val_1
- {
- get
- {
- string answ = "";
- if (chkFilt.Checked)
- {
- try
- {
- string[] _dataKey = dlFilt.SelectedValue.Split('#');
- answ = _dataKey[0];
- }
- catch
- { }
- }
- else
- {
- answ = "*";
- }
- return answ;
- }
- }
- ///
- /// secondo valore di una chiave multicampo
- ///
- public string val_2
- {
- get
- {
- string answ = "";
- if (chkFilt.Checked)
- {
- try
- {
- string[] _dataKey = dlFilt.SelectedValue.Split('#');
- answ = _dataKey[1];
- }
- catch
- { }
- }
- else
- {
- answ = "*";
- }
- return answ;
- }
- }
- ///
- /// fornisce il valore scelto o "0" se nulla selezionato o non valido
- ///
- public int valoreInt
- {
- get
- {
- int answ = 0;
- try
- {
- if (chkFilt.Checked)
- {
- answ = Convert.ToInt32(dlFilt.SelectedValue);
- }
- }
- catch
- { }
- return answ;
- }
- }
- protected void fixValore()
- {
- if (_ods != null)
- {
- try
- {
- dlFilt.DataSource = _ods;
- dlFilt.DataBind();
- if (_valore != "")
- {
- dlFilt.SelectedValue = _valore;
- dlFilt.Visible = true;
- chkFilt.Checked = true;
- }
- }
- catch (Exception exc)
- {
- logger.lg.scriviLog(string.Format("Errore bind ods filtraggio: {0}", exc), tipoLog.EXCEPTION);
- }
- }
- }
-
-
- public event EventHandler eh_selValore;
-
- ///
- /// determina se sia possibile (de)selezionare il check di filtraggio, altrimenti sempre attivo
- ///
- public bool changeCheckEnabled
- {
- get
- {
- return _changeCheckEnabled;
- }
- set
- {
- _changeCheckEnabled = value;
- updateChk();
- }
- }
- ///
- /// determina se sia possibile modificare la selezione
- ///
- public bool changeSelEnabled
- {
- get
- {
- return _changeSelEnabled;
- }
- set
- {
- _changeSelEnabled = value;
- updateSel();
- }
- }
- ///
- /// determina se sia possibile visibile il check di filtraggio
- ///
- public bool changeCheckVisible
- {
- get
- {
- return _changeCheckVisible;
- }
- set
- {
- _changeCheckVisible = value;
- updateChkLbl();
- }
- }
- protected void dlFilt_SelectedIndexChanged(object sender, EventArgs e)
- {
- raiseSelEvent();
- // salvo val selezionato...
- }
-
- ///
- /// oggetto ODS con cui popolare il selettore, VINCOLO abbia campi value(key) / label
- ///
- public ObjectDataSource ods
- {
- get
- {
- return _ods;
- }
- set
- {
- _ods = value;
- bindControlli();
- }
- }
-
- public Unit dlWidth
- {
- get
- {
- return dlFilt.Width;
- }
- set
- {
- dlFilt.Width = value;
- }
- }
+ base.OnInit(e);
+ if (!Page.IsPostBack)
+ {
+ traduciObj();
+ }
+ bindControlli();
}
+
+ protected ObjectDataSource _ods;
+ protected string _valore
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj(string.Format("valFiltro_{0}", this.ID));
+ }
+ set
+ {
+ memLayer.ML.setSessionVal(string.Format("valFiltro_{0}", this.ID), value, false);
+ }
+ }
+ protected bool _changeCheckEnabled = true;
+ protected bool _changeCheckVisible = true;
+ protected bool _changeSelEnabled = true;
+ protected string _where = "";
+ ///
+ /// Descr filtro da visualizzare
+ ///
+ public string descrFiltro { get; set; }
+ protected void traduciObj()
+ {
+ if (_changeCheckVisible)
+ {
+ if (!chkFilt.Checked)
+ {
+ chkFilt.Text = string.Format("{0} | {1}", descrFiltro, traduci("mostraSoloSelez"));
+ }
+ else
+ {
+ chkFilt.Text = string.Format("{0} | {1}", descrFiltro, traduci("mostraTutti"));
+ }
+ }
+ }
+ protected void chkFilt_CheckedChanged(object sender, EventArgs e)
+ {
+ // cambio modalità visualizzazione del filtro...
+ dlFilt.Visible = !dlFilt.Visible;
+ raiseSelEvent();
+ }
+
+ protected void raiseSelEvent()
+ {
+ if (!dlFilt.Visible)
+ {
+ memLayer.ML.setSessionVal(string.Format("valFiltro_{0}", this.ID), "", false);
+ }
+ else
+ {
+ _valore = dlFilt.SelectedValue;
+ }
+ if (eh_selValore != null)
+ {
+ eh_selValore(this, new EventArgs());
+ }
+ }
+ protected void updateChk()
+ {
+ chkFilt.Enabled = _changeCheckEnabled;
+ if (!_changeCheckEnabled)
+ {
+ chkFilt.Checked = true;
+ dlFilt.Visible = true;
+ }
+ }
+ protected void updateSel()
+ {
+ dlFilt.Enabled = _changeSelEnabled;
+ }
+ protected void updateChkLbl()
+ {
+ chkFilt.Visible = _changeCheckVisible;
+ }
+ protected void bindControlli()
+ {
+ updateChk();
+ fixValore();
+ where.Text = _where;
+ traduciObj();
+ }
+ protected SteamWare.tipoVistaMod _modo = SteamWare.tipoVistaMod.editing;
+
+
+ ///
+ /// condizione where per ridurre elementi mostrati in selettore
+ ///
+ public string condizione
+ {
+ get
+ {
+ return _where;
+ }
+ set
+ {
+ _where = value;
+ }
+ }
+
+ ///
+ /// fornisce il valore scelto o "*" se nulla selezionato
+ ///
+ public string valore
+ {
+ get
+ {
+ string answ = "*";
+ if (chkFilt.Checked)
+ {
+ answ = dlFilt.SelectedValue;
+ }
+ return answ;
+ }
+ set
+ {
+ _valore = value;
+ fixValore();
+ }
+ }
+
+ ///
+ /// primo valore di una chiave multicampo
+ ///
+ public string val_1
+ {
+ get
+ {
+ string answ = "";
+ if (chkFilt.Checked)
+ {
+ try
+ {
+ string[] _dataKey = dlFilt.SelectedValue.Split('#');
+ answ = _dataKey[0];
+ }
+ catch
+ { }
+ }
+ else
+ {
+ answ = "*";
+ }
+ return answ;
+ }
+ }
+ ///
+ /// secondo valore di una chiave multicampo
+ ///
+ public string val_2
+ {
+ get
+ {
+ string answ = "";
+ if (chkFilt.Checked)
+ {
+ try
+ {
+ string[] _dataKey = dlFilt.SelectedValue.Split('#');
+ answ = _dataKey[1];
+ }
+ catch
+ { }
+ }
+ else
+ {
+ answ = "*";
+ }
+ return answ;
+ }
+ }
+ ///
+ /// fornisce il valore scelto o "0" se nulla selezionato o non valido
+ ///
+ public int valoreInt
+ {
+ get
+ {
+ int answ = 0;
+ try
+ {
+ if (chkFilt.Checked)
+ {
+ answ = Convert.ToInt32(dlFilt.SelectedValue);
+ }
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ protected void fixValore()
+ {
+ if (_ods != null)
+ {
+ try
+ {
+ dlFilt.DataSource = _ods;
+ dlFilt.DataBind();
+ if (_valore != "")
+ {
+ dlFilt.SelectedValue = _valore;
+ dlFilt.Visible = true;
+ chkFilt.Checked = true;
+ }
+ }
+ catch (Exception exc)
+ {
+ logger.lg.scriviLog(string.Format("Errore bind ods filtraggio: {0}", exc), tipoLog.EXCEPTION);
+ }
+ }
+ }
+
+
+ public event EventHandler eh_selValore;
+
+ ///
+ /// determina se sia possibile (de)selezionare il check di filtraggio, altrimenti sempre attivo
+ ///
+ public bool changeCheckEnabled
+ {
+ get
+ {
+ return _changeCheckEnabled;
+ }
+ set
+ {
+ _changeCheckEnabled = value;
+ updateChk();
+ }
+ }
+ ///
+ /// determina se sia possibile modificare la selezione
+ ///
+ public bool changeSelEnabled
+ {
+ get
+ {
+ return _changeSelEnabled;
+ }
+ set
+ {
+ _changeSelEnabled = value;
+ updateSel();
+ }
+ }
+ ///
+ /// determina se sia possibile visibile il check di filtraggio
+ ///
+ public bool changeCheckVisible
+ {
+ get
+ {
+ return _changeCheckVisible;
+ }
+ set
+ {
+ _changeCheckVisible = value;
+ updateChkLbl();
+ }
+ }
+ protected void dlFilt_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ raiseSelEvent();
+ // salvo val selezionato...
+ }
+
+ ///
+ /// oggetto ODS con cui popolare il selettore, VINCOLO abbia campi value(key) / label
+ ///
+ public ObjectDataSource ods
+ {
+ get
+ {
+ return _ods;
+ }
+ set
+ {
+ _ods = value;
+ bindControlli();
+ }
+ }
+
+ public Unit dlWidth
+ {
+ get
+ {
+ return dlFilt.Width;
+ }
+ set
+ {
+ dlFilt.Width = value;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/XPS/WebUserControls/mod_filtro.ascx.designer.cs b/XPS/WebUserControls/mod_filtro.ascx.designer.cs
index d816114..3d4ae8e 100644
--- a/XPS/WebUserControls/mod_filtro.ascx.designer.cs
+++ b/XPS/WebUserControls/mod_filtro.ascx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
+//
+// Codice generato da uno strumento.
//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
+// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
+// il codice viene rigenerato.
+//
//------------------------------------------------------------------------------
namespace XPS.WebUserControls {
@@ -13,29 +13,29 @@ namespace XPS.WebUserControls {
public partial class mod_filtro {
///
- /// chkFilt control.
+ /// Controllo chkFilt.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.CheckBox chkFilt;
///
- /// dlFilt control.
+ /// Controllo dlFilt.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.DropDownList dlFilt;
///
- /// where control.
+ /// Controllo where.
///
///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
+ /// Campo generato automaticamente.
+ /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
///
protected global::System.Web.UI.WebControls.Label where;
}
diff --git a/XPS/WebUserControls/mod_periodoAnalisi.ascx b/XPS/WebUserControls/mod_periodoAnalisi.ascx
index b0edee8..04d3871 100644
--- a/XPS/WebUserControls/mod_periodoAnalisi.ascx
+++ b/XPS/WebUserControls/mod_periodoAnalisi.ascx
@@ -1,30 +1,28 @@
<%@ Control Language="C#" AutoEventWireup="true" Inherits="XPS.WebUserControls.mod_periodoAnalisi"
- CodeBehind="mod_periodoAnalisi.ascx.cs" %>
+ CodeBehind="mod_periodoAnalisi.ascx.cs" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
-
-
- selezione
- Ultimi 15 gg
- Ultimi 30 gg
- Ultimi 2 mesi
- Ultimi 3 mesi
- Ultimi 6 mesi
- Ultimi 12 mesi
-
-
-
-
-
+
+
+ selezione
+ Ultimi 15 gg
+ Ultimi 30 gg
+ Ultimi 2 mesi
+ Ultimi 3 mesi
+ Ultimi 6 mesi
+ Ultimi 12 mesi
+
+
+
+
+