diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj index d3ad595..779d9b1 100644 --- a/NKC_WF/NKC_WF.csproj +++ b/NKC_WF/NKC_WF.csproj @@ -166,6 +166,7 @@ + @@ -367,6 +368,13 @@ cmp_menuTop.ascx + + cmp_numRow.ascx + ASPXCodeBehind + + + cmp_numRow.ascx + cmp_orderStatus.ascx ASPXCodeBehind diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index e36a084..0a3fde1 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -76,6 +76,7 @@ namespace NKC_WF.WebUserControls { // registro accettazione Nesting DataLayer.man.taBL.acceptBatch(BatchId, DataLayer.man.CodSoggCurrUser); + raiseEvent(); } protected void lbtStopNesting_Click(object sender, EventArgs e) diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index e691ff6..c53ddcc 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -1,5 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_batchList.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_batchList" %> <%@ Register Src="~/WebUserControls/cmp_batchDetail.ascx" TagPrefix="uc1" TagName="cmp_batchDetail" %> +<%@ Register Src="~/WebUserControls/cmp_numRow.ascx" TagPrefix="uc1" TagName="cmp_numRow" %> +
@@ -22,6 +24,8 @@ +  |  +
@@ -40,15 +44,15 @@ - + - - - + <%----%> + + <%----%> - <%# BStatus(Eval("Status")) %> + <%# BStatus(Eval("Status")) %> diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs index d848825..3ff0641 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.cs @@ -18,6 +18,14 @@ namespace NKC_WF.WebUserControls divDetail.Visible = false; } cmp_batchDetail.eh_doRefresh += Cmp_batchDetail_eh_doRefresh; + cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh; + } + + private void Cmp_numRow_eh_doRefresh(object sender, EventArgs e) + { + // recupero num righe ed aggiorno... + grView.PageSize = cmp_numRow.numRow; + grView.DataBind(); } private void Cmp_batchDetail_eh_doRefresh(object sender, EventArgs e) @@ -25,6 +33,35 @@ namespace NKC_WF.WebUserControls resetSelezione(); } + /// + /// Codice CSS in base a status... + /// + /// + /// + public string cssByStatus(object _status) + { + string answ = ""; + int status = -1; + int.TryParse(_status.ToString(), out status); + switch (status) + { + case 1: + answ = "font-weight-bold text-warning"; + break; + case 2: + answ = "font-weight-bold text-info"; + break; + case 3: + answ = "font-weight-bold text-success"; + break; + case 4: + answ = "font-weight-bold text-secondary"; + break; + default: + break; + } + return answ; + } /// /// Converte il codice stato in effettivo campo /// diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs index a4be3b6..c1fec37 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx.designer.cs @@ -39,6 +39,15 @@ namespace NKC_WF.WebUserControls { /// protected global::System.Web.UI.WebControls.DropDownList ddlStatus; + /// + /// Controllo cmp_numRow. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::NKC_WF.WebUserControls.cmp_numRow cmp_numRow; + /// /// Controllo grView. /// diff --git a/NKC_WF/WebUserControls/cmp_numRow.ascx b/NKC_WF/WebUserControls/cmp_numRow.ascx new file mode 100644 index 0000000..0ec2543 --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_numRow.ascx @@ -0,0 +1,4 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_numRow.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_numRow" %> + +size: + \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_numRow.ascx.cs b/NKC_WF/WebUserControls/cmp_numRow.ascx.cs new file mode 100644 index 0000000..9ecdf4e --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_numRow.ascx.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace NKC_WF.WebUserControls +{ + public partial class cmp_numRow : System.Web.UI.UserControl + { + public event EventHandler eh_doRefresh; + protected void Page_Load(object sender, EventArgs e) + { + + } + + private void raiseEvent() + { + // se qualcuno ascolta sollevo evento nuovo valore... + if (eh_doRefresh != null) + { + eh_doRefresh(this, new EventArgs()); + } + } + public int numRow + { + set + { + txtNumRow.Text = value.ToString(); + } + get + { + int answ = 10; + int.TryParse(txtNumRow.Text, out answ); + return answ; + } + } + + protected void txtNumRow_TextChanged(object sender, EventArgs e) + { + raiseEvent(); + } + } +} \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_numRow.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_numRow.ascx.designer.cs new file mode 100644 index 0000000..e1119ad --- /dev/null +++ b/NKC_WF/WebUserControls/cmp_numRow.ascx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// 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 NKC_WF.WebUserControls { + + + public partial class cmp_numRow { + + /// + /// Controllo txtNumRow. + /// + /// + /// 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.TextBox txtNumRow; + } +}