@@ -24,6 +26,7 @@
+
diff --git a/GPW_Admin/dipendenti.aspx.cs b/GPW_Admin/dipendenti.aspx.cs
index e1e68e3..6e48af3 100644
--- a/GPW_Admin/dipendenti.aspx.cs
+++ b/GPW_Admin/dipendenti.aspx.cs
@@ -1,9 +1,5 @@
using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
using System.Web.UI;
-using System.Web.UI.WebControls;
namespace GPW_Admin
{
@@ -67,27 +63,40 @@ namespace GPW_Admin
cmp_userCard.showExt = cmp_toggleLinkExt.toggleValue;
cmp_userLicense.Visible = IdxDipSel > 0;
cmp_ticketFreeActiv.Visible = cmp_ticketFreeActiv.idxDipSel > 0;
+ cmp_ticketList.Visible = cmp_ticketList.idxDipSel > 0;
}
private void Mod_adminDipendenti1_eh_addNew(object sender, EventArgs e)
{
+ // reset preliminare
+ IdxDipSel = 0;
+ cmp_ticketFreeActiv.idxDipSel = 0;
+ // imposto solo 1
if (mod_adminDipendenti1.isTicketReq)
{
- IdxDipSel = 0;
cmp_ticketFreeActiv.idxDipSel = mod_adminDipendenti1.IdxDipSel;
}
else
{
IdxDipSel = mod_adminDipendenti1.IdxDipSel;
- cmp_ticketFreeActiv.idxDipSel = 0;
}
fixDisplay();
}
+ private void Mod_adminDipendenti1_eh_doRefresh(object sender, EventArgs e)
+ {
+ // mostro elenco tickets
+ IdxDipSel = 0;
+ cmp_ticketFreeActiv.idxDipSel = 0;
+ cmp_ticketList.idxDipSel = mod_adminDipendenti1.IdxDipSel;
+ fixDisplay();
+ }
+
private void Mod_adminDipendenti1_eh_doReset(object sender, EventArgs e)
{
IdxDipSel = 0;
cmp_ticketFreeActiv.idxDipSel = 0;
+ cmp_ticketList.idxDipSel = 0;
fixDisplay();
}
@@ -116,6 +125,7 @@ namespace GPW_Admin
cmp_toggleLinkExt.ehToggle += Cmp_toggleLinkExt_ehToggle;
mod_adminDipendenti1.eh_addNew += Mod_adminDipendenti1_eh_addNew;
mod_adminDipendenti1.eh_doReset += Mod_adminDipendenti1_eh_doReset;
+ mod_adminDipendenti1.eh_doRefresh += Mod_adminDipendenti1_eh_doRefresh;
cmp_userLicense.eh_doReset += Cmp_userLicense_eh_doReset;
cmp_userLicense.eh_addNew += Cmp_userLicense_eh_addNew;
cmp_ticketFreeActiv.eh_doRefresh += Cmp_ticketFreeActiv_eh_doRefresh;
diff --git a/GPW_Admin/dipendenti.aspx.designer.cs b/GPW_Admin/dipendenti.aspx.designer.cs
index 0946717..6891eff 100644
--- a/GPW_Admin/dipendenti.aspx.designer.cs
+++ b/GPW_Admin/dipendenti.aspx.designer.cs
@@ -41,6 +41,15 @@ namespace GPW_Admin
///
protected global::GPW_Admin.WebUserControls.cmp_userLicense cmp_userLicense;
+ ///
+ /// cmp_ticketList control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GPW_Admin.WebUserControls.cmp_ticketList cmp_ticketList;
+
///
/// cmp_ticketFreeActiv control.
///
diff --git a/GPW_Data/licenzeGPW.cs b/GPW_Data/licenzeGPW.cs
index 159a475..d58b1a8 100644
--- a/GPW_Data/licenzeGPW.cs
+++ b/GPW_Data/licenzeGPW.cs
@@ -927,7 +927,7 @@ namespace GPW_data
RestClient client = new RestClient(apiUrl);
//client.Authenticator = new HttpBasicAuthenticator("username", "password");
string MKeyEnc = HttpUtility.UrlEncode(MasterKey);
- var request = new RestRequest($"/api/ticket/{installazione}?CodApp={applicazione}?Chiave={MKeyEnc}", DataFormat.Json);
+ var request = new RestRequest($"/api/ticket/{installazione}?CodApp={applicazione}&Chiave={MKeyEnc}", DataFormat.Json);
var response = client.Get(request);
// controllo risposta
if (response.StatusCode == System.Net.HttpStatusCode.OK)