diff --git a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx
index bd28888..193b378 100644
--- a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx
+++ b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx
@@ -45,31 +45,38 @@
-
+
Dati richiesta
-
+
+
-
diff --git a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.cs b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.cs
index fe965e2..3127de8 100644
--- a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.cs
+++ b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.cs
@@ -46,6 +46,23 @@ namespace GPW_Admin.WebUserControls
}
}
+ protected int idxSubLic
+ {
+ get
+ {
+ int answ = 0;
+ // verifico SE sia disponibile licenza...
+ var activationsList = licenzeGPW.ListaAttivazioni;
+ var currHash = DataProxy.DP.hashCodImpiego(currRowDip);
+ var currAct = activationsList.Where(x => x.CodImpiego == currHash).FirstOrDefault();
+ if (currAct != null)
+ {
+ answ = currAct.IdxSubLic;
+ }
+ return answ;
+ }
+ }
+
#endregion Protected Properties
#region Public Properties
@@ -77,9 +94,11 @@ namespace GPW_Admin.WebUserControls
DateTime adesso = DateTime.Now;
// chiama resync dati licenza (cod impiego / codAuth)
- bool fatto = licenzeGPW.sendTicketReq(txtEmail.Text.Trim(), txtPhone.Text.Trim(), txtCausale.Text.Trim(), CodImpiego).Result;
- frmView.DataBind();
- raiseAddNew();
+ bool fatto = licenzeGPW.sendTicketReq(txtRichiedente.Text.Trim(), txtEmail.Text.Trim(), txtPhone.Text.Trim(), txtCausale.Text.Trim(), CodImpiego, idxSubLic).Result;
+ if (fatto)
+ {
+ raiseReset();
+ }
}
}
diff --git a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.designer.cs b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.designer.cs
index 62e4f49..eaa8dd5 100644
--- a/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.designer.cs
+++ b/GPW_Admin/WebUserControls/cmp_ticketFreeActiv.ascx.designer.cs
@@ -23,6 +23,15 @@ namespace GPW_Admin.WebUserControls
///
protected global::System.Web.UI.WebControls.FormView frmView;
+ ///
+ /// txtRichiedente control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtRichiedente;
+
///
/// txtEmail control.
///
diff --git a/GPW_Admin/dipendenti.aspx.cs b/GPW_Admin/dipendenti.aspx.cs
index acfd8ad..e1e68e3 100644
--- a/GPW_Admin/dipendenti.aspx.cs
+++ b/GPW_Admin/dipendenti.aspx.cs
@@ -27,6 +27,13 @@ namespace GPW_Admin
#region Private Methods
+ private void Cmp_ticketFreeActiv_eh_doRefresh(object sender, EventArgs e)
+ {
+ IdxDipSel = 0;
+ cmp_ticketFreeActiv.idxDipSel = 0;
+ fixDisplay();
+ }
+
private void Cmp_toggleCards_ehToggle(object sender, EventArgs e)
{
fixDisplay();
@@ -111,6 +118,7 @@ namespace GPW_Admin
mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_doReset;
cmp_userLicense.eh_doReset += Cmp_userLicense_eh_doReset;
cmp_userLicense.eh_addNew += Cmp_userLicense_eh_addNew;
+ cmp_ticketFreeActiv.eh_doRefresh += Cmp_ticketFreeActiv_eh_doRefresh;
}
#endregion Protected Methods
diff --git a/GPW_Data/ObjLicenze.cs b/GPW_Data/ObjLicenze.cs
index 3d9871f..bfb406c 100644
--- a/GPW_Data/ObjLicenze.cs
+++ b/GPW_Data/ObjLicenze.cs
@@ -116,12 +116,13 @@ namespace GPW_data
public string CodImp { get; set; } = "";
public string CodInst { get; set; } = "";
public string ContactEmail { get; set; } = "";
+ public string ContactName { get; set; } = "";
public string ContactPhone { get; set; } = "";
public int idxSubLic { get; set; } = 0;
public bool IsValid
{
- get => !string.IsNullOrEmpty(MasterKey) && !string.IsNullOrEmpty(ContactEmail) && !string.IsNullOrEmpty(CodInst) && !string.IsNullOrEmpty(CodApp);
+ get => !string.IsNullOrEmpty(MasterKey) && !string.IsNullOrEmpty(ContactName) && !string.IsNullOrEmpty(ContactEmail) && !string.IsNullOrEmpty(CodInst) && !string.IsNullOrEmpty(CodApp);
}
public string MasterKey { get; set; } = "";
diff --git a/GPW_Data/licenzeGPW.cs b/GPW_Data/licenzeGPW.cs
index 19debc6..cacfaed 100644
--- a/GPW_Data/licenzeGPW.cs
+++ b/GPW_Data/licenzeGPW.cs
@@ -683,13 +683,14 @@ namespace GPW_data
///
/// Tenta invio di un ticket x licenza indicata
///
+ ///
///
///
///
///
///
///
- public static async Task sendTicketReq(string contEmail, string contPhone, string reqBody, string codImpiego, int idxSubLic = 0)
+ public static async Task sendTicketReq(string contName, string contEmail, string contPhone, string reqBody, string codImpiego, int idxSubLic)
{
bool answ = false;
// cerco online
@@ -699,6 +700,7 @@ namespace GPW_data
SupportRequest richiesta = new SupportRequest()
{
+ ContactName = contName,
ContactEmail = contEmail,
ContactPhone = contPhone,
ReqBody = reqBody,
@@ -826,7 +828,7 @@ namespace GPW_data
///
/// Tenta disattivazione licenza dato codice impiego
///
- /// Dizionario codici da eliminare (CodImpiego/MasterKey)
+ /// Dizionario codici da eliminare (CodImpiego/uSERkEY)
///
public static async Task tryDeactivation(Dictionary ParamsList)
{