diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index bd2a2fb..e49e1fd 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx b/WebSCR/WebUserControls/mod_compSquadra.ascx index de750c8..0bdd3de 100644 --- a/WebSCR/WebUserControls/mod_compSquadra.ascx +++ b/WebSCR/WebUserControls/mod_compSquadra.ascx @@ -3,7 +3,8 @@
- + COMPOSIZIONE SQUADRA: TO BE DONE + diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx index dad537e..d0628c1 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -92,5 +92,6 @@ + diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index c740037..a180ea0 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -104,13 +104,13 @@ namespace WebSCR.WebUserControls protected void lbAdd_Click(object sender, EventArgs e) { // verifico se si possa inserire (ovvero totale tempo > minTempo e valore da inserire NEGATIVO...) - if (selTaskMin < 0 && (actualMin + selTaskMin) >= minTempoInt) + if (((actualMin + selTaskMin) >= minTempoInt)) { // fix warning lblWarning.Visible = false; lblWarning.Text = ""; - DtProxy.man.taDetImp.insertQuery(idxImpegno, ddlTipoCons.SelectedValue); + DtProxy.man.taDetImp.insertQuery(idxImpegno, matrOp, ddlTipoCons.SelectedValue); //doUpdate(); reportEvent(); } diff --git a/WebSCR/WebUserControls/mod_giornataASSD.ascx b/WebSCR/WebUserControls/mod_giornataASSD.ascx index 2abf227..5ce3588 100644 --- a/WebSCR/WebUserControls/mod_giornataASSD.ascx +++ b/WebSCR/WebUserControls/mod_giornataASSD.ascx @@ -33,6 +33,7 @@ + diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx index 60e5882..b3a903a 100644 --- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx +++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx @@ -1,6 +1,8 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_schemaSettASSD.ascx.cs" Inherits="WebSCR.WebUserControls.mod_schemaSettASSD" %> <%@ Register Src="~/WebUserControls/mod_giornataASSD.ascx" TagPrefix="uc1" TagName="mod_giornataASSD" %> <%@ Register Src="~/WebUserControls/mod_selData.ascx" TagPrefix="uc1" TagName="mod_selData" %> +<%@ Register Src="~/WebUserControls/mod_selSquadre.ascx" TagPrefix="uc1" TagName="mod_selSquadre" %> +
CLONA SETT PREC @@ -12,6 +14,9 @@ INIZIALIZZA SETT
+
+ +
@@ -39,7 +44,10 @@
-

-

+

+ + - +

Torna a schema SETTIMANALE diff --git a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs index a507e7b..731a7e6 100644 --- a/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_schemaSettASSD.ascx.designer.cs @@ -39,6 +39,15 @@ namespace WebSCR.WebUserControls { /// protected global::System.Web.UI.WebControls.LinkButton lbtInitWeek; + /// + /// 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; + /// /// repWeek control. /// diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index d20d5f4..7138664 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 34cdc1d..dc3eee6 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 b48f4ab..63d1055 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 a68f7f4..393b861 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -15522,6 +15522,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq 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("@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("@MatrOp", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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; @@ -15531,6 +15532,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq 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("@MatrOp", 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, "", "", "")); } @@ -15635,7 +15637,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 insertQuery(global::System.Nullable IdxImpegno, string CodConsegna) { + public virtual int insertQuery(global::System.Nullable IdxImpegno, string MatrOp, string CodConsegna) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(IdxImpegno.Value)); @@ -15643,11 +15645,17 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[1].Value = global::System.DBNull.Value; } - if ((CodConsegna == null)) { + if ((MatrOp == null)) { command.Parameters[2].Value = global::System.DBNull.Value; } else { - command.Parameters[2].Value = ((string)(CodConsegna)); + command.Parameters[2].Value = ((string)(MatrOp)); + } + if ((CodConsegna == null)) { + command.Parameters[3].Value = global::System.DBNull.Value; + } + else { + command.Parameters[3].Value = ((string)(CodConsegna)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -15669,7 +15677,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 updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string CodConsegna, string Note) { + public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable Original_NumCons, string CodConsegna, string MatrOp, string Note) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; if ((Original_IdxImpegno.HasValue == true)) { command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value)); @@ -15689,11 +15697,17 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq else { command.Parameters[3].Value = ((string)(CodConsegna)); } - if ((Note == null)) { + if ((MatrOp == null)) { command.Parameters[4].Value = global::System.DBNull.Value; } else { - command.Parameters[4].Value = ((string)(Note)); + command.Parameters[4].Value = ((string)(MatrOp)); + } + if ((Note == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(Note)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -17379,6 +17393,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)"; this._commandCollection[4].CommandText = "dbo.stp_ASS_getByDateSlot"; 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("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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] = new global::System.Data.SqlClient.SqlCommand(); @@ -17456,19 +17471,25 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)"; [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.AssegnSlotSquadreDipDataTable getSquadre_byDateSlot(global::System.Nullable Data, string Slot) { + public virtual DS_Applicazione.AssegnSlotSquadreDipDataTable getSquadre_byDateSlot(string CodSquadra, global::System.Nullable Data, string Slot) { this.Adapter.SelectCommand = this.CommandCollection[4]; - if ((Data.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(Data.Value)); - } - else { + if ((CodSquadra == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } - if ((Slot == null)) { - this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodSquadra)); + } + if ((Data.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(Data.Value)); } else { - this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Slot)); + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((Slot == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(Slot)); } DS_Applicazione.AssegnSlotSquadreDipDataTable dataTable = new DS_Applicazione.AssegnSlotSquadreDipDataTable(); this.Adapter.Fill(dataTable); diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 1859c9c..7d56a20 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -1051,6 +1051,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + @@ -1065,6 +1066,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + @@ -1406,6 +1408,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)dbo.stp_ASS_getByDateSlot + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 311a9ed..bc16bf6 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + - - + + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index d20d5f4..14a9761 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 b48f4ab..9273d14 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 dedfd0d..63d1055 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 c506334..212c838 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 1ed5056..8a78738 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 b48f4ab..9273d14 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/DesignTimeResolveAssemblyReferencesInput.cache b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index c6e8846..a9b7eb3 100644 Binary files a/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache 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 57efe07..65a4f1e 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 dedfd0d..63d1055 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ