diff --git a/.vs/WebSCR/v14/.suo b/.vs/WebSCR/v14/.suo index 2f97bd8..bd2a2fb 100644 Binary files a/.vs/WebSCR/v14/.suo and b/.vs/WebSCR/v14/.suo differ diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 02c7366..587d6b4 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 0a1f9cc..dc34672 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 8421b21..fbe2bf5 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 2b24a8b..8ff44f2 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 0a1f9cc..dc34672 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/VersGen/obj/Release/VersGen.dll b/VersGen/obj/Release/VersGen.dll index 8421b21..fbe2bf5 100644 Binary files a/VersGen/obj/Release/VersGen.dll and b/VersGen/obj/Release/VersGen.dll differ diff --git a/WebSCR/WebUserControls/mod_compSquadra.ascx.cs b/WebSCR/WebUserControls/mod_compSquadra.ascx.cs index 126fc45..4253f4d 100644 --- a/WebSCR/WebUserControls/mod_compSquadra.ascx.cs +++ b/WebSCR/WebUserControls/mod_compSquadra.ascx.cs @@ -13,5 +13,9 @@ namespace WebSCR.WebUserControls { } + public void doUpdate() + { + grView.DataBind(); + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx b/WebSCR/WebUserControls/mod_dettInt.ascx index 732aab2..dad537e 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx +++ b/WebSCR/WebUserControls/mod_dettInt.ascx @@ -4,7 +4,7 @@
- +
diff --git a/WebSCR/WebUserControls/mod_dettInt.ascx.cs b/WebSCR/WebUserControls/mod_dettInt.ascx.cs index b09fd31..c740037 100644 --- a/WebSCR/WebUserControls/mod_dettInt.ascx.cs +++ b/WebSCR/WebUserControls/mod_dettInt.ascx.cs @@ -94,6 +94,7 @@ namespace WebSCR.WebUserControls protected void Page_Load(object sender, EventArgs e) { lblWarning.Visible = false; + lbAdd.DataBind(); } /// /// aggiunge il task corrente all'elenco dei task... @@ -120,7 +121,33 @@ namespace WebSCR.WebUserControls lblWarning.Text = string.Format("Attenzione: impossibile inserire, tempo complessivo diventerebbe inferiore a soglia minima ({0} min)!", minTempoInt); } } - + /// + /// verifica se ci sia matricola in sessione + /// + public bool hasMatricola + { + get + { + return matrOp != ""; + } + } + /// + /// matricola OP (x utente) + /// + public string matrOp + { + get + { + string answ = ""; + try + { + answ = memLayer.ML.StringSessionObj("matrOp"); + } + catch + { } + return answ; + } + } protected int minTempoInt { get diff --git a/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs b/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs index 76f0845..c6678d8 100644 --- a/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileImpegno.ascx.cs @@ -17,6 +17,11 @@ namespace WebSCR.WebUserControls /// /// protected void Page_Load(object sender, EventArgs e) + { + doUpdate(); + } + + public void doUpdate() { // leggo impegno int IdxImpegno = 0; @@ -31,7 +36,7 @@ namespace WebSCR.WebUserControls if (IdxImpegno > 0) { // cerco DOC... - DS_Applicazione.ImpegniRow riga =DtProxy.man.taImp.getByKey(IdxImpegno)[0]; + DS_Applicazione.ImpegniRow riga = DtProxy.man.taImp.getByKey(IdxImpegno)[0]; // se c'รจ documento... if (riga.RifOC != "") { diff --git a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs index 4c46235..30ab5bd 100644 --- a/WebSCR/WebUserControls/mod_fileUpload.ascx.cs +++ b/WebSCR/WebUserControls/mod_fileUpload.ascx.cs @@ -35,6 +35,11 @@ namespace WebSCR.WebUserControls divNewEdit.Visible = isWriteEnabled; btnAdd.DataBind(); } + + public void doUpdate() + { + grView.DataBind(); + } protected void Upload(object sender, EventArgs e) { string filename = Path.GetFileName(FileUpload1.PostedFile.FileName); diff --git a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs index e6d5c11..98e6f4d 100644 --- a/WebSCR/WebUserControls/mod_filtroZona.ascx.cs +++ b/WebSCR/WebUserControls/mod_filtroZona.ascx.cs @@ -86,6 +86,12 @@ namespace WebSCR.WebUserControls } catch { } + // 2016.02.01 modifica se trovo OC0 --> OC0000000 + if (answ == "OC0" || answ == "OC00" || answ == "OC000") + { + answ = "OC0000000"; + txtCerca.Text = answ; + } return answ; } set @@ -129,7 +135,7 @@ namespace WebSCR.WebUserControls memLayer.ML.emptySessionVal("currDoc"); } } - catch + catch(Exception exc) { } } else diff --git a/WebSCR/WebUserControls/mod_impegno.ascx b/WebSCR/WebUserControls/mod_impegno.ascx index 678ff75..a18b00a 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx +++ b/WebSCR/WebUserControls/mod_impegno.ascx @@ -11,14 +11,15 @@
-
+ <%--
-
+
--%> +
<%----%> @@ -258,8 +259,8 @@
- - + +
diff --git a/WebSCR/WebUserControls/mod_impegno.ascx.cs b/WebSCR/WebUserControls/mod_impegno.ascx.cs index ad49cad..d28dc93 100644 --- a/WebSCR/WebUserControls/mod_impegno.ascx.cs +++ b/WebSCR/WebUserControls/mod_impegno.ascx.cs @@ -25,6 +25,20 @@ namespace WebSCR.WebUserControls eh_errUpd(this, new EventArgs()); } } + /// + /// evento update + /// + public event EventHandler eh_Upd; + /// + /// sollevo evento selezione /deselezione + /// + protected void raiseEventUpd() + { + if (eh_Upd != null) + { + eh_Upd(this, new EventArgs()); + } + } protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) @@ -37,6 +51,33 @@ namespace WebSCR.WebUserControls /// public bool disableEdit { get; set; } /// + /// verifica se ci sia matricola in sessione + /// + public bool hasMatricola + { + get + { + return matrOp != ""; + } + } + /// + /// matricola OP (x utente) + /// + public string matrOp + { + get + { + string answ = ""; + try + { + answ = memLayer.ML.StringSessionObj("matrOp"); + } + catch + { } + return answ; + } + } + /// /// impegno corrente /// public int idxImpegno @@ -86,6 +127,10 @@ namespace WebSCR.WebUserControls { e.InputParameters["NoteGen"] = ""; } + if (e.InputParameters["MatrOp"] == null) + { + e.InputParameters["MatrOp"] = matrOp; + } } protected void odsImpegni_Deleted(object sender, ObjectDataSourceStatusEventArgs e) diff --git a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs index af4a4f6..00426f1 100644 --- a/WebSCR/WebUserControls/mod_pianificazione.ascx.cs +++ b/WebSCR/WebUserControls/mod_pianificazione.ascx.cs @@ -36,6 +36,15 @@ namespace WebSCR.WebUserControls mod_filtroPeriodo.eh_selData += mod_filtroPeriodo_eh_selData; mod_dettInt.eh_update += mod_dettInt_eh_update; mod_impegno.eh_errUpd += Mod_impegno_eh_errUpd; + mod_impegno.eh_Upd += Mod_impegno_eh_Upd; + } + + private void Mod_impegno_eh_Upd(object sender, EventArgs e) + { + // aggiorno visualizzazione dett a dx + mod_compSquadra.doUpdate(); + mod_fileImpegno.doUpdate(); + mod_fileUpload.doUpdate(); } private void Mod_impegno_eh_errUpd(object sender, EventArgs e) @@ -471,12 +480,14 @@ namespace WebSCR.WebUserControls memLayer.ML.setSessionVal("matrOp", txtMatrOp.Text.Trim()); errorMess = "Selezionato Operatore"; lblWarning.Text = errorMess; - mod_giornata.doUpdate(); } else { memLayer.ML.emptySessionVal("matrOp"); + lblWarning.Text = ""; } + mod_giornata.doUpdate(); + mod_impegno.doUpdate(); } protected override void OnUnload(EventArgs e) diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index 7138664..d20d5f4 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 9684b5c..34cdc1d 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 dedfd0d..b48f4ab 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 0fcda4e..a68f7f4 100644 --- a/WebSCR_data/DS_Applicazione.Designer.cs +++ b/WebSCR_data/DS_Applicazione.Designer.cs @@ -13659,6 +13659,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("@MatrOp", 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("@DataOra", 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("@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(); @@ -13990,7 +13992,23 @@ 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, global::System.Nullable DataOraComFrom, global::System.Nullable DataOraComTo) { + 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, + string MatrOp, + global::System.Nullable DataOra, + 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)); @@ -14064,18 +14082,30 @@ 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 { + if ((MatrOp == null)) { command.Parameters[13].Value = global::System.DBNull.Value; } - if ((DataOraComTo.HasValue == true)) { - command.Parameters[14].Value = ((System.DateTime)(DataOraComTo.Value)); + else { + command.Parameters[13].Value = ((string)(MatrOp)); + } + if ((DataOra.HasValue == true)) { + command.Parameters[14].Value = ((System.DateTime)(DataOra.Value)); } else { command.Parameters[14].Value = global::System.DBNull.Value; } + if ((DataOraComFrom.HasValue == true)) { + command.Parameters[15].Value = ((System.DateTime)(DataOraComFrom.Value)); + } + else { + command.Parameters[15].Value = global::System.DBNull.Value; + } + if ((DataOraComTo.HasValue == true)) { + command.Parameters[16].Value = ((System.DateTime)(DataOraComTo.Value)); + } + else { + command.Parameters[16].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 fa85558..1859c9c 100644 --- a/WebSCR_data/DS_Applicazione.xsd +++ b/WebSCR_data/DS_Applicazione.xsd @@ -735,6 +735,8 @@ FROM v_elencoImpegni + + diff --git a/WebSCR_data/DS_Applicazione.xss b/WebSCR_data/DS_Applicazione.xss index 5c39941..311a9ed 100644 --- a/WebSCR_data/DS_Applicazione.xss +++ b/WebSCR_data/DS_Applicazione.xss @@ -4,24 +4,24 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - + - + diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index d9ae4d7..d20d5f4 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 5fc9368..b48f4ab 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 604bdc0..c506334 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 3075d17..1ed5056 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 5fc9368..b48f4ab 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ