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

<%: traduci("UserRights") %>

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+
+
+
+
+

<%: traduci("UserRights") %>

-
-
-
-

<%: traduci("DevicesList") %>

-
-
- <%-- - - - - - - - - - - - - - - - - --%> -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - +
+
+
+
+

<%: traduci("DevicesList") %>

+
+
+ + + + + + + <%----%> + + + + + + + + +
+
+
+
+ diff --git a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs index 19287e4..358078d 100644 --- a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs +++ b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.cs @@ -14,7 +14,7 @@ namespace C2P.WebUserControls { if (!Page.IsPostBack) { - frmView.Visible= false; + divDetail.Visible = false; } } /// @@ -96,7 +96,7 @@ namespace C2P.WebUserControls break; case "Edit": // mostro dettaglio.. - frmView.Visible = true; + divDetail.Visible = true; break; default: break; @@ -153,7 +153,39 @@ namespace C2P.WebUserControls protected void lnkReset_Click(object sender, EventArgs e) { grView.SelectedIndex = -1; - frmView.Visible = false; + divDetail.Visible = false; + } + /// + /// Aggiunge tutti i permessi mancanti + /// + /// + /// + protected void lnbAddNew_Click(object sender, EventArgs e) + { + // chiamo stored x creazione diritti missing + devicesAuthProxy.stObj.taDiritti.AddMissing(grView.SelectedValue.ToString(), "X999", memLayer.ML.confReadString("CodModulo")); + // update visualizzazione + grViewDiritti.DataBind(); + } + /// + /// verifica se ci siano diritti da aggiungere + /// + public bool canAddDiritti + { + get + { + bool answ = false; + // conto se ci siano diritti missing... + try + { + int assegnati = devicesAuthProxy.stObj.taDiritti.getByUserModulo(grView.SelectedValue.ToString(), memLayer.ML.confReadString("CodModulo")).Rows.Count; + int disponibili = devicesAuthProxy.stObj.taFunzione.GetData().Rows.Count; + if (disponibili > assegnati) answ = true; + } + catch + { } + return answ; + } } } } \ 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 5bbfcf4..22b64fd 100644 --- a/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs +++ b/C2P/WebUserControls/mod_elencoRichResetUtenti.ascx.designer.cs @@ -13,13 +13,49 @@ namespace C2P.WebUserControls { public partial class mod_elencoRichResetUtenti { /// - /// frmView control. + /// divDetail control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.FormView frmView; + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail; + + /// + /// grViewDiritti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewDiritti; + + /// + /// odsDiritti control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsDiritti; + + /// + /// grViewDevices control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grViewDevices; + + /// + /// odsDevices control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsDevices; /// /// grView control. diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index ba4b89e..1c78e59 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 a131d6a..bb0c14e 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 c59bc2d..bf1db42 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 a131d6a..bb0c14e 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 6b8ce9b..aa9e07d 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 c59bc2d..bf1db42 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ