diff --git a/XPS/Web.config b/XPS/Web.config index 9e13be0..d6ebcab 100644 --- a/XPS/Web.config +++ b/XPS/Web.config @@ -58,7 +58,7 @@ - + - - - - + + + + + + + + - - + + - - + + + diff --git a/XPS/mod_ULP.ascx b/XPS/mod_ULP.ascx index 953f5bf..87badcb 100644 --- a/XPS/mod_ULP.ascx +++ b/XPS/mod_ULP.ascx @@ -2,10 +2,12 @@ <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> <%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %> +<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc3" %> + OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated" + OnRowDeleted="grView_RowDeleted" Width="100%"> @@ -19,8 +21,6 @@ - - - - + + + @@ -44,7 +45,15 @@ Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />--%> - + + + + + + + + @@ -96,7 +105,7 @@ + ReadOnly="True" DataFormatString="{0:dd/MM/yy HH:mm}" /> @@ -158,9 +167,13 @@    -
- -
+ +
+ +
+
+ + + diff --git a/XPS/mod_elencoComm.ascx b/XPS/mod_elencoComm.ascx index 098d72e..f88223a 100644 --- a/XPS/mod_elencoComm.ascx +++ b/XPS/mod_elencoComm.ascx @@ -2,6 +2,7 @@ Inherits="mod_elencoComm" %> <%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %> <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %> +<%@ Register Src="mod_logStati.ascx" TagName="mod_logStati" TagPrefix="uc2" %>
@@ -37,10 +38,12 @@ - - Brunitura - Fosfatazione + + + @@ -49,7 +52,6 @@ - @@ -121,7 +123,19 @@ - + + + + + + + +
+ --> +
+
+
+ + +