diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo
index ecbbb0a..bb84dbf 100644
Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ
diff --git a/WebSCR/WebUserControls/mod_dettImpegno.ascx b/WebSCR/WebUserControls/mod_dettImpegno.ascx
index 1047065..4b1af4a 100644
--- a/WebSCR/WebUserControls/mod_dettImpegno.ascx
+++ b/WebSCR/WebUserControls/mod_dettImpegno.ascx
@@ -67,11 +67,8 @@
CodCliente:
- Cognome:
-
-
- Nome:
-
+ Rag Soc:
+
CodFis:
@@ -177,11 +174,8 @@
CodCliente:
- Cognome:
-
-
- Nome:
-
+ Rag Soc:
+
CodFis:
diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx b/WebSCR/WebUserControls/mod_schedaGiorno.ascx
index fc194df..ea36d1f 100644
--- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx
+++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx
@@ -4,7 +4,7 @@
diff --git a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs
index 3a73bd5..76267d7 100644
--- a/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs
+++ b/WebSCR/WebUserControls/mod_schedaGiorno.ascx.cs
@@ -89,7 +89,7 @@ namespace WebSCR.WebUserControls
{
// recupero indirizzo e cliente !!FARE!!!
// selezionato periodo, salvo evento inizio...
- DtProxy.man.taImp.insertQuery(e.Start, "INDIC", rblSquadre.SelectedValue, memLayer.ML.StringSessionObj("CodCliente"), "OC00000000", "via Provinciale 29", "24044", "DALMINE", "BG");
+ DtProxy.man.taImp.insertQuery(e.Start, "INDIC", rblSquadre.SelectedValue, "OC00000000");
}
doUpdate();
}
@@ -157,7 +157,9 @@ namespace WebSCR.WebUserControls
protected void DayPilotCalendar1_EventClick(object sender, DayPilot.Web.Ui.Events.EventClickEventArgs e)
{
- Response.Redirect(string.Format("Pianificazione?CodCliente={0}&Indir={1}&Data={2:yyyy-MM-dd}&IdxImpegno", qsVal("CodCliente"), qsVal("Indir"), qsVal("Data"), e.Id));
+#if false
+ Response.Redirect(string.Format("{0}?CodCliente={1}&Indir={2}&Data={3:yyyy-MM-dd}&IdxImpegno={4}", devicesAuthProxy.pagCorrente, qsVal("CodCliente"), qsVal("Indir"), qsVal("Data"), e.Id));
+#endif
}
}
}
\ No newline at end of file
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index 0f97520..18e1fb8 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 e3e6fe7..8f3e19e 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 aedaf4e..3aa6a3a 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 573f828..08500e8 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 e3e6fe7..8f3e19e 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 930a63c..ad7bdfb 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -8754,12 +8754,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
this._commandCollection[3].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[3].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[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSquadra", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
- this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", 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("@RifOC", 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", 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("@Cap", 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("@Localita", 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("@Prov", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 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_updateQuery";
@@ -8768,12 +8763,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
this._commandCollection[4].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[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("@Indir", 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("@Cap", 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("@Localita", 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("@Prov", global::System.Data.SqlDbType.NVarChar, 2, 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("@CodCliente", 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("@NoteGen", global::System.Data.SqlDbType.NVarChar, 250, 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("@UrlDoc", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -8852,7 +8842,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
[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 CodCliente, string RifOC, string Indir, string Cap, string Localita, string Prov) {
+ public virtual int insertQuery(global::System.Nullable DataOra, string TipoOrario, string CodSquadra, string RifOC) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3];
if ((DataOra.HasValue == true)) {
command.Parameters[1].Value = ((System.DateTime)(DataOra.Value));
@@ -8872,41 +8862,11 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
else {
command.Parameters[3].Value = ((string)(CodSquadra));
}
- if ((CodCliente == null)) {
+ if ((RifOC == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[4].Value = ((string)(CodCliente));
- }
- if ((RifOC == null)) {
- command.Parameters[5].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[5].Value = ((string)(RifOC));
- }
- if ((Indir == null)) {
- command.Parameters[6].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[6].Value = ((string)(Indir));
- }
- if ((Cap == null)) {
- command.Parameters[7].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[7].Value = ((string)(Cap));
- }
- if ((Localita == null)) {
- command.Parameters[8].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[8].Value = ((string)(Localita));
- }
- if ((Prov == null)) {
- command.Parameters[9].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[9].Value = ((string)(Prov));
+ command.Parameters[4].Value = ((string)(RifOC));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
@@ -8928,24 +8888,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
- public virtual int updateQuery(
- global::System.Nullable Original_IdxImpegno,
- global::System.Nullable DataOra,
- string TipoOrario,
- string Indir,
- string Cap,
- string Localita,
- string Prov,
- string CodSquadra,
- string CodCliente,
- string RifOC,
- string NoteGen,
- string UrlDoc,
- global::System.Nullable NumOp,
- global::System.Nullable RitUsato,
- global::System.Nullable Ascensore,
- global::System.Nullable PianoCons,
- string UserMod) {
+ public virtual int updateQuery(global::System.Nullable Original_IdxImpegno, global::System.Nullable DataOra, 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[4];
if ((Original_IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value));
@@ -8965,89 +8908,59 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
else {
command.Parameters[3].Value = ((string)(TipoOrario));
}
- if ((Indir == null)) {
+ if ((CodSquadra == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[4].Value = ((string)(Indir));
+ command.Parameters[4].Value = ((string)(CodSquadra));
}
- if ((Cap == null)) {
+ if ((RifOC == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[5].Value = ((string)(Cap));
+ command.Parameters[5].Value = ((string)(RifOC));
}
- if ((Localita == null)) {
+ if ((NoteGen == null)) {
command.Parameters[6].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[6].Value = ((string)(Localita));
+ command.Parameters[6].Value = ((string)(NoteGen));
}
- if ((Prov == null)) {
+ if ((UrlDoc == null)) {
command.Parameters[7].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[7].Value = ((string)(Prov));
+ command.Parameters[7].Value = ((string)(UrlDoc));
}
- if ((CodSquadra == null)) {
+ if ((NumOp.HasValue == true)) {
+ command.Parameters[8].Value = ((int)(NumOp.Value));
+ }
+ else {
command.Parameters[8].Value = global::System.DBNull.Value;
}
- else {
- command.Parameters[8].Value = ((string)(CodSquadra));
+ if ((RitUsato.HasValue == true)) {
+ command.Parameters[9].Value = ((int)(RitUsato.Value));
}
- if ((CodCliente == null)) {
+ else {
command.Parameters[9].Value = global::System.DBNull.Value;
}
- else {
- command.Parameters[9].Value = ((string)(CodCliente));
+ if ((Ascensore.HasValue == true)) {
+ command.Parameters[10].Value = ((int)(Ascensore.Value));
}
- if ((RifOC == null)) {
+ else {
command.Parameters[10].Value = global::System.DBNull.Value;
}
- else {
- command.Parameters[10].Value = ((string)(RifOC));
+ if ((PianoCons.HasValue == true)) {
+ command.Parameters[11].Value = ((int)(PianoCons.Value));
}
- if ((NoteGen == null)) {
+ else {
command.Parameters[11].Value = global::System.DBNull.Value;
}
- else {
- command.Parameters[11].Value = ((string)(NoteGen));
- }
- if ((UrlDoc == null)) {
+ if ((UserMod == null)) {
command.Parameters[12].Value = global::System.DBNull.Value;
}
else {
- command.Parameters[12].Value = ((string)(UrlDoc));
- }
- if ((NumOp.HasValue == true)) {
- command.Parameters[13].Value = ((int)(NumOp.Value));
- }
- else {
- command.Parameters[13].Value = global::System.DBNull.Value;
- }
- if ((RitUsato.HasValue == true)) {
- command.Parameters[14].Value = ((int)(RitUsato.Value));
- }
- else {
- command.Parameters[14].Value = global::System.DBNull.Value;
- }
- if ((Ascensore.HasValue == true)) {
- command.Parameters[15].Value = ((int)(Ascensore.Value));
- }
- else {
- command.Parameters[15].Value = global::System.DBNull.Value;
- }
- if ((PianoCons.HasValue == true)) {
- command.Parameters[16].Value = ((int)(PianoCons.Value));
- }
- else {
- command.Parameters[16].Value = global::System.DBNull.Value;
- }
- if ((UserMod == null)) {
- command.Parameters[17].Value = global::System.DBNull.Value;
- }
- else {
- command.Parameters[17].Value = ((string)(UserMod));
+ command.Parameters[12].Value = ((string)(UserMod));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 874351b..f6e1bef 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -584,12 +584,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
-
-
-
-
-
@@ -603,12 +598,7 @@ SELECT CodCliente, Cognome, Nome, CodFis, Tel, Cell, Email, Indir_01, Cap_01, Lo
-
-
-
-
-
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index 0f97520..18e1fb8 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 aedaf4e..3aa6a3a 100644
Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ
diff --git a/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/WebSCR_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll
index c121315..e66d79d 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 3f4ec28..4e40eca 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 aedaf4e..3aa6a3a 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ