diff --git a/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs b/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs index 369ea42..9ec1747 100644 --- a/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs +++ b/C-TRACK/WebUserControls/mod_btnComandi.ascx.cs @@ -93,7 +93,14 @@ namespace C_TRACK.WebUserControls { string answ = ""; // controllos e ho in sessione numTask altrimenti NON E' abilitato... - answ = hasVeto ? "Commessa Chiusa: " + CurrNumTask.ToString() : ""; + if (CurrNumTask == "") + { + answ = "Manca Commessa"; + } + else + { + answ = hasVeto ? "Commessa Chiusa: " + CurrNumTask.ToString() : ""; + } return answ; } } diff --git a/C-TRACK/WebUserControls/mod_fasiAttive.ascx.cs b/C-TRACK/WebUserControls/mod_fasiAttive.ascx.cs index 27cfa8d..25d837e 100644 --- a/C-TRACK/WebUserControls/mod_fasiAttive.ascx.cs +++ b/C-TRACK/WebUserControls/mod_fasiAttive.ascx.cs @@ -14,6 +14,7 @@ namespace C_TRACK.WebUserControls { // chiama la procedura che chiude tutte la fasi rimaste attive... dataLayer.man.taTR.closePending(); + Response.Redirect("~/task"); } } } \ No newline at end of file diff --git a/C-TRACK/WebUserControls/mod_taskList.ascx b/C-TRACK/WebUserControls/mod_taskList.ascx index 5a2f253..0dfa9c3 100644 --- a/C-TRACK/WebUserControls/mod_taskList.ascx +++ b/C-TRACK/WebUserControls/mod_taskList.ascx @@ -1,5 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_taskList.ascx.cs" Inherits="C_TRACK.WebUserControls.mod_taskList" %> -<%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %> <%@ Register Src="~/WebUserControls/mod_taskRec.ascx" TagPrefix="uc1" TagName="mod_taskRec" %> <%@ Register Src="~/WebUserControls/mod_fasiAttive.ascx" TagPrefix="uc1" TagName="mod_fasiAttive" %>