From ada7238daa222ad020cb8f7d6f614555dc31a77c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Jul 2022 14:55:51 +0200 Subject: [PATCH 1/4] Aggiunta config x PROD DB - aggiunto file conf x test Jetco --- MP-ADM/Web.Jetco.config | 381 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 381 insertions(+) create mode 100644 MP-ADM/Web.Jetco.config diff --git a/MP-ADM/Web.Jetco.config b/MP-ADM/Web.Jetco.config new file mode 100644 index 00000000..bd8ed849 --- /dev/null +++ b/MP-ADM/Web.Jetco.config @@ -0,0 +1,381 @@ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From dcd2fb9bff6b84b46bd7b9b2f15a85450863e09b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Jul 2022 14:57:24 +0200 Subject: [PATCH 2/4] ADM - Fix file conf DEV e Jtco x testing --- MP-ADM/MP-ADM.csproj | 1 + MP-ADM/Web.DEV.config | 381 ++++++++++++++++++++++++++++++++++++++++ MP-ADM/Web.Debug.config | 8 +- MP-ADM/Web.Jetco.config | 28 +-- MP-ADM/Web.config | 2 +- 5 files changed, 401 insertions(+), 19 deletions(-) create mode 100644 MP-ADM/Web.DEV.config diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 9289a984..55bae9f1 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -1293,6 +1293,7 @@ + Web.config diff --git a/MP-ADM/Web.DEV.config b/MP-ADM/Web.DEV.config new file mode 100644 index 00000000..32b60e84 --- /dev/null +++ b/MP-ADM/Web.DEV.config @@ -0,0 +1,381 @@ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-ADM/Web.Debug.config b/MP-ADM/Web.Debug.config index ed91a811..5dc23431 100644 --- a/MP-ADM/Web.Debug.config +++ b/MP-ADM/Web.Debug.config @@ -3,7 +3,7 @@ - - - - + \ No newline at end of file diff --git a/MP-ADM/Web.Jetco.config b/MP-ADM/Web.Jetco.config index bd8ed849..05bfbbfd 100644 --- a/MP-ADM/Web.Jetco.config +++ b/MP-ADM/Web.Jetco.config @@ -25,22 +25,22 @@ - - - - - - - - + + + + + + + + - - - - - - + + + + + + diff --git a/MP-ADM/Web.config b/MP-ADM/Web.config index bd8ed849..32b60e84 100644 --- a/MP-ADM/Web.config +++ b/MP-ADM/Web.config @@ -39,7 +39,7 @@ - + From b4e40b2ef3960fe78ac23571e33cdb2f5512f47f Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Jul 2022 15:01:53 +0200 Subject: [PATCH 3/4] SITE - inizio modifiche webconfig x test Jetco --- MP-ADM/MP-ADM.csproj | 1 + ...Web.Jetco.config => Web.PROD.Jetco.config} | 0 MP-SITE/Web.DEV.config | 400 ++++++++++++++++++ MP-SITE/Web.PROD.Jetco.config | 400 ++++++++++++++++++ 4 files changed, 801 insertions(+) rename MP-ADM/{Web.Jetco.config => Web.PROD.Jetco.config} (100%) create mode 100644 MP-SITE/Web.DEV.config create mode 100644 MP-SITE/Web.PROD.Jetco.config diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index 55bae9f1..f5f56c4c 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -1294,6 +1294,7 @@ + Web.config diff --git a/MP-ADM/Web.Jetco.config b/MP-ADM/Web.PROD.Jetco.config similarity index 100% rename from MP-ADM/Web.Jetco.config rename to MP-ADM/Web.PROD.Jetco.config diff --git a/MP-SITE/Web.DEV.config b/MP-SITE/Web.DEV.config new file mode 100644 index 00000000..99567041 --- /dev/null +++ b/MP-SITE/Web.DEV.config @@ -0,0 +1,400 @@ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MP-SITE/Web.PROD.Jetco.config b/MP-SITE/Web.PROD.Jetco.config new file mode 100644 index 00000000..be7e37af --- /dev/null +++ b/MP-SITE/Web.PROD.Jetco.config @@ -0,0 +1,400 @@ + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 99dea91fdb13aa5272f3760e22d53f6ce902ce30 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Jul 2022 15:33:38 +0200 Subject: [PATCH 4/4] Aggiunto sel TUTTI x ADM (filtro reparti) --- MP-ADM/MP-ADM.csproj | 2 +- MP-ADM/WebUserControls/mod_gestPromODL.ascx | 4 +- .../mod_gestPromODL.ascx.designer.cs | 212 +++++++++--------- MP-Site/MP-Site.csproj | 2 + MP-Site/Web.config | 16 +- 5 files changed, 121 insertions(+), 115 deletions(-) diff --git a/MP-ADM/MP-ADM.csproj b/MP-ADM/MP-ADM.csproj index f5f56c4c..54436918 100644 --- a/MP-ADM/MP-ADM.csproj +++ b/MP-ADM/MP-ADM.csproj @@ -1293,7 +1293,7 @@ - + Web.config diff --git a/MP-ADM/WebUserControls/mod_gestPromODL.ascx b/MP-ADM/WebUserControls/mod_gestPromODL.ascx index 2f371ddc..e14395e2 100644 --- a/MP-ADM/WebUserControls/mod_gestPromODL.ascx +++ b/MP-ADM/WebUserControls/mod_gestPromODL.ascx @@ -11,7 +11,9 @@
REPARTO
- + + +
diff --git a/MP-ADM/WebUserControls/mod_gestPromODL.ascx.designer.cs b/MP-ADM/WebUserControls/mod_gestPromODL.ascx.designer.cs index 17b47006..a6682090 100644 --- a/MP-ADM/WebUserControls/mod_gestPromODL.ascx.designer.cs +++ b/MP-ADM/WebUserControls/mod_gestPromODL.ascx.designer.cs @@ -1,230 +1,232 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ -namespace MP_ADM.WebUserControls { - - - public partial class mod_gestPromODL { - +namespace MP_ADM.WebUserControls +{ + + + public partial class mod_gestPromODL + { + /// - /// Controllo ddlCodGruppo. + /// ddlCodGruppo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.DropDownList ddlCodGruppo; - + /// - /// Controllo odsCodGruppo. + /// odsCodGruppo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsCodGruppo; - + /// - /// Controllo lbtResArt. + /// lbtResArt control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResArt; - + /// - /// Controllo lblCodArt. + /// lblCodArt control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblCodArt; - + /// - /// Controllo lblDescArt. + /// lblDescArt control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblDescArt; - + /// - /// Controllo lbtResMacc. + /// lbtResMacc control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtResMacc; - + /// - /// Controllo lblNomeMacc. + /// lblNomeMacc control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNomeMacc; - + /// - /// Controllo lblIdxMacc. + /// lblIdxMacc control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblIdxMacc; - + /// - /// Controllo chkUnassigned. + /// chkUnassigned control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.CheckBox chkUnassigned; - + /// - /// Controllo lblUnass. + /// lblUnass control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblUnass; - + /// - /// Controllo lbtNewPODL. + /// lbtNewPODL control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtNewPODL; - + /// - /// Controllo mod_newPromessaODL. + /// mod_newPromessaODL control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::MP_ADM.WebUserControls.mod_newPromessaODL mod_newPromessaODL; - + /// - /// Controllo divEditQta. + /// divEditQta control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divEditQta; - + /// - /// Controllo lbtOk. + /// lbtOk control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtOk; - + /// - /// Controllo txtNewQta. + /// txtNewQta control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtNewQta; - + /// - /// Controllo txtNewPzPallet. + /// txtNewPzPallet control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtNewPzPallet; - + /// - /// Controllo lbtCancel. + /// lbtCancel control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtCancel; - + /// - /// Controllo grView. + /// grView control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.GridView grView; - + /// - /// Controllo hfCodGruppo. + /// hfCodGruppo control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodGruppo; - + /// - /// Controllo hfCodPre. + /// hfCodPre control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfCodPre; - + /// - /// Controllo ods. + /// ods control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.ObjectDataSource ods; - + /// - /// Controllo lblNumRec. + /// lblNumRec control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblNumRec; - + /// - /// Controllo lblWarning. + /// lblWarning control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblWarning; - + /// - /// Controllo txtPageSize. + /// txtPageSize control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtPageSize; } diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index be206936..88729620 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -983,9 +983,11 @@ + Web.config + Web.config diff --git a/MP-Site/Web.config b/MP-Site/Web.config index 99567041..be7e37af 100644 --- a/MP-Site/Web.config +++ b/MP-Site/Web.config @@ -30,16 +30,16 @@ - - - - - + + + + + - - - + + +