diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 179428f..a06cd72 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 0f7aa2b..aa3c061 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 0f7aa2b..aa3c061 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx b/WebSCR/WebUserControls/mod_Interventi.ascx index c1a7d67..49374ba 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx +++ b/WebSCR/WebUserControls/mod_Interventi.ascx @@ -1,4 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_Interventi.ascx.cs" Inherits="WebSCR.WebUserControls.mod_Interventi" %> +<%@ Register Src="~/WebUserControls/mod_selSquadre.ascx" TagPrefix="uc1" TagName="mod_selSquadre" %> +
@@ -54,7 +56,8 @@
-
+ + <%--
@@ -64,7 +67,7 @@
-
+
--%>
@@ -193,7 +196,8 @@ - + <%----%> + diff --git a/WebSCR/WebUserControls/mod_Interventi.ascx.designer.cs b/WebSCR/WebUserControls/mod_Interventi.ascx.designer.cs index 5bece24..bd481c5 100644 --- a/WebSCR/WebUserControls/mod_Interventi.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_Interventi.ascx.designer.cs @@ -94,31 +94,13 @@ namespace WebSCR.WebUserControls { protected global::System.Web.UI.WebControls.DropDownList ddlRecAgeDd; /// - /// btnAllSquadre control. + /// mod_selSquadre 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; + protected global::WebSCR.WebUserControls.mod_selSquadre mod_selSquadre; /// /// grView control. diff --git a/WebSCR/WebUserControls/mod_dispPeriodo.ascx b/WebSCR/WebUserControls/mod_dispPeriodo.ascx index c9ce1ef..81c6f2a 100644 --- a/WebSCR/WebUserControls/mod_dispPeriodo.ascx +++ b/WebSCR/WebUserControls/mod_dispPeriodo.ascx @@ -23,6 +23,6 @@ - + diff --git a/WebSCR_data/DS_Applicazione.Designer.cs b/WebSCR_data/DS_Applicazione.Designer.cs index a52ebb5..e0f27e9 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -11320,7 +11320,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Stato", 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("@DataRif", 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("@NumGg", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 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("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 2500, 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("@RecAgeDd", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 43ab449..13a4624 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -626,7 +626,7 @@ FROM v_elencoImpegni - + @@ -1154,7 +1154,7 @@ FROM raw.DB2_DOCS - + @@ -1186,7 +1186,7 @@ FROM raw.DB2_DOCS - + @@ -1222,7 +1222,7 @@ FROM raw.DB2_DOCS - + @@ -1247,7 +1247,7 @@ FROM raw.DB2_DOCS - + @@ -1331,7 +1331,7 @@ FROM raw.DB2_DOCS - + @@ -1469,7 +1469,7 @@ FROM raw.DB2_DOCS - + @@ -1479,7 +1479,7 @@ FROM raw.DB2_DOCS - + @@ -1495,7 +1495,7 @@ FROM raw.DB2_DOCS - + @@ -1525,7 +1525,7 @@ FROM raw.DB2_DOCS - + @@ -1542,7 +1542,7 @@ FROM raw.DB2_DOCS - + @@ -1577,7 +1577,7 @@ FROM raw.DB2_DOCS - + @@ -1632,7 +1632,7 @@ FROM raw.DB2_DOCS - + @@ -1830,7 +1830,7 @@ FROM raw.DB2_DOCS - + \ No newline at end of file diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 08f6ccb..85e85df 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,20 +4,20 @@ 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 7cff1f2..cae3206 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 93c886b..b279548 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 b733d4c..7313133 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 3cedefe..d3b9fb4 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 93c886b..b279548 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ