diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx b/GPW_Admin/WebUserControls/cmp_userLicense.ascx
index f15650f..9348b65 100644
--- a/GPW_Admin/WebUserControls/cmp_userLicense.ascx
+++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx
@@ -43,7 +43,7 @@
Attiva Utente
-
Rimuovi licenza
+
Cessazione Utente
Assegna licenza
diff --git a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
index 708083e..578ec71 100644
--- a/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
+++ b/GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
@@ -86,13 +86,11 @@ namespace GPW_Admin.WebUserControls
// verifica SE ci sono licenze disponibili
if (licenzeGPW.licenzeOnline > licenzeGPW.attivazioniOnline)
{
+ // attiva utente
+ DataProxy.DP.taDipendenti.updateActive(true, idxDipSel);
+
// effettua riassegnazione
bool fatto = licenzeGPW.tryActivation(CodImpiego, ChiaveUtente).Result;
- if (fatto)
- {
- // attiva utente
- DataProxy.DP.taDipendenti.updateActive(true, idxDipSel);
- }
}
frmView.DataBind();
diff --git a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
index 7d1b977..75306bd 100644
--- a/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+++ b/GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
@@ -17,10 +17,10 @@
-
Refresh Online
+
Refresh Status Online
-
Try Reallocation
+
Allocazione Licenze
diff --git a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 0e00260..1867bc1 100644
Binary files a/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/GPW_Data/licenzeGPW.cs b/GPW_Data/licenzeGPW.cs
index ae88493..9b838a6 100644
--- a/GPW_Data/licenzeGPW.cs
+++ b/GPW_Data/licenzeGPW.cs
@@ -18,8 +18,8 @@ namespace GPW_data
///
/// Url di base chiamate API gestione licenze
///
- //protected static string apiUrl = "https://iis01.egalware.com/ELM.API/";
- protected static string apiUrl = "https://localhost:44351/";
+ //protected static string apiUrl = "https://localhost:44351/";
+ protected static string apiUrl = "https://iis01.egalware.com/ELM.API/";
///
/// Durata cache statica locale dati licenza