From efdb05c6383bbad892506aa246a72350a3e63891 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 2 Feb 2021 09:01:19 +0100 Subject: [PATCH 1/2] fix comportamento lock/unlock selezione packlist da processare --- MP-MAG/MP-MAG.csproj | 16 ++++ MP-MAG/SMART/gestPedane.aspx | 62 ++++++------ MP-MAG/SMART/gestPedane.aspx.cs | 84 +++++++--------- MP-MAG/SMART/gestPedane.aspx.designer.cs | 38 ++++---- MP-MAG/WebUserControls/cmp_PL_detail.ascx | 13 +++ MP-MAG/WebUserControls/cmp_PL_detail.ascx.cs | 69 ++++++++++++++ .../cmp_PL_detail.ascx.designer.cs | 44 +++++++++ MP-MAG/WebUserControls/cmp_gestPedane.ascx | 24 +++++ MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs | 95 +++++++++++++++++++ .../cmp_gestPedane.ascx.designer.cs | 71 ++++++++++++++ 10 files changed, 417 insertions(+), 99 deletions(-) create mode 100644 MP-MAG/WebUserControls/cmp_PL_detail.ascx create mode 100644 MP-MAG/WebUserControls/cmp_PL_detail.ascx.cs create mode 100644 MP-MAG/WebUserControls/cmp_PL_detail.ascx.designer.cs create mode 100644 MP-MAG/WebUserControls/cmp_gestPedane.ascx create mode 100644 MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs create mode 100644 MP-MAG/WebUserControls/cmp_gestPedane.ascx.designer.cs diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 26cf82fd..9ae6f732 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -471,6 +471,13 @@ cmp_footer.ascx + + cmp_gestPedane.ascx + ASPXCodeBehind + + + cmp_gestPedane.ascx + cmp_jumper.ascx ASPXCodeBehind @@ -541,6 +548,13 @@ cmp_packListNew.ascx + + cmp_PL_detail.ascx + ASPXCodeBehind + + + cmp_PL_detail.ascx + cmp_printODL.ascx ASPXCodeBehind @@ -828,6 +842,7 @@ + @@ -838,6 +853,7 @@ + diff --git a/MP-MAG/SMART/gestPedane.aspx b/MP-MAG/SMART/gestPedane.aspx index caa10b17..2be50dc7 100644 --- a/MP-MAG/SMART/gestPedane.aspx +++ b/MP-MAG/SMART/gestPedane.aspx @@ -1,44 +1,50 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="gestPedane.aspx.cs" Inherits="MP_MAG.SMART.gestPedane" %> -<%@ Register Src="~/WebUserControls/cmp_elencoPedane.ascx" TagPrefix="uc1" TagName="cmp_elencoPedane" %> -<%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %> -<%@ Register Src="~/WebUserControls/cmp_elencoUDC.ascx" TagPrefix="uc1" TagName="cmp_elencoUDC" %> +<%@ Register Src="~/WebUserControls/cmp_gestPedane.ascx" TagPrefix="uc1" TagName="cmp_gestPedane" %>
-
-
-

Preparazione Spedizioni

-
-
- Richieste + + +
+
+

Preparazione Spedizioni

+
+
+
+
+ Richieste +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
- -
- -
-
- Aggiorna - -
-
+ +
-
-
-
- -
-
- -
-
+
+
-
\ No newline at end of file diff --git a/MP-MAG/SMART/gestPedane.aspx.cs b/MP-MAG/SMART/gestPedane.aspx.cs index ca4539e7..47db9429 100644 --- a/MP-MAG/SMART/gestPedane.aspx.cs +++ b/MP-MAG/SMART/gestPedane.aspx.cs @@ -10,6 +10,26 @@ namespace MP_MAG.SMART { public partial class gestPedane : System.Web.UI.Page { + #region Protected Properties + + protected bool showDetail + { + get + { + return cmp_gestPedane.Visible; + } + set + { + cmp_gestPedane.Visible = value; + ddlElencoPL.Enabled = !value; + lblSel.Text = value ? "Sblocca" : "Imposta"; + icnLock.Visible = value; + icnUnlock.Visible = !value; + } + } + + #endregion Protected Properties + #region Public Properties public int PackListID @@ -29,44 +49,20 @@ namespace MP_MAG.SMART #region Private Methods - private void Cmp_elencoPedane_eh_doRefresh(object sender, EventArgs e) - { - cmp_elencoUDC.Visible = true; - cmp_elencoUDC.AlSel = cmp_elencoPedane.AlSel; - } - - private void Cmp_elencoPedane_eh_doReset(object sender, EventArgs e) - { - ddlElencoPL.DataBind(); - cmp_elencoUDC.Visible = false; - } - - private void Cmp_elencoUDC_eh_doReset(object sender, EventArgs e) - { - ddlElencoPL.DataBind(); - fixDisplay(); - resetSelezione(); - } - private void fixDisplay() { - cmp_elencoPedane.PackListID = PackListID; - cmp_OrderList.PackListID = PackListID; - cmp_elencoUDC.Visible = false; - refreshQrCode(); + cmp_gestPedane.PackListID = PackListID; + cmp_gestPedane.fixDisplay(); } private void refreshStatus() { - cmp_OrderList.doUpdate(); - cmp_elencoPedane.doUpdate(); - cmp_elencoUDC.doUpdate(); + cmp_gestPedane.refreshStatus(); } private void resetSelezione() { - cmp_elencoPedane.resetSelezione(); - cmp_elencoUDC.Visible = false; + cmp_gestPedane.resetSelezione(); } #endregion Private Methods @@ -83,22 +79,19 @@ namespace MP_MAG.SMART fixDisplay(); } - /// - /// restituisce URL immagine QRCode - /// - /// - protected string getImageUrl() + protected void lbtSelect_Click(object sender, EventArgs e) { - string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val="; - string payload = "{'baseUrl':'{0}','parameters':['PL" + PackListID + "']}"; - string answ = $"{baseUrl}{payload}"; - return answ; + // scambio visualizzazione e selezione... + showDetail = !showDetail; + fixDisplay(); } +#if false protected void lbtRefresh_Click(object sender, EventArgs e) { refreshStatus(); } +#endif protected void Page_Load(object sender, EventArgs e) { @@ -106,22 +99,9 @@ namespace MP_MAG.SMART { ((Site)this.Master).showSearch = false; resetSelezione(); + showDetail = false; + fixDisplay(); } - cmp_elencoPedane.eh_doRefresh += Cmp_elencoPedane_eh_doRefresh; - cmp_elencoPedane.eh_doReset += Cmp_elencoPedane_eh_doReset; - cmp_elencoUDC.eh_doReset += Cmp_elencoUDC_eh_doReset; - } - - protected void refreshQrCode() - { - // genero nuovo QR - string qrUrl = getImageUrl(); - imgQrMain.ImageUrl = qrUrl; - } - - protected void timerGestPed_Tick(object sender, EventArgs e) - { - refreshStatus(); } #endregion Protected Methods diff --git a/MP-MAG/SMART/gestPedane.aspx.designer.cs b/MP-MAG/SMART/gestPedane.aspx.designer.cs index 611166e1..35c5202b 100644 --- a/MP-MAG/SMART/gestPedane.aspx.designer.cs +++ b/MP-MAG/SMART/gestPedane.aspx.designer.cs @@ -14,6 +14,15 @@ namespace MP_MAG.SMART public partial class gestPedane { + /// + /// Controllo pnlPL01. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel pnlPL01; + /// /// Controllo ddlElencoPL. /// @@ -33,57 +42,48 @@ namespace MP_MAG.SMART protected global::System.Web.UI.WebControls.ObjectDataSource odsPL; /// - /// Controllo cmp_OrderList. + /// Controllo lbtSelect. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList; + protected global::System.Web.UI.WebControls.LinkButton lbtSelect; /// - /// Controllo lbtRefresh. + /// Controllo icnUnlock. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.LinkButton lbtRefresh; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnUnlock; /// - /// Controllo imgQrMain. + /// Controllo lblSel. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::System.Web.UI.WebControls.Image imgQrMain; + protected global::System.Web.UI.WebControls.Label lblSel; /// - /// Controllo cmp_elencoPedane. + /// Controllo icnLock. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MP_MAG.WebUserControls.cmp_elencoPedane cmp_elencoPedane; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnLock; /// - /// Controllo cmp_elencoUDC. + /// Controllo cmp_gestPedane. /// /// /// Campo generato automaticamente. /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// - protected global::MP_MAG.WebUserControls.cmp_elencoUDC cmp_elencoUDC; - - /// - /// Controllo timerGestPed. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.Timer timerGestPed; + protected global::MP_MAG.WebUserControls.cmp_gestPedane cmp_gestPedane; } } diff --git a/MP-MAG/WebUserControls/cmp_PL_detail.ascx b/MP-MAG/WebUserControls/cmp_PL_detail.ascx new file mode 100644 index 00000000..a9ccc6fd --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PL_detail.ascx @@ -0,0 +1,13 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_PL_detail.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_PL_detail" %> + +<%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %> + + +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_PL_detail.ascx.cs b/MP-MAG/WebUserControls/cmp_PL_detail.ascx.cs new file mode 100644 index 00000000..73763a52 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PL_detail.ascx.cs @@ -0,0 +1,69 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_PL_detail : BaseUserControl + { + #region Public Properties + + public int PackListID + { + get + { + int answ = 0; + int.TryParse(hfPackListID.Value, out answ); + return answ; + } + set + { + hfPackListID.Value = $"{value}"; + cmp_OrderList.PackListID = value; + refreshQrCode(); + } + } + + #endregion Public Properties + + #region Protected Methods + + /// + /// restituisce URL immagine QRCode + /// + /// + protected string getImageUrl() + { + string baseUrl = $"{memLayer.ML.CRS("matrixUrl")}/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['PL" + PackListID + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + + protected void Page_Load(object sender, EventArgs e) + { + } + + protected void refreshQrCode() + { + // genero nuovo QR + string qrUrl = getImageUrl(); + imgQrMain.ImageUrl = qrUrl; + } + + #endregion Protected Methods + + #region Internal Methods + + internal void doUpdate() + { + cmp_OrderList.doUpdate(); + } + + #endregion Internal Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_PL_detail.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_PL_detail.ascx.designer.cs new file mode 100644 index 00000000..c451ef8a --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_PL_detail.ascx.designer.cs @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_PL_detail + { + + /// + /// Controllo hfPackListID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfPackListID; + + /// + /// Controllo cmp_OrderList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList; + + /// + /// Controllo imgQrMain. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.Image imgQrMain; + } +} diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx b/MP-MAG/WebUserControls/cmp_gestPedane.ascx new file mode 100644 index 00000000..90e4afb2 --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx @@ -0,0 +1,24 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_gestPedane.ascx.cs" Inherits="MP_MAG.WebUserControls.cmp_gestPedane" %> + +<%@ Register Src="~/WebUserControls/cmp_elencoPedane.ascx" TagPrefix="uc1" TagName="cmp_elencoPedane" %> +<%@ Register Src="~/WebUserControls/cmp_elencoUDC.ascx" TagPrefix="uc1" TagName="cmp_elencoUDC" %> +<%@ Register Src="~/WebUserControls/cmp_PL_detail.ascx" TagPrefix="uc1" TagName="cmp_PL_detail" %> + + + + +
+
+ +
+
+ +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs new file mode 100644 index 00000000..c3dd123e --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.cs @@ -0,0 +1,95 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.WebUserControls +{ + public partial class cmp_gestPedane : BaseUserControl + { + #region Public Properties + + public int PackListID + { + get + { + int answ = 0; + int.TryParse(hfPackListID.Value, out answ); + return answ; + } + set + { + hfPackListID.Value = $"{value}"; + cmp_PL_detail.PackListID = value; + cmp_elencoPedane.PackListID = value; + } + } + + #endregion Public Properties + + #region Private Methods + + private void Cmp_elencoPedane_eh_doRefresh(object sender, EventArgs e) + { + cmp_elencoUDC.Visible = true; + cmp_elencoUDC.AlSel = cmp_elencoPedane.AlSel; + } + + private void Cmp_elencoPedane_eh_doReset(object sender, EventArgs e) + { + cmp_elencoUDC.Visible = false; + raiseReset(); + } + + private void Cmp_elencoUDC_eh_doReset(object sender, EventArgs e) + { + fixDisplay(); + resetSelezione(); + raiseReset(); + } + + #endregion Private Methods + + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + cmp_elencoPedane.eh_doRefresh += Cmp_elencoPedane_eh_doRefresh; + cmp_elencoPedane.eh_doReset += Cmp_elencoPedane_eh_doReset; + cmp_elencoUDC.eh_doReset += Cmp_elencoUDC_eh_doReset; + } + + protected void timerGestPed_Tick(object sender, EventArgs e) + { + refreshStatus(); + } + + #endregion Protected Methods + + #region Public Methods + + public void fixDisplay() + { + cmp_PL_detail.PackListID = PackListID; + cmp_elencoPedane.PackListID = PackListID; + cmp_elencoUDC.Visible = false; + } + + public void refreshStatus() + { + cmp_PL_detail.doUpdate(); + cmp_elencoPedane.doUpdate(); + cmp_elencoUDC.doUpdate(); + } + + public void resetSelezione() + { + cmp_elencoPedane.resetSelezione(); + cmp_elencoUDC.Visible = false; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_gestPedane.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.designer.cs new file mode 100644 index 00000000..7e8b2adc --- /dev/null +++ b/MP-MAG/WebUserControls/cmp_gestPedane.ascx.designer.cs @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + +namespace MP_MAG.WebUserControls +{ + + + public partial class cmp_gestPedane + { + + /// + /// Controllo pnlPL. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.UpdatePanel pnlPL; + + /// + /// Controllo cmp_PL_detail. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_PL_detail cmp_PL_detail; + + /// + /// Controllo cmp_elencoPedane. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_elencoPedane cmp_elencoPedane; + + /// + /// Controllo cmp_elencoUDC. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::MP_MAG.WebUserControls.cmp_elencoUDC cmp_elencoUDC; + + /// + /// Controllo hfPackListID. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfPackListID; + + /// + /// Controllo timerGestPed. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.Timer timerGestPed; + } +} From da67a407509ea2f845ac5987820001ae13d35bbe Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 2 Feb 2021 09:01:45 +0100 Subject: [PATCH 2/2] new rel --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7c0964b6..6e2700e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1390']) { + withEnv(['NEXT_BUILD_NUMBER=1391']) { // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO'