diff --git a/XPS/Web.config b/XPS/Web.config index 78e218b..a1d33b8 100644 --- a/XPS/Web.config +++ b/XPS/Web.config @@ -167,6 +167,8 @@ + + diff --git a/XPS/WebUserControls/mod_elencoComm.ascx b/XPS/WebUserControls/mod_elencoComm.ascx index c326de4..3479fd3 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx +++ b/XPS/WebUserControls/mod_elencoComm.ascx @@ -3,75 +3,86 @@ <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %> <%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc2" %> -
-
- - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
- - - - - - - - - - - - -
- + +
+
+
+ +
+
+ + + + + + + + + + + + + +
+
+ + + + +
+
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ +
+
-
+
@@ -98,9 +109,7 @@
   -
-
- +
@@ -227,6 +236,7 @@ + diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.cs b/XPS/WebUserControls/mod_elencoComm.ascx.cs index ef0189e..895bb58 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx.cs +++ b/XPS/WebUserControls/mod_elencoComm.ascx.cs @@ -121,6 +121,7 @@ namespace XPS.WebUserControls { traduciObj(); SetUpByUserRight(); + setupDataMin(); } aggiornaControlliDataGL(); _idxGridView = "CodDDT"; @@ -129,6 +130,14 @@ namespace XPS.WebUserControls mod_logStati1.eh_reset += new EventHandler(mod_logStati1_eh_reset); setStatiRewindAmmessi(); } + /// + /// imposta data minima x recupero dati... + /// + private void setupDataMin() + { + // imposto data minima a x mesi fa... + txtData.Text = DateTime.Today.AddMonths(-memLayer.ML.CRI("prevMonth")).ToString("dd/MM/yyyy"); + } /// diff --git a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs index 321aeb6..2260973 100644 --- a/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs +++ b/XPS/WebUserControls/mod_elencoComm.ascx.designer.cs @@ -12,6 +12,15 @@ namespace XPS.WebUserControls { public partial class mod_elencoComm { + /// + /// txtData control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtData; + /// /// mf_tipoFiltro control. /// @@ -255,6 +264,15 @@ namespace XPS.WebUserControls { /// protected global::System.Web.UI.WebControls.Label Label2; + /// + /// divDet control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDet; + /// /// pnlSetDueDate control. /// @@ -399,15 +417,6 @@ namespace XPS.WebUserControls { /// protected global::AjaxControlToolkit.ConfirmButtonExtender cbeOkStati; - /// - /// divDet control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDet; - /// /// pnlLogStati control. /// diff --git a/XPS_data/DS_applicazione.Designer.cs b/XPS_data/DS_applicazione.Designer.cs index fd96ca1..b1c8db2 100644 --- a/XPS_data/DS_applicazione.Designer.cs +++ b/XPS_data/DS_applicazione.Designer.cs @@ -12152,6 +12152,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT 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("@CodFiltro", 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("@DataFiltro", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, 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.sp_creaSetObj"; @@ -12231,7 +12232,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT [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.v_commesseDataTable getByCodFiltro(string CodFiltro) { + public virtual DS_applicazione.v_commesseDataTable getByCodFiltro(string CodFiltro, global::System.Nullable DataFiltro) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((CodFiltro == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -12239,6 +12240,12 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(CodFiltro)); } + if ((DataFiltro.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((System.DateTime)(DataFiltro.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } DS_applicazione.v_commesseDataTable dataTable = new DS_applicazione.v_commesseDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/XPS_data/DS_applicazione.xsd b/XPS_data/DS_applicazione.xsd index 0720fe7..139aed6 100644 --- a/XPS_data/DS_applicazione.xsd +++ b/XPS_data/DS_applicazione.xsd @@ -9,7 +9,7 @@ - + DELETE FROM [dbo].[AnagClienti] WHERE (([CodCliente] = @Original_CodCliente) AND ((@IsNull_RagioneSociale = 1 AND [RagioneSociale] IS NULL) OR ([RagioneSociale] = @Original_RagioneSociale)) AND ((@IsNull_piva = 1 AND [piva] IS NULL) OR ([piva] = @Original_piva)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_indirizzo = 1 AND [indirizzo] IS NULL) OR ([indirizzo] = @Original_indirizzo)) AND ((@IsNull_cap = 1 AND [cap] IS NULL) OR ([cap] = @Original_cap)) AND ((@IsNull_localita = 1 AND [localita] IS NULL) OR ([localita] = @Original_localita)) AND ((@IsNull_provincia = 1 AND [provincia] IS NULL) OR ([provincia] = @Original_provincia))) @@ -98,7 +98,7 @@ SELECT CodCliente, RagioneSociale, piva, email, indirizzo, cap, localita, provin - + dbo.stp_AnagCliGetByKey @@ -109,7 +109,7 @@ SELECT CodCliente, RagioneSociale, piva, email, indirizzo, cap, localita, provin - + dbo.stp_AnagCliUpdate @@ -131,7 +131,7 @@ SELECT CodCliente, RagioneSociale, piva, email, indirizzo, cap, localita, provin - + DELETE FROM [dbo].[AnagTrattamenti] WHERE (([CodTrattamento] = @Original_CodTrattamento) AND ((@IsNull_DescrTrattamento = 1 AND [DescrTrattamento] IS NULL) OR ([DescrTrattamento] = @Original_DescrTrattamento))) @@ -181,7 +181,7 @@ SELECT CodTrattamento, DescrTrattamento FROM AnagTrattamenti WHERE (CodTrattamen - + DELETE FROM [dbo].[Tratt2Obj] WHERE (([IdxObj] = @Original_IdxObj) AND ([CodTrattamento] = @Original_CodTrattamento) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note))) @@ -236,7 +236,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + SELECT * FROM v_commesse ORDER BY DataArrivo DESC @@ -268,7 +268,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + dbo.stp_vElComm_getByCod @@ -279,18 +279,19 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + dbo.stp_vElComm_getByCodFiltro + - + dbo.sp_creaSetObj @@ -309,7 +310,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + dbo.sp_delObj @@ -320,7 +321,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + dbo.stp_IstObjUpdateMag @@ -341,7 +342,7 @@ SELECT IdxObj, CodTrattamento, Note FROM Tratt2Obj WHERE (CodTrattamento = @CodT - + DELETE FROM [IstObj] WHERE (([IdxObj] = @Original_IdxObj) AND ((@IsNull_CodCliente = 1 AND [CodCliente] IS NULL) OR ([CodCliente] = @Original_CodCliente)) AND ((@IsNull_CodStato = 1 AND [CodStato] IS NULL) OR ([CodStato] = @Original_CodStato)) AND ((@IsNull_Posizione = 1 AND [Posizione] IS NULL) OR ([Posizione] = @Original_Posizione)) AND ((@IsNull_Livello = 1 AND [Livello] IS NULL) OR ([Livello] = @Original_Livello)) AND ((@IsNull_Rev = 1 AND [Rev] IS NULL) OR ([Rev] = @Original_Rev)) AND ((@IsNull_CodObj = 1 AND [CodObj] IS NULL) OR ([CodObj] = @Original_CodObj)) AND ((@IsNull_Nome = 1 AND [Nome] IS NULL) OR ([Nome] = @Original_Nome)) AND ((@IsNull_DataRif = 1 AND [DataRif] IS NULL) OR ([DataRif] = @Original_DataRif)) AND ((@IsNull_IdxObjMamma = 1 AND [IdxObjMamma] IS NULL) OR ([IdxObjMamma] = @Original_IdxObjMamma)) AND ((@IsNull_Note = 1 AND [Note] IS NULL) OR ([Note] = @Original_Note)) AND ((@IsNull_ExtKey = 1 AND [ExtKey] IS NULL) OR ([ExtKey] = @Original_ExtKey)) AND ((@IsNull_DueDate = 1 AND [DueDate] IS NULL) OR ([DueDate] = @Original_DueDate)) AND ((@IsNull_LeadTime = 1 AND [LeadTime] IS NULL) OR ([LeadTime] = @Original_LeadTime)) AND ((@IsNull_LeadTimeUM = 1 AND [LeadTimeUM] IS NULL) OR ([LeadTimeUM] = @Original_LeadTimeUM)) AND ((@IsNull_UserCreaz = 1 AND [UserCreaz] IS NULL) OR ([UserCreaz] = @Original_UserCreaz)) AND ((@IsNull_DataCreaz = 1 AND [DataCreaz] IS NULL) OR ([DataCreaz] = @Original_DataCreaz)) AND ((@IsNull_UserMod = 1 AND [UserMod] IS NULL) OR ([UserMod] = @Original_UserMod)) AND ((@IsNull_DataMod = 1 AND [DataMod] IS NULL) OR ([DataMod] = @Original_DataMod)) AND ((@IsNull_Qta = 1 AND [Qta] IS NULL) OR ([Qta] = @Original_Qta)) AND ((@IsNull_Peso = 1 AND [Peso] IS NULL) OR ([Peso] = @Original_Peso)) AND ((@IsNull_emailReq = 1 AND [emailReq] IS NULL) OR ([emailReq] = @Original_emailReq)) AND ((@IsNull_emailSent = 1 AND [emailSent] IS NULL) OR ([emailSent] = @Original_emailSent))) @@ -537,7 +538,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_countSisters @@ -548,7 +549,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_getByIdx @@ -559,7 +560,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_lastSister @@ -570,7 +571,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateDueDateULP @@ -584,7 +585,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateEmailSent @@ -595,7 +596,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateStato @@ -609,7 +610,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.stp_IstObj_updateStatoTree @@ -627,7 +628,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + SELECT Cod, Stato, CodCliente, Cliente, CodCli, descrizione, DDT, DataDDT, DataArrivo, Posizione, Qta, Peso, Colli, DataPrevista, IdxObjMamma, CodStato, minStato, maxStato FROM dbo.v_righe @@ -657,7 +658,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + SELECT Cliente, Cod, CodCli, CodCliente, CodStato, Colli, DDT, DataArrivo, DataDDT, DataPrevista, IdxObjMamma, Peso, Posizione, Qta, Stato, descrizione, maxStato, minStato FROM v_righe WHERE (IdxObjMamma = @CodMamma) @@ -667,7 +668,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.sp_clonaRowObj @@ -678,7 +679,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + dbo.sp_delRow @@ -689,7 +690,7 @@ SELECT IdxObj, CodCliente, CodStato, Posizione, Livello, Rev, CodObj, Nome, Data - + UPDATE IstObj @@ -706,7 +707,7 @@ WHERE (IdxObj = @Original_Cod) - + dbo.sp_rec4Day @@ -725,7 +726,7 @@ WHERE (IdxObj = @Original_Cod) - + SELECT Cod, Stato, CodCliente, Cliente, CodCli, descrizione, DDT, DataDDT, DataArrivo, Posizione, Qta, Peso, DataPrevista, IdxObjMamma, CodStato FROM dbo.v_ULP @@ -752,7 +753,7 @@ WHERE (IdxObj = @Original_Cod) - + SELECT * FROM v_ULP WHERE (IdxObjMamma = @CodMamma) @@ -762,7 +763,7 @@ WHERE (IdxObj = @Original_Cod) - + SELECT Cod, Stato, CodCliente, Cliente, CodCli, descrizione, DDT, DataDDT, DataArrivo, Posizione, Qta, Peso, DataPrevista, IdxObjMamma, CodStato @@ -774,7 +775,7 @@ WHERE (CodStato = @CodStato) - + SELECT Cod, Stato, CodCliente, Cliente, CodCli, descrizione, DDT, DataDDT, DataArrivo, Posizione, Qta, Peso, DataPrevista, IdxObjMamma, CodStato @@ -787,7 +788,7 @@ WHERE (DataPrevista BETWEEN @DataRif AND DATEADD(dd, 1, @DataRif)) AND (CodS - + SELECT * FROM v_ULP @@ -800,7 +801,7 @@ ORDER BY DataArrivo - + dbo.sp_clonaObj @@ -811,7 +812,7 @@ ORDER BY DataArrivo - + dbo.sp_delRow @@ -822,7 +823,7 @@ ORDER BY DataArrivo - + UPDATE IstObj @@ -842,7 +843,7 @@ WHERE (IdxObj = @Original_Cod) - + DELETE FROM [dbo].[Eventi] WHERE (([CodEvento] = @Original_CodEvento) AND ((@IsNull_CodTipoEvento = 1 AND [CodTipoEvento] IS NULL) OR ([CodTipoEvento] = @Original_CodTipoEvento)) AND ((@IsNull_DescrEvento = 1 AND [DescrEvento] IS NULL) OR ([DescrEvento] = @Original_DescrEvento)) AND ((@IsNull_Action = 1 AND [Action] IS NULL) OR ([Action] = @Original_Action))) @@ -903,7 +904,7 @@ SELECT CodEvento, CodTipoEvento, DescrEvento, Action FROM Eventi WHERE (CodEvent - + SELECT DISTINCT Eventi.CodEvento, Eventi.CodTipoEvento, Eventi.DescrEvento, Eventi.Action @@ -920,7 +921,7 @@ WHERE (TraEv2Stati.CodEvento = @CodEvento) - + DELETE FROM [dbo].[TraEv2Stati] WHERE (([CodMappa] = @Original_CodMappa) AND ([CodObj] = @Original_CodObj) AND ([CodStato] = @Original_CodStato) AND ([CodEvento] = @Original_CodEvento) AND ((@IsNull_NextCodStato = 1 AND [NextCodStato] IS NULL) OR ([NextCodStato] = @Original_NextCodStato)) AND ((@IsNull_CmdPlugin = 1 AND [CmdPlugin] IS NULL) OR ([CmdPlugin] = @Original_CmdPlugin)) AND ((@IsNull_text2show = 1 AND [text2show] IS NULL) OR ([text2show] = @Original_text2show)) AND ((@IsNull_descrComando = 1 AND [descrComando] IS NULL) OR ([descrComando] = @Original_descrComando))) @@ -1003,7 +1004,7 @@ SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show - + SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show, descrComando FROM dbo.TraEv2Stati @@ -1014,7 +1015,7 @@ where CodMappa=@CodMappa - + SELECT CodMappa, CodObj, CodStato, CodEvento, NextCodStato, CmdPlugin, text2show, descrComando @@ -1033,7 +1034,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + SELECT IdxObj, CodCliente, Nome, DataRif, Note, ExtKey, DataOra, DescrStato FROM dbo.v_logStati @@ -1053,7 +1054,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + SELECT IdxObj, CodCliente, Nome, DataRif, Note, ExtKey, DataOra, DescrStato @@ -1069,7 +1070,7 @@ WHERE (IdxObj = @IdxObj) - + dbo.sp_contaNonSched @@ -1088,7 +1089,7 @@ WHERE (IdxObj = @IdxObj) - + dbo.sp_schedaIdent @@ -1129,7 +1130,7 @@ WHERE (IdxObj = @IdxObj) - + dbo.sp_ddt @@ -1149,7 +1150,7 @@ WHERE (IdxObj = @IdxObj) - + dbo.sp_updateAncestorState @@ -1164,62 +1165,62 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - + - + - + - + @@ -1229,17 +1230,17 @@ WHERE (IdxObj = @IdxObj) - + - + - + @@ -1249,24 +1250,24 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + @@ -1276,101 +1277,101 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - + - - - + + + - - - - - - + + + + + + - + - + - + - + - + @@ -1380,194 +1381,194 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - - - + + + - + - - + + - + - + - - - + + + - + - - + + - - - - - + + + + + - + - + - + - + - + - + - + - + - - - + + + - - - - - + + + + + - + - + - + @@ -1577,85 +1578,85 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - + - + - + - + - - - + + + - - - - + + + + - + @@ -1665,31 +1666,31 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + @@ -1699,59 +1700,59 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - + - + - + @@ -1761,47 +1762,47 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - - + + - + - - + + @@ -1811,161 +1812,161 @@ WHERE (IdxObj = @IdxObj) - + - + - + - + - + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2022,10 +2023,10 @@ WHERE (IdxObj = @IdxObj) - - - - + + + + \ No newline at end of file diff --git a/XPS_data/DS_applicazione.xss b/XPS_data/DS_applicazione.xss index 5fbfe2b..7509906 100644 --- a/XPS_data/DS_applicazione.xss +++ b/XPS_data/DS_applicazione.xss @@ -4,18 +4,18 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + @@ -51,7 +51,7 @@ - + 432