diff --git a/EgwCoreLib.BlazorTest/EgwCoreLib.BlazorTest.csproj b/EgwCoreLib.BlazorTest/EgwCoreLib.BlazorTest.csproj index 73eda87..3f8e3ed 100644 --- a/EgwCoreLib.BlazorTest/EgwCoreLib.BlazorTest.csproj +++ b/EgwCoreLib.BlazorTest/EgwCoreLib.BlazorTest.csproj @@ -31,4 +31,52 @@ + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + diff --git a/EgwCoreLib.BlazorTest/Pages/TestComponenti.razor b/EgwCoreLib.BlazorTest/Pages/TestComponenti.razor index 3445cf6..1b46dcd 100644 --- a/EgwCoreLib.BlazorTest/Pages/TestComponenti.razor +++ b/EgwCoreLib.BlazorTest/Pages/TestComponenti.razor @@ -1,4 +1,5 @@ @page "/TestComponenti" +@using EgwCoreLib.Utils @using static EgwCoreLib.Razor.Sorter @inject NavigationManager NavMan @@ -196,6 +197,20 @@ +
+
+

Test Periodo

+
+
standard
+ +
custom
+ +
+ +
+
+
+
@@ -287,7 +302,28 @@ Tooltip = $"Switch {i:00}" }); } + + // preparo sel periodo custom (es traduzioni)... + CustomSelDict = Enum.GetValues(typeof(DtUtils.PeriodSet)) + .Cast() + .ToDictionary(e => e, e => Traduci(e.ToString())); } + + /// + /// Mockup traduzione termini + /// + /// + /// + private string Traduci(string lemma) + { + return $"IT | {lemma}"; + } + + /// + /// Periodo custom selezione valori + /// + private Dictionary? CustomSelDict = new(); + async void LocationChanged(object sender, LocationChangedEventArgs e) { qsNome = NavMan.ExtractQueryStringByKey("Nome"); diff --git a/EgwCoreLib.BlazorTest/wwwroot/css/font.css b/EgwCoreLib.BlazorTest/wwwroot/css/font.css new file mode 100644 index 0000000..354cb21 --- /dev/null +++ b/EgwCoreLib.BlazorTest/wwwroot/css/font.css @@ -0,0 +1,36 @@ +/* lato-regular - latin */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-weight: 400; + src: url('../fonts/lato-v17-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/lato-v17-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg'); /* Legacy iOS */ +} +/* roboto-regular - latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-v27-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg'); /* Legacy iOS */ +} +/* roboto-condensed-regular - latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('../fonts/roboto-condensed-v19-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), url('../fonts/roboto-condensed-v19-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/roboto-condensed-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/roboto-condensed-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/roboto-condensed-v19-latin-regular.svg#RobotoCondensed') format('svg'); /* Legacy iOS */ +} diff --git a/EgwCoreLib.BlazorTest/wwwroot/css/site.css b/EgwCoreLib.BlazorTest/wwwroot/css/site.css index 1f4b8cf..4b47b44 100644 --- a/EgwCoreLib.BlazorTest/wwwroot/css/site.css +++ b/EgwCoreLib.BlazorTest/wwwroot/css/site.css @@ -1,7 +1,12 @@ @import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); +@import url('font.css'); html, body { - font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: Roboto,sans-serif; +} + +.condensed { + font-family: 'Roboto Condensed', sans-serif; } h1:focus { diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.eot b/EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.eot similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.eot rename to EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.eot diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.svg b/EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.svg similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.svg rename to EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.svg diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.ttf b/EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.ttf similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.ttf rename to EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.ttf diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.woff b/EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.woff similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.woff rename to EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.woff diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.woff2 b/EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.woff2 similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/lato-v17-latin-regular.woff2 rename to EgwCoreLib.BlazorTest/wwwroot/fonts/lato-v17-latin-regular.woff2 diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.eot b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.eot rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.eot diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.svg b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.svg rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.svg diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.ttf b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.ttf rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.ttf diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.woff b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.woff rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.woff2 b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-condensed-v19-latin-regular.woff2 rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-condensed-v19-latin-regular.woff2 diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.eot b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.eot similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.eot rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.eot diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.svg b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.svg similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.svg rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.svg diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.ttf b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.ttf similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.ttf rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.ttf diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.woff b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.woff similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.woff rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.woff diff --git a/EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.woff2 b/EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.woff2 similarity index 100% rename from EgwCoreLib.BlazorTest/wwwroot/font/roboto-v27-latin-regular.woff2 rename to EgwCoreLib.BlazorTest/wwwroot/fonts/roboto-v27-latin-regular.woff2 diff --git a/EgwCoreLib.Razor/PeriodoSel.razor b/EgwCoreLib.Razor/PeriodoSel.razor index 21d22bc..b5c28b4 100644 --- a/EgwCoreLib.Razor/PeriodoSel.razor +++ b/EgwCoreLib.Razor/PeriodoSel.razor @@ -1,16 +1,16 @@ @using EgwCoreLib.Utils;
- Periodo + @PeriodoLabel - + @foreach (var item in DictSelect ?? new()) { - + + }
- diff --git a/EgwCoreLib.Razor/PeriodoSel.razor.cs b/EgwCoreLib.Razor/PeriodoSel.razor.cs index a121681..88151f5 100644 --- a/EgwCoreLib.Razor/PeriodoSel.razor.cs +++ b/EgwCoreLib.Razor/PeriodoSel.razor.cs @@ -7,13 +7,6 @@ namespace EgwCoreLib.Razor { #region Public Properties - [Parameter] - public EventCallback E_PeriodoSel { get; set; } - - #endregion Public Properties - - #region Protected Properties - [Parameter] public DtUtils.Periodo CurrPeriodo { @@ -28,7 +21,43 @@ namespace EgwCoreLib.Razor } } - protected DateTime Fine + [Parameter] + public Dictionary? DictSelect { get; set; } + + [Parameter] + public EventCallback E_PeriodoSel { get; set; } + + [Parameter] + public string PeriodoLabel { get; set; } = "Periodo"; + + #endregion Public Properties + + #region Protected Methods + + protected override async Task OnInitializedAsync() + { + await E_PeriodoSel.InvokeAsync(CurrPeriodo); + } + + protected override void OnParametersSet() + { + // se fosse vuoto il dizionario lo preparo... + if (DictSelect == null || DictSelect.Count == 0) + { + // inizializzo! + DictSelect = Enum.GetValues(typeof(DtUtils.PeriodSet)) + .Cast() + .ToDictionary(e => e, e => $"{e}"); + } + + } + #endregion Protected Methods + + #region Private Properties + + private DtUtils.Periodo currPeriodo { get; set; } = new DtUtils.Periodo(); + + private DateTime Fine { get => CurrPeriodo.Fine; set @@ -42,7 +71,7 @@ namespace EgwCoreLib.Razor } } - protected DateTime Inizio + private DateTime Inizio { get => CurrPeriodo.Inizio; set @@ -56,9 +85,13 @@ namespace EgwCoreLib.Razor } } - protected List periodList { get => Enum.GetNames(typeof(DtUtils.PeriodSet)).ToList(); } +#if false + private List periodList { get => Enum.GetNames(typeof(DtUtils.PeriodSet)).ToList(); } +#endif - protected string PerSelect + private string perSelect { get; set; } = "Select"; + + private string PerSelect { get => perSelect; set @@ -73,22 +106,6 @@ namespace EgwCoreLib.Razor } } - #endregion Protected Properties - - #region Protected Methods - - protected override async Task OnInitializedAsync() - { - await E_PeriodoSel.InvokeAsync(CurrPeriodo); - } - - #endregion Protected Methods - - #region Private Properties - - private DtUtils.Periodo currPeriodo { get; set; } = new DtUtils.Periodo(); - private string perSelect { get; set; } = "Select"; - #endregion Private Properties } } \ No newline at end of file