+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Nessun componente squadra assegnato
-
-
-
-
-
-
-
-
-
-
-
-
- <%----%>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nessun componente squadra assegnato
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%----%>
+
+
+
diff --git a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
index 2721ed3..8bc7fc4 100644
--- a/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
+++ b/WebSCR/WebUserControls/mod_AssSquadra.ascx.cs
@@ -13,11 +13,11 @@ namespace WebSCR.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
- mod_selData.eh_update += Mod_selData_eh_update;
if (!Page.IsPostBack)
{
reloadSessionByCookie();
}
+ mod_selData.eh_update += Mod_selData_eh_update;
}
///
/// rilegge (eventualmente90 dati ins essione da cookie se non presenti
@@ -25,19 +25,21 @@ namespace WebSCR.WebUserControls
private static void reloadSessionByCookie()
{
// se valore in session รจ nullo PROVO a leggerlo da cookie...
+ DateTime adesso = DateTime.Now;
if (!memLayer.ML.isInSessionObject("DataRif"))
{
try
{
- DateTime adesso = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
- memLayer.ML.setSessionVal("DataRif", adesso.ToString("yyyy-MM-dd"), true);
+ adesso = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
}
catch
{ }
+ memLayer.ML.setSessionVal("DataRif", adesso.ToString("yyyy-MM-dd"), true);
}
}
private void Mod_selData_eh_update(object sender, EventArgs e)
{
+ reloadSessionByCookie();
grView.DataBind();
}
///
diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx b/WebSCR/WebUserControls/mod_compSquadra.ascx
index d586092..de750c8 100644
--- a/WebSCR/WebUserControls/mod_compSquadra.ascx
+++ b/WebSCR/WebUserControls/mod_compSquadra.ascx
@@ -25,7 +25,7 @@
-
+
<%----%>
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index d58bda5..691d10b 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 5d49220..f3bc3a0 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 8fb25d9..000ed82 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 7a247fa..30d4583 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -15053,7 +15053,7 @@ FROM raw.DB2_DOCS";
[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[3];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT DataFrom, CodSquadra, Matr, DataTo, CognomeNome\r\nFROM v_" +
@@ -15061,19 +15061,27 @@ FROM raw.DB2_DOCS";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
- this._commandCollection[1].CommandText = "dbo.stp_AsSq_GetByCodSqData";
+ this._commandCollection[1].CommandText = "dbo.stp_AsSq_delete";
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("@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("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_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("@Original_DataFrom", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
- this._commandCollection[2].CommandText = "dbo.stp_AsSq_insert";
+ this._commandCollection[2].CommandText = "dbo.stp_AsSq_GetByCodSqData";
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("@CodSquadra", 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("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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_AsSq_insert";
+ 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("@CodSquadra", 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("@Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Matr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -15105,7 +15113,7 @@ FROM raw.DB2_DOCS";
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_Applicazione.AssegnSquadreDataTable GetByCodSqData(string CodSquadra, global::System.Nullable Data) {
- this.Adapter.SelectCommand = this.CommandCollection[1];
+ this.Adapter.SelectCommand = this.CommandCollection[2];
if ((CodSquadra == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -15123,11 +15131,51 @@ FROM raw.DB2_DOCS";
return dataTable;
}
+ [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 deleteQuery(string Original_CodSquadra, global::System.Nullable Original_DataFrom, string Original_Matr) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
+ if ((Original_CodSquadra == null)) {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[1].Value = ((string)(Original_CodSquadra));
+ }
+ if ((Original_DataFrom.HasValue == true)) {
+ command.Parameters[2].Value = ((System.DateTime)(Original_DataFrom.Value));
+ }
+ else {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ if ((Original_Matr == null)) {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[3].Value = ((string)(Original_Matr));
+ }
+ 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 insertQuery(string CodSquadra, global::System.Nullable Data, string Matr) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
if ((CodSquadra == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 5cd695a..974c20f 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -1166,6 +1166,19 @@ FROM v_AssSqDip
+
+
+
+ dbo.stp_AsSq_delete
+
+
+
+
+
+
+
+
+
@@ -1257,7 +1270,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1289,7 +1302,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1325,7 +1338,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1350,7 +1363,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1434,7 +1447,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1572,7 +1585,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1582,7 +1595,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1598,7 +1611,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1628,7 +1641,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1645,7 +1658,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1680,7 +1693,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1735,7 +1748,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1881,7 +1894,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1910,7 +1923,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -2006,9 +2019,9 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
-
-
+
+
+
\ No newline at end of file
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index d58bda5..691d10b 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 8fb25d9..000ed82 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 de35ad7..7ed95f8 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 9d4b2f2..808c97b 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 8fb25d9..000ed82 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ