diff --git a/GPW_Admin/GPW_Admin.csproj b/GPW_Admin/GPW_Admin.csproj
index d88e30e..23a1b76 100644
--- a/GPW_Admin/GPW_Admin.csproj
+++ b/GPW_Admin/GPW_Admin.csproj
@@ -646,7 +646,6 @@
-
@@ -660,7 +659,7 @@
-
+
@@ -983,13 +982,6 @@
unauthorized.aspx
-
- UserLicMan.aspx
- ASPXCodeBehind
-
-
- UserLicMan.aspx
-
Vocabolario.aspx
ASPXCodeBehind
@@ -1099,12 +1091,12 @@
cmp_userCard.ascx
-
- cmp_UserLicAdmin.ascx
+
+ cmp_userLicense.ascx
ASPXCodeBehind
-
- cmp_UserLicAdmin.ascx
+
+ cmp_userLicense.ascx
cmp_vocabolario.ascx
diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx b/GPW_Admin/WebUserControls/cmp_userLicense.ascx
index 1ad845a..dd7e8cf 100644
--- a/GPW_Admin/WebUserControls/cmp_userLicense.ascx
+++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx
@@ -1 +1,251 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_userLicense.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_userLicense" %>
+
+
+
+ idxDipendente:
+
+
+ matricola:
+
+
+ CF:
+
+
+ Cognome:
+
+
+ Nome:
+
+
+ dataNascita:
+
+
+ luogoNascita:
+
+
+ provNascita:
+
+
+ nazNascita:
+
+
+ codHw:
+
+
+ codOrario:
+
+
+ mailLastOp:
+
+
+ mailDay:
+
+
+ mailWeek:
+
+
+ mailMonth:
+
+
+ email:
+
+
+ authKey:
+
+
+ numAuth:
+
+
+ WOL_MAC:
+
+
+ dominio:
+
+
+ utente:
+
+
+ codDipendenteExt:
+
+
+ gruppo:
+
+
+ dataAssunzione:
+
+
+ dataCessazione:
+
+
+ attivo:
+
+
+
+
+
+
+ matricola:
+
+
+ CF:
+
+
+ Cognome:
+
+
+ Nome:
+
+
+ dataNascita:
+
+
+ luogoNascita:
+
+
+ provNascita:
+
+
+ nazNascita:
+
+
+ codHw:
+
+
+ codOrario:
+
+
+ mailLastOp:
+
+
+ mailDay:
+
+
+ mailWeek:
+
+
+ mailMonth:
+
+
+ email:
+
+
+ authKey:
+
+
+ numAuth:
+
+
+ WOL_MAC:
+
+
+ dominio:
+
+
+ utente:
+
+
+ codDipendenteExt:
+
+
+ gruppo:
+
+
+ dataAssunzione:
+
+
+ dataCessazione:
+
+
+ attivo:
+
+
+
+
+
+
+ idxDipendente:
+
+
+ matricola:
+
+
+ CF:
+
+
+ Cognome:
+
+
+ Nome:
+
+
+ dataNascita:
+
+
+ luogoNascita:
+
+
+ provNascita:
+
+
+ nazNascita:
+
+
+ codHw:
+
+
+ codOrario:
+
+
+ mailLastOp:
+
+
+ mailDay:
+
+
+ mailWeek:
+
+
+ mailMonth:
+
+
+ email:
+
+
+ authKey:
+
+
+ numAuth:
+
+
+ WOL_MAC:
+
+
+ dominio:
+
+
+ utente:
+
+
+ codDipendenteExt:
+
+
+ gruppo:
+
+
+ dataAssunzione:
+
+
+ dataCessazione:
+
+
+ attivo:
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
index da32e01..d1d6c93 100644
--- a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
+++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
@@ -9,9 +9,30 @@ namespace GPW_Admin.WebUserControls
{
public partial class cmp_userLicense : System.Web.UI.UserControl
{
+ #region Public Properties
+
+ public int idxDipSel
+ {
+ get
+ {
+ int answ = 0;
+ int.TryParse(hfIdxDip.Value, out answ);
+ return answ;
+ }
+ set
+ {
+ hfIdxDip.Value = $"{value}";
+ }
+ }
+
+ #endregion Public Properties
+
+ #region Protected Methods
+
protected void Page_Load(object sender, EventArgs e)
{
-
}
+
+ #endregion Protected Methods
}
}
\ No newline at end of file
diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs
index a25d802..824b9f9 100644
--- a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.designer.cs
@@ -3,14 +3,42 @@
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
+// the code is regenerated.
//
//------------------------------------------------------------------------------
-
namespace GPW_Admin.WebUserControls
{
+
+
public partial class cmp_userLicense
{
+
+ ///
+ /// 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;
+
+ ///
+ /// ods control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource ods;
+
+ ///
+ /// hfIdxDip control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hfIdxDip;
}
}
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
index 254dbc3..a8fcc0d 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
@@ -209,6 +209,18 @@
+
+
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
index 6f53dd2..afabfed 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
@@ -14,6 +14,20 @@ namespace GPW_Admin.WebUserControls
{
#region Public Properties
+ public int IdxDipSel
+ {
+ get
+ {
+ int answ = 0;
+ if (grView.SelectedIndex >= 0)
+ {
+ var rawIdx = grView.SelectedValue.ToString();
+ int.TryParse(rawIdx, out answ);
+ }
+ return answ;
+ }
+ }
+
public int numLicenze
{
get => licenzeGPW.licenzeAttive;
@@ -117,6 +131,7 @@ namespace GPW_Admin.WebUserControls
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
// mostro gestione licenza DIP
+ raiseAddNew();
}
///
diff --git a/GPW_Admin/dipendenti.aspx b/GPW_Admin/dipendenti.aspx
index 2ecfcaf..5b92afc 100644
--- a/GPW_Admin/dipendenti.aspx
+++ b/GPW_Admin/dipendenti.aspx
@@ -4,6 +4,7 @@
<%@ Register Src="~/WebUserControls/mod_pageSize.ascx" TagPrefix="uc1" TagName="mod_pageSize" %>
<%@ Register Src="~/WebUserControls/cmp_userCard.ascx" TagPrefix="uc1" TagName="cmp_userCard" %>
<%@ Register Src="~/WebUserControls/cmp_toggle.ascx" TagPrefix="uc1" TagName="cmp_toggle" %>
+<%@ Register Src="~/WebUserControls/cmp_userLicense.ascx" TagPrefix="uc1" TagName="cmp_userLicense" %>
@@ -21,6 +22,7 @@
+
diff --git a/GPW_Admin/dipendenti.aspx.cs b/GPW_Admin/dipendenti.aspx.cs
index ebb9422..df78451 100644
--- a/GPW_Admin/dipendenti.aspx.cs
+++ b/GPW_Admin/dipendenti.aspx.cs
@@ -9,6 +9,22 @@ namespace GPW_Admin
{
public partial class dipendenti : BasePage
{
+ #region Protected Properties
+
+ protected int IdxDipSel
+ {
+ get
+ {
+ return cmp_userLicense.idxDipSel;
+ }
+ set
+ {
+ cmp_userLicense.idxDipSel = value;
+ }
+ }
+
+ #endregion Protected Properties
+
#region Private Methods
private void Cmp_toggleCards_ehToggle(object sender, EventArgs e)
@@ -29,10 +45,18 @@ namespace GPW_Admin
cmp_toggleLinkExt.Visible = cmp_toggleCards.toggleValue;
cmp_userCard.showAll = mod_adminDipendenti1.showAll;
cmp_userCard.showExt = cmp_toggleLinkExt.toggleValue;
+ cmp_userLicense.Visible = IdxDipSel > 0;
}
- private void Mod_adminDipendenti1_eh_resetSelezione(object sender, EventArgs e)
+ private void Mod_adminDipendenti1_eh_addNew(object sender, EventArgs e)
{
+ IdxDipSel = mod_adminDipendenti1.IdxDipSel;
+ fixDisplay();
+ }
+
+ private void Mod_adminDipendenti1_eh_doReset(object sender, EventArgs e)
+ {
+ IdxDipSel = 0;
fixDisplay();
}
@@ -57,9 +81,10 @@ namespace GPW_Admin
fixDisplay();
}
mod_pageSize.eh_nuovaSize += Mod_pageSize_eh_nuovaSize;
- mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_resetSelezione;
cmp_toggleCards.ehToggle += Cmp_toggleCards_ehToggle;
cmp_toggleLinkExt.ehToggle += Cmp_toggleLinkExt_ehToggle;
+ mod_adminDipendenti1.eh_addNew += Mod_adminDipendenti1_eh_addNew;
+ mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_doReset;
}
#endregion Protected Methods
diff --git a/GPW_Admin/dipendenti.aspx.designer.cs b/GPW_Admin/dipendenti.aspx.designer.cs
index 2cf6f72..7472f0a 100644
--- a/GPW_Admin/dipendenti.aspx.designer.cs
+++ b/GPW_Admin/dipendenti.aspx.designer.cs
@@ -32,6 +32,15 @@ namespace GPW_Admin
///
protected global::GPW_Admin.WebUserControls.cmp_toggle cmp_toggleLinkExt;
+ ///
+ /// cmp_userLicense control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GPW_Admin.WebUserControls.cmp_userLicense cmp_userLicense;
+
///
/// mod_adminDipendenti1 control.
///