diff --git a/Template.Maui/wwwroot/index.html b/Template.Maui/wwwroot/index.html index 9c832fe..3ab32ce 100644 --- a/Template.Maui/wwwroot/index.html +++ b/Template.Maui/wwwroot/index.html @@ -18,6 +18,7 @@ + @@ -51,7 +52,7 @@ - + diff --git a/Template.Shared/Components/Pages/Calendar.razor b/Template.Shared/Components/Pages/Calendar.razor index c3c848a..ac1b329 100644 --- a/Template.Shared/Components/Pages/Calendar.razor +++ b/Template.Shared/Components/Pages/Calendar.razor @@ -4,7 +4,7 @@ @using Template.Shared.Components.Layout @using Template.Shared.Components.SingleElements @using Template.Shared.Components.Layout.Spinner -@using Template.Shared.Components.Layout.BottomSheet +@using Template.Shared.Components.SingleElements.BottomSheet @inject IManageDataService ManageData @inject IJSRuntime JS diff --git a/Template.Shared/Components/Pages/Users.razor b/Template.Shared/Components/Pages/Users.razor index a460e24..5717ef8 100644 --- a/Template.Shared/Components/Pages/Users.razor +++ b/Template.Shared/Components/Pages/Users.razor @@ -4,6 +4,10 @@ +
+ +
+ @code { } \ No newline at end of file diff --git a/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor b/Template.Shared/Components/SingleElements/BottomSheet/FilterActivity.razor similarity index 100% rename from Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor rename to Template.Shared/Components/SingleElements/BottomSheet/FilterActivity.razor diff --git a/Template.Shared/Components/SingleElements/BottomSheet/FilterActivity.razor.css b/Template.Shared/Components/SingleElements/BottomSheet/FilterActivity.razor.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/Template.Shared/Components/SingleElements/BottomSheet/FilterActivity.razor.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor new file mode 100644 index 0000000..9508f81 --- /dev/null +++ b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor @@ -0,0 +1,106 @@ +@using Template.Shared.Core.Dto +@using Template.Shared.Core.Entity +@using Template.Shared.Core.Interface +@inject IManageDataService ManageData + +
+ +
+
+
+ + Esito + + +
+ +
+
+ Data effettiva + + +
+ +
+ +
+ Inizio + + +
+ +
+ +
+ Fine + + +
+
+ +
+
+ Esito + + + @foreach (var result in ActivityResult) + { + @result.ActivityResultId + } + +
+
+ +
+ +
+ +
+ Salva +
+
+
+ +@code { + [Parameter] public bool IsSheetVisible { get; set; } + [Parameter] public EventCallback IsSheetVisibleChanged { get; set; } + + [Parameter] public ActivityDTO ActivityModel { get; set; } + [Parameter] public EventCallback ActivityModelChanged { get; set; } + + private List ActivityResult { get; set; } = []; + + private DateTime EffectiveDate { get; set; } = DateTime.Today; + + private TimeSpan EffectiveTime { get; set; } + private TimeSpan EffectiveEndTime { get; set; } + + protected override async Task OnParametersSetAsync() + { + if (IsSheetVisible) + await LoadData(); + } + + private async Task LoadData() + { + ActivityResult = await ManageData.GetTable(); + + EffectiveTime = ActivityModel.EffectiveTime?.TimeOfDay ?? TimeSpan.Zero; + EffectiveEndTime = ActivityModel.EffectiveEndtime?.TimeOfDay ?? TimeSpan.Zero; + StateHasChanged(); + } + + private void CloseBottomSheet() + { + ActivityModel.EffectiveTime = new DateTime(EffectiveDate.Year, EffectiveDate.Month, EffectiveDate.Day, + EffectiveTime.Hours, EffectiveTime.Minutes, EffectiveTime.Seconds); + + ActivityModel.EffectiveEndtime = new DateTime(EffectiveDate.Year, EffectiveDate.Month, EffectiveDate.Day, + EffectiveEndTime.Hours, EffectiveEndTime.Minutes, EffectiveEndTime.Seconds); + + IsSheetVisible = false; + IsSheetVisibleChanged.InvokeAsync(IsSheetVisible); + ActivityModelChanged.InvokeAsync(ActivityModel); + } + +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor.css b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor.css new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor.css @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor b/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor index e4ebb96..8c786ea 100644 --- a/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor +++ b/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor @@ -1,8 +1,10 @@ -@using Template.Shared.Core.Dto +@using Microsoft.VisualBasic +@using Template.Shared.Core.Dto @using Template.Shared.Components.Layout @using Template.Shared.Core.Entity @using Template.Shared.Core.Interface @using Template.Shared.Components.Layout.Overlay +@using Template.Shared.Components.SingleElements.BottomSheet @inject IManageDataService ManageData @inject INetworkService NetworkService @inject IIntegryApiService IntegryApiService @@ -79,10 +81,10 @@
-
+
Esito - + @foreach (var result in ActivityResult) { @result.ActivityResultId @@ -100,6 +102,8 @@ + + @code { [CascadingParameter] private IMudDialogInstance MudDialog { get; set; } @@ -121,6 +125,8 @@ private bool VisibleOverlay { get; set; } private bool SuccessAnimation { get; set; } + private bool OpenEsito { get; set; } = false; + protected override async Task OnInitializedAsync() { _ = LoadData(); @@ -169,4 +175,10 @@ StateHasChanged(); } + private void OpenSelectEsito() + { + OpenEsito = !OpenEsito; + StateHasChanged(); + } + } \ No newline at end of file diff --git a/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor.css b/Template.Shared/wwwroot/css/bottomSheet.css similarity index 84% rename from Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor.css rename to Template.Shared/wwwroot/css/bottomSheet.css index 104a4f5..e82d077 100644 --- a/Template.Shared/Components/Layout/BottomSheet/FilterActivity.razor.css +++ b/Template.Shared/wwwroot/css/bottomSheet.css @@ -22,9 +22,7 @@ z-index: 1003; } -.bottom-sheet-container.show { - bottom: 0; -} +.bottom-sheet-container.show { bottom: 0; } .bottom-sheet { background-color: var(--mud-palette-surface); @@ -34,11 +32,9 @@ box-shadow: 0 -2px 10px rgba(165, 165, 165, 0.5); } -.clearButton ::deep .mud-icon-button { - padding: 4px !important; -} +.clearButton .mud-icon-button { padding: 4px !important; } -.bottom-sheet ::deep .closeIcon .mud-icon-root { +.bottom-sheet .closeIcon .mud-icon-root { border-radius: 50%; padding: 2px; min-width: 15px; diff --git a/Template.Shared/wwwroot/js/alphaScroll.js b/Template.Shared/wwwroot/js/alphaScroll.js new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/Template.Shared/wwwroot/js/alphaScroll.js @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Template.Shared/wwwroot/js/header.js b/Template.Shared/wwwroot/js/header.js deleted file mode 100644 index 7977944..0000000 --- a/Template.Shared/wwwroot/js/header.js +++ /dev/null @@ -1,26 +0,0 @@ -window.blazorIosHeader = { - init: function () { - const largeTitleSection = document.querySelector('.large-title-section'); - const largeTitle = document.querySelector('.large-title'); - const centerTitle = document.querySelector('.center-title'); - - if (!largeTitleSection || !largeTitle || !centerTitle) return; - - window.addEventListener('scroll', function () { - // Soglia simile a iOS: metà della sezione large title - const threshold = largeTitleSection.offsetHeight / 2; - if (window.scrollY > threshold) { - largeTitle.classList.add('hide'); - centerTitle.classList.add('visible'); - } else { - largeTitle.classList.remove('hide'); - centerTitle.classList.remove('visible'); - } - }); - } -}; - -// Per compatibilità con il tuo GoBack Blazor -window.goBack = function () { - window.history.back(); -} \ No newline at end of file