diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index 25f5148..288706e 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx b/WebSCR/WebUserControls/mod_dispPeriodo.ascx
index 554a185..c9ce1ef 100644
--- a/WebSCR/WebUserControls/mod_dispPeriodo.ascx
+++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx
@@ -23,5 +23,6 @@
+
diff --git a/WebSCR/WebUserControls/mod_giornata.ascx b/WebSCR/WebUserControls/mod_giornata.ascx
index f64e1c2..970c6c8 100644
--- a/WebSCR/WebUserControls/mod_giornata.ascx
+++ b/WebSCR/WebUserControls/mod_giornata.ascx
@@ -1,33 +1,19 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_giornata.ascx.cs" Inherits="WebSCR.WebUserControls.mod_giornata" %>
<%@ Register Assembly="DayPilot" Namespace="DayPilot.Web.Ui" TagPrefix="DayPilot" %>
+<%@ Register Src="~/WebUserControls/mod_selSquadre.ascx" TagPrefix="uc1" TagName="mod_selSquadre" %>
+
-
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
index 1c0d87c..32afe4d 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs
@@ -22,6 +22,10 @@ namespace WebSCR.WebUserControls
{
mod_filtroZona.Zona = memLayer.ML.confReadString("zonaDef");
mod_filtroPeriodo.numGG = memLayer.ML.confReadInt("numGgDef");
+ // reimposto selezione squadre...
+ // !!!FARE!!! verifica
+ //mod_selSquadre.selezionaAttive();
+ mod_selSquadre.selezionaDaSession();
refreshDetail();
}
mod_filtroZona.eh_selIndir += mod_filtroZona_eh_selIndir;
diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
index a83ea77..952635b 100644
--- a/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.designer.cs
@@ -30,6 +30,15 @@ namespace WebSCR.WebUserControls {
///
protected global::WebSCR.WebUserControls.mod_filtroPeriodo mod_filtroPeriodo;
+ ///
+ /// mod_selSquadre control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_selSquadre mod_selSquadre;
+
///
/// mod_dispPeriodo control.
///
diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx b/WebSCR/WebUserControls/mod_selSquadre.ascx
index 0bd5f2f..921d0c4 100644
--- a/WebSCR/WebUserControls/mod_selSquadre.ascx
+++ b/WebSCR/WebUserControls/mod_selSquadre.ascx
@@ -4,5 +4,4 @@
-
-<%--
--%>
\ No newline at end of file
+
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs
index b731a94..c1f674d 100644
--- a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs
+++ b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs
@@ -11,8 +11,13 @@ namespace WebSCR.WebUserControls
{
public partial class mod_selSquadre : System.Web.UI.UserControl
{
+ ///
+ /// elenco squadre slezionate
+ ///
+ public List
selected;
protected void Page_Load(object sender, EventArgs e)
{
+ if (!Page.IsPostBack) selected = new List();
}
///
/// pre-seleziona squadre attive da anagrafica
@@ -30,6 +35,22 @@ namespace WebSCR.WebUserControls
saveSelected();
}
+ ///
+ /// effettua selezione da valori in sessione...
+ ///
+ public void selezionaDaSession()
+ {
+ // !!!FARE!!! NON FUNZIONA!!!
+ if (memLayer.ML.isInSessionObject("elencoSquadre"))
+ {
+ foreach (ListItem item in cblSquadre.Items)
+ {
+ if (memLayer.ML.isInSessionObject("elencoSquadre").ToString().IndexOf(item.Value) > 0)
+ item.Selected = true;
+ }
+ }
+ }
+
protected void cblSquadre_SelectedIndexChanged(object sender, EventArgs e)
{
saveSelected();
@@ -37,7 +58,7 @@ namespace WebSCR.WebUserControls
private void saveSelected()
{
- List selected = new List();
+ selected = new List();
string elencoSquadre = "";
foreach (ListItem item in cblSquadre.Items)
{
@@ -48,7 +69,6 @@ namespace WebSCR.WebUserControls
}
elencoSquadre = string.Join(",", selected);
memLayer.ML.setSessionVal("elencoSquadre", elencoSquadre);
- //lblOut.Text = elencoSquadre;
}
}
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index da54507..6168962 100644
Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index 7b5018a..7ec84dd 100644
Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ
diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll
index 1be423d..94d8724 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs
index be7d689..a52ebb5 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -11933,6 +11933,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumGG", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Zona", 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("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -11963,7 +11964,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[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_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable DataFrom, global::System.Nullable NumGG, string Zona) {
+ public virtual DS_Applicazione.DispImpTotDataTable getByDataRange(global::System.Nullable DataFrom, global::System.Nullable NumGG, string Zona, string CodSquadra) {
this.Adapter.SelectCommand = this.CommandCollection[1];
if ((DataFrom.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(DataFrom.Value));
@@ -11983,6 +11984,12 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Zona));
}
+ if ((CodSquadra == null)) {
+ this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodSquadra));
+ }
DS_Applicazione.DispImpTotDataTable dataTable = new DS_Applicazione.DispImpTotDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -12310,7 +12317,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", 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("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 2500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 11928ae..43ab449 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -749,6 +749,7 @@ FROM v_elencoImpegni
+
@@ -801,7 +802,7 @@ FROM v_elencoImpegni
-
+
@@ -1153,7 +1154,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1185,7 +1186,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1221,7 +1222,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1246,7 +1247,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1330,7 +1331,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1468,7 +1469,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1478,7 +1479,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1494,7 +1495,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1524,7 +1525,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1541,7 +1542,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1576,7 +1577,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1631,7 +1632,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1829,7 +1830,7 @@ FROM raw.DB2_DOCS
-
+
\ No newline at end of file
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index da54507..6168962 100644
Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ
diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll
index 1be423d..94d8724 100644
Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index 778feeb..b733d4c 100644
Binary files a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
index b36be51..dbb5530 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ
diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll
index 1be423d..94d8724 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ