diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo
index 21eadd8..d652e62 100644
Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ
diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx b/WebSCR/WebUserControls/mod_dettImpegno.ascx
index 6b71ad4..0504ba7 100644
--- a/WebSCR/WebUserControls/mod_dettImpegno.ascx
+++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx
@@ -235,14 +235,14 @@
- <%----%>
+
@@ -259,16 +259,8 @@
Nessun Task
- <%--
-
- --%>
- <%----%>
- <%--
-
- --%>
-
+ <%--
- <%-- --%>
@@ -278,31 +270,30 @@
-
+ --%>
-
+ <%--
-
+ --%>
@@ -310,17 +301,16 @@
-
+ <%--
-
+ --%>
-
-
+
@@ -328,23 +318,14 @@
+
+
+
+
+
+
-
-
-
-
- textbox x selezionare...
-
-
- GridView:
-
- Permetto di inserire uno o + task
-
- selettore testuale x ADD
-
- elenco task inseriti (gridview) che aggiornano i totali del tempi impegni (togliere da colonna fisica e fare solo calcolata?)
-
diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
index 05cc3b7..7c86382 100644
--- a/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
+++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx.cs
@@ -89,5 +89,14 @@ namespace WebSCR.WebUserControls
{
doUpdate();
}
+
+ protected void odsDettInt_Updating(object sender, ObjectDataSourceMethodEventArgs e)
+ {
+ // recupero valori consegna e note...
+ e.InputParameters["CodConsegna"] = ((DropDownList)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("ddlTipoCons")).SelectedValue;
+ e.InputParameters["Note"] = ((TextBox)grViewDettInt.Rows[grViewDettInt.EditIndex].FindControl("txtNote")).Text;
+ }
+
+
}
}
\ No newline at end of file
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 75a5b16..3999063 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 31a2d28..16ad2a6 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 a47fa96..7e3e20a 100644
Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ
diff --git a/WebSCR/logs/20150505.txt.zip b/WebSCR/logs/20150505.txt.zip
new file mode 100644
index 0000000..c3bb344
Binary files /dev/null and b/WebSCR/logs/20150505.txt.zip differ
diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache
index 91248a6..7688271 100644
Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ
diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll
index eba012c..16ad2a6 100644
Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ
diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs
index 4c414d9..21d98d0 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -10762,7 +10762,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 IdxImpegno, NumCons, CodConsegna, DescrConsegna, MinutiStd, NumOp, Elettro" +
@@ -10795,6 +10795,15 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
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("@IdxImpegno", 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("@CodConsegna", 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_DettImp_update";
+ 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_IdxImpegno", 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("@Original_NumCons", 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("@CodConsegna", 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("@Note", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10928,6 +10937,52 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
}
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 updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string CodConsegna, string Note) {
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+ if ((Original_IdxImpegno.HasValue == true)) {
+ command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value));
+ }
+ else {
+ command.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ if ((Original_NumCons.HasValue == true)) {
+ command.Parameters[2].Value = ((int)(Original_NumCons.Value));
+ }
+ else {
+ command.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ if ((CodConsegna == null)) {
+ command.Parameters[3].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[3].Value = ((string)(CodConsegna));
+ }
+ if ((Note == null)) {
+ command.Parameters[4].Value = global::System.DBNull.Value;
+ }
+ else {
+ command.Parameters[4].Value = ((string)(Note));
+ }
+ 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 146f977..aca4714 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -857,6 +857,20 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq
+
+
+
+ dbo.stp_DettImp_update
+
+
+
+
+
+
+
+
+
+
diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss
index eb23236..489eb46 100644
--- a/WebSCR_data/DS_Applicazione.xss
+++ b/WebSCR_data/DS_Applicazione.xss
@@ -15,7 +15,7 @@
-
+
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index c95106a..3999063 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 d3b76a2..7e3e20a 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/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll
index a47fa96..df8c0bd 100644
Binary files a/WebSCR_data/bin/Release/WebSCR_data.dll and b/WebSCR_data/bin/Release/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 c87daec..f573621 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 0705b51..0a9d71b 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 d3b76a2..7e3e20a 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
index cf5190c..4767c3f 100644
Binary files a/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ
diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll
index a47fa96..df8c0bd 100644
Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ