diff --git a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx index 179b988..436e24d 100644 --- a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx +++ b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx @@ -1,4 +1,80 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoRichResetUtenti.ascx.cs" Inherits="C2P.WebUserControls.mod_elencoRichResetUtenti" %> + + + +
+
+
+
+

<%: traduci("UserRights") %>

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+

<%: traduci("DevicesList") %>

+
+
+ <%-- + + + + + + + + + + + + + + + + --%> +
+
+
+
+ + @@ -16,12 +92,16 @@
<%----%> - +
- - - + +
+ +
+ + <%-- + --%> @@ -66,6 +146,10 @@ + + + + diff --git a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs index 6047867..19287e4 100644 --- a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs +++ b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs @@ -12,9 +12,10 @@ namespace C2P.WebUserControls { protected void Page_Load(object sender, EventArgs e) { - //if (!Page.IsPostBack) - //{ - //} + if (!Page.IsPostBack) + { + frmView.Visible= false; + } } /// /// ultimo comando letto da link button @@ -93,6 +94,10 @@ namespace C2P.WebUserControls devicesAuthProxy.stObj.sendEmailAuthKey(USER_NAME, AuthKey); } break; + case "Edit": + // mostro dettaglio.. + frmView.Visible = true; + break; default: break; } @@ -140,5 +145,15 @@ namespace C2P.WebUserControls { return user_std.UtSn.Traduci(lemma); } + /// + /// reset + /// + /// + /// + protected void lnkReset_Click(object sender, EventArgs e) + { + grView.SelectedIndex = -1; + frmView.Visible = false; + } } } \ No newline at end of file diff --git a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs index e6603c3..5bbfcf4 100644 --- a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs +++ b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs @@ -12,6 +12,15 @@ namespace C2P.WebUserControls { public partial class mod_elencoRichResetUtenti { + /// + /// frmView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.FormView frmView; + /// /// grView control. /// diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index e13272f..1873920 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -87,9 +87,9 @@ <%--
  • Settings
  • --%>
  • Gestione Voc
    • -
  • Update Voc
    • - <%--
  • --%>
  • User Admin
    • +
  • +
  • Update Voc
    • diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 06bed46..ba4b89e 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 866543f..a131d6a 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 732cbb1..c59bc2d 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 866543f..a131d6a 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index d00fd6f..6b8ce9b 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 732cbb1..c59bc2d 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index ecae4c3..f40183f 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.149.348")] -[assembly: AssemblyFileVersion("2.0.149.348")] +[assembly: AssemblyVersion("2.0.150.353")] +[assembly: AssemblyFileVersion("2.0.150.353")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 3a71d9d..65342a2 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.149.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.149.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.0.150.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.0.150.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+