diff --git a/GPW_Smart/GPW_Smart.csproj b/GPW_Smart/GPW_Smart.csproj index 6afe4d9..73a040c 100644 --- a/GPW_Smart/GPW_Smart.csproj +++ b/GPW_Smart/GPW_Smart.csproj @@ -564,7 +564,7 @@ - + @@ -818,12 +818,12 @@ mod_commAttivita.ascx - - mod_dateTimeJQM.ascx + + mod_dateTime.ascx ASPXCodeBehind - - mod_dateTimeJQM.ascx + + mod_dateTime.ascx mod_enrollByAuthKey.ascx diff --git a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx index 1b3554e..a540cea 100644 --- a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx +++ b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_attivitaIns.ascx.cs" Inherits="GPW.WebUserControls.mod_attivitaIns" %> -<%@ Register Src="mod_dateTimeJQM.ascx" TagName="mod_dateTimeJQM" TagPrefix="uc1" %> +<%@ Register Src="mod_dateTime.ascx" TagName="mod_dateTime" TagPrefix="uc1" %> @@ -22,8 +22,8 @@ - - + +
descrizione: @@ -52,8 +52,8 @@ - - + +
descrizione: @@ -79,8 +79,8 @@ - - + +
descrizione: diff --git a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx.cs b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx.cs index bee47d7..4f8ab74 100644 --- a/GPW_Smart/WebUserControls/mod_attivitaIns.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_attivitaIns.ascx.cs @@ -121,8 +121,8 @@ namespace GPW.WebUserControls else // è insert nuova!!! { frViewRA.ChangeMode(FormViewMode.Insert); - mod_dateTimeJQM dtjInizio = (mod_dateTimeJQM)frViewRA.FindControl("dtjInizio"); - mod_dateTimeJQM dtjFine = (mod_dateTimeJQM)frViewRA.FindControl("dtjFine"); + mod_dateTime dtjInizio = (mod_dateTime)frViewRA.FindControl("dtjInizio"); + mod_dateTime dtjFine = (mod_dateTime)frViewRA.FindControl("dtjFine"); dtjInizio.valoreDateTime = dataRif.AddHours(DateTime.Now.Hour).AddMinutes(DateTime.Now.Minute); dtjFine.valoreDateTime = dtjInizio.valoreDateTime.AddMinutes(memLayer.ML.confReadInt("defRegAttMin")); } diff --git a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx b/GPW_Smart/WebUserControls/mod_dateTime.ascx similarity index 96% rename from GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx rename to GPW_Smart/WebUserControls/mod_dateTime.ascx index 2ed04e9..0b30851 100644 --- a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx +++ b/GPW_Smart/WebUserControls/mod_dateTime.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dateTimeJQM.ascx.cs" Inherits="GPW.WebUserControls.mod_dateTimeJQM" %> +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dateTime.ascx.cs" Inherits="GPW.WebUserControls.mod_dateTime" %>
diff --git a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.cs b/GPW_Smart/WebUserControls/mod_dateTime.ascx.cs similarity index 95% rename from GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.cs rename to GPW_Smart/WebUserControls/mod_dateTime.ascx.cs index c6cddf0..f61696f 100644 --- a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.cs +++ b/GPW_Smart/WebUserControls/mod_dateTime.ascx.cs @@ -2,7 +2,7 @@ namespace GPW.WebUserControls { - public partial class mod_dateTimeJQM : System.Web.UI.UserControl + public partial class mod_dateTime : System.Web.UI.UserControl { /// /// avvio pagina diff --git a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.designer.cs b/GPW_Smart/WebUserControls/mod_dateTime.ascx.designer.cs similarity index 98% rename from GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.designer.cs rename to GPW_Smart/WebUserControls/mod_dateTime.ascx.designer.cs index b6ab13c..1d70fd7 100644 --- a/GPW_Smart/WebUserControls/mod_dateTimeJQM.ascx.designer.cs +++ b/GPW_Smart/WebUserControls/mod_dateTime.ascx.designer.cs @@ -10,7 +10,7 @@ namespace GPW.WebUserControls { - public partial class mod_dateTimeJQM { + public partial class mod_dateTime { /// /// Controllo txtData.