diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 59224c1..fafcb9e 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/WebUserControls/mod_dettASSD.ascx b/WebSCR/WebUserControls/mod_dettASSD.ascx index 6530490..5fc5c73 100644 --- a/WebSCR/WebUserControls/mod_dettASSD.ascx +++ b/WebSCR/WebUserControls/mod_dettASSD.ascx @@ -1,18 +1,83 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettASSD.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettASSD" %> - + <%# Eval("CognomeNome") %> |  - + + + + + + + + + + + + + + Nessun risultato + + + + + + +
+ +
+
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + - + + + + + + + diff --git a/WebSCR/WebUserControls/mod_dettASSD.ascx.cs b/WebSCR/WebUserControls/mod_dettASSD.ascx.cs index 1d288c6..0e03b49 100644 --- a/WebSCR/WebUserControls/mod_dettASSD.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettASSD.ascx.cs @@ -9,9 +9,22 @@ namespace WebSCR.WebUserControls { public partial class mod_dettASSD : System.Web.UI.UserControl { + public event EventHandler eh_updReq; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_updReq != null) + { + eh_updReq(this, new EventArgs()); + } + } + protected void Page_Load(object sender, EventArgs e) { - repMatr.DataBind(); + } /// /// data di riferimento scelta @@ -32,7 +45,6 @@ namespace WebSCR.WebUserControls set { hfDataRif.Value = value.ToShortDateString(); - //repMatr.DataBind(); } } /// @@ -47,7 +59,6 @@ namespace WebSCR.WebUserControls set { hfSlot.Value = value; - //repMatr.DataBind(); } } /// @@ -62,8 +73,26 @@ namespace WebSCR.WebUserControls set { hfCodSquadra.Value = value; - //repMatr.DataBind(); } } + public bool editMode + { + get + { + return repShow.Visible; + + } + set + { + repShow.Visible = !value; + grViewEdit.Visible = value; + } + } + + protected void odsDip_Updated(object sender, ObjectDataSourceStatusEventArgs e) + { + // sollevo evento! + reportEvent(); + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettASSD.ascx.designer.cs b/WebSCR/WebUserControls/mod_dettASSD.ascx.designer.cs index 7cfb3a0..6b7e23e 100644 --- a/WebSCR/WebUserControls/mod_dettASSD.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_dettASSD.ascx.designer.cs @@ -13,13 +13,22 @@ namespace WebSCR.WebUserControls { public partial class mod_dettASSD { /// - /// repMatr control. + /// repShow control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Repeater repMatr; + protected global::System.Web.UI.WebControls.Repeater repShow; + + /// + /// grViewEdit control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewEdit; /// /// odsDip control. diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx b/WebSCR/WebUserControls/mod_giornataASSD.ascx index 1e84882..2abf227 100644 --- a/WebSCR/WebUserControls/mod_giornataASSD.ascx +++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx @@ -12,7 +12,7 @@ <%# Eval("DescrSquadra") %>
- +
@@ -26,7 +26,7 @@ <%# Eval("DescrSquadra") %>
- +
diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs b/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs index b5c95dc..7dbb300 100644 --- a/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs +++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx.cs @@ -59,7 +59,14 @@ namespace WebSCR.WebUserControls { repShow.Visible = !value; repEdit.Visible = value; + repShow.DataBind(); } } + + protected void mod_dettASSD_eh_updReq(object sender, EventArgs e) + { + // aggiorno repView... + repEdit.DataBind(); + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx index d1c8368..17fcc2d 100644 --- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx +++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx @@ -37,7 +37,7 @@
-
+

-

@@ -45,7 +45,7 @@ Torna a schema SETTIMANALE
-
+
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index e39fa6a..bedce68 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 779e2a9..0482786 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 0a23211..e70ad3d 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 ce3a45c..2f10352 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -17316,7 +17316,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)"; [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 * FROM v_ASSD"; @@ -17348,6 +17348,16 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)"; 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.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 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_ASSD_updateSquadra"; + 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("@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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Data", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 16, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Slot", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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[5].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, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17481,6 +17491,58 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)"; } 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 updateSquadra(string Original_CodSquadra, global::System.Nullable Original_Data, string Original_Slot, string Original_Matr, string CodSquadra) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + if ((Original_CodSquadra == null)) { + command.Parameters[1].Value = global::System.DBNull.Value; + } + else { + command.Parameters[1].Value = ((string)(Original_CodSquadra)); + } + if ((Original_Data.HasValue == true)) { + command.Parameters[2].Value = ((System.DateTime)(Original_Data.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Original_Slot == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(Original_Slot)); + } + if ((Original_Matr == null)) { + command.Parameters[4].Value = global::System.DBNull.Value; + } + else { + command.Parameters[4].Value = ((string)(Original_Matr)); + } + if ((CodSquadra == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].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)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 65124b2..2a18b0a 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1407,6 +1407,21 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr) + + + + dbo.stp_ASSD_updateSquadra + + + + + + + + + + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index faa216d..5c39941 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -21,7 +21,7 @@ - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index e39fa6a..bedce68 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 0a23211..e70ad3d 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 d7f6db0..fed192e 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 6d8a41a..58b4fba 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 0a23211..e70ad3d 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ