diff --git a/VersGen/WebSC.cs b/VersGen/WebSC.cs index fbd9074..d2c9d24 100644 --- a/VersGen/WebSC.cs +++ b/VersGen/WebSC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.023.41")] -[assembly: AssemblyFileVersion("0.7.023.41")] +[assembly: AssemblyVersion("0.7.025.42")] +[assembly: AssemblyFileVersion("0.7.025.42")] [assembly: AssemblyCopyright("Steamware © 2015-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/WebSC.tt b/VersGen/WebSC.tt index d32b921..fc52013 100644 --- a/VersGen/WebSC.tt +++ b/VersGen/WebSC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("0.7.023.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("0.7.023.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("0.7.025.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("0.7.025.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+ diff --git a/VersGen/bin/Debug/VersGen.dll b/VersGen/bin/Debug/VersGen.dll index 0f11291..1c6fa55 100644 Binary files a/VersGen/bin/Debug/VersGen.dll and b/VersGen/bin/Debug/VersGen.dll differ diff --git a/VersGen/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/VersGen/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..52c26af Binary files /dev/null and b/VersGen/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/VersGen/obj/Debug/TempPE/WebSC.cs.dll b/VersGen/obj/Debug/TempPE/WebSC.cs.dll index ca34596..f6b7a33 100644 Binary files a/VersGen/obj/Debug/TempPE/WebSC.cs.dll and b/VersGen/obj/Debug/TempPE/WebSC.cs.dll differ diff --git a/VersGen/obj/Debug/VersGen.dll b/VersGen/obj/Debug/VersGen.dll index 0f11291..1c6fa55 100644 Binary files a/VersGen/obj/Debug/VersGen.dll and b/VersGen/obj/Debug/VersGen.dll differ diff --git a/WebSCR.v11.suo b/WebSCR.v11.suo index 68d0f6f..e442c8e 100644 Binary files a/WebSCR.v11.suo and b/WebSCR.v11.suo differ diff --git a/WebSCR/Squadra.aspx.cs b/WebSCR/Squadra.aspx.cs index 39a0170..2b15056 100644 --- a/WebSCR/Squadra.aspx.cs +++ b/WebSCR/Squadra.aspx.cs @@ -13,6 +13,17 @@ namespace WebSCR protected void Page_Load(object sender, EventArgs e) { fixVisibility(); + mod_gestIntSquadra.eh_update += mod_gestIntSquadra_eh_update; + } + /// + /// update gest squadra sul campo + /// + /// + /// + void mod_gestIntSquadra_eh_update(object sender, EventArgs e) + { + mod_dettInt.doUpdate(); + mod_ImpegnoSmall.doUpdate(); } /// /// recupera valore querystring diff --git a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs index 9e1050c..22f9c9a 100644 --- a/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs +++ b/WebSCR/WebUserControls/mod_ImpegnoSmall.ascx.cs @@ -29,5 +29,12 @@ namespace WebSCR.WebUserControls { } return answ; } + /// + /// effettua update + /// + public void doUpdate() + { + frmViewImpegni.DataBind(); + } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx index c32eb26..875d163 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx @@ -1,106 +1,22 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadra" %> - - -

Click the button to get your coordinates.

- - -

aaaaaa

- -<%----%> +<%-- +--%>
diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs index 7acb208..7bf163a 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs @@ -11,6 +11,23 @@ namespace WebSCR.WebUserControls { public partial class mod_gestIntSquadra : System.Web.UI.UserControl { + public event EventHandler eh_update; + /// + /// solleva evento selezione data + /// + protected void reportEvent() + { + // evento! + if (eh_update != null) + { + eh_update(this, new EventArgs()); + } + } + /// + /// load pagina + /// + /// + /// protected void Page_Load(object sender, EventArgs e) { fixVisibility(); @@ -29,6 +46,34 @@ namespace WebSCR.WebUserControls return answ; } } + protected double latitude + { + get + { + double answ = 0; + try + { + answ = Convert.ToDouble(hLat.Value.Replace(".",",")); + } + catch + { } + return answ; + } + } + protected double longitude + { + get + { + double answ = 0; + try + { + answ = Convert.ToDouble(hLon.Value.Replace(".", ",")); + } + catch + { } + return answ; + } + } /// /// sistemo visibilità buttons /// @@ -63,24 +108,36 @@ namespace WebSCR.WebUserControls } } + + //protected void btnLoad_Click(object sender, EventArgs e) + //{ + // lblCoord.Text = string.Format("Lat: {0}, Lon: {1}", hLat.Value, hLon.Value); + //} + protected void lbInizioInt_Click(object sender, EventArgs e) { - //DtProxy.man.taImp.recStartInt(IdxImpegno, DateTime.Now, 0, 0); + DtProxy.man.taImp.recStartInt(IdxImpegno, DateTime.Now, latitude, longitude); + fixVisibility(); + reportEvent(); } protected void lbFineInt_Click(object sender, EventArgs e) { - + DtProxy.man.taImp.recFineInt(IdxImpegno, DateTime.Now, latitude, longitude); + fixVisibility(); + reportEvent(); } protected void lbNoteInt_Click(object sender, EventArgs e) { - + fixVisibility(); + reportEvent(); } protected void lbFileInt_Click(object sender, EventArgs e) { - + fixVisibility(); + reportEvent(); } } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs index 0fed111..8b84152 100644 --- a/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs @@ -12,6 +12,24 @@ namespace WebSCR.WebUserControls { public partial class mod_gestIntSquadra { + /// + /// hLat control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hLat; + + /// + /// hLon control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hLon; + /// /// lbInizioInt control. /// diff --git a/WebSCR/WebUserControls/mod_header.ascx b/WebSCR/WebUserControls/mod_header.ascx index d015caa..376af43 100644 --- a/WebSCR/WebUserControls/mod_header.ascx +++ b/WebSCR/WebUserControls/mod_header.ascx @@ -24,18 +24,5 @@ <%: DataSel %> | <%: ClienteSel %> | <%: SquadraSel %>
-test - - + + diff --git a/WebSCR/WebUserControls/mod_header.ascx.cs b/WebSCR/WebUserControls/mod_header.ascx.cs index bf20ea8..0a553ce 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.cs @@ -122,8 +122,6 @@ namespace WebSCR.WebUserControls Response.Redirect("UserAdmin"); } } - // !!!FARE!!! non lo intercetta - lblCoord.Text = demo.Text; } /// /// verifica che la pagina sia tra quelle autorizzate x l'utente @@ -238,11 +236,7 @@ namespace WebSCR.WebUserControls memLayer.ML.setCookieVal(memLayer.ML.confReadString("AuthCookieName"), ""); memLayer.ML.emptyCookieVal(memLayer.ML.confReadString("AuthCookieName")); } - - protected void demo_Unload(object sender, EventArgs e) - { - lblCoord.Text = demo.Text; - } + } } \ No newline at end of file diff --git a/WebSCR/WebUserControls/mod_header.ascx.designer.cs b/WebSCR/WebUserControls/mod_header.ascx.designer.cs index 8cabb78..6ce35d2 100644 --- a/WebSCR/WebUserControls/mod_header.ascx.designer.cs +++ b/WebSCR/WebUserControls/mod_header.ascx.designer.cs @@ -29,23 +29,5 @@ namespace WebSCR.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Label lblVers; - - /// - /// demo control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label demo; - - /// - /// lblCoord control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label lblCoord; } } diff --git a/WebSCR/bin/SteamWare.dll b/WebSCR/bin/SteamWare.dll index b084f9a..c06b925 100644 Binary files a/WebSCR/bin/SteamWare.dll and b/WebSCR/bin/SteamWare.dll differ diff --git a/WebSCR/bin/WebSCR.dll b/WebSCR/bin/WebSCR.dll index 54ccedc..b8cd294 100644 Binary files a/WebSCR/bin/WebSCR.dll and b/WebSCR/bin/WebSCR.dll differ diff --git a/WebSCR/bin/WebSCR_data.dll b/WebSCR/bin/WebSCR_data.dll index 3fbae11..cd3c78e 100644 Binary files a/WebSCR/bin/WebSCR_data.dll and b/WebSCR/bin/WebSCR_data.dll differ diff --git a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache index b601ac8..033fe32 100644 Binary files a/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache and b/WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR/obj/Debug/WebSCR.dll b/WebSCR/obj/Debug/WebSCR.dll index 54ccedc..b8cd294 100644 Binary files a/WebSCR/obj/Debug/WebSCR.dll and b/WebSCR/obj/Debug/WebSCR.dll differ diff --git a/WebSCR_data/bin/Debug/SteamWare.dll b/WebSCR_data/bin/Debug/SteamWare.dll index b084f9a..c06b925 100644 Binary files a/WebSCR_data/bin/Debug/SteamWare.dll and b/WebSCR_data/bin/Debug/SteamWare.dll differ diff --git a/WebSCR_data/bin/Debug/WebSCR_data.dll b/WebSCR_data/bin/Debug/WebSCR_data.dll index 3fbae11..cd3c78e 100644 Binary files a/WebSCR_data/bin/Debug/WebSCR_data.dll and b/WebSCR_data/bin/Debug/WebSCR_data.dll differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache index 98bba60..137cbff 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache and b/WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache differ diff --git a/WebSCR_data/obj/Debug/WebSCR_data.dll b/WebSCR_data/obj/Debug/WebSCR_data.dll index 3fbae11..cd3c78e 100644 Binary files a/WebSCR_data/obj/Debug/WebSCR_data.dll and b/WebSCR_data/obj/Debug/WebSCR_data.dll differ