@@ -283,6 +282,9 @@
+
+
+
diff --git a/WebSCR/WebUserControls/mod_selDataOra.ascx.cs b/WebSCR/WebUserControls/mod_selDataOra.ascx.cs
index e547cab..5044fb9 100644
--- a/WebSCR/WebUserControls/mod_selDataOra.ascx.cs
+++ b/WebSCR/WebUserControls/mod_selDataOra.ascx.cs
@@ -37,12 +37,6 @@ namespace WebSCR.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
-#if false
- if (!Page.IsPostBack)
- {
- txtDataSel.Text = dataSel.ToString("yyyy-MM-dd");
- }
-#endif
}
///
/// data-ora selezionata
@@ -76,6 +70,27 @@ namespace WebSCR.WebUserControls
{ }
}
}
-
+ public bool showData
+ {
+ get
+ {
+ return txtDataSel.Visible;
+ }
+ set
+ {
+ txtDataSel.Visible = value;
+ }
+ }
+ public bool showOra
+ {
+ get
+ {
+ return ddlOrario.Visible;
+ }
+ set
+ {
+ ddlOrario.Visible = value;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll
index e2326f7..930db7a 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 38c0c3b..85c24ec 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 1c827d9..1954081 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 cefbe6d..94fd7c7 100644
--- a/WebSCR_data/DS_Applicazione.Designer.cs
+++ b/WebSCR_data/DS_Applicazione.Designer.cs
@@ -2276,7 +2276,9 @@ namespace WebSCR_data {
private global::System.Data.DataColumn columnIdxImpegno;
- private global::System.Data.DataColumn columnDataOraCom;
+ private global::System.Data.DataColumn columnDataOraComFrom;
+
+ private global::System.Data.DataColumn columnDataOraComTo;
private global::System.Data.DataColumn columnDataOra;
@@ -2403,9 +2405,17 @@ namespace WebSCR_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public global::System.Data.DataColumn DataOraComColumn {
+ public global::System.Data.DataColumn DataOraComFromColumn {
get {
- return this.columnDataOraCom;
+ return this.columnDataOraComFrom;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public global::System.Data.DataColumn DataOraComToColumn {
+ get {
+ return this.columnDataOraComTo;
}
}
@@ -2776,7 +2786,8 @@ namespace WebSCR_data {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
public ImpegniRow AddImpegniRow(
int IdxImpegno,
- System.DateTime DataOraCom,
+ System.DateTime DataOraComFrom,
+ System.DateTime DataOraComTo,
System.DateTime DataOra,
string TipoOrario,
string CodCliente,
@@ -2821,7 +2832,8 @@ namespace WebSCR_data {
ImpegniRow rowImpegniRow = ((ImpegniRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
IdxImpegno,
- DataOraCom,
+ DataOraComFrom,
+ DataOraComTo,
DataOra,
TipoOrario,
CodCliente,
@@ -2893,7 +2905,8 @@ namespace WebSCR_data {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
internal void InitVars() {
this.columnIdxImpegno = base.Columns["IdxImpegno"];
- this.columnDataOraCom = base.Columns["DataOraCom"];
+ this.columnDataOraComFrom = base.Columns["DataOraComFrom"];
+ this.columnDataOraComTo = base.Columns["DataOraComTo"];
this.columnDataOra = base.Columns["DataOra"];
this.columnTipoOrario = base.Columns["TipoOrario"];
this.columnCodCliente = base.Columns["CodCliente"];
@@ -2942,8 +2955,10 @@ namespace WebSCR_data {
private void InitClass() {
this.columnIdxImpegno = new global::System.Data.DataColumn("IdxImpegno", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnIdxImpegno);
- this.columnDataOraCom = new global::System.Data.DataColumn("DataOraCom", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
- base.Columns.Add(this.columnDataOraCom);
+ this.columnDataOraComFrom = new global::System.Data.DataColumn("DataOraComFrom", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnDataOraComFrom);
+ this.columnDataOraComTo = new global::System.Data.DataColumn("DataOraComTo", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnDataOraComTo);
this.columnDataOra = new global::System.Data.DataColumn("DataOra", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDataOra);
this.columnTipoOrario = new global::System.Data.DataColumn("TipoOrario", typeof(string), null, global::System.Data.MappingType.Element);
@@ -3030,8 +3045,10 @@ namespace WebSCR_data {
this.columnIdxImpegno}, true));
this.columnIdxImpegno.AllowDBNull = false;
this.columnIdxImpegno.Unique = true;
- this.columnDataOraCom.AllowDBNull = false;
- this.columnDataOraCom.Caption = "DataOra";
+ this.columnDataOraComFrom.AllowDBNull = false;
+ this.columnDataOraComFrom.Caption = "DataOra";
+ this.columnDataOraComTo.AllowDBNull = false;
+ this.columnDataOraComTo.Caption = "DataOra";
this.columnDataOra.AllowDBNull = false;
this.columnTipoOrario.AllowDBNull = false;
this.columnTipoOrario.MaxLength = 10;
@@ -7317,12 +7334,23 @@ namespace WebSCR_data {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
- public System.DateTime DataOraCom {
+ public System.DateTime DataOraComFrom {
get {
- return ((global::System.DateTime)(this[this.tableImpegni.DataOraComColumn]));
+ return ((global::System.DateTime)(this[this.tableImpegni.DataOraComFromColumn]));
}
set {
- this[this.tableImpegni.DataOraComColumn] = value;
+ this[this.tableImpegni.DataOraComFromColumn] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
+ public System.DateTime DataOraComTo {
+ get {
+ return ((global::System.DateTime)(this[this.tableImpegni.DataOraComToColumn]));
+ }
+ set {
+ this[this.tableImpegni.DataOraComToColumn] = value;
}
}
@@ -13060,6 +13088,8 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
this._commandCollection[9].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[9].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].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IntAperto", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._commandCollection[9].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOraComFrom", 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("@DataOraComTo", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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_updNoteInt";
@@ -13389,7 +13419,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")]
[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.Nullable IntAperto) {
+ 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.Nullable IntAperto, global::System.Nullable DataOraComFrom, global::System.Nullable DataOraComTo) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[9];
if ((Original_IdxImpegno.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_IdxImpegno.Value));
@@ -13463,6 +13493,18 @@ SELECT CodCliente, RagSoc, CodFis, Tel, Cell, EnableSMS, Email, Indir, Cap, Loca
else {
command.Parameters[12].Value = global::System.DBNull.Value;
}
+ if ((DataOraComFrom.HasValue == true)) {
+ command.Parameters[13].Value = ((System.DateTime)(DataOraComFrom.Value));
+ }
+ else {
+ command.Parameters[13].Value = global::System.DBNull.Value;
+ }
+ if ((DataOraComTo.HasValue == true)) {
+ command.Parameters[14].Value = ((System.DateTime)(DataOraComTo.Value));
+ }
+ else {
+ command.Parameters[14].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)) {
diff --git a/WebSCR_data/DS_Applicazione.xsd b/WebSCR_data/DS_Applicazione.xsd
index 8d0095f..ed75b4e 100644
--- a/WebSCR_data/DS_Applicazione.xsd
+++ b/WebSCR_data/DS_Applicazione.xsd
@@ -735,6 +735,8 @@ FROM v_elencoImpegni
+
+
@@ -1526,7 +1528,8 @@ SELECT Matr, Cognome, Nome, CognomeNome FROM Dipendenti WHERE (Matr = @Matr)
-
+
+
diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll
index e2326f7..930db7a 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 1c827d9..1954081 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 84af970..e789ece 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 b3cc78f..7455cf0 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 1c827d9..1954081 100644
Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ