From 5b708ff8e5ff2dea41fd2cffde0b209245a12bfc Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 21 Apr 2021 13:15:40 +0200 Subject: [PATCH] Fix filtragigo e visual richieste PackList --- MP-MAG/WebUserControls/cmp_packList.ascx | 157 +++++++++++------- MP-MAG/WebUserControls/cmp_packList.ascx.cs | 8 + .../cmp_packList.ascx.designer.cs | 27 +++ MP-MAG/WebUserControls/cmp_packListMgmt.ascx | 10 +- MagData/DS_Utility.Designer.cs | 23 ++- 5 files changed, 145 insertions(+), 80 deletions(-) diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx b/MP-MAG/WebUserControls/cmp_packList.ascx index 7f7e7f39..819588c5 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx +++ b/MP-MAG/WebUserControls/cmp_packList.ascx @@ -2,71 +2,102 @@ <%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> <%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %> -
-
-
-
- BOZZA -
-
- Invia RICHIESTA -
-
- Split Caricate -
-
- Trasferisci +
+
+
+
+
+
+ BOZZA +
+
+ Invia RICHIESTA +
+
+ Split Caricate +
+
+ Trasferisci +
+
-
- - - - - - - Nessun record trovato - - - - - - - - - - - - - - <%----%> - <%----%> - <%----%> - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+ + + + + + + Nessun record trovato + + + + + + + + + + + + + + <%----%> + <%----%> + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+ Max status +
+ + + + + + + +
+
+
+
+
+ +
+
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx.cs b/MP-MAG/WebUserControls/cmp_packList.ascx.cs index 39a42aa2..85e50622 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_packList.ascx.cs @@ -61,6 +61,11 @@ namespace MP_MAG.WebUserControls #region Private Methods + private void Cmp_numRow_eh_doRefresh(object sender, EventArgs e) + { + grView.PageSize = cmp_numRow.numRow; + } + private void showAction(bool showAction) { // calcolo cosa mostro da status corrente @@ -168,7 +173,10 @@ namespace MP_MAG.WebUserControls lbtSetRequest.DataBind(); lbtSplitSped.DataBind(); lbtSendPack.DataBind(); + ddlMaxStatus.SelectedValue = "3"; + grView.PageSize = cmp_numRow.numRow; } + cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh; } #endregion Protected Methods diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs index 94ce7112..db29cffb 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs @@ -85,5 +85,32 @@ namespace MP_MAG.WebUserControls /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfMaxStatus; + + /// + /// ddlMaxStatus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlMaxStatus; + + /// + /// odsMaxStatus control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsMaxStatus; + + /// + /// cmp_numRow control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::MP_MAG.WebUserControls.cmp_numRow cmp_numRow; } } diff --git a/MP-MAG/WebUserControls/cmp_packListMgmt.ascx b/MP-MAG/WebUserControls/cmp_packListMgmt.ascx index 7869d37a..8ed27bee 100644 --- a/MP-MAG/WebUserControls/cmp_packListMgmt.ascx +++ b/MP-MAG/WebUserControls/cmp_packListMgmt.ascx @@ -5,17 +5,17 @@ <%@ Register Src="~/WebUserControls/cmp_packListNew.ascx" TagPrefix="uc1" TagName="cmp_packListNew" %>
-
+

Packing List

-
+
Cliente
- +
@@ -34,8 +34,8 @@
-
-
+
+
diff --git a/MagData/DS_Utility.Designer.cs b/MagData/DS_Utility.Designer.cs index 3c17faaf..52e645b1 100644 --- a/MagData/DS_Utility.Designer.cs +++ b/MagData/DS_Utility.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se -// il codice viene rigenerato. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -1517,7 +1517,7 @@ namespace MagData { return ((string)(this[this.tableselAnagCli.labelColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'label\' nella tabella \'selAnagCli\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'label\' in table \'selAnagCli\' is DBNull.", e); } } set { @@ -1560,7 +1560,7 @@ namespace MagData { return ((string)(this[this.tableselPackList.labelColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'label\' nella tabella \'selPackList\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'label\' in table \'selPackList\' is DBNull.", e); } } set { @@ -1625,7 +1625,7 @@ namespace MagData { return ((string)(this[this.tableselMacchine.labelColumn])); } catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("Il valore della colonna \'label\' nella tabella \'selMacchine\' è DBNull.", e); + throw new global::System.Data.StrongTypingException("The value for column \'label\' in table \'selMacchine\' is DBNull.", e); } } set { @@ -2709,9 +2709,8 @@ namespace MagData.DS_UtilityTableAdapters { } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { - throw new global::System.ApplicationException("TableAdapterManager non contiene informazioni di connessione. Impostare la propri" + - "età TableAdapter di ciascun oggetto TableAdapterManager su un\'istanza TableAdapt" + - "er valida."); + throw new global::System.ApplicationException("TableAdapterManager contains no connection information. Set each TableAdapterMana" + + "ger TableAdapter property to a valid TableAdapter instance."); } bool workConnOpened = false; if (((workConnection.State & global::System.Data.ConnectionState.Broken) @@ -2724,8 +2723,8 @@ namespace MagData.DS_UtilityTableAdapters { } global::System.Data.IDbTransaction workTransaction = workConnection.BeginTransaction(); if ((workTransaction == null)) { - throw new global::System.ApplicationException("Impossibile avviare la transazione. La connessione dati corrente non supporta le " + - "transazioni oppure lo stato corrente non consente l\'avvio della transazione."); + throw new global::System.ApplicationException("The transaction cannot begin. The current data connection does not support transa" + + "ctions or the current state is not allowing the transaction to begin."); } global::System.Collections.Generic.List allChangedRows = new global::System.Collections.Generic.List(); global::System.Collections.Generic.List allAddedRows = new global::System.Collections.Generic.List();