Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix procedura gestione licenze utente

Browse Source
This commit is contained in:
Samuele Locatelli
2021-11-08 13:02:24 +01:00
parent 14274fd960
commit ff74e2cb75
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/WebUserControls/cmp_userLicense.ascx
+1 -1
View File
@@ -43,7 +43,7 @@
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtActivate" CssClass="btn btn-block btn-success" Visible='<%# canActivate(Eval("attivo"), Eval("dataAssunzione"), Eval("dataCessazione")) %>' OnClick="lbtActivate_Click">Attiva Utente <i class="fa fa-link" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbrRelease" CssClass="btn btn-block btn-danger" Visible='<%# canRemove(Eval("attivo"), Eval("dataAssunzione"), Eval("dataCessazione")) %>' OnClick="lbrRelease_Click">Rimuovi licenza <i class="fa fa-unlink" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbrRelease" CssClass="btn btn-block btn-danger" Visible='<%# canRemove(Eval("attivo"), Eval("dataAssunzione"), Eval("dataCessazione")) %>' OnClick="lbrRelease_Click">Cessazione Utente <i class="fa fa-unlink" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtReissue" CssClass="btn btn-block btn-info" Visible='<%# canReissue(Eval("attivo"), Eval("dataAssunzione"), Eval("dataCessazione")) %>' OnClick="lbtReissue_Click">Assegna licenza <i class="fa fa-exclamation-triangle" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
GPW_Admin/WebUserControls/cmp_userLicense.ascx.cs
+3 -5
View File
@@ -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();
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+2 -2
View File
@@ -17,10 +17,10 @@
</span>
</div>
<div class="px-2">
<asp:LinkButton runat="server" ID="lbtRefresh" CssClass="btn btn-success" OnClick="lbtRefresh_Click">Refresh Online&nbsp;<i class="fa fa-cloud-download" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtRefresh" CssClass="btn btn-success" OnClick="lbtRefresh_Click">Refresh Status Online&nbsp;<i class="fa fa-cloud-download" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="px-2">
<asp:LinkButton runat="server" ID="lbtFixMissing" CssClass="btn btn-primary" OnClick="lbtFixMissing_Click">Try Reallocation&nbsp;<i class="fa fa-cloud-upload" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtFixMissing" CssClass="btn btn-primary" OnClick="lbtFixMissing_Click">Allocazione Licenze&nbsp;<i class="fa fa-cloud-upload" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
GPW_Data/licenzeGPW.cs
+2 -2
View File
@@ -18,8 +18,8 @@ namespace GPW_data
/// <summary>
/// Url di base chiamate API gestione licenze
/// </summary>
//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/";
/// <summary>
/// Durata cache statica locale dati licenza