diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo
index 9e6b505..245a9c0 100644
Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ
diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs
index 8523297..1eda281 100644
--- a/VersGen/WebSC.cs
+++ b/VersGen/WebSC.cs
@@ -5,7 +5,7 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.5.051.169")]
-[assembly: AssemblyFileVersion("1.5.051.169")]
+[assembly: AssemblyVersion("1.6.057.170")]
+[assembly: AssemblyFileVersion("1.6.057.170")]
[assembly: AssemblyCopyright("Steamware © 2015-2015")]
[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt
index c1a632c..0b7bb3a 100644
--- a/VersGen/WebSC.tt
+++ b/VersGen/WebSC.tt
@@ -6,8 +6,8 @@
using System.Reflection;
-[assembly: AssemblyVersion("1.5.051.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("1.5.051.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("1.6.057.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("1.6.057.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
diff --git a/VersGen/obj/Release/TempPE/WebSC.cs.dll b/VersGen/obj/Release/TempPE/WebSC.cs.dll
index a7f004c..b362495 100644
Binary files a/VersGen/obj/Release/TempPE/WebSC.cs.dll and b/VersGen/obj/Release/TempPE/WebSC.cs.dll differ
diff --git a/WebSCR/Cronologico.aspx b/WebSCR/Cronologico.aspx
index 83c8264..22ccdb1 100644
--- a/WebSCR/Cronologico.aspx
+++ b/WebSCR/Cronologico.aspx
@@ -1,5 +1,15 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Cronologico.aspx.cs" Inherits="WebSCR.Cronologico" %>
+<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %>
+<%@ Register Src="~/WebUserControls/mod_cronologico.ascx" TagPrefix="uc1" TagName="mod_cronologico" %>
+
+
+
+
diff --git a/WebSCR/Cronologico.aspx.designer.cs b/WebSCR/Cronologico.aspx.designer.cs
index 3895b02..1603858 100644
--- a/WebSCR/Cronologico.aspx.designer.cs
+++ b/WebSCR/Cronologico.aspx.designer.cs
@@ -3,15 +3,31 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace WebSCR
-{
-
-
- public partial class Cronologico
- {
+namespace WebSCR {
+
+
+ public partial class Cronologico {
+
+ ///
+ /// mod_cronologico control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_cronologico mod_cronologico;
+
+ ///
+ /// mod_impegno control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_impegno mod_impegno;
}
}
diff --git a/WebSCR/ElencoInt.aspx b/WebSCR/ElencoInt.aspx
new file mode 100644
index 0000000..d779dd4
--- /dev/null
+++ b/WebSCR/ElencoInt.aspx
@@ -0,0 +1,13 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="ElencoInt.aspx.cs" Inherits="WebSCR.ElencoInt" %>
+<%@ Register Src="~/WebUserControls/mod_Interventi.ascx" TagName="mod_Interventi" TagPrefix="uc1" %>
+<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/WebSCR/ElencoInt.aspx.cs b/WebSCR/ElencoInt.aspx.cs
new file mode 100644
index 0000000..9d0f0f7
--- /dev/null
+++ b/WebSCR/ElencoInt.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebSCR
+{
+ public partial class ElencoInt : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/ElencoInt.aspx.designer.cs b/WebSCR/ElencoInt.aspx.designer.cs
new file mode 100644
index 0000000..92eb561
--- /dev/null
+++ b/WebSCR/ElencoInt.aspx.designer.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------
+//
+// 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 {
+
+
+ public partial class ElencoInt {
+
+ ///
+ /// mod_Interventi1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_Interventi mod_Interventi1;
+
+ ///
+ /// mod_impegno control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::WebSCR.WebUserControls.mod_impegno mod_impegno;
+ }
+}
diff --git a/WebSCR/Interventi.aspx b/WebSCR/Interventi.aspx
index f7f2557..c17fe70 100644
--- a/WebSCR/Interventi.aspx
+++ b/WebSCR/Interventi.aspx
@@ -2,7 +2,6 @@
<%@ Register Src="~/WebUserControls/mod_Interventi.ascx" TagName="mod_Interventi" TagPrefix="uc1" %>
<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %>
-<%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %>
diff --git a/WebSCR/WebSCR.csproj b/WebSCR/WebSCR.csproj
index 0b9f165..2d6f483 100644
--- a/WebSCR/WebSCR.csproj
+++ b/WebSCR/WebSCR.csproj
@@ -353,6 +353,7 @@
+
@@ -393,6 +394,7 @@
+
@@ -462,6 +464,13 @@
Default.aspx
+
+ ElencoInt.aspx
+ ASPXCodeBehind
+
+
+ ElencoInt.aspx
+
Interventi.aspx
ASPXCodeBehind
@@ -592,6 +601,13 @@
mod_consegne.ascx
+
+ mod_cronologico.ascx
+ ASPXCodeBehind
+
+
+ mod_cronologico.ascx
+
mod_dettInt.ascx
ASPXCodeBehind
diff --git a/WebSCR/WebUserControls/mod_cronologico.ascx b/WebSCR/WebUserControls/mod_cronologico.ascx
new file mode 100644
index 0000000..57a29ae
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_cronologico.ascx
@@ -0,0 +1,153 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_cronologico.ascx.cs" Inherits="WebSCR.WebUserControls.mod_cronologico" %>
+
+
+
+
+
+
+
(data inserimento ordine)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nessun risultato
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%--
+
+
+ --%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebSCR/WebUserControls/mod_cronologico.ascx.cs b/WebSCR/WebUserControls/mod_cronologico.ascx.cs
new file mode 100644
index 0000000..08c89f3
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_cronologico.ascx.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using SteamWare;
+using WebSCR_data;
+
+namespace WebSCR.WebUserControls
+{
+ public partial class mod_cronologico : System.Web.UI.UserControl
+ {
+ public event EventHandler eh_selData;
+ ///
+ /// solleva evento selezione data
+ ///
+ protected void reportEvent()
+ {
+ // evento!
+ if (eh_selData != null)
+ {
+ eh_selData(this, new EventArgs());
+ }
+ }
+
+ ///
+ /// data riferimento
+ ///
+ public DateTime dataFrom
+ {
+ get
+ {
+ DateTime answ = DateTime.Now.Date;
+ try
+ {
+ answ = Convert.ToDateTime(txtDataFrom.Text.Trim());
+ }
+ catch
+ { }
+ return answ;
+ }
+ set
+ {
+ txtDataFrom.Text = value.ToString("yyyy-MM-dd");
+ }
+ }
+ ///
+ /// data selezionata (da query string o inizializzata...
+ ///
+ protected DateTime dataSel
+ {
+ get
+ {
+ DateTime answ = DateTime.Now;
+ if (memLayer.ML.isInSessionObject("DataRif"))
+ {
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.StringSessionObj("DataRif"));
+ }
+ catch
+ { }
+ }
+ else if (memLayer.ML.getCookieVal("DataRif") != "")
+ {
+ try
+ {
+ answ = Convert.ToDateTime(memLayer.ML.getCookieVal("DataRif"));
+ }
+ catch
+ { }
+ }
+ return answ;
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("DataRif", value);
+ }
+ }
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ dataFrom = dataSel;
+ }
+ }
+ ///
+ /// ultimo comando letto da link button
+ ///
+ public string lastCmd { get; set; }
+
+ protected void txtDataFrom_TextChanged(object sender, EventArgs e)
+ {
+ dataSel = Convert.ToDateTime(txtDataFrom.Text);
+ reportEvent();
+ }
+
+ 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;
+ }
+ ///
+ /// 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));
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebSCR/WebUserControls/mod_cronologico.ascx.designer.cs b/WebSCR/WebUserControls/mod_cronologico.ascx.designer.cs
new file mode 100644
index 0000000..1a1bc76
--- /dev/null
+++ b/WebSCR/WebUserControls/mod_cronologico.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_cronologico {
+
+ ///
+ /// ddlStato control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DropDownList ddlStato;
+
+ ///
+ /// txtDataFrom control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtDataFrom;
+
+ ///
+ /// txtSearch control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtSearch;
+
+ ///
+ /// 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_footer.ascx b/WebSCR/WebUserControls/mod_footer.ascx
index 2631f28..5aca6ff 100644
--- a/WebSCR/WebUserControls/mod_footer.ascx
+++ b/WebSCR/WebUserControls/mod_footer.ascx
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_footer.ascx.cs" Inherits="WebSCR.WebUserControls.mod_footer" %>
diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs
index de57ce3..aa24913 100644
--- a/WebSCR/WebUserControls/mod_header.ascx.cs
+++ b/WebSCR/WebUserControls/mod_header.ascx.cs
@@ -128,7 +128,7 @@ namespace WebSCR.WebUserControls
}
// in base alla pagina corrente decido cosa mostrare in header...
- if (devicesAuthProxy.pagCorrente == "Cronologico")
+ if (devicesAuthProxy.pagCorrente == "Cronologico" || devicesAuthProxy.pagCorrente == "ElencoInt")
{
ulStd.Visible = false;
ulSquadra.Visible = false;
diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll
index 54d1e9a..09b19ae 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 95798f4..29b815e 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 e7013bb..3cacf2b 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -12306,7 +12306,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[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[10];
+ this._commandCollection = new global::System.Data.SqlClient.SqlCommand[11];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_elencoImpegni";
@@ -12335,62 +12335,69 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
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;
- this._commandCollection[4].CommandText = "dbo.stp_Imp_insertQuery";
+ this._commandCollection[4].CommandText = "dbo.stp_Imp_getBySearchCronologico";
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("@DataOra", 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("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, 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("@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("@RifOC", 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("@anno", 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("@Stato", 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("@DataCreaz", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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_Imp_recFineInt";
+ this._commandCollection[5].CommandText = "dbo.stp_Imp_insertQuery";
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("@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("@FineInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, 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, "", "", ""));
+ this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", 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("@anno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[6].Connection = this.Connection;
- this._commandCollection[6].CommandText = "dbo.stp_Imp_recStartInt";
+ this._commandCollection[6].CommandText = "dbo.stp_Imp_recFineInt";
this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[6].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[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InizioInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@FineInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonFine", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[7].Connection = this.Connection;
- this._commandCollection[7].CommandText = "dbo.stp_Imp_updateQuery";
+ this._commandCollection[7].CommandText = "dbo.stp_Imp_recStartInt";
this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[7].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[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NoteGen", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UrlDoc", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumOp", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RitUsato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Ascensore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PianoCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InizioInt", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LatInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LonInizio", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 53, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[8].Connection = this.Connection;
- this._commandCollection[8].CommandText = "dbo.stp_Imp_updNoteInt";
+ this._commandCollection[8].CommandText = "dbo.stp_Imp_updateQuery";
this._commandCollection[8].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[8].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[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NoteInt", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoOrario", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].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[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RifOC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NoteGen", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UrlDoc", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NumOp", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RitUsato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Ascensore", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PianoCons", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[8].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UserMod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[9] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[9].Connection = this.Connection;
- this._commandCollection[9].CommandText = "dbo.stp_Imp_updStart";
+ this._commandCollection[9].CommandText = "dbo.stp_Imp_updNoteInt";
this._commandCollection[9].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[9].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[9].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[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraNew", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@NoteInt", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[10] = new global::System.Data.SqlClient.SqlCommand();
+ this._commandCollection[10].Connection = this.Connection;
+ this._commandCollection[10].CommandText = "dbo.stp_Imp_updStart";
+ this._commandCollection[10].CommandType = global::System.Data.CommandType.StoredProcedure;
+ this._commandCollection[10].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[10].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[10].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraNew", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -12492,11 +12499,34 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
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.ImpegniDataTable getBySearchCron(string Stato, global::System.Nullable DataCreaz) {
+ this.Adapter.SelectCommand = this.CommandCollection[4];
+ if ((Stato == null)) {
+ this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Stato));
+ }
+ if ((DataCreaz.HasValue == true)) {
+ this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(DataCreaz.Value));
+ }
+ else {
+ this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
+ }
+ DS_Applicazione.ImpegniDataTable dataTable = new DS_Applicazione.ImpegniDataTable();
+ 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")]
public virtual int insertQuery(global::System.Nullable DataOra, string TipoOrario, string CodSquadra, string RifOC, global::System.Nullable anno) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
if ((DataOra.HasValue == true)) {
command.Parameters[1].Value = ((System.DateTime)(DataOra.Value));
}
@@ -12548,7 +12578,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int recFineInt(global::System.Nullable IdxImpegno, global::System.Nullable FineInt, global::System.Nullable LatFine, global::System.Nullable LonFine) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
if ((IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxImpegno.Value));
}
@@ -12594,7 +12624,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int recStartInt(global::System.Nullable IdxImpegno, global::System.Nullable InizioInt, global::System.Nullable LatInizio, global::System.Nullable LonInizio) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
if ((IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxImpegno.Value));
}
@@ -12640,7 +12670,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[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, string TipoOrario, string CodSquadra, string RifOC, string NoteGen, string UrlDoc, global::System.Nullable NumOp, global::System.Nullable RitUsato, global::System.Nullable Ascensore, global::System.Nullable PianoCons, string UserMod) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8];
if ((Original_IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value));
}
@@ -12728,7 +12758,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updNoteInt(global::System.Nullable IdxImpegno, string NoteInt) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[8];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9];
if ((IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxImpegno.Value));
}
@@ -12762,7 +12792,7 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updStart(global::System.Nullable IdxImpegno, global::System.Nullable DataOraNew) {
- global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9];
+ global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[10];
if ((IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(IdxImpegno.Value));
}
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 4502544..4fce611 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -632,6 +632,18 @@ FROM v_elencoImpegni
+
+
+
+ dbo.stp_Imp_getBySearchCronologico
+
+
+
+
+
+
+
+
@@ -1270,7 +1282,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1302,7 +1314,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1338,7 +1350,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1363,7 +1375,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1447,7 +1459,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1585,7 +1597,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1595,7 +1607,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1611,7 +1623,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1641,7 +1653,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1658,7 +1670,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1693,7 +1705,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1748,7 +1760,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1894,7 +1906,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -1923,7 +1935,7 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
@@ -2019,9 +2031,9 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
-
-
+
+
+
\ No newline at end of file
diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss
index 54d227d..4bdd2d3 100644
--- a/WebSCR_data/DS_Applicazione.xss
+++ b/WebSCR_data/DS_Applicazione.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
diff --git a/WebSCR_data/bin/Release/WebSCR_data.dll b/WebSCR_data/bin/Release/WebSCR_data.dll
index 95798f4..29b815e 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/Release/DesignTimeResolveAssemblyReferences.cache b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.cache
index f8bbc8b..2e4a892 100644
Binary files a/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/WebSCR_data/obj/Release/DesignTimeResolveAssemblyReferences.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 eb0f8de..c5022ce 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 95798f4..29b815e 100644
Binary files a/WebSCR_data/obj/Release/WebSCR_data.dll and b/WebSCR_data/obj/Release/WebSCR_data.dll differ