diff --git a/GPW.CORE.Comp/Toggler.razor.cs b/GPW.CORE.Comp/Toggler.razor.cs index 3e730b5..f043156 100644 --- a/GPW.CORE.Comp/Toggler.razor.cs +++ b/GPW.CORE.Comp/Toggler.razor.cs @@ -14,6 +14,100 @@ namespace GPW.CORE.Comp #endregion Public Properties + #region Public Classes + + /// + /// Classe utility x toggle + /// + public class SelectGlobalToggle + { + #region Public Constructors + + public SelectGlobalToggle() + { } + + #endregion Public Constructors + + #region Public Properties + + /// + /// Bool: indica se il toggleClosed � attivo + /// + public bool isActive { get; set; } = true; + + /// + /// string: stringa da mostrare a sinistra (disattivo onInitialize) + /// + public string leftString { get; set; } = ""; + + /// + /// string: stile stringa da mostrare a sinistra (disattivo onInitialize) + /// + public string leftStringCSS { get; set; } = ""; + + /// + /// CSS specifico x placard + /// + public string placardCss { get; set; } = ""; + + /// + /// string: stringa da mostrare a destra (attivo onInitialize) + /// + public string rightString { get; set; } = ""; + + /// + /// string: stile stringa da mostrare a destra (attivo onInitialize) + /// + public string rightStringCSS { get; set; } = ""; + + /// + /// Parametro da mostrare in tooltip + /// + public string toolTip { get; set; } = ""; + + #endregion Public Properties + + #region Public Methods + + public override bool Equals(object obj) + { + if (!(obj is SelectGlobalToggle item)) + return false; + + if (isActive != item.isActive) + return false; + + if (leftString != item.leftString) + return false; + + if (rightString != item.rightString) + return false; + + if (leftStringCSS != item.leftStringCSS) + return false; + + if (rightStringCSS != item.rightStringCSS) + return false; + + if (toolTip != item.toolTip) + return false; + + if (placardCss != item.placardCss) + return false; + + return true; + } + + public override int GetHashCode() + { + return base.GetHashCode(); + } + + #endregion Public Methods + } + + #endregion Public Classes + #region Protected Properties protected bool isActive @@ -146,99 +240,5 @@ namespace GPW.CORE.Comp } #endregion Private Methods - - #region Public Classes - - /// - /// Classe utility x toggle - /// - public class SelectGlobalToggle - { - #region Public Constructors - - public SelectGlobalToggle() - { } - - #endregion Public Constructors - - #region Public Properties - - /// - /// Bool: indica se il toggleClosed � attivo - /// - public bool isActive { get; set; } = true; - - /// - /// string: stringa da mostrare a sinistra (disattivo onInitialize) - /// - public string leftString { get; set; } = ""; - - /// - /// string: stile stringa da mostrare a sinistra (disattivo onInitialize) - /// - public string leftStringCSS { get; set; } = ""; - - /// - /// CSS specifico x placard - /// - public string placardCss { get; set; } = ""; - - /// - /// string: stringa da mostrare a destra (attivo onInitialize) - /// - public string rightString { get; set; } = ""; - - /// - /// string: stile stringa da mostrare a destra (attivo onInitialize) - /// - public string rightStringCSS { get; set; } = ""; - - /// - /// Parametro da mostrare in tooltip - /// - public string toolTip { get; set; } = ""; - - #endregion Public Properties - - #region Public Methods - - public override bool Equals(object obj) - { - if (!(obj is SelectGlobalToggle item)) - return false; - - if (isActive != item.isActive) - return false; - - if (leftString != item.leftString) - return false; - - if (rightString != item.rightString) - return false; - - if (leftStringCSS != item.leftStringCSS) - return false; - - if (rightStringCSS != item.rightStringCSS) - return false; - - if (toolTip != item.toolTip) - return false; - - if (placardCss != item.placardCss) - return false; - - return true; - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - - #endregion Public Methods - } - - #endregion Public Classes } } \ No newline at end of file diff --git a/GPW.CORE.SMART.sln b/GPW.CORE.SMART.sln index befa747..27bcbd3 100644 --- a/GPW.CORE.SMART.sln +++ b/GPW.CORE.SMART.sln @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GPW.CORE.Comp", "GPW.CORE.Comp\GPW.CORE.Comp.csproj", "{056826D6-6B88-42AA-AD09-FC380955834D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GPW.CORE.Smart", "GPW.CORE.Smart\GPW.CORE.Smart.csproj", "{9E5A3295-08BF-4603-9FA3-D38A2F1100E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GPW.CORE.Data", "GPW.CORE.Data\GPW.CORE.Data.csproj", "{32DE3E46-CCED-4F7E-8EC1-A854DA4F51C1}" @@ -15,10 +13,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {056826D6-6B88-42AA-AD09-FC380955834D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {056826D6-6B88-42AA-AD09-FC380955834D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {056826D6-6B88-42AA-AD09-FC380955834D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {056826D6-6B88-42AA-AD09-FC380955834D}.Release|Any CPU.Build.0 = Release|Any CPU {9E5A3295-08BF-4603-9FA3-D38A2F1100E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9E5A3295-08BF-4603-9FA3-D38A2F1100E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {9E5A3295-08BF-4603-9FA3-D38A2F1100E5}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/GPW.CORE.SMART/Components/AdminTask.razor.cs b/GPW.CORE.SMART/Components/AdminTask.razor.cs index 182a7f6..a3ef74a 100644 --- a/GPW.CORE.SMART/Components/AdminTask.razor.cs +++ b/GPW.CORE.SMART/Components/AdminTask.razor.cs @@ -1,30 +1,20 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using GPW.CORE.Comp; using GPW.CORE.Data.DbModels; -using GPW.CORE.Smart; -using GPW.CORE.Smart.Components; -using GPW.CORE.Smart.Shared; using GPW.CORE.Smart.Data; +using Microsoft.AspNetCore.Components; namespace GPW.CORE.Smart.Components { public partial class AdminTask { + #region Public Properties + [Parameter] public int IdxDipendente { get; set; } = 0; + #endregion Public Properties + + #region Protected Methods + protected override async Task OnParametersSetAsync() { if (IdxDipendente > 0) @@ -34,9 +24,28 @@ namespace GPW.CORE.Smart.Components await InvokeAsync(StateHasChanged); } } + + #endregion Protected Methods + + #region Private Fields + + private bool isApprAdmin = false; + + private bool isAuthKeyAdmin = false; + + #endregion Private Fields + + #region Private Properties + [Inject] private CoreSmartDataService CDService { get; set; } = null!; + private List? listaRuoli { get; set; } = new List(); + + #endregion Private Properties + + #region Private Methods + private async Task ReloadData() { // verifico se il dip sia admin... @@ -48,12 +57,7 @@ namespace GPW.CORE.Smart.Components } } - private bool isAuthKeyAdmin = false; - private bool isApprAdmin = false; - - private List? listaRuoli { get; set; } = new List(); - - #region Private Methods + #endregion Private Methods //private async void MService_EA_DipUpdated() //{ @@ -63,7 +67,5 @@ namespace GPW.CORE.Smart.Components // await Task.Delay(1); // await InvokeAsync(StateHasChanged); //} - - #endregion Private Methods } } \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs index fceef34..623fa10 100644 --- a/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs +++ b/GPW.CORE.SMART/Components/BottoniEntrEsc.razor.cs @@ -1,4 +1,3 @@ -using GPW.CORE.Comp; using GPW.CORE.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Data.DTO; @@ -219,7 +218,7 @@ namespace GPW.CORE.Smart.Components { var remoteIp = $"{httpContextAccessor.HttpContext.Connection?.RemoteIpAddress}"; // provo a recuperare ipV4... - ipv4 = IpUtils.getLocalIpv4(remoteIp); + ipv4 = Egw.Core.Razor.Comp.Data.IpUtils.getLocalIpv4(remoteIp); } } // arrotondo ingresso/uscita ai 5 minuti secondo sia entrata o uscita... diff --git a/GPW.CORE.SMART/Components/CheckTemp.razor.cs b/GPW.CORE.SMART/Components/CheckTemp.razor.cs index 35e5ff6..f092f53 100644 --- a/GPW.CORE.SMART/Components/CheckTemp.razor.cs +++ b/GPW.CORE.SMART/Components/CheckTemp.razor.cs @@ -1,4 +1,4 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; diff --git a/GPW.CORE.SMART/Components/CmpTop.razor.cs b/GPW.CORE.SMART/Components/CmpTop.razor.cs index b933cde..408bfae 100644 --- a/GPW.CORE.SMART/Components/CmpTop.razor.cs +++ b/GPW.CORE.SMART/Components/CmpTop.razor.cs @@ -1,4 +1,4 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; diff --git a/GPW.CORE.SMART/Components/InvioLinkEmail.razor.cs b/GPW.CORE.SMART/Components/InvioLinkEmail.razor.cs index 485b5f8..f65085d 100644 --- a/GPW.CORE.SMART/Components/InvioLinkEmail.razor.cs +++ b/GPW.CORE.SMART/Components/InvioLinkEmail.razor.cs @@ -1,8 +1,8 @@ +using Egw.Core.Razor.Comp; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; using System.Text; -using static GPW.CORE.Comp.Toggler; namespace GPW.CORE.Smart.Components { @@ -59,7 +59,7 @@ namespace GPW.CORE.Smart.Components [Inject] private MessageService MService { get; set; } = null!; - private SelectGlobalToggle ToggleData { get; set; } = new SelectGlobalToggle(); + private Toggler.SelectGlobalToggle ToggleData { get; set; } = new Toggler.SelectGlobalToggle(); private string UrlLinkExt { get; set; } = ""; @@ -141,7 +141,7 @@ namespace GPW.CORE.Smart.Components await Task.Delay(1); } - private async Task evToggled(SelectGlobalToggle newTogData) + private async Task evToggled(Toggler.SelectGlobalToggle newTogData) { ToggleData = newTogData; forceResetAuthKey = !ToggleData.isActive; @@ -161,7 +161,7 @@ namespace GPW.CORE.Smart.Components private void initToggler() { - ToggleData = new SelectGlobalToggle() + ToggleData = new Toggler.SelectGlobalToggle() { leftString = "Reset + Invio", rightString = "Solo Invio", diff --git a/GPW.CORE.SMART/Components/NavBottom.razor.cs b/GPW.CORE.SMART/Components/NavBottom.razor.cs index 5baa210..2ca532d 100644 --- a/GPW.CORE.SMART/Components/NavBottom.razor.cs +++ b/GPW.CORE.SMART/Components/NavBottom.razor.cs @@ -5,6 +5,15 @@ namespace GPW.CORE.Smart.Components { public partial class NavBottom { + #region Protected Fields + + protected string hideButtonCSS = "visible"; + protected string hideMenuCSS = "hidden"; + protected bool isVisible = false; + protected Version? version = typeof(Program).Assembly.GetName().Version; + + #endregion Protected Fields + #region Protected Properties protected bool isActive { get; set; } = false; @@ -51,8 +60,6 @@ namespace GPW.CORE.Smart.Components hideButtonCSS = "visible"; } - protected bool isVisible = false; - protected void showMenu() { if (MService.IdxDipendente > 0) @@ -74,13 +81,5 @@ namespace GPW.CORE.Smart.Components } #endregion Protected Methods - - #region Private Fields - - private string hideButtonCSS = "visible"; - private string hideMenuCSS = "hidden"; - private Version? version = typeof(Program).Assembly.GetName().Version; - - #endregion Private Fields } } \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/RegAttEditor.razor.cs b/GPW.CORE.SMART/Components/RegAttEditor.razor.cs index 9b729a1..ce9634a 100644 --- a/GPW.CORE.SMART/Components/RegAttEditor.razor.cs +++ b/GPW.CORE.SMART/Components/RegAttEditor.razor.cs @@ -1,22 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using GPW.CORE.Comp; using GPW.CORE.Data.DbModels; -using GPW.CORE.Smart; -using GPW.CORE.Smart.Components; -using GPW.CORE.Smart.Shared; using GPW.CORE.Smart.Data; +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; using NLog; using System.Diagnostics; @@ -24,46 +9,8 @@ namespace GPW.CORE.Smart.Components { public partial class RegAttEditor { - #region Protected Fields - - protected string _gruppoSel = ""; - protected int _idxProj = 0; - protected bool vetoUpd = false; - - #endregion Protected Fields - - #region Private Properties - - [Inject] - private MessageService AppMServ { get; set; } = null!; - - [Inject] - private IJSRuntime JSRuntime { get; set; } = null!; - - private bool VetoInsert - { - get => CDService.VetoInsert; - } - - #endregion Private Properties - - #region Protected Properties - - protected List fasiList { get; set; } = new List(); - - [Inject] - protected CoreSmartDataService CDService { get; set; } = null!; - - protected List gruppiList { get; set; } = new List(); - protected List projList { get; set; } = new List(); - - #endregion Protected Properties - #region Public Properties - - private static Logger Log = LogManager.GetCurrentClassLogger(); - [Parameter] public RegAttivitaModel? currRecord { @@ -89,7 +36,6 @@ namespace GPW.CORE.Smart.Components } else { - // effettuo selezione manuale... var currFase = await CDService.AnagFasiByKey(value.IdxFase); if (currFase != null) @@ -132,26 +78,6 @@ namespace GPW.CORE.Smart.Components } } - protected int idxFase - { - get - { - int answ = 0; - if (currRecord != null) - { - answ = currRecord.IdxFase; - } - return answ; - } - set - { - if (currRecord != null) - { - currRecord.IdxFase = value; - } - } - } - public int idxProj { get @@ -177,47 +103,46 @@ namespace GPW.CORE.Smart.Components #endregion Public Properties - #region Private Methods + #region Protected Fields - private void arrotondaMinuti() - { - if (currRecord != null) - { - // arrotondo ai 5 min... - currRecord.Inizio = CORE.Data.Utils.DateRounded(currRecord.Inizio.AddMinutes(2), 5, true); - // arrotondo ai 5 min... - currRecord.Fine = CORE.Data.Utils.DateRounded(currRecord.Fine.AddMinutes(2), 5, true); - checkCoerenzaDate(true); - } - } + protected string _gruppoSel = ""; + protected int _idxProj = 0; + protected bool vetoUpd = false; - /// - /// Verifico coerenza date (inizio < fine) - /// - /// indica se la data modificata sia l'inizio - private void checkCoerenzaDate(bool modInizio) + #endregion Protected Fields + + #region Protected Properties + + [Inject] + protected CoreSmartDataService CDService { get; set; } = null!; + + protected List fasiList { get; set; } = new List(); + + protected List gruppiList { get; set; } = new List(); + + protected int idxFase { - bool inError = false; - // verifica presenza errori - if (currRecord != null) + get { - inError = currRecord.Inizio >= currRecord.Fine; - if (inError) + int answ = 0; + if (currRecord != null) { - // se ho mod inizio --> tengo ferma fine, inizio 1/2 h prima - if (modInizio) - { - currRecord.Inizio = currRecord.Fine.AddMinutes(-30); - } - else - { - currRecord.Fine = currRecord.Inizio.AddMinutes(30); - } + answ = currRecord.IdxFase; + } + return answ; + } + set + { + if (currRecord != null) + { + currRecord.IdxFase = value; } } } - #endregion Private Methods + protected List projList { get; set; } = new List(); + + #endregion Protected Properties #region Protected Methods @@ -378,5 +303,66 @@ namespace GPW.CORE.Smart.Components } #endregion Protected Methods + + #region Private Fields + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Private Properties + + [Inject] + private MessageService AppMServ { get; set; } = null!; + + [Inject] + private IJSRuntime JSRuntime { get; set; } = null!; + + private bool VetoInsert + { + get => CDService.VetoInsert; + } + + #endregion Private Properties + + #region Private Methods + + private void arrotondaMinuti() + { + if (currRecord != null) + { + // arrotondo ai 5 min... + currRecord.Inizio = CORE.Data.Utils.DateRounded(currRecord.Inizio.AddMinutes(2), 5, true); + // arrotondo ai 5 min... + currRecord.Fine = CORE.Data.Utils.DateRounded(currRecord.Fine.AddMinutes(2), 5, true); + checkCoerenzaDate(true); + } + } + + /// Verifico coerenza date (inizio < fine) indica se la data modificata sia l'inizio + private void checkCoerenzaDate(bool modInizio) + { + bool inError = false; + // verifica presenza errori + if (currRecord != null) + { + inError = currRecord.Inizio >= currRecord.Fine; + if (inError) + { + // se ho mod inizio --> tengo ferma fine, inizio 1/2 h prima + if (modInizio) + { + currRecord.Inizio = currRecord.Fine.AddMinutes(-30); + } + else + { + currRecord.Fine = currRecord.Inizio.AddMinutes(30); + } + } + } + } + + #endregion Private Methods } } \ No newline at end of file diff --git a/GPW.CORE.SMART/Components/RegMalattia.razor.cs b/GPW.CORE.SMART/Components/RegMalattia.razor.cs index 593765c..c073469 100644 --- a/GPW.CORE.SMART/Components/RegMalattia.razor.cs +++ b/GPW.CORE.SMART/Components/RegMalattia.razor.cs @@ -1,22 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using GPW.CORE.Comp; using GPW.CORE.Data.DbModels; -using GPW.CORE.Smart; -using GPW.CORE.Smart.Components; -using GPW.CORE.Smart.Shared; using GPW.CORE.Smart.Data; +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; namespace GPW.CORE.Smart.Components { @@ -42,6 +27,9 @@ namespace GPW.CORE.Smart.Components } } + [Parameter] + public EventCallback ReportUpdate { get; set; } + #endregion Public Properties #region Protected Fields @@ -141,9 +129,6 @@ namespace GPW.CORE.Smart.Components isSendingData = false; } - [Parameter] - public EventCallback ReportUpdate { get; set; } - private async Task ReloadData() { ListRecords = null; diff --git a/GPW.CORE.SMART/Components/RegRichieste.razor b/GPW.CORE.SMART/Components/RegRichieste.razor index 811b28f..2522361 100644 --- a/GPW.CORE.SMART/Components/RegRichieste.razor +++ b/GPW.CORE.SMART/Components/RegRichieste.razor @@ -49,9 +49,12 @@ else
diff --git a/GPW.CORE.SMART/Components/RegRichieste.razor.cs b/GPW.CORE.SMART/Components/RegRichieste.razor.cs index 71e66cf..b913626 100644 --- a/GPW.CORE.SMART/Components/RegRichieste.razor.cs +++ b/GPW.CORE.SMART/Components/RegRichieste.razor.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web.Virtualization; using Microsoft.JSInterop; -using GPW.CORE.Comp; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart; using GPW.CORE.Smart.Components; diff --git a/GPW.CORE.SMART/Components/TestWeekCal.razor.cs b/GPW.CORE.SMART/Components/TestWeekCal.razor.cs index 46cd774..db3efe4 100644 --- a/GPW.CORE.SMART/Components/TestWeekCal.razor.cs +++ b/GPW.CORE.SMART/Components/TestWeekCal.razor.cs @@ -1,4 +1,4 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using Microsoft.AspNetCore.Components; namespace GPW.CORE.Smart.Components diff --git a/GPW.CORE.SMART/Components/UserQrCode.razor.cs b/GPW.CORE.SMART/Components/UserQrCode.razor.cs index 1587c1d..ad8ad0f 100644 --- a/GPW.CORE.SMART/Components/UserQrCode.razor.cs +++ b/GPW.CORE.SMART/Components/UserQrCode.razor.cs @@ -1,8 +1,8 @@ +using Egw.Core.Razor.Comp; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; -using static GPW.CORE.Comp.Toggler; namespace GPW.CORE.Smart.Components { @@ -80,7 +80,7 @@ namespace GPW.CORE.Smart.Components private DipendentiModel? recordDip { get; set; } = null; - private SelectGlobalToggle ToggleData { get; set; } = new SelectGlobalToggle(); + private Toggler.SelectGlobalToggle ToggleData { get; set; } = new Toggler.SelectGlobalToggle(); private string UrlLinkExt { get; set; } = ""; @@ -90,7 +90,7 @@ namespace GPW.CORE.Smart.Components #region Private Methods - private async Task evToggled(SelectGlobalToggle newTogData) + private async Task evToggled(Toggler.SelectGlobalToggle newTogData) { ToggleData = newTogData; await Task.Delay(1); @@ -109,7 +109,7 @@ namespace GPW.CORE.Smart.Components private void initToggler() { - ToggleData = new SelectGlobalToggle() + ToggleData = new Toggler.SelectGlobalToggle() { leftString = "Link Esterno", rightString = "Link Interno", diff --git a/GPW.CORE.SMART/Data/CoreSmartDataService.cs b/GPW.CORE.SMART/Data/CoreSmartDataService.cs index aa51a05..b5ba204 100644 --- a/GPW.CORE.SMART/Data/CoreSmartDataService.cs +++ b/GPW.CORE.SMART/Data/CoreSmartDataService.cs @@ -1,4 +1,4 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Data.DTO; using Microsoft.AspNetCore.Identity.UI.Services; @@ -647,7 +647,7 @@ namespace GPW.CORE.Smart.Data return dbResult; } - public string DeriptData(string encData) + public string DecriptData(string encData) { return SteamCrypto.DecryptString(encData, passPhrase); } diff --git a/GPW.CORE.SMART/GPW.CORE.SMART.csproj b/GPW.CORE.SMART/GPW.CORE.SMART.csproj index bcdb0db..5afdea0 100644 --- a/GPW.CORE.SMART/GPW.CORE.SMART.csproj +++ b/GPW.CORE.SMART/GPW.CORE.SMART.csproj @@ -3,7 +3,7 @@ net6.0 enable - 3.0.2301.2518 + 3.0.2302.0216 enable www.egalware.com GPW Smart UI @@ -26,12 +26,12 @@ + - diff --git a/GPW.CORE.SMART/Pages/About.razor.cs b/GPW.CORE.SMART/Pages/About.razor.cs index 9e09e6d..54899fe 100644 --- a/GPW.CORE.SMART/Pages/About.razor.cs +++ b/GPW.CORE.SMART/Pages/About.razor.cs @@ -1,21 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using GPW.CORE.Comp; -using GPW.CORE.Data.DbModels; -using GPW.CORE.Smart; -using GPW.CORE.Smart.Components; -using GPW.CORE.Smart.Shared; namespace GPW.CORE.Smart.Pages { diff --git a/GPW.CORE.SMART/Pages/DayOff.razor.cs b/GPW.CORE.SMART/Pages/DayOff.razor.cs index 985aca7..8c8e6b0 100644 --- a/GPW.CORE.SMART/Pages/DayOff.razor.cs +++ b/GPW.CORE.SMART/Pages/DayOff.razor.cs @@ -1,8 +1,8 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; -using static GPW.CORE.Comp.Toggler; namespace GPW.CORE.Smart.Pages { @@ -114,9 +114,9 @@ namespace GPW.CORE.Smart.Pages private bool showRichieste { get; set; } = false; - private SelectGlobalToggle ToggleShow { get; set; } = new SelectGlobalToggle(); + private Toggler.SelectGlobalToggle ToggleShow { get; set; } = new Toggler.SelectGlobalToggle(); - private SelectGlobalToggle ToggleTipo { get; set; } = new SelectGlobalToggle(); + private Toggler.SelectGlobalToggle ToggleTipo { get; set; } = new Toggler.SelectGlobalToggle(); #endregion Private Properties @@ -184,14 +184,14 @@ namespace GPW.CORE.Smart.Pages MService.ReportDateChange(); } - private async Task evTogShow(SelectGlobalToggle newTogData) + private async Task evTogShow(Toggler.SelectGlobalToggle newTogData) { ToggleShow = newTogData; showRichieste = !ToggleShow.isActive; await Task.Delay(1); } - private async Task evTogTipo(SelectGlobalToggle newTogData) + private async Task evTogTipo(Toggler.SelectGlobalToggle newTogData) { ToggleTipo = newTogData; showMalattie = !ToggleTipo.isActive; @@ -206,13 +206,13 @@ namespace GPW.CORE.Smart.Pages private void initToggler() { - ToggleTipo = new SelectGlobalToggle() + ToggleTipo = new Toggler.SelectGlobalToggle() { leftString = "Malattie", rightString = "Ferie e Permessi", placardCss = "bg-light border-light text-dark", }; - ToggleShow = new SelectGlobalToggle() + ToggleShow = new Toggler.SelectGlobalToggle() { leftString = "Mostra Richieste", rightString = "Solo Calendario", diff --git a/GPW.CORE.SMART/Pages/ForceReset.razor.cs b/GPW.CORE.SMART/Pages/ForceReset.razor.cs index 4791556..bc2433d 100644 --- a/GPW.CORE.SMART/Pages/ForceReset.razor.cs +++ b/GPW.CORE.SMART/Pages/ForceReset.razor.cs @@ -1,4 +1,4 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; diff --git a/GPW.CORE.SMART/Pages/Index.razor.cs b/GPW.CORE.SMART/Pages/Index.razor.cs index cb503f3..5cdbaaf 100644 --- a/GPW.CORE.SMART/Pages/Index.razor.cs +++ b/GPW.CORE.SMART/Pages/Index.razor.cs @@ -1,4 +1,3 @@ -using GPW.CORE.Comp; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; @@ -6,12 +5,15 @@ namespace GPW.CORE.Smart.Pages { public partial class Index : IDisposable { - #region Protected Properties + #region Public Methods - [Inject] - private MessageService MService { get; set; } = null!; + public void Dispose() + { + MService.EA_DipUpdated -= MService_EA_DipUpdated; + GC.Collect(); + } - #endregion Protected Properties + #endregion Public Methods #region Protected Methods @@ -25,18 +27,14 @@ namespace GPW.CORE.Smart.Pages #region Private Properties - public void Dispose() - { - MService.EA_DipUpdated -= MService_EA_DipUpdated; - GC.Collect(); - } - - /// /// IdxDipCurr /// private int idxDipendente { get; set; } = 0; + [Inject] + private MessageService MService { get; set; } = null!; + #endregion Private Properties #region Private Methods diff --git a/GPW.CORE.SMART/Pages/Jumper.razor.cs b/GPW.CORE.SMART/Pages/Jumper.razor.cs index 7184343..0ddd0fc 100644 --- a/GPW.CORE.SMART/Pages/Jumper.razor.cs +++ b/GPW.CORE.SMART/Pages/Jumper.razor.cs @@ -1,12 +1,10 @@ -using GPW.CORE.Comp; +using Egw.Core.Razor.Comp.Data; using GPW.CORE.Data.DbModels; using GPW.CORE.Smart.Data; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.WebUtilities; using Microsoft.JSInterop; using NLog; -using Org.BouncyCastle.Asn1; -using System.Net; namespace GPW.CORE.Smart.Pages { @@ -133,7 +131,7 @@ namespace GPW.CORE.Smart.Pages if (currDip.AuthKey == authKey) { // creo la DeviceSecret - devSec = CDService.EncriptData($"{rndTxt01}|{dtData}|{idxDipendente}|{devIp}|{rndTxt02}"); + devSec = CDService.EncriptData($"{rndTxt01}|{dtData}|{idxDipendente}|{devIp}|{rndTxt02}"); // ...e la salvo sul DB AnagDeviceModel newDev = new AnagDeviceModel() { diff --git a/GPW.CORE.SMART/Pages/RegNewDevice.razor.cs b/GPW.CORE.SMART/Pages/RegNewDevice.razor.cs index c4f7306..b8ef4a1 100644 --- a/GPW.CORE.SMART/Pages/RegNewDevice.razor.cs +++ b/GPW.CORE.SMART/Pages/RegNewDevice.razor.cs @@ -1,20 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using System.Net.Http; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Components.Authorization; -using Microsoft.AspNetCore.Components.Forms; -using Microsoft.AspNetCore.Components.Routing; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.Web.Virtualization; -using Microsoft.JSInterop; -using GPW.CORE.Smart; -using GPW.CORE.Smart.Shared; -using GPW.CORE.Comp; - namespace GPW.CORE.Smart.Pages { public partial class RegNewDevice diff --git a/GPW.CORE.SMART/_Imports.razor b/GPW.CORE.SMART/_Imports.razor index c263ebf..5eae3ba 100644 --- a/GPW.CORE.SMART/_Imports.razor +++ b/GPW.CORE.SMART/_Imports.razor @@ -6,7 +6,7 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using GPW.CORE.Comp +@using Egw.Core.Razor.Comp @using GPW.CORE.Data.DbModels @using GPW.CORE.Smart @using GPW.CORE.Smart.Components diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html index 91afe73..80ef4d4 100644 --- a/Resources/ChangeLog.html +++ b/Resources/ChangeLog.html @@ -1,6 +1,6 @@ GPW - Gestione Presenze Web -

Versione: 3.0.2301.2711

+

Versione: 3.0.2302.0216


Note di rilascio:
  • diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt index 9864f12..c9a1a84 100644 --- a/Resources/VersNum.txt +++ b/Resources/VersNum.txt @@ -1 +1 @@ -3.0.2301.2711 +3.0.2302.0216 diff --git a/Resources/manifest.xml b/Resources/manifest.xml index e594784..a9243b9 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ - 3.0.2301.2711 - http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.UI.zip + 3.0.2302.0216 + http://nexus.steamware.net/repository/SWS/GPW/stable/GPW.Smart.zip http://nexus.steamware.net/repository/SWS/GPW/stable/ChangeLog.html false