Merge branch 'MAG' into ADM

This commit is contained in:
Samuele E. Locatelli
2021-02-02 09:01:53 +01:00
11 changed files with 418 additions and 100 deletions
Vendored
+1 -1
View File
@@ -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'
+16
View File
@@ -471,6 +471,13 @@
<Compile Include="WebUserControls\cmp_footer.ascx.designer.cs">
<DependentUpon>cmp_footer.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_gestPedane.ascx.cs">
<DependentUpon>cmp_gestPedane.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_gestPedane.ascx.designer.cs">
<DependentUpon>cmp_gestPedane.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_jumper.ascx.cs">
<DependentUpon>cmp_jumper.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -541,6 +548,13 @@
<Compile Include="WebUserControls\cmp_packListNew.ascx.designer.cs">
<DependentUpon>cmp_packListNew.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_PL_detail.ascx.cs">
<DependentUpon>cmp_PL_detail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_PL_detail.ascx.designer.cs">
<DependentUpon>cmp_PL_detail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_printODL.ascx.cs">
<DependentUpon>cmp_printODL.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -828,6 +842,7 @@
<Content Include="WebUserControls\cmp_elencoPedane.ascx" />
<Content Include="WebUserControls\cmp_elencoUDC.ascx" />
<Content Include="WebUserControls\cmp_footer.ascx" />
<Content Include="WebUserControls\cmp_gestPedane.ascx" />
<Content Include="WebUserControls\cmp_jumper.ascx" />
<Content Include="WebUserControls\cmp_listODL.ascx" />
<Content Include="WebUserControls\cmp_menuTop.ascx" />
@@ -838,6 +853,7 @@
<Content Include="WebUserControls\cmp_packList.ascx" />
<Content Include="WebUserControls\cmp_packListMgmt.ascx" />
<Content Include="WebUserControls\cmp_packListNew.ascx" />
<Content Include="WebUserControls\cmp_PL_detail.ascx" />
<Content Include="WebUserControls\cmp_printODL.ascx" />
<Content Include="WebUserControls\cmp_SelPackList.ascx" />
<Content Include="WebUserControls\cmp_SelPedana.ascx" />
+34 -28
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="row m-0">
<div class="col-12">
<div class="card border-info">
<div class="card-header text-uppercase">
<div class="row">
<div class="col-12 col-md-10">
<h3>Preparazione Spedizioni</h3>
<div class="input-group mb-3 small">
<div class="input-group-prepend">
<span class="input-group-text">Richieste</span>
<asp:UpdatePanel runat="server" ID="pnlPL01">
<ContentTemplate>
<div class="row">
<div class="col-12">
<h3>Preparazione Spedizioni</h3>
</div>
<div class="col-12 col-md-10">
<div class="input-group mb-1 small">
<div class="input-group-prepend">
<span class="input-group-text">Richieste</span>
</div>
<asp:DropDownList runat="server" ID="ddlElencoPL" DataSourceID="odsPL" DataTextField="label" DataValueField="value" AutoPostBack="True" CssClass="form-control" OnSelectedIndexChanged="ddlElencoPL_SelectedIndexChanged" OnDataBound="ddlElencoPL_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsPL" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MagData.DS_UtilityTableAdapters.selPackListTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="col-12 col-md-2">
<asp:LinkButton runat="server" ID="lbtSelect" CssClass="btn btn-block btn-primary" OnClick="lbtSelect_Click">
<div class="d-flex justify-content-between">
<div class="px-2">
<i class="fas fa-unlock" runat="server" id="icnUnlock"></i>
</div>
<div class="px-2">
<asp:Label runat="server" ID="lblSel" />
</div>
<div class="px-2">
<i class="fas fa-lock" runat="server" id="icnLock"></i>
</div>
</div>
</asp:LinkButton>
</div>
<asp:DropDownList runat="server" ID="ddlElencoPL" DataSourceID="odsPL" DataTextField="label" DataValueField="value" AutoPostBack="True" CssClass="form-control" OnSelectedIndexChanged="ddlElencoPL_SelectedIndexChanged" OnDataBound="ddlElencoPL_DataBound"></asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsPL" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MagData.DS_UtilityTableAdapters.selPackListTableAdapter"></asp:ObjectDataSource>
</div>
<uc1:cmp_OrderList runat="server" ID="cmp_OrderList" EnableEdit="false" />
</div>
<div class="col-12 col-md-2">
<asp:LinkButton runat="server" ID="lbtRefresh" CssClass="btn btn-block btn-primary" OnClick="lbtRefresh_Click"><i class="fas fa-sync-alt"></i> Aggiorna</asp:LinkButton>
<asp:Image runat="server" ID="imgQrMain" CssClass="img-fluid" />
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</div>
<div class="card-body">
<div class="row small">
<div class="col-6">
<uc1:cmp_elencoPedane runat="server" ID="cmp_elencoPedane" />
</div>
<div class="col-6">
<uc1:cmp_elencoUDC runat="server" ID="cmp_elencoUDC" />
</div>
</div>
<div class="card-body small">
<uc1:cmp_gestPedane runat="server" ID="cmp_gestPedane" />
</div>
</div>
</div>
<asp:Timer runat="server" ID="timerGestPed" Interval="10000" OnTick="timerGestPed_Tick" />
</div>
</asp:Content>
+32 -52
View File
@@ -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();
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <returns></returns>
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
+19 -19
View File
@@ -14,6 +14,15 @@ namespace MP_MAG.SMART
public partial class gestPedane
{
/// <summary>
/// Controllo pnlPL01.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel pnlPL01;
/// <summary>
/// Controllo ddlElencoPL.
/// </summary>
@@ -33,57 +42,48 @@ namespace MP_MAG.SMART
protected global::System.Web.UI.WebControls.ObjectDataSource odsPL;
/// <summary>
/// Controllo cmp_OrderList.
/// Controllo lbtSelect.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList;
protected global::System.Web.UI.WebControls.LinkButton lbtSelect;
/// <summary>
/// Controllo lbtRefresh.
/// Controllo icnUnlock.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefresh;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnUnlock;
/// <summary>
/// Controllo imgQrMain.
/// Controllo lblSel.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgQrMain;
protected global::System.Web.UI.WebControls.Label lblSel;
/// <summary>
/// Controllo cmp_elencoPedane.
/// Controllo icnLock.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_elencoPedane cmp_elencoPedane;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnLock;
/// <summary>
/// Controllo cmp_elencoUDC.
/// Controllo cmp_gestPedane.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_elencoUDC cmp_elencoUDC;
/// <summary>
/// Controllo timerGestPed.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerGestPed;
protected global::MP_MAG.WebUserControls.cmp_gestPedane cmp_gestPedane;
}
}
+13
View File
@@ -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" %>
<asp:HiddenField runat="server" ID="hfPackListID" />
<div class="row">
<div class="col-12 col-md-10">
<uc1:cmp_OrderList runat="server" ID="cmp_OrderList" EnableEdit="false" />
</div>
<div class="col-12 col-md-2">
<asp:Image runat="server" ID="imgQrMain" CssClass="img-fluid" />
</div>
</div>
@@ -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
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <returns></returns>
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
}
}
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_MAG.WebUserControls
{
public partial class cmp_PL_detail
{
/// <summary>
/// Controllo hfPackListID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfPackListID;
/// <summary>
/// Controllo cmp_OrderList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList;
/// <summary>
/// Controllo imgQrMain.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Image imgQrMain;
}
}
@@ -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" %>
<asp:UpdatePanel runat="server" ID="pnlPL">
<ContentTemplate>
<div class="row">
<div class="col-12">
<uc1:cmp_PL_detail runat="server" ID="cmp_PL_detail" />
</div>
<div class="col-6">
<uc1:cmp_elencoPedane runat="server" ID="cmp_elencoPedane" />
</div>
<div class="col-6">
<uc1:cmp_elencoUDC runat="server" ID="cmp_elencoUDC" />
</div>
</div>
<asp:HiddenField runat="server" ID="hfPackListID" />
<asp:Timer runat="server" ID="timerGestPed" Interval="1000" OnTick="timerGestPed_Tick" />
</ContentTemplate>
</asp:UpdatePanel>
@@ -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
}
}
+71
View File
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_MAG.WebUserControls
{
public partial class cmp_gestPedane
{
/// <summary>
/// Controllo pnlPL.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel pnlPL;
/// <summary>
/// Controllo cmp_PL_detail.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_PL_detail cmp_PL_detail;
/// <summary>
/// Controllo cmp_elencoPedane.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_elencoPedane cmp_elencoPedane;
/// <summary>
/// Controllo cmp_elencoUDC.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_elencoUDC cmp_elencoUDC;
/// <summary>
/// Controllo hfPackListID.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfPackListID;
/// <summary>
/// Controllo timerGestPed.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.Timer timerGestPed;
}
}