diff --git a/AppData/Utils.cs b/AppData/Utils.cs index 2625d22..c299c58 100644 --- a/AppData/Utils.cs +++ b/AppData/Utils.cs @@ -124,8 +124,10 @@ namespace AppData { waiting = 0, running, + error, completed, aborted, - error + accepted, + refused } } diff --git a/NKC_WF/OrderManager.aspx b/NKC_WF/OrderManager.aspx index 5d0da43..a3bc35e 100644 --- a/NKC_WF/OrderManager.aspx +++ b/NKC_WF/OrderManager.aspx @@ -19,16 +19,7 @@
-
-
-
- Accetta -
-
- Annulla -
-
-
+ diff --git a/NKC_WF/OrderManager.aspx.cs b/NKC_WF/OrderManager.aspx.cs index bc2d654..e295064 100644 --- a/NKC_WF/OrderManager.aspx.cs +++ b/NKC_WF/OrderManager.aspx.cs @@ -94,19 +94,11 @@ namespace NKC_WF private void checkVisibility() { bool hasBatch = false; - bool isBatchCompleted = false; if (currBatchID > 0) { hasBatch = true; } - // !!!FIXME!!! fare lettura - // leggo da REDIS se รจ stato COMPLETATO il Batch... - if (true) - { - isBatchCompleted = true; - } divStatus.Visible = hasBatch; - divButtons.Visible = hasBatch && isBatchCompleted; } } } \ No newline at end of file diff --git a/NKC_WF/OrderManager.aspx.designer.cs b/NKC_WF/OrderManager.aspx.designer.cs index 3e03bd6..b302d94 100644 --- a/NKC_WF/OrderManager.aspx.designer.cs +++ b/NKC_WF/OrderManager.aspx.designer.cs @@ -38,32 +38,5 @@ namespace NKC_WF { /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::NKC_WF.WebUserControls.cmp_orderStatus cmp_orderStatus; - - /// - /// Controllo divButtons. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divButtons; - - /// - /// Controllo lbtConfirm. - /// - /// - /// 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 lbtConfirm; - - /// - /// Controllo lbtCancel. - /// - /// - /// 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 lbtCancel; } } diff --git a/NKC_WF/WebUserControls/cmp_orderStatus.ascx b/NKC_WF/WebUserControls/cmp_orderStatus.ascx index 05b257e..b8c7c1b 100644 --- a/NKC_WF/WebUserControls/cmp_orderStatus.ascx +++ b/NKC_WF/WebUserControls/cmp_orderStatus.ascx @@ -33,6 +33,16 @@ (minutes) +
+
+
+ Accetta +
+
+ Annulla +
+
+
diff --git a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs index ed502dd..5d1413b 100644 --- a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs @@ -71,7 +71,8 @@ namespace NKC_WF.WebUserControls lblNestingRuntime.Text = statoBatch.ProcessingRuntime.ToString(); lblWrktimeEst.Text = (statoBatch.EstimatedWorktime / 60).ToString(); // secondo status mostro barra... - divProgress.Visible = (statoBatch.ProcessStatus > procStatus.waiting && statoBatch.ProcessStatus < procStatus.completed); + divProgress.Visible = (statoBatch.ProcessStatus > procStatus.waiting && statoBatch.ProcessStatus < procStatus.error); + divButtons.Visible = (statoBatch.ProcessStatus > procStatus.error && statoBatch.ProcessStatus < procStatus.accepted); } } TimerUpdateStatus.Enabled = statusPresent; @@ -82,5 +83,15 @@ namespace NKC_WF.WebUserControls { updateStatus(); } + + protected void lbtConfirm_Click(object sender, EventArgs e) + { + // accettazione ordine: scrivo su DB e QUINDI su redis indico accepted + } + + protected void lbtCancel_Click(object sender, EventArgs e) + { + // rifiuto ordine: ELIMINO su DB e QUINDI su redis indico refused + } } } \ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.designer.cs b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.designer.cs index fe1d3ec..5e282b4 100644 --- a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.designer.cs +++ b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.designer.cs @@ -66,6 +66,33 @@ namespace NKC_WF.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblWrktimeEst; + /// + /// Controllo divButtons. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divButtons; + + /// + /// Controllo lbtConfirm. + /// + /// + /// 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 lbtConfirm; + + /// + /// Controllo lbtCancel. + /// + /// + /// 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 lbtCancel; + /// /// Controllo TimerUpdateStatus. ///