diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index 12fc50a..42b3ead 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.031.49")] -[assembly: AssemblyFileVersion("1.0.031.49")] +[assembly: AssemblyVersion("1.1.035.51")] +[assembly: AssemblyFileVersion("1.1.035.51")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index 289d087..91f4988 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("1.0.031.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("1.0.031.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("1.1.035.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("1.1.035.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index bca10e7..6e05dec 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index 609d3f2..0733f2a 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index 56200f4..ee3ca68 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index bca10e7..6e05dec 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll index 53dd54c..dda888d 100644 Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 609d3f2..0733f2a 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 885dc19..d0c37c0 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Clienti.aspx b/WebSCR/Clienti.aspx index 47865d8..5b49f28 100644 --- a/WebSCR/Clienti.aspx +++ b/WebSCR/Clienti.aspx @@ -1,7 +1,10 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Clienti.aspx.cs" Inherits="WebSCR.Clienti" %> -<%@ Register src="WebUserControls/mod_elencoClienti.ascx" tagname="mod_elencoClienti" tagprefix="uc1" %> +<%@ Register src="~/WebUserControls/mod_elencoClienti.ascx" tagname="mod_elencoClienti" tagprefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_DocIntCli.ascx" TagPrefix="uc1" TagName="mod_DocIntCli" %> + - + + diff --git a/WebSCR/Clienti.aspx.cs b/WebSCR/Clienti.aspx.cs index 5c41ab0..e3e58aa 100644 --- a/WebSCR/Clienti.aspx.cs +++ b/WebSCR/Clienti.aspx.cs @@ -11,7 +11,36 @@ namespace WebSCR { protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + mod_DocIntCli.Visible = false; + } + mod_elencoClienti.eh_selCliente += mod_elencoClienti_eh_selCliente; + mod_DocIntCli.eh_return += mod_DocIntCli_eh_return; + } + void mod_DocIntCli_eh_return(object sender, EventArgs e) + { + toggleControls(); + } + /// + /// selezionato un cliente... + /// + /// + /// + void mod_elencoClienti_eh_selCliente(object sender, EventArgs e) + { + toggleControls(); + } + /// + /// effettua toggle su visibilità controlli + /// + private void toggleControls() + { + // la visibilità dell vista dett doc clienti è a questo punto come l'elenco clienti + mod_DocIntCli.Visible = mod_elencoClienti.Visible; + // cambio visibilità elenco clienti + mod_elencoClienti.Visible = !mod_elencoClienti.Visible; } } } \ No newline at end of file diff --git a/WebSCR/Clienti.aspx.designer.cs b/WebSCR/Clienti.aspx.designer.cs index 558561d..cf8ee8e 100644 --- a/WebSCR/Clienti.aspx.designer.cs +++ b/WebSCR/Clienti.aspx.designer.cs @@ -13,12 +13,21 @@ namespace WebSCR { public partial class Clienti { /// - /// mod_elencoClienti1 control. + /// mod_elencoClienti control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::WebSCR.WebUserControls.mod_elencoClienti mod_elencoClienti1; + protected global::WebSCR.WebUserControls.mod_elencoClienti mod_elencoClienti; + + /// + /// mod_DocIntCli control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebSCR.WebUserControls.mod_DocIntCli mod_DocIntCli; } } diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj index d1988f6..ddd5933 100644 --- a/WebSCR/WebSCR.csproj +++ b/WebSCR/WebSCR.csproj @@ -355,6 +355,7 @@ + @@ -536,6 +537,13 @@ mod_dispPeriodo.ascx + + mod_DocIntCli.ascx + ASPXCodeBehind + + + mod_DocIntCli.ascx + mod_elencoClienti.ascx ASPXCodeBehind diff --git a/WebSCR/WebUserControls/mod_DocIntCli.ascx b/WebSCR/WebUserControls/mod_DocIntCli.ascx new file mode 100644 index 0000000..4b85ae0 --- /dev/null +++ b/WebSCR/WebUserControls/mod_DocIntCli.ascx @@ -0,0 +1,138 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_DocIntCli.ascx.cs" Inherits="WebSCR.WebUserControls.mod_DocIntCli" %> + +
+
+
+ + + + + + + + + + + + + + Nessun risultato + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + Nessun risultato + + + + +
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+
+
+ + +   +   + + +
+
+
+ + + + +
+ +
+ + + + +
+ +
+
+ +
+ +
+ + + + + +
+ +
+ + + + +
+ +
+ + + + + + + + + +
+
+
diff --git a/WebSCR/WebUserControls/mod_DocIntCli.ascx.cs b/WebSCR/WebUserControls/mod_DocIntCli.ascx.cs new file mode 100644 index 0000000..bcdcbc3 --- /dev/null +++ b/WebSCR/WebUserControls/mod_DocIntCli.ascx.cs @@ -0,0 +1,87 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using WebSCR_data; + +namespace WebSCR.WebUserControls +{ + public partial class mod_DocIntCli : System.Web.UI.UserControl + { + public event EventHandler eh_return; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_return != null) + { + eh_return(this, new EventArgs()); + } + } + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void btnChiudi_Click(object sender, EventArgs e) + { + reportEvent(); + } + /// + /// ultimo comando letto da link button + /// + public string lastCmd { get; set; } + /// + /// evento selezione paziente... + /// + /// + /// + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // recupero dati paziente... + int IdxImpegno = 0; + DS_Applicazione.ImpegniRow riga;// = DtProxy.man.taImp.GetData()[0]; + try + { + IdxImpegno = Convert.ToInt32(grView.SelectedDataKey["IdxImpegno"]); + memLayer.ML.setSessionVal("IdxImpegno", IdxImpegno); + riga = DtProxy.man.taImp.getByKey(IdxImpegno)[0]; + memLayer.ML.setSessionVal("Cliente", string.Format("{0}", riga.RagSoc)); + memLayer.ML.setSessionVal("CodCliente", riga.CodCliente); + } + catch (Exception exc) + { + logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); + riga = DtProxy.man.taImp.GetData()[0]; + } + // rimando su pagina! + Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", "Pianificazione", riga.CodCliente, riga.Indir, riga.DataOra, IdxImpegno)); + } + protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) + { + // salvo il command argument... + lastCmd = e.CommandArgument.ToString(); + } + /// + /// verifica se valore passato è NON NULLO + /// + /// + /// + public bool notNull(object dataInizio) + { + bool answ = false; + try + { + answ = dataInizio.ToString() != ""; + } + catch + { } + return answ; + } + } +} \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_DocIntCli.ascx.designer.cs b/WebSCR/WebUserControls/mod_DocIntCli.ascx.designer.cs new file mode 100644 index 0000000..1ab80fe --- /dev/null +++ b/WebSCR/WebUserControls/mod_DocIntCli.ascx.designer.cs @@ -0,0 +1,60 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace WebSCR.WebUserControls { + + + public partial class mod_DocIntCli { + + /// + /// btnChiudi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnChiudi; + + /// + /// grViewDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewDoc; + + /// + /// odsDoc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsDoc; + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs b/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs index f4fad7b..2d8b424 100644 --- a/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoClienti.ascx.cs @@ -11,6 +11,18 @@ namespace WebSCR.WebUserControls { public partial class mod_elencoClienti : System.Web.UI.UserControl { + public event EventHandler eh_selCliente; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_selCliente != null) + { + eh_selCliente(this, new EventArgs()); + } + } protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -50,11 +62,12 @@ namespace WebSCR.WebUserControls memLayer.ML.setSessionVal("Cliente", string.Format("{0}", riga.RagSoc)); } - catch(Exception exc) + catch (Exception exc) { logger.lg.scriviLog(string.Format("Errore in rimando clienti --> interventi: {0}{1}", Environment.NewLine, exc)); } - + reportEvent(); +#if false if (lastCmd == "add") { // mando a AGGIUNTA intervento cliente! @@ -65,6 +78,8 @@ namespace WebSCR.WebUserControls // mando a dettaglio con filtro x cliente! Response.Redirect(string.Format("Interventi?FiltroCliente=1&ShowState=0&CodCliente={0}", grView.SelectedDataKey["CodCliente"])); } + +#endif } protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx b/WebSCR/WebUserControls/mod_elencoDisp.ascx index 9132783..c599c8c 100644 --- a/WebSCR/WebUserControls/mod_elencoDisp.ascx +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx @@ -1,4 +1,67 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoDisp.ascx.cs" Inherits="WebSCR.WebUserControls.mod_elencoDisp" %> <%@ Register Src="~/WebUserControls/mod_filtroPeriodo.ascx" TagPrefix="uc1" TagName="mod_filtroPeriodo" %> - +
+
+ +
+
+ +
+
+
+ +
+
+
+ + + +
+ +
+
+
+
+ + + + + + + + + + + + + + Nessun risultato + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs index 7d7ef1b..e7debe9 100644 --- a/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using WebSCR_data; namespace WebSCR.WebUserControls { @@ -11,7 +12,39 @@ namespace WebSCR.WebUserControls { protected void Page_Load(object sender, EventArgs e) { + if (!Page.IsPostBack) + { + mod_filtroPeriodo.numGG = 30; + } + } + protected void grView_RowCommand(object sender, GridViewCommandEventArgs e) + { + + } + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + } + + protected void btnAllSquadre_Click(object sender, EventArgs e) + { + // resetto sel rbl + rblSquadre.SelectedIndex = -1; + } + /// + /// selezione nuova squadra... + /// + /// + /// + protected void rblSquadre_SelectedIndexChanged(object sender, EventArgs e) + { + // aggiorno controllo... + } + + protected void btnCreaDisp_Click(object sender, EventArgs e) + { + DtProxy.man.taDisp.genDispSquadre(mod_filtroPeriodo.dataFrom, mod_filtroPeriodo.numGG); } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs b/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs index 9343fc9..9af2d79 100644 --- a/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_elencoDisp.ascx.designer.cs @@ -12,6 +12,15 @@ namespace WebSCR.WebUserControls { public partial class mod_elencoDisp { + /// + /// btnCreaDisp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnCreaDisp; + /// /// mod_filtroPeriodo control. /// @@ -20,5 +29,50 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::WebSCR.WebUserControls.mod_filtroPeriodo mod_filtroPeriodo; + + /// + /// btnAllSquadre 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; + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; } } diff --git a/WebSCR/WebUserControls/mod_elencoSquadre.ascx b/WebSCR/WebUserControls/mod_elencoSquadre.ascx index e291798..9b7a909 100644 --- a/WebSCR/WebUserControls/mod_elencoSquadre.ascx +++ b/WebSCR/WebUserControls/mod_elencoSquadre.ascx @@ -47,6 +47,18 @@ + + + + + + + + + + + + @@ -122,7 +134,7 @@ - + @@ -144,6 +156,7 @@ + diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 48ccb25..dc2439b 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 44f2b17..6525a58 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 527f4de..ea16053 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index 3b0a0b6..3cb6951 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 44f2b17..2ade440 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 ddd22a1..99e67e8 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -8645,6 +8645,7 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform, Attiva, CssColo this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Elettrod", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Clima", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Inform", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attiva", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4].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, "", "", "")); } @@ -8989,7 +8990,7 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform, Attiva, CssColo [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.Update, false)] - public virtual int UpdateQuery(string CodSquadra, string DescrSquadra, global::System.Nullable NumOp, global::System.Nullable Elettrod, global::System.Nullable Clima, global::System.Nullable Inform, string Original_CodSquadra) { + public virtual int UpdateQuery(string CodSquadra, string DescrSquadra, global::System.Nullable NumOp, global::System.Nullable Elettrod, global::System.Nullable Clima, global::System.Nullable Inform, global::System.Nullable Attiva, string Original_CodSquadra) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4]; if ((CodSquadra == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -9027,11 +9028,17 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform, Attiva, CssColo else { command.Parameters[6].Value = global::System.DBNull.Value; } - if ((Original_CodSquadra == null)) { - command.Parameters[7].Value = global::System.DBNull.Value; + if ((Attiva.HasValue == true)) { + command.Parameters[7].Value = ((bool)(Attiva.Value)); } else { - command.Parameters[7].Value = ((string)(Original_CodSquadra)); + command.Parameters[7].Value = global::System.DBNull.Value; + } + if ((Original_CodSquadra == null)) { + command.Parameters[8].Value = global::System.DBNull.Value; + } + else { + command.Parameters[8].Value = ((string)(Original_CodSquadra)); } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) @@ -12485,17 +12492,39 @@ 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[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM dbo.Disponibilita"; 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_Dis_getByData"; + this._commandCollection[1].CommandText = "dbo.stp_Dis_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("@Data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_genDispSquadre"; + 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("@dataFrom", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@numDay", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 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_Dis_getByData"; + 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("@Data", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[4].Connection = this.Connection; + this._commandCollection[4].CommandText = "dbo.stp_Dis_getByDataNumGg"; + 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.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumDay", 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("@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()] @@ -12527,7 +12556,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Applicazione.DisponibilitaDataTable getByData(global::System.Nullable Data) { - this.Adapter.SelectCommand = this.CommandCollection[1]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((Data.HasValue == true)) { this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(Data.Value)); } @@ -12539,6 +12568,35 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq 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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Applicazione.DisponibilitaDataTable getByDataNumGg(global::System.Nullable Data, global::System.Nullable NumDay, string CodSquadra) { + this.Adapter.SelectCommand = this.CommandCollection[4]; + if ((Data.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[1].Value = ((System.DateTime)(Data.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + if ((NumDay.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(NumDay.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + if ((CodSquadra == null)) { + this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodSquadra)); + } + DS_Applicazione.DisponibilitaDataTable dataTable = new DS_Applicazione.DisponibilitaDataTable(); + this.Adapter.Fill(dataTable); + 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")] @@ -12690,6 +12748,74 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq public virtual int Update(int OreDisp, int NumOp, System.DateTime Original_Data, string Original_CodSquadra, int Original_OreDisp, int Original_NumOp, global::System.Nullable Original_MinDisp) { return this.Update(Original_Data, Original_CodSquadra, OreDisp, NumOp, Original_Data, Original_CodSquadra, Original_OreDisp, Original_NumOp, Original_MinDisp); } + + [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(global::System.Nullable Original_Data, string Original_CodSquadra) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; + if ((Original_Data.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(Original_Data.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((Original_CodSquadra == null)) { + command.Parameters[2].Value = global::System.DBNull.Value; + } + else { + command.Parameters[2].Value = ((string)(Original_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; + } + + [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 genDispSquadre(global::System.Nullable dataFrom, global::System.Nullable numDay) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((dataFrom.HasValue == true)) { + command.Parameters[1].Value = ((System.DateTime)(dataFrom.Value)); + } + else { + command.Parameters[1].Value = global::System.DBNull.Value; + } + if ((numDay.HasValue == true)) { + command.Parameters[2].Value = ((int)(numDay.Value)); + } + else { + command.Parameters[2].Value = global::System.DBNull.Value; + } + 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; + } } /// @@ -13440,7 +13566,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[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 TIPOPROTOC, NUMERO, ESERPROTOC, NUMEPROTOC, DATAPROTOC, ESERRIFERI, NUMERI" + @@ -13449,33 +13575,39 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq 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_DOC_GetLast"; + this._commandCollection[1].CommandText = "dbo.stp_DOC_GetByCodCliente"; 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("@CodCliente", 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_DOC_upsert"; + this._commandCollection[2].CommandText = "dbo.stp_DOC_GetLast"; 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("@TIPOPROTOC", global::System.Data.SqlDbType.NVarChar, 2, 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("@NUMERO", global::System.Data.SqlDbType.NVarChar, 7, 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("@ESERPROTOC", global::System.Data.SqlDbType.NVarChar, 4, 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("@NUMEPROTOC", global::System.Data.SqlDbType.NVarChar, 7, 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("@DATAPROTOC", global::System.Data.SqlDbType.NVarChar, 8, 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("@ESERRIFERI", global::System.Data.SqlDbType.NVarChar, 4, 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("@NUMERIFERI", global::System.Data.SqlDbType.NVarChar, 7, 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("@TIPORIFERI", global::System.Data.SqlDbType.NVarChar, 2, 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("@DATARIFERI", global::System.Data.SqlDbType.NVarChar, 8, 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("@NUMEDOCRIF", global::System.Data.SqlDbType.NVarChar, 10, 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("@DATADOCRIF", global::System.Data.SqlDbType.NVarChar, 8, 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("@ESERCOLLEG", global::System.Data.SqlDbType.NVarChar, 4, 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("@CLI_FOR", global::System.Data.SqlDbType.NVarChar, 10, 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("@DESTINATAR", global::System.Data.SqlDbType.NVarChar, 10, 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("@RGSOC_DEST", 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("@INDIR_DEST", global::System.Data.SqlDbType.NVarChar, 35, 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("@LOCAL_DEST", global::System.Data.SqlDbType.NVarChar, 35, 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("@CAP_DEST", global::System.Data.SqlDbType.NVarChar, 5, 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("@ULT_AGG", global::System.Data.SqlDbType.NVarChar, 8, 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_DOC_upsert"; + 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("@TIPOPROTOC", global::System.Data.SqlDbType.NVarChar, 2, 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("@NUMERO", global::System.Data.SqlDbType.NVarChar, 7, 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("@ESERPROTOC", global::System.Data.SqlDbType.NVarChar, 4, 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("@NUMEPROTOC", global::System.Data.SqlDbType.NVarChar, 7, 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("@DATAPROTOC", global::System.Data.SqlDbType.NVarChar, 8, 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("@ESERRIFERI", global::System.Data.SqlDbType.NVarChar, 4, 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("@NUMERIFERI", global::System.Data.SqlDbType.NVarChar, 7, 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("@TIPORIFERI", global::System.Data.SqlDbType.NVarChar, 2, 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("@DATARIFERI", global::System.Data.SqlDbType.NVarChar, 8, 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("@NUMEDOCRIF", global::System.Data.SqlDbType.NVarChar, 10, 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("@DATADOCRIF", global::System.Data.SqlDbType.NVarChar, 8, 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("@ESERCOLLEG", global::System.Data.SqlDbType.NVarChar, 4, 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("@CLI_FOR", global::System.Data.SqlDbType.NVarChar, 10, 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("@DESTINATAR", global::System.Data.SqlDbType.NVarChar, 10, 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("@RGSOC_DEST", 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("@INDIR_DEST", global::System.Data.SqlDbType.NVarChar, 35, 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("@LOCAL_DEST", global::System.Data.SqlDbType.NVarChar, 35, 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("@CAP_DEST", global::System.Data.SqlDbType.NVarChar, 5, 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("@ULT_AGG", global::System.Data.SqlDbType.NVarChar, 8, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13506,8 +13638,25 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq [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.DB2_DOCSDataTable getLast() { + public virtual DS_Applicazione.DB2_DOCSDataTable getByCodCliente(string CodCliente) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((CodCliente == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodCliente)); + } + DS_Applicazione.DB2_DOCSDataTable dataTable = new DS_Applicazione.DB2_DOCSDataTable(); + this.Adapter.Fill(dataTable); + 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")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Applicazione.DB2_DOCSDataTable getLast() { + this.Adapter.SelectCommand = this.CommandCollection[2]; DS_Applicazione.DB2_DOCSDataTable dataTable = new DS_Applicazione.DB2_DOCSDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -13719,7 +13868,7 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq string LOCAL_DEST, string CAP_DEST, string ULT_AGG) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; if ((TIPOPROTOC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd index 9c80024..b52b2d5 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -135,6 +135,7 @@ SELECT CodSquadra, DescrSquadra, NumOp, Elettrod, Clima, Inform, Attiva, CssColo + @@ -859,6 +860,30 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + dbo.stp_Dis_delete + + + + + + + + + + + + dbo.stp_genDispSquadre + + + + + + + + @@ -870,6 +895,19 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + dbo.stp_Dis_getByDataNumGg + + + + + + + + + @@ -1054,6 +1092,17 @@ SELECT Data, CodSquadra, OreDisp, NumOp, MinDisp FROM Disponibilita WHERE (CodSq + + + + dbo.stp_DOC_GetByCodCliente + + + + + + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index da19864..b4354ce 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,35 +4,31 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - - + + - + - + - - + + - 742 + 765 720 - 742 - 821 - - - 778 - 821 + 765 + 839 diff --git a/WebSCR_data/DtProxy.cs b/WebSCR_data/DtProxy.cs index d936d76..ccc7251 100644 --- a/WebSCR_data/DtProxy.cs +++ b/WebSCR_data/DtProxy.cs @@ -30,6 +30,7 @@ namespace WebSCR_data taDetImp = new DS_ApplicazioneTableAdapters.DettImpegnoTableAdapter(); taVcz = new DS_ApplicazioneTableAdapters.v_clientiZoneTableAdapter(); taDocs = new DS_ApplicazioneTableAdapters.DB2_DOCSTableAdapter(); + taDisp = new DS_ApplicazioneTableAdapters.DisponibilitaTableAdapter(); taFile = new DS_UtilityTableAdapters.tblFilesTableAdapter(); taListVal = new DS_UtilityTableAdapters.ListValuesTableAdapter(); } @@ -49,6 +50,7 @@ namespace WebSCR_data taDetImp.Connection.ConnectionString = connStr; taVcz.Connection.ConnectionString = connStr; taDocs.Connection.ConnectionString = connStr; + taDisp.Connection.ConnectionString = connStr; taFile.Connection.ConnectionString = connStrFiles; taListVal.Connection.ConnectionString = connStrFiles; } @@ -65,6 +67,7 @@ namespace WebSCR_data public DS_ApplicazioneTableAdapters.DettImpegnoTableAdapter taDetImp; public DS_ApplicazioneTableAdapters.v_clientiZoneTableAdapter taVcz; public DS_ApplicazioneTableAdapters.DB2_DOCSTableAdapter taDocs; + public DS_ApplicazioneTableAdapters.DisponibilitaTableAdapter taDisp; public DS_UtilityTableAdapters.tblFilesTableAdapter taFile; public DS_UtilityTableAdapters.ListValuesTableAdapter taListVal; diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index 48ccb25..ceb632e 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 527f4de..01a9c96 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 afbcee5..ea16053 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 c5455c5..3eea75a 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 6ad9166..006f3af 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 527f4de..01a9c96 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 7a6497f..ea4b106 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/TempPE/DS_Utility.Designer.cs.dll b/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll index c8fd06b..a92ecd7 100644 Binary files a/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll and b/WebSCR_data/obj/Release/TempPE/DS_Utility.Designer.cs.dll differ diff --git a/WebSCR_data/obj/Release/WebSCR_data.dll b/WebSCR_data/obj/Release/WebSCR_data.dll index afbcee5..ea16053 100644 Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ