diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index db42ba3..510b3ff 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx b/WebSCR/WebUserControls/mod_elencoDisp.ascx
index 054df42..0a0dc66 100644
--- a/WebSCR/WebUserControls/mod_elencoDisp.ascx
+++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx
@@ -5,7 +5,8 @@
diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs
index 2066978..05b4925 100644
--- a/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs
+++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -32,25 +33,25 @@ namespace WebSCR.WebUserControls
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
}
-
- protected void btnAllSquadre_Click(object sender, EventArgs e)
- {
- // resetto sel rbl
- rblSquadre.SelectedIndex = -1;
- }
///
- /// selezione nuova squadra...
+ /// crea disponibilità delle squadre selezionate x il periodo
///
///
///
- protected void rblSquadre_SelectedIndexChanged(object sender, EventArgs e)
- {
- // aggiorno controllo...
- }
-
protected void btnCreaDisp_Click(object sender, EventArgs e)
{
- DtProxy.man.taDisp.genDispSquadre(mod_filtroPeriodo.dataFrom, mod_filtroPeriodo.numGG);
+ DtProxy.man.taDisp.genDispSquadre(mod_filtroPeriodo.dataFrom, memLayer.ML.StringSessionObj("elencoSquadre"), mod_filtroPeriodo.numGG);
+ grView.DataBind();
+ }
+ ///
+ /// crea disponibilità delle squadre selezionate x singola giornata selezionata
+ ///
+ ///
+ ///
+ protected void btnCreaDispGg_Click(object sender, EventArgs e)
+ {
+ DtProxy.man.taDisp.genDispSquadreGg(mod_filtroPeriodo.dataFrom, memLayer.ML.StringSessionObj("elencoSquadre"));
+ grView.DataBind();
}
}
}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs
index d448ac9..c9d35ac 100644
--- a/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs
@@ -21,6 +21,15 @@ namespace WebSCR.WebUserControls {
///
protected global::System.Web.UI.WebControls.Button btnCreaDisp;
+ ///
+ /// btnCreaDispGg control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnCreaDispGg;
+
///
/// mod_filtroPeriodo control.
///
@@ -39,33 +48,6 @@ namespace WebSCR.WebUserControls {
///
protected global::WebSCR.WebUserControls.mod_selSquadre mod_selSquadre;
- ///
- /// btnAllSquadre control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Button btnAllSquadre;
-
- ///
- /// rblSquadre control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.RadioButtonList rblSquadre;
-
- ///
- /// odsSquadre control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.ObjectDataSource odsSquadre;
-
///
/// grView control.
///
diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx b/WebSCR/WebUserControls/mod_selSquadre.ascx
index ee52e73..0bd5f2f 100644
--- a/WebSCR/WebUserControls/mod_selSquadre.ascx
+++ b/WebSCR/WebUserControls/mod_selSquadre.ascx
@@ -5,4 +5,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 911b155..b731a94 100644
--- a/WebSCR/WebUserControls/mod_selSquadre.ascx.cs
+++ b/WebSCR/WebUserControls/mod_selSquadre.ascx.cs
@@ -1,4 +1,5 @@
-using System;
+using SteamWare;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -26,32 +27,29 @@ namespace WebSCR.WebUserControls
if (tab.Select(string.Format("CodSquadra = '{0}'", item.Value)).Length > 0)
item.Selected = true;
}
- countSelected();
+ saveSelected();
}
protected void cblSquadre_SelectedIndexChanged(object sender, EventArgs e)
{
- countSelected();
+ saveSelected();
}
- private void countSelected()
+ private void saveSelected()
{
List selected = new List();
+ string elencoSquadre = "";
foreach (ListItem item in cblSquadre.Items)
{
- if (item.Selected) selected.Add(item);
+ if (item.Selected)
+ {
+ selected.Add(item);
+ }
}
- lblOut.Text = selected.Count.ToString();
+ elencoSquadre = string.Join(",", selected);
+ memLayer.ML.setSessionVal("elencoSquadre", elencoSquadre);
+ //lblOut.Text = elencoSquadre;
}
- //protected void cblSquadre_DataBound(object sender, EventArgs e)
- //{
- // // controllo se sia selezionata da sessione...
-
- // // oppure se sia attiva da anagrafica
-
- // // ed imposto css ad attiva...
-
- //}
}
}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_selSquadre.ascx.designer.cs b/WebSCR/WebUserControls/mod_selSquadre.ascx.designer.cs
index 31fb066..a9481ec 100644
--- a/WebSCR/WebUserControls/mod_selSquadre.ascx.designer.cs
+++ b/WebSCR/WebUserControls/mod_selSquadre.ascx.designer.cs
@@ -29,14 +29,5 @@ namespace WebSCR.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.ObjectDataSource odsSquadre;
-
- ///
- /// lblOut control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblOut;
}
}
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index c166ea5..1a44fef 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 a3b9383..2c8d062 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 84a7b40..bbc3e6d 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 56d433a..be7d689 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -12536,7 +12536,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
private void InitCommandCollection() {
- this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM dbo.Disponibilita";
@@ -12554,21 +12554,29 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[2].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[2].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[2].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, "", "", ""));
this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numDay", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[3].Connection = this.Connection;
- this._commandCollection[3].CommandText = "dbo.stp_Dis_getByData";
+ this._commandCollection[3].CommandText = "dbo.stp_genDispSquadreGg";
this._commandCollection[3].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[3].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[3].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[3].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[3].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, "", "", ""));
this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[4].Connection = this.Connection;
- this._commandCollection[4].CommandText = "dbo.stp_Dis_getByDataNumGg";
+ this._commandCollection[4].CommandText = "dbo.stp_Dis_getByData";
this._commandCollection[4].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[4].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[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumDay", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[4].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[5] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[5].Connection = this.Connection;
+ this._commandCollection[5].CommandText = "dbo.stp_Dis_getByDataNumGg";
+ this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[5].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[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumDay", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].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()]
@@ -12600,7 +12608,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_Applicazione.DisponibilitaDataTable getByData(global::System.Nullable Data) {
- this.Adapter.SelectCommand = this.CommandCollection[3];
+ this.Adapter.SelectCommand = this.CommandCollection[4];
if ((Data.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(Data.Value));
}
@@ -12617,7 +12625,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_Applicazione.DisponibilitaDataTable getByDataNumGg(global::System.Nullable Data, global::System.Nullable NumDay, string CodSquadra) {
- this.Adapter.SelectCommand = this.CommandCollection[4];
+ this.Adapter.SelectCommand = this.CommandCollection[5];
if ((Data.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(Data.Value));
}
@@ -12830,7 +12838,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
[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 int genDispSquadre(global::System.Nullable dataFrom, global::System.Nullable numDay) {
+ public virtual int genDispSquadre(global::System.Nullable dataFrom, string CodSquadra, global::System.Nullable numDay) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
if ((dataFrom.HasValue == true)) {
command.Parameters[1].Value = ((System.DateTime)(dataFrom.Value));
@@ -12838,12 +12846,52 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
else {
command.Parameters[1].Value = global::System.DBNull.Value;
}
- if ((numDay.HasValue == true)) {
- command.Parameters[2].Value = ((int)(numDay.Value));
+ if ((CodSquadra == null)) {
+ command.Parameters[2].Value = global::System.DBNull.Value;
}
else {
+ command.Parameters[2].Value = ((string)(CodSquadra));
+ }
+ if ((numDay.HasValue == true)) {
+ command.Parameters[3].Value = ((int)(numDay.Value));
+ }
+ else {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
+ if (((command.Connection.State & global::System.Data.ConnectionState.Open)
+ != global::System.Data.ConnectionState.Open)) {
+ command.Connection.Open();
+ }
+ int returnValue;
+ try {
+ returnValue = command.ExecuteNonQuery();
+ }
+ finally {
+ if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
+ command.Connection.Close();
+ }
+ }
+ return returnValue;
+ }
+
+ [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 int genDispSquadreGg(global::System.Nullable dataFrom, string CodSquadra) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
+ if ((dataFrom.HasValue == true)) {
+ command.Parameters[1].Value = ((System.DateTime)(dataFrom.Value));
+ }
+ else {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ if ((CodSquadra == null)) {
command.Parameters[2].Value = global::System.DBNull.Value;
}
+ else {
+ command.Parameters[2].Value = ((string)(CodSquadra));
+ }
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index a0d9977..11928ae 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -889,11 +889,24 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
+
+
+
+
+ dbo.stp_genDispSquadreGg
+
+
+
+
+
+
+
+
@@ -913,7 +926,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
-
+
@@ -1140,7 +1153,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1172,7 +1185,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1208,7 +1221,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1233,7 +1246,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1317,7 +1330,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1455,7 +1468,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1465,7 +1478,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1481,7 +1494,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1511,7 +1524,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1528,7 +1541,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1563,7 +1576,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1618,7 +1631,7 @@ FROM raw.DB2_DOCS
-
+
@@ -1816,7 +1829,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 c166ea5..1a44fef 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 84a7b40..bbc3e6d 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/DesignTimeResolveAssemblyReferences.cache b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index d1bff9b..83da710 100644
Binary files a/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/WebSCR_data/obj/Debug/DesignTimeResolveAssemblyReferences.cache 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 2190741..584ffb2 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 79fbd92..3d78bd5 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 84a7b40..bbc3e6d 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ