From 51a4c7a97102dcdcd9dfa5d5476cd22fb5aec6f4 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Fri, 20 Jun 2025 08:55:30 +0200 Subject: [PATCH] Iniziata creazione pagina contatti --- .../Components/Layout/MainLayout.razor | 8 +- .../Components/Layout/NavMenu.razor.css | 4 +- .../Components/Pages/Notifications.razor | 5 + .../Components/Pages/PersonalInfo.razor | 179 +++++++++--------- Template.Shared/Components/Pages/User.razor | 113 +++++++++++ .../Components/Pages/User.razor.css | 142 ++++++++++++++ Template.Shared/Components/Pages/Users.razor | 98 +++++++++- .../Components/Pages/Users.razor.css | 22 +++ Template.Shared/Components/Routes.razor | 8 +- .../BottomSheet/SelectEsito.razor | 15 +- .../SingleElements/Card/ContactCard.razor | 24 +++ .../SingleElements/Card/ContactCard.razor.css | 63 ++++++ .../SingleElements/Card/UserCard.razor | 72 +++++++ .../SingleElements/Card/UserCard.razor.css | 90 +++++++++ .../SingleElements/ExceptionModal.razor | 62 ++++++ .../SingleElements/ExceptionModal.razor.css | 61 ++++++ .../SingleElements/Modal/ActivityForm.razor | 18 +- .../SingleElements/NoDataAvailable.razor.css | 13 +- Template.Shared/Core/Entity/AnagClie.cs | 7 +- Template.Shared/Core/Entity/VtbCliePersRif.cs | 8 +- .../Core/Interface/IIntegryApiService.cs | 2 +- .../AppAuthenticationStateProvider.cs | 2 +- .../Core/Services/IntegryApiService.cs | 4 +- Template.Shared/Core/Utility/UtilityString.cs | 1 + 24 files changed, 896 insertions(+), 125 deletions(-) create mode 100644 Template.Shared/Components/Pages/User.razor create mode 100644 Template.Shared/Components/Pages/User.razor.css create mode 100644 Template.Shared/Components/SingleElements/Card/ContactCard.razor create mode 100644 Template.Shared/Components/SingleElements/Card/ContactCard.razor.css create mode 100644 Template.Shared/Components/SingleElements/Card/UserCard.razor create mode 100644 Template.Shared/Components/SingleElements/Card/UserCard.razor.css create mode 100644 Template.Shared/Components/SingleElements/ExceptionModal.razor create mode 100644 Template.Shared/Components/SingleElements/ExceptionModal.razor.css diff --git a/Template.Shared/Components/Layout/MainLayout.razor b/Template.Shared/Components/Layout/MainLayout.razor index 65aa5d8..b86279f 100644 --- a/Template.Shared/Components/Layout/MainLayout.razor +++ b/Template.Shared/Components/Layout/MainLayout.razor @@ -1,4 +1,5 @@ -@using Template.Shared.Core.Messages +@using System.Globalization +@using Template.Shared.Core.Messages @inherits LayoutComponentBase @inject IJSRuntime JS @inject BackNavigationService BackService @@ -36,6 +37,11 @@ { await JS.InvokeVoidAsync("goBack"); }; + + var culture = new CultureInfo("it-IT", false); + + CultureInfo.CurrentCulture = culture; + CultureInfo.CurrentUICulture = culture; } } \ No newline at end of file diff --git a/Template.Shared/Components/Layout/NavMenu.razor.css b/Template.Shared/Components/Layout/NavMenu.razor.css index 40836dc..fb5ee34 100644 --- a/Template.Shared/Components/Layout/NavMenu.razor.css +++ b/Template.Shared/Components/Layout/NavMenu.razor.css @@ -45,7 +45,7 @@ bottom: 15px; } -.nav-item ::deep .custom-plus-button .mud-icon-root { +.navbar ::deep .custom-plus-button .mud-icon-root { transition: .5s; transform: rotate(0); font-size: 2rem; @@ -57,7 +57,7 @@ transition: all 0.3s ease-in-out; } -.nav-item ::deep .custom-plus-button:focus .mud-icon-root { transform: rotate(225deg); } +.navbar ::deep .custom-plus-button:focus .mud-icon-root { transform: rotate(225deg); } .nav-item ::deep a { display: flex; diff --git a/Template.Shared/Components/Pages/Notifications.razor b/Template.Shared/Components/Pages/Notifications.razor index 8151533..4c5d964 100644 --- a/Template.Shared/Components/Pages/Notifications.razor +++ b/Template.Shared/Components/Pages/Notifications.razor @@ -1,9 +1,14 @@ @page "/Notifications" @attribute [Authorize] @using Template.Shared.Components.Layout +@using Template.Shared.Components.SingleElements +
+ +
+ @code { } \ No newline at end of file diff --git a/Template.Shared/Components/Pages/PersonalInfo.razor b/Template.Shared/Components/Pages/PersonalInfo.razor index 5235ea6..4a258d0 100644 --- a/Template.Shared/Components/Pages/PersonalInfo.razor +++ b/Template.Shared/Components/Pages/PersonalInfo.razor @@ -10,113 +10,118 @@ -
-
-
- - @UtilityString.ExtractInitials(UserSession.User.Fullname) - +@if (IsLoggedIn) +{ +
+
+
+ + @UtilityString.ExtractInitials(UserSession.User.Fullname) + -
- @UserSession.User.Fullname - @if (UserSession.User.KeyGroup is not null) - { - @(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable()) - } -
-
- -
- -
-
-
- Telefono - 000 0000000 @*Todo: to implement*@ -
- -
- Status - @if (NetworkService.IsNetworkAvailable()) +
+ @UserSession.User.Fullname + @if (UserSession.User.KeyGroup is not null) { -
- - Online -
- } - else - { -
- - Offline -
+ @(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable()) }
-
-
- E-mail - - @if (string.IsNullOrEmpty(UserSession.User.Email)) +
+ +
+
+
+ Telefono + 000 0000000 @*Todo: to implement*@ +
+ +
+ Status + @if (NetworkService.IsNetworkAvailable()) { - @("Nessuna mail configurata") +
+ + Online +
} else { - @UserSession.User.Email +
+ + Offline +
} - +
-
- Ultima sincronizzazione - @LastSync.ToString("g") +
+
+ E-mail + + @if (string.IsNullOrEmpty(UserSession.User.Email)) + { + @("Nessuna mail configurata") + } + else + { + @UserSession.User.Email + } + +
+ +
+ Ultima sincronizzazione + @LastSync.ToString("g") +
+ +
+ + Sincronizza + + +
+ + + Ripristina dati + +
+ +
+ + Esci + +
- -
- - Sincronizza - - -
- - - Ripristina dati - -
- -
- - Esci - -
-
+} @code { private bool Unavailable { get; set; } + private bool IsLoggedIn { get; set; } private DateTime LastSync { get; set; } protected override async Task OnInitializedAsync() { + IsLoggedIn = await UserSession.IsLoggedIn(); await LoadData(); } @@ -134,8 +139,12 @@ private void OpenSettings() => NavigationManager.NavigateTo("/settings/Profilo"); - private void Logout() => - AuthenticationStateProvider.SignOut(); + private async Task Logout() + { + await AuthenticationStateProvider.SignOut(); + IsLoggedIn = await UserSession.IsLoggedIn(); + StateHasChanged(); + } private void UpdateDb(bool withData = false) { diff --git a/Template.Shared/Components/Pages/User.razor b/Template.Shared/Components/Pages/User.razor new file mode 100644 index 0000000..e4afbf9 --- /dev/null +++ b/Template.Shared/Components/Pages/User.razor @@ -0,0 +1,113 @@ +@page "/User/{CodAnag}" +@attribute [Authorize] +@using Template.Shared.Components.Layout +@using Template.Shared.Core.Entity +@using Template.Shared.Core.Interface +@using Template.Shared.Components.Layout.Spinner +@inject IManageDataService ManageData + + + +@if (IsLoading) +{ + +} +else +{ +
+
+
+ + @UtilityString.ExtractInitials(Anag.RagSoc) + + +
+ @Anag.RagSoc + @if (UserSession.User.KeyGroup is not null) + { + @Anag.Indirizzo + @($"{Anag.Cap} - {Anag.Citta} ({Anag.Prov})") + } +
+
+ +
+ +
+
+
+ Telefono + + @if (string.IsNullOrEmpty(Anag.Telefono)) + { + @("Nessuna mail configurata") + } + else + { + @Anag.Telefono + } + +
+
+ +
+
+ E-mail + + @if (string.IsNullOrEmpty(Anag.EMail)) + { + @("Nessuna mail configurata") + } + else + { + @Anag.EMail + } + +
+
+
+
+ + @if (PersRif is { Count: > 0 }) + { +
+ + + +
+ } + +
+ + Aggiungi contatto + +
+
+} + +@code { + [Parameter] public string CodAnag { get; set; } + + private AnagClie Anag { get; set; } = new(); + private List? PersRif { get; set; } + + private bool IsLoading { get; set; } = true; + + protected override async Task OnInitializedAsync() + { + await LoadData(); + } + + private async Task LoadData() + { + Anag = (await ManageData.GetTable(x => x.CodAnag.Equals(CodAnag))).Last(); + PersRif = await ManageData.GetTable(x => x.CodAnag.Equals(Anag.CodAnag)); + + IsLoading = false; + StateHasChanged(); + } + +} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/User.razor.css b/Template.Shared/Components/Pages/User.razor.css new file mode 100644 index 0000000..5fd5c42 --- /dev/null +++ b/Template.Shared/Components/Pages/User.razor.css @@ -0,0 +1,142 @@ +.container-primary-info { + box-shadow: var(--custom-box-shadow); + width: 100%; + margin-bottom: 2rem; + border-radius: 16px; +} + +.container-primary-info .divider { + margin: 0 0 0 7rem; + width: unset; +} + +.section-primary-info { + display: flex; + flex-direction: row; + align-items: center; + gap: 1.5rem; + padding: .8rem 1.2rem .4rem; +} + +.personal-info { + display: flex; + flex-direction: column; + align-items: flex-start; + line-height: normal; +} + +.info-nome { + color: var(--mud-palette-text-primary); + font-weight: 800; + font-size: medium; +} + +.info-section { + color: var(--mud-palette-gray-default); + font-size: small; + font-weight: 600; +} + +.section-info { + display: flex; + justify-content: space-between; + flex-direction: row; + padding: .4rem 1.2rem .8rem; +} + +.section-personal-info { + display: flex; + flex-direction: column; +} + +.section-personal-info > div { + display: flex; + flex-direction: column; + line-height: normal; + margin: .25rem 0; +} + +.info-title { + color: var(--mud-palette-gray-darker); + font-weight: 800; +} + +.info-text { + color: var(--mud-palette-text-secondary); + font-weight: 700; + font-size: small; +} + +.content ::deep .user-button { border: 1px solid var(--card-border-color) !important; } + +.user-button > i { font-size: large; } + +.user-button > span { + font-size: medium; + font-weight: 600; +} + +.status { font-weight: 700; } + +.status.online { color: var(--mud-palette-success); } + +.status.offline { color: var(--mud-palette-error); } + +.container-button { + width: 100%; + box-shadow: var(--custom-box-shadow); + padding: .25rem 0; + border-radius: 16px; +} + +.container-button .divider { + margin: .5rem 0 .5rem 3rem; + width: unset; +} + +.container-button ::deep .button-settings { border: none !important; } + +.container-button ::deep .button-settings .mud-icon-root { + border-radius: 6px; + padding: 2px; + min-width: 25px; + min-height: 25px; +} + +.container-button ::deep .button-settings.infoText { + color: var(--mud-palette-info); +} + + .container-button ::deep .button-settings.green-icon .mud-icon-root { + border: 1px solid var(--mud-palette-success); + background: hsl(from var(--mud-palette-success-lighten) h s 95%); + color: var(--mud-palette-success-darken); + } + + .container-button ::deep .button-settings.red-icon .mud-icon-root { + border: 1px solid var(--mud-palette-error); + background: hsl(from var(--mud-palette-error-lighten) h s 95%); + color: var(--mud-palette-error-darken); + } + +.container-button ::deep .button-settings .mud-button-label { + justify-content: flex-start; + text-transform: capitalize; + font-size: 1rem; +} + +.container-button ::deep .button-settings.exit { padding: 0; } + +.container-button ::deep .button-settings.exit .mud-button-label { + justify-content: center; + font-size: 1.1rem; + line-height: normal; +} + +.container-pers-rif { + width: 100%; + display: flex; + flex-direction: column; + gap: 1rem; + margin-bottom: 1rem; +} \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Users.razor b/Template.Shared/Components/Pages/Users.razor index 5717ef8..5d60151 100644 --- a/Template.Shared/Components/Pages/Users.razor +++ b/Template.Shared/Components/Pages/Users.razor @@ -1,13 +1,105 @@ @page "/Users" @attribute [Authorize] @using Template.Shared.Components.Layout +@using Template.Shared.Core.Entity +@using Template.Shared.Core.Interface +@inject IManageDataService ManageData - + -
- +
+ @if (GroupedUserList?.Count > 0) + { +
+ + + +
+ + + @if (item.ShowHeader) + { +
@item.HeaderLetter
+ } + + + }
@code { + private List GroupedUserList { get; set; } = []; + private List FilteredGroupedUserList { get; set; } = []; + private string? TextToFilter { get; set; } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + await LoadData(); + StateHasChanged(); + } + } + + private async Task LoadData() + { + var users = await ManageData.GetTable(x => x.FlagStato.Equals("A")); + + var sortedUsers = users + .Where(u => !string.IsNullOrWhiteSpace(u.RagSoc)) + .OrderBy(u => + { + var firstChar = char.ToUpper(u.RagSoc[0]); + return char.IsLetter(firstChar) ? firstChar.ToString() : "ZZZ"; + }) + .ThenBy(u => u.RagSoc) + .ToList(); + + GroupedUserList = []; + + string? lastHeader = null; + + foreach (var user in sortedUsers) + { + var firstChar = char.ToUpper(user.RagSoc[0]); + var currentLetter = char.IsLetter(firstChar) ? firstChar.ToString() : "#"; + + var showHeader = currentLetter != lastHeader; + lastHeader = currentLetter; + + GroupedUserList.Add(new UserDisplayItem + { + User = user, + ShowHeader = showHeader, + HeaderLetter = currentLetter + }); + } + + FilterUsers(true); + } + + private class UserDisplayItem + { + public required AnagClie User { get; set; } + public bool ShowHeader { get; set; } + public string? HeaderLetter { get; set; } + } + + private void FilterUsers() => FilterUsers(false); + + private void FilterUsers(bool clearFilter) + { + if (clearFilter) + { + TextToFilter = null; + FilteredGroupedUserList = GroupedUserList; + StateHasChanged(); + return; + } + + if (TextToFilter == null) return; + + FilteredGroupedUserList = GroupedUserList.FindAll(x => x.User.RagSoc.Contains(TextToFilter, StringComparison.OrdinalIgnoreCase)); + StateHasChanged(); + } } \ No newline at end of file diff --git a/Template.Shared/Components/Pages/Users.razor.css b/Template.Shared/Components/Pages/Users.razor.css index e69de29..3ff6510 100644 --- a/Template.Shared/Components/Pages/Users.razor.css +++ b/Template.Shared/Components/Pages/Users.razor.css @@ -0,0 +1,22 @@ +.users { + display: flex; + gap: 1rem; + overflow-y: auto; + flex-direction: column; + -ms-overflow-style: none; + scrollbar-width: none; + padding-bottom: 70px; + height: 100%; +} + +.users .divider { + margin: .1rem 0; + margin-left: 3rem; +} + +.users .input-card { margin: 0 !important; } + +.letter-header { + border-bottom: 1px solid var(--card-border-color); + font-weight: bolder; +} \ No newline at end of file diff --git a/Template.Shared/Components/Routes.razor b/Template.Shared/Components/Routes.razor index c732899..7a6e1bf 100644 --- a/Template.Shared/Components/Routes.razor +++ b/Template.Shared/Components/Routes.razor @@ -1,3 +1,4 @@ +@using Template.Shared.Components.SingleElements @inject NavigationManager NavigationManager @@ -33,14 +34,15 @@ - @* *@ + OnRetry="() => ErrorBoundary?.Recover()"/> @code { + private ErrorBoundary? ErrorBoundary { get; set; } - // private ExceptionModal ExceptionModal { get; set; } + private ExceptionModal ExceptionModal { get; set; } } \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor index 9508f81..e2e275e 100644 --- a/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor +++ b/Template.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor @@ -18,7 +18,7 @@
Data effettiva - +
@@ -70,7 +70,7 @@ private List ActivityResult { get; set; } = []; - private DateTime EffectiveDate { get; set; } = DateTime.Today; + private DateTime? EffectiveDate { get; set; } = DateTime.Today; private TimeSpan EffectiveTime { get; set; } private TimeSpan EffectiveEndTime { get; set; } @@ -92,11 +92,14 @@ private void CloseBottomSheet() { - ActivityModel.EffectiveTime = new DateTime(EffectiveDate.Year, EffectiveDate.Month, EffectiveDate.Day, - EffectiveTime.Hours, EffectiveTime.Minutes, EffectiveTime.Seconds); + if (EffectiveDate != null) + { + ActivityModel.EffectiveTime = new DateTime(EffectiveDate!.Value.Year, EffectiveDate!.Value.Month, EffectiveDate!.Value.Day, + EffectiveTime.Hours, EffectiveTime.Minutes, EffectiveTime.Seconds); - ActivityModel.EffectiveEndtime = new DateTime(EffectiveDate.Year, EffectiveDate.Month, EffectiveDate.Day, - EffectiveEndTime.Hours, EffectiveEndTime.Minutes, EffectiveEndTime.Seconds); + ActivityModel.EffectiveEndtime = new DateTime(EffectiveDate!.Value.Year, EffectiveDate!.Value.Month, EffectiveDate!.Value.Day, + EffectiveEndTime.Hours, EffectiveEndTime.Minutes, EffectiveEndTime.Seconds); + } IsSheetVisible = false; IsSheetVisibleChanged.InvokeAsync(IsSheetVisible); diff --git a/Template.Shared/Components/SingleElements/Card/ContactCard.razor b/Template.Shared/Components/SingleElements/Card/ContactCard.razor new file mode 100644 index 0000000..b4c2d42 --- /dev/null +++ b/Template.Shared/Components/SingleElements/Card/ContactCard.razor @@ -0,0 +1,24 @@ +@using Template.Shared.Core.Entity + +
+
+
+
+ @Contact.PersonaRif +
+ + @if (Contact.Mansione is not null) + { + @Contact.Mansione + } +
+
+
+ + +
+
+ +@code { + [Parameter] public VtbCliePersRif Contact { get; set; } = new(); +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/Card/ContactCard.razor.css b/Template.Shared/Components/SingleElements/Card/ContactCard.razor.css new file mode 100644 index 0000000..07fb96b --- /dev/null +++ b/Template.Shared/Components/SingleElements/Card/ContactCard.razor.css @@ -0,0 +1,63 @@ +.contact-card { + width: 100%; + display: flex; + flex-direction: row; + padding: .5rem .5rem; + border-radius: 16px; + line-height: normal; + box-shadow: var(--custom-box-shadow); + justify-content: space-between; + align-items: center; +} + +.contact-card.memo { border-left: 5px solid var(--mud-palette-info-darken); } + +.contact-card.interna { border-left: 5px solid var(--mud-palette-success-darken); } + +.contact-card.commessa { border-left: 5px solid var(--mud-palette-warning); } + +.contact-left-section { + display: flex; + align-items: center; + margin-left: 4px; +} + +.title-section { + display: flex; + flex-direction: row; + justify-content: space-between; + width: 100%; +} + +.contact-hours { font-weight: 700; } + +.contact-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; } + +.contact-body-section { + width: 100%; + display: flex; + flex-direction: column; +} + +.title-section ::deep > .contact-title { + font-weight: 800 !important; + margin: 0 !important; + line-height: normal !important; +} + +.contact-body-section ::deep > .contact-subtitle { + color: var(--mud-palette-gray-darker); + margin: .2rem 0 !important; + line-height: normal !important; +} + +.contact-info-section { + display: flex; + flex-wrap: wrap; +} + +.contact-right-section { + display: flex; + flex-direction: row; + gap: 1rem; +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/Card/UserCard.razor b/Template.Shared/Components/SingleElements/Card/UserCard.razor new file mode 100644 index 0000000..64cb490 --- /dev/null +++ b/Template.Shared/Components/SingleElements/Card/UserCard.razor @@ -0,0 +1,72 @@ +@using Template.Shared.Core.Entity +@using Template.Shared.Core.Interface +@inject IManageDataService ManageData + +
+
+
+
+ + +
+
+ @User.RagSoc + +
+ +
+ @if (ShowSectionCommesse && IsLoading) + { + + } + else + { + @if (!Commesse.IsNullOrEmpty()) + { +
+ @foreach (var commessa in Commesse!) + { +
+ @($"{commessa.CodAnag} - {commessa.Descrizione}") +
+ } +
+ } + else + { + Nessuna commessa presente + } + } +
+
+
+
+
+
+ +@code { + [Parameter] public AnagClie User { get; set; } = new(); + + private List? Commesse { get; set; } + private bool IsLoading { get; set; } = true; + private bool ShowSectionCommesse { get; set; } + + private void OpenUser() => + NavigationManager.NavigateTo($"/User/{User.CodAnag}"); + + private async Task ShowCommesse() + { + ShowSectionCommesse = !ShowSectionCommesse; + + if (ShowSectionCommesse) + { + Commesse = await ManageData.GetTable(x => x.CodAnag.Equals(User.CodAnag)); + IsLoading = false; + StateHasChanged(); + return; + } + + IsLoading = true; + } + +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/Card/UserCard.razor.css b/Template.Shared/Components/SingleElements/Card/UserCard.razor.css new file mode 100644 index 0000000..bd0c5c2 --- /dev/null +++ b/Template.Shared/Components/SingleElements/Card/UserCard.razor.css @@ -0,0 +1,90 @@ +.user-card-card { width: 100%; } + +.user-card-card.memo { border-left: 5px solid var(--mud-palette-info-darken); } + +.user-card-card.interna { border-left: 5px solid var(--mud-palette-success-darken); } + +.user-card-card.commessa { border-left: 5px solid var(--mud-palette-warning); } + +.user-card-left-section { + display: flex; + align-items: center; +} + +.title-section { + display: flex; + flex-direction: row; + width: 100%; + align-items: center; + gap: .75rem; +} + +.user-card-hours { font-weight: 700; } + +.user-card-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; } + +.user-card-body-section { + width: 100%; + display: flex; + flex-direction: column; +} + +.user-card-right-section { + width: 100%; + border-bottom: 1px solid var(--card-border-color); +} + +.user-card-title { + display: flex; + align-items: center; + min-height: 32px; + padding-left: .25rem; + justify-content: space-between; +} + +.user-card-title ::deep > h3 { + font-weight: 700 !important; + margin: 0 !important; + line-height: normal !important; + font-size: .85rem; +} + +.user-card-body-section ::deep > .user-card-subtitle { + color: var(--mud-palette-gray-darker); + margin: .2rem 0 !important; + line-height: normal !important; +} + +.user-card-info-section { + display: flex; + flex-wrap: wrap; +} + +.title-section ::deep > .mud-icon-root { + background: var(--gray-for-shadow); + padding: .25rem; + border-radius: 50%; +} + +.user-card-subtitle { + overflow: hidden; + max-height: 0; + opacity: 0; + transition: max-height 0.4s ease, opacity 0.4s ease; + margin-top: 0; +} + +.user-card-subtitle.show { + max-height: 250px; + opacity: 1; +} + +.container-commesse { + padding: .5rem; +} + +.commessa { + color: var(--mud-palette-text-secondary); + font-weight: 700; + font-size: small; +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/ExceptionModal.razor b/Template.Shared/Components/SingleElements/ExceptionModal.razor new file mode 100644 index 0000000..1364830 --- /dev/null +++ b/Template.Shared/Components/SingleElements/ExceptionModal.razor @@ -0,0 +1,62 @@ +@using Template.Shared.Core.Services +@inject AppAuthenticationStateProvider AuthenticationStateProvider + +
+
+
+ + Ops +
+
+ @if (Exception != null) + { + @Message + } +
+
+
+ Logout +
+
+ Riprova +
+
+
+
+ +@code { + [Parameter] public Exception? Exception { get; set; } + [Parameter] public EventCallback OnRetry { get; set; } + [Parameter] public ErrorBoundary? ErrorBoundary { get; set; } + + private string Message { get; set; } = ""; + + protected override void OnInitialized() + { + if (Exception == null) return; + + if (Exception.Message.Contains("Failed to connect to")) + { + var ipPort = Exception.Message.Split("to /")[1]; + + Message = $"Impossibile collegarsi al server ({ipPort})"; + } + else + { + Message = Exception.Message; + } + StateHasChanged(); + } + + private async Task OnRetryClick() + { + await OnRetry.InvokeAsync(); + } + + private async Task OnLogoutClick() + { + LocalStorage.Remove("last-sync"); + AuthenticationStateProvider.SignOut(); + await OnRetry.InvokeAsync(); + } +} \ No newline at end of file diff --git a/Template.Shared/Components/SingleElements/ExceptionModal.razor.css b/Template.Shared/Components/SingleElements/ExceptionModal.razor.css new file mode 100644 index 0000000..97ba16c --- /dev/null +++ b/Template.Shared/Components/SingleElements/ExceptionModal.razor.css @@ -0,0 +1,61 @@ +.container-modal { + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; +} + +.c-modal { + border-radius: 16px; + box-shadow: var(--custom-box-shadow); + padding: 16px; +} + +.button-container { + display: flex; + gap: 1rem; + flex-direction: row; + align-items: center; + width: 100%; + justify-content: space-between; + margin: 1.5rem 0 0 0; +} + +.text { + font-size: medium; + font-weight: 500; + display: flex; + text-align: center; +} + +.card-button { + text-align: center; + background-color: transparent; + padding: .3rem 1rem; + font-weight: 700; + color: var(--bs-primary-text-emphasis); +} + +.exception-header { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + + .exception-header > i { + font-size: 3rem; + line-height: normal; + color: var(--bs-danger); + } + +.exception-header > span { + font-size: x-large; + font-weight: 700; +} + +code { + width: 100%; + height: auto; + color: var(--bs-gray-dark); +} \ 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 8c786ea..97e54f0 100644 --- a/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor +++ b/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor @@ -1,4 +1,5 @@ -@using Microsoft.VisualBasic +@using System.Globalization +@using Microsoft.VisualBasic @using Template.Shared.Core.Dto @using Template.Shared.Components.Layout @using Template.Shared.Core.Entity @@ -34,7 +35,7 @@
Inizio - +
@@ -42,7 +43,7 @@
Fine - +
@@ -102,7 +103,7 @@ - + @code { [CascadingParameter] private IMudDialogInstance MudDialog { get; set; } @@ -140,6 +141,7 @@ { ActivityModel.EstimatedTime = DateTime.Today.Add(TimeSpan.FromHours(DateTime.Now.Hour)); ActivityModel.EstimatedEndtime = DateTime.Today.Add(TimeSpan.FromHours(DateTime.Now.Hour) + TimeSpan.FromHours(1)); + ActivityModel.UserName = UserSession.User.Username; } OriginalModel = ActivityModel.Clone(); @@ -150,7 +152,13 @@ VisibleOverlay = true; StateHasChanged(); - var newActivity = await IntegryApiService.SaveActivity(ActivityModel); + var response = await IntegryApiService.SaveActivity(ActivityModel); + + if (response == null) + return; + + var newActivity = response.Last(); + await ManageData.InsertOrUpdate(newActivity); SuccessAnimation = true; diff --git a/Template.Shared/Components/SingleElements/NoDataAvailable.razor.css b/Template.Shared/Components/SingleElements/NoDataAvailable.razor.css index 4909983..ff7f681 100644 --- a/Template.Shared/Components/SingleElements/NoDataAvailable.razor.css +++ b/Template.Shared/Components/SingleElements/NoDataAvailable.razor.css @@ -1,12 +1,5 @@ -.no-data { - margin-top: 2rem; - width: calc(100vw - (var(--bs-gutter-x) * .5) * 2); -} +.no-data { margin-top: 2rem; } -.no-data img { - width: 60%; -} +.no-data img { width: 60%; } -.no-data p { - font-size: 1.2rem; -} \ No newline at end of file +.no-data p { font-size: 1.2rem; } \ No newline at end of file diff --git a/Template.Shared/Core/Entity/AnagClie.cs b/Template.Shared/Core/Entity/AnagClie.cs index 68efca4..f3dab12 100644 --- a/Template.Shared/Core/Entity/AnagClie.cs +++ b/Template.Shared/Core/Entity/AnagClie.cs @@ -34,7 +34,7 @@ public class AnagClie public string Nazione { get; set; } [Column("telefono"), JsonPropertyName("telefono")] - public string Telefono { get; set; } + public string? Telefono { get; set; } [Column("fax"), JsonPropertyName("fax")] public string Fax { get; set; } @@ -52,7 +52,7 @@ public class AnagClie public string PersonaRif { get; set; } [Column("e_mail"), JsonPropertyName("eMail")] - public string EMail { get; set; } + public string? EMail { get; set; } [Column("e_mail_pec"), JsonPropertyName("eMailPec")] public string EMailPec { get; set; } @@ -80,4 +80,7 @@ public class AnagClie [Column("data_mod"), JsonPropertyName("dataMod")] public DateTime? DataMod { get; set; } = DateTime.Now; + + [Column("flag_stato"), JsonPropertyName("flagStato")] + public string FlagStato { get; set; } } \ No newline at end of file diff --git a/Template.Shared/Core/Entity/VtbCliePersRif.cs b/Template.Shared/Core/Entity/VtbCliePersRif.cs index 3c5b355..9b1c2e4 100644 --- a/Template.Shared/Core/Entity/VtbCliePersRif.cs +++ b/Template.Shared/Core/Entity/VtbCliePersRif.cs @@ -16,19 +16,19 @@ public class VtbCliePersRif public string PersonaRif { get; set; } [Column("mansione"), JsonPropertyName("mansione")] - public string Mansione { get; set; } + public string? Mansione { get; set; } [Column("telefono"), JsonPropertyName("telefono")] - public string Telefono { get; set; } + public string? Telefono { get; set; } [Column("fax"), JsonPropertyName("fax")] public string Fax { get; set; } [Column("e_mail"), JsonPropertyName("eMail")] - public string EMail { get; set; } + public string? EMail { get; set; } [Column("num_cellulare"), JsonPropertyName("numCellulare")] - public string NumCellulare { get; set; } + public string? NumCellulare { get; set; } [Column("tipo_indirizzo"), JsonPropertyName("tipoIndirizzo")] public string TipoIndirizzo { get; set; } diff --git a/Template.Shared/Core/Interface/IIntegryApiService.cs b/Template.Shared/Core/Interface/IIntegryApiService.cs index 363442c..32b1612 100644 --- a/Template.Shared/Core/Interface/IIntegryApiService.cs +++ b/Template.Shared/Core/Interface/IIntegryApiService.cs @@ -11,5 +11,5 @@ public interface IIntegryApiService Task RetrieveProspect(string? dateFilter = null); Task RetrieveSettings(); - Task SaveActivity(ActivityDTO activity); + Task?> SaveActivity(ActivityDTO activity); } \ No newline at end of file diff --git a/Template.Shared/Core/Services/AppAuthenticationStateProvider.cs b/Template.Shared/Core/Services/AppAuthenticationStateProvider.cs index d8bbb91..f634221 100644 --- a/Template.Shared/Core/Services/AppAuthenticationStateProvider.cs +++ b/Template.Shared/Core/Services/AppAuthenticationStateProvider.cs @@ -24,7 +24,7 @@ public class AppAuthenticationStateProvider : AuthenticationStateProvider return await LoadAuthenticationState(); } - public async void SignOut() + public async Task SignOut() { await _userAccountService.Logout(); NotifyAuthenticationState(); diff --git a/Template.Shared/Core/Services/IntegryApiService.cs b/Template.Shared/Core/Services/IntegryApiService.cs index cd621f1..88d6600 100644 --- a/Template.Shared/Core/Services/IntegryApiService.cs +++ b/Template.Shared/Core/Services/IntegryApiService.cs @@ -55,6 +55,6 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser public Task RetrieveSettings() => integryApiRestClient.AuthorizedGet("crm/retrieveSettings", null)!; - public Task SaveActivity(ActivityDTO activity) => - integryApiRestClient.AuthorizedPost("crm/saveActivity", activity); + public Task?> SaveActivity(ActivityDTO activity) => + integryApiRestClient.AuthorizedPost?>("crm/saveActivity", activity); } \ No newline at end of file diff --git a/Template.Shared/Core/Utility/UtilityString.cs b/Template.Shared/Core/Utility/UtilityString.cs index a6c5bcf..13b3ce2 100644 --- a/Template.Shared/Core/Utility/UtilityString.cs +++ b/Template.Shared/Core/Utility/UtilityString.cs @@ -6,6 +6,7 @@ public static class UtilityString { return string.Concat(fullname .Split(' ', StringSplitOptions.RemoveEmptyEntries) + .Take(3) .Select(word => char.ToUpper(word[0]))); }