diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index a4d433af..62d0eff3 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -22,20 +22,21 @@ @code { - - [Inject] public UserProfileService ProfileService { get; set; } + #pragma warning disable CS8618 + + [Inject] public UserPreferenceService PreferenceService { get; set; } private int KmMorning { get; set; } - private UserProfile Profiles { get; set; } = new(); + private UserPreference Preferences { get; set; } = new(); protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetProfile(); - KmMorning = Profiles.KmMorning; + Preferences = await PreferenceService.GetProfile(); + KmMorning = Preferences.KmMorning; } private async Task OnKmChanged() { - await ProfileService.SetKmMorning(KmMorning); + await PreferenceService.SetKmMorning(KmMorning); } } \ No newline at end of file diff --git a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs index a74d0256..c2200adf 100644 --- a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs @@ -30,7 +30,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class AdvisorLandingComponent { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } private readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions { @@ -38,12 +38,12 @@ public partial class AdvisorLandingComponent PropertyNamingPolicy = JsonNamingPolicy.CamelCase }; - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private DateTime SelectedDate { get; set; } protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetProfile(); + Profiles = await PreferenceService.GetProfile(); SelectedDate = string.IsNullOrWhiteSpace(Profiles.WorkDate) ? DateTime.Now : DateTime.Parse(Profiles.WorkDate); } diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index 80ad87e5..96240371 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -23,10 +23,10 @@ namespace Wonky.Client.Components; public partial class CatalogGroupComponent { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private UserProfile _profiles = new(); + private UserPreference _profiles = new(); private string? GroupCol { get; set; } diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs index 9fa1f22e..5a9141e6 100644 --- a/Wonky.Client/Components/CatalogSearchComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSearchComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } /// /// OnChanged event callback @@ -34,7 +34,7 @@ public partial class CatalogSearchComponent : IDisposable /// /// User preferences /// - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); /// /// Selected item @@ -46,8 +46,8 @@ public partial class CatalogSearchComponent : IDisposable /// protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + Profiles = await PreferenceService.GetProfile(); SearchCol = Profiles.ItemSearch; await OnChanged.InvokeAsync(SearchCol); } @@ -61,16 +61,16 @@ public partial class CatalogSearchComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await ProfileService.SetItemSearch(val); + await PreferenceService.SetItemSearch(val); } /// /// Preference update from profile service /// - /// - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + /// + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - Profiles = newUserProfile; + Profiles = newUserPreference; StateHasChanged(); } @@ -79,6 +79,6 @@ public partial class CatalogSearchComponent : IDisposable /// public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs index 9a309bd7..b1d38edf 100644 --- a/Wonky.Client/Components/CatalogSortComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSortComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } /// /// OnChanged callback function @@ -34,7 +34,7 @@ public partial class CatalogSortComponent : IDisposable /// /// User's preferences /// - private UserProfile _profiles = new(); + private UserPreference _profiles = new(); /// /// Item selected by user @@ -46,8 +46,8 @@ public partial class CatalogSortComponent : IDisposable /// protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileServiceOnOnChange; - _profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + _profiles = await PreferenceService.GetProfile(); SortCol = _profiles.ItemSort; } @@ -60,16 +60,16 @@ public partial class CatalogSortComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await ProfileService.SetItemSort(val); + await PreferenceService.SetItemSort(val); } /// /// Get updated settings from preference service /// - /// - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + /// + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - _profiles = newUserProfile; + _profiles = newUserPreference; StateHasChanged(); } @@ -78,6 +78,6 @@ public partial class CatalogSortComponent : IDisposable /// public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs index f130a388..b73a75be 100644 --- a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components; public partial class CustomerSearchColumnComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private string SearchCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + Profiles = await PreferenceService.GetProfile(); SearchCol = Profiles.CompanySearch; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -40,15 +40,15 @@ public partial class CustomerSearchColumnComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await ProfileService.SetCompanySearch(val); + await PreferenceService.SetCompanySearch(val); } - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - Profiles = newUserProfile; + Profiles = newUserPreference; StateHasChanged(); } public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs index a834ec56..b534e53c 100644 --- a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs @@ -25,13 +25,13 @@ public partial class CustomerSearchPhraseComponent { private Timer InputTimer { get; set; } = new(); private string SearchTerm { get; set; } = ""; - private UserProfile Profiles { get; set; } = new (); - [Inject] public UserProfileService ProfileService { get; set; } + private UserPreference Profiles { get; set; } = new (); + [Inject] public UserPreferenceService PreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetProfile(); + Profiles = await PreferenceService.GetProfile(); SearchTerm = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase.Trim(); if(!string.IsNullOrWhiteSpace(SearchTerm)) @@ -42,13 +42,13 @@ public partial class CustomerSearchPhraseComponent { InputTimer.Dispose(); SearchTerm = ""; - await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await PreferenceService.SetCompanyFilterPhrase(SearchTerm.Trim()); await OnChanged.InvokeAsync(SearchTerm); } private async Task OnSearchChanged() { - await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await PreferenceService.SetCompanyFilterPhrase(SearchTerm.Trim()); InputTimer.Dispose(); InputTimer = new Timer(500); InputTimer.AutoReset = false; diff --git a/Wonky.Client/Components/CustomerSortComponent.razor.cs b/Wonky.Client/Components/CustomerSortComponent.razor.cs index d4633a67..f5a87a5d 100644 --- a/Wonky.Client/Components/CustomerSortComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSortComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components; public partial class CustomerSortComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private UserProfile _profiles = new(); + private UserPreference _profiles = new(); private string SortCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileServiceOnOnChange; - _profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + _profiles = await PreferenceService.GetProfile(); SortCol = _profiles.CompanySort; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -40,15 +40,15 @@ public partial class CustomerSortComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await ProfileService.SetCompanySort(val); + await PreferenceService.SetCompanySort(val); } - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - _profiles = newUserProfile; + _profiles = newUserPreference; StateHasChanged(); } public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor b/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor index 0cd3a82a..cf7414ee 100644 --- a/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor @@ -13,28 +13,36 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ -
+ + @if (UserList.Any()) { - foreach (var user in UserList) + @foreach (var user in UserList) { -
-
-
@user.CountryCode @user.SalesRep
-
@user.FullName
-
@user.PhoneNumber
-
- Rapporter -
-
- Kunder -
-
-
+ + + + + + + } } else { -
Ingen data
+ + + } - \ No newline at end of file + +
+ @user.FullName + + @user.PhoneNumber + + @user.SalesRep + + Rapport Oversigt + + Kunde Liste +
Ingen data
\ No newline at end of file diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor.cs b/Wonky.Client/Components/OfficeLandingComponent.razor.cs index 719c4943..6e403531 100644 --- a/Wonky.Client/Components/OfficeLandingComponent.razor.cs +++ b/Wonky.Client/Components/OfficeLandingComponent.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class OfficeLandingComponent { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } private readonly JsonSerializerOptions _options = new JsonSerializerOptions { @@ -40,21 +40,21 @@ public partial class OfficeLandingComponent PropertyNamingPolicy = JsonNamingPolicy.CamelCase }; - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; private string Today { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileChanged; - Profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileChanged; + Profiles = await PreferenceService.GetProfile(); if (string.IsNullOrWhiteSpace(Profiles.WorkDate)) { - await ProfileService.SetWorkDate(DateTime.Now); + await PreferenceService.SetWorkDate(DateTime.Now); } } - private void ProfileChanged(UserProfile newProfiles) + private void ProfileChanged(UserPreference newProfiles) { Profiles = newProfiles; WorkDate = Profiles.WorkDate; diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index 8bd24c84..e348a39e 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -23,18 +23,18 @@ namespace Wonky.Client.Components; public partial class PageSizeComponent : IDisposable { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); - private UserProfile Profile { get; set; } = new(); + private UserPreference Profile { get; set; } = new(); private string PageSize { get; set; } protected override async Task OnInitializedAsync() { - ProfileService.OnChange += ProfileServiceOnOnChange; - Profile = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + Profile = await PreferenceService.GetProfile(); PageSize = Profile.PageSize; await OnChanged.InvokeAsync(PageSize); } @@ -46,18 +46,18 @@ public partial class PageSizeComponent : IDisposable var cVal = Convert.ToInt32(val); if (cVal > 50) val = "50"; // mitigate variable manipulation await OnChanged.InvokeAsync(val); - await ProfileService.SetPageSize(val); + await PreferenceService.SetPageSize(val); } - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - Profile = newUserProfile; + Profile = newUserPreference; PageSize = Profile.PageSize; StateHasChanged(); } public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index caaddf09..bf63e305 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -29,7 +29,7 @@ public partial class WorkDateComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService UserProfile { get; set; } + [Inject] public UserPreferenceService UserPreference { get; set; } /// /// OnChanged callback function @@ -49,7 +49,7 @@ public partial class WorkDateComponent : IDisposable /// /// user preferences /// - private UserProfile Profile { get; set; } = new(); + private UserPreference Profile { get; set; } = new(); /// /// Component Initialization @@ -57,8 +57,8 @@ public partial class WorkDateComponent : IDisposable protected override async Task OnInitializedAsync() { WorkDateContext = new EditContext(SelectedDate); - UserProfile.OnChange += ProfileServiceOnOnChange; - Profile = await UserProfile.GetProfile(); + UserPreference.OnChange += ProfileServiceOnOnChange; + Profile = await UserPreference.GetProfile(); SelectedDate = string.IsNullOrWhiteSpace(Profile.WorkDate) ? DateTime.Now : DateTime.Parse(Profile.WorkDate); @@ -73,7 +73,7 @@ public partial class WorkDateComponent : IDisposable if (DateTime.TryParse(e.Value.ToString(), out var setDate)) { - await UserProfile.SetWorkDate(setDate); + await UserPreference.SetWorkDate(setDate); await OnChangedCallback.InvokeAsync($"{setDate:yyyy-MM-dd}"); } } @@ -81,10 +81,10 @@ public partial class WorkDateComponent : IDisposable /// /// ProfileService /// - /// - private void ProfileServiceOnOnChange(UserProfile newUserProfile) + /// + private void ProfileServiceOnOnChange(UserPreference newUserPreference) { - Profile = newUserProfile; + Profile = newUserPreference; StateHasChanged(); } @@ -93,6 +93,6 @@ public partial class WorkDateComponent : IDisposable /// public void Dispose() { - UserProfile.OnChange -= ProfileServiceOnOnChange; + UserPreference.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs index fd7f90f4..ef532481 100644 --- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs @@ -32,7 +32,7 @@ public partial class CatalogPagedOverlay : IDisposable // injections [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public ILogger Logger { get; set; } // parameters @@ -45,7 +45,7 @@ public partial class CatalogPagedOverlay : IDisposable private List Items { get; set; } = new(); private MetaData? PageData { get; set; } = new(); private CatalogPager _pager = new(); - private UserProfile _userProfile = new(); + private UserPreference _userPreference = new(); protected override async Task OnParametersSetAsync() { @@ -56,10 +56,10 @@ public partial class CatalogPagedOverlay : IDisposable protected override async Task OnInitializedAsync() { - _userProfile = await ProfileService.GetProfile(); - _pager.OrderBy = _userProfile.ItemSort; - _pager.SearchColumn = _userProfile.ItemSearch; - _pager.PageSize = Convert.ToInt32(_userProfile.PageSize); + _userPreference = await PreferenceService.GetProfile(); + _pager.OrderBy = _userPreference.ItemSort; + _pager.SearchColumn = _userPreference.ItemSearch; + _pager.PageSize = Convert.ToInt32(_userPreference.PageSize); } private async Task GetSalesItems() diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 21cbcb89..66288929 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -41,7 +41,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // Injected services [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } @@ -50,8 +50,7 @@ public partial class AdvisorActivityCreatePage : IDisposable [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } [Inject] public IAdvisorReportRepository ReportRepo { get; set; } [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - - [Inject] public IUserInfoService UserService { get; set; } + [Inject] public IUserInfoService UserInfo { get; set; } // ************************************************************* // Parameters @@ -63,7 +62,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // Variables private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; private SalesItemView SelectedItem { get; set; } = new(); - private UserProfile UserProfile { get; set; } = new(); + private UserPreference UserPreference { get; set; } = new(); private ActivityDto Activity { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private EditContext? ActivityContext { get; set; } @@ -117,9 +116,9 @@ public partial class AdvisorActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // User Preferences - UserProfile = await ProfileService.GetProfile(); + UserPreference = await PreferenceService.GetProfile(); // User Info - SalesRep = await UserService.GetUserInfo(); + SalesRep = await UserInfo.GetUserInfo(); // Fetch Customer from http Company = await CompanyRepo.GetCompanyById(CompanyId); if (Company.HasFolded == 1) @@ -159,15 +158,15 @@ public partial class AdvisorActivityCreatePage : IDisposable Activity.DlvZipCode = Company.ZipCode; Activity.DlvCity = Company.City; // Initialize date variable - Logger.LogDebug("AdvisorActivityCreatePage => DateTime parser => {}", UserProfile.WorkDate); - SelectedDate = string.IsNullOrWhiteSpace(UserProfile.WorkDate) + Logger.LogDebug("AdvisorActivityCreatePage => DateTime parser => {}", UserPreference.WorkDate); + SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate) ? DateTime.Now - : DateTime.Parse(UserProfile.WorkDate); + : DateTime.Parse(UserPreference.WorkDate); // raise flag if report is closed ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); // Ask for confirmation of date - Logger.LogDebug("Preferences.DateConfirmed => {}", UserProfile.DateConfirmed); - if (!UserProfile.DateConfirmed) + Logger.LogDebug("Preferences.DateConfirmed => {}", UserPreference.DateConfirmed); + if (!UserPreference.DateConfirmed) { PromptDateConfirm = $"Aktiviteter oprettes med dato {SelectedDate.ToShortDateString()}. Er dette OK?"; ConfirmWorkDate.Show(); @@ -338,7 +337,7 @@ public partial class AdvisorActivityCreatePage : IDisposable private async Task WorkDateConfirmCallback() { - await ProfileService.SetDateConfirmed(true); + await PreferenceService.SetDateConfirmed(true); Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}"; ConfirmWorkDate.Hide(); StateHasChanged(); diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index 5c7cb023..d906032a 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -29,7 +29,7 @@ namespace Wonky.Client.Pages; public partial class AdvisorActivityTodayListPage : IDisposable { - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -37,7 +37,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable [Inject] public IAdvisorReportRepository ReportRepo { get; set; } [Inject] public IToastService Toaster { get; set; } private ReportStatusView ReportStatusView { get; set; } = new(); - private UserProfile UserProfile { get; set; } = new(); + private UserPreference UserPreference { get; set; } = new(); private DateTime SelectedDate { get; set; } private bool ReportExist { get; set; } private bool Working { get; set; } = true; @@ -46,10 +46,10 @@ public partial class AdvisorActivityTodayListPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserProfile = await ProfileService.GetProfile(); - SelectedDate = string.IsNullOrWhiteSpace(UserProfile.WorkDate) + UserPreference = await PreferenceService.GetProfile(); + SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate) ? DateTime.Now - : DateTime.Parse(UserProfile.WorkDate); + : DateTime.Parse(UserPreference.WorkDate); ReportExist = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); await GetActivities($"{SelectedDate:yyyy-MM-dd}"); Working = false; diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs index 15075899..b6d882b7 100644 --- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs @@ -29,14 +29,14 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerPagedListPage : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } private List CompanyList { get; set; } = new(); - private UserProfile Profile { get; set; } = new(); + private UserPreference Profile { get; set; } = new(); private UserManagerEditView UserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool Working { get; set; } = true; @@ -56,7 +56,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable protected override async Task OnInitializedAsync() { // set preferences - Profile = await ProfileService.GetProfile(); + Profile = await PreferenceService.GetProfile(); UserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profile.CompanySort; Paging.SearchColumn = Profile.CompanySearch; diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 22f6d73b..5308d840 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -32,7 +32,7 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportCreatePage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -42,7 +42,7 @@ public partial class AdvisorReportCreatePage : IDisposable private ReportDto Report { get; set; } = new(); private List Activities { get; set; } = new(); private ReportFiguresDto InitialValues { get; set; } = new(); - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private bool FormInvalid { get; set; } = true; private bool NoFigures { get; set; } = true; private bool Working { get; set; } @@ -69,8 +69,8 @@ public partial class AdvisorReportCreatePage : IDisposable ReportContext.OnFieldChanged += HandleFieldChanged; ReportContext.OnValidationStateChanged += ValidationChanged; - ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetProfile(); + PreferenceService.OnChange += ProfileServiceOnOnChange; + Profiles = await PreferenceService.GetProfile(); Logger.LogDebug("{}", JsonSerializer.Serialize(Profiles)); WorkDate = Profiles.WorkDate; @@ -78,7 +78,7 @@ public partial class AdvisorReportCreatePage : IDisposable { ThisWorkDate = DateTime.Now; WorkDate = $"{ThisWorkDate:yyyy-MM-dd}"; - await ProfileService.SetWorkDate(ThisWorkDate); + await PreferenceService.SetWorkDate(ThisWorkDate); } else { @@ -104,9 +104,9 @@ public partial class AdvisorReportCreatePage : IDisposable Logger.LogDebug("OnInitializedAsync => GetKeyFigures <= {}", JsonSerializer.Serialize(Report)); } - private void ProfileServiceOnOnChange(UserProfile userProfile) + private void ProfileServiceOnOnChange(UserPreference userPreference) { - Profiles = userProfile; + Profiles = userPreference; WorkDate = Profiles.WorkDate; StateHasChanged(); } @@ -193,9 +193,9 @@ public partial class AdvisorReportCreatePage : IDisposable Logger.LogDebug("CreateReport.result => {}", JsonSerializer.Serialize(result)); // reset km and date confirmation - await ProfileService.SetKmMorning(0); + await PreferenceService.SetKmMorning(0); // reset date confirmed - await ProfileService.SetDateConfirmed(false); + await PreferenceService.SetDateConfirmed(false); Navigator.NavigateTo($"/advisor/reports/view/{ThisWorkDate:yyyy-MM-dd}"); } @@ -306,6 +306,6 @@ public partial class AdvisorReportCreatePage : IDisposable Interceptor.DisposeEvent(); ReportContext.OnFieldChanged -= HandleFieldChanged; ReportContext.OnValidationStateChanged -= ValidationChanged; - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index cef084bb..d0f7ffb3 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -34,10 +34,10 @@ public partial class AdvisorReportViewPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ILogger Logger { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new (); private bool Working { get; set; } @@ -51,8 +51,8 @@ public partial class AdvisorReportViewPage : IDisposable XUserInfo = await UserInfoService.GetUserInfo(); - ProfileService.OnChange += ProfileServiceOnOnChange; - await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); + PreferenceService.OnChange += ProfileServiceOnOnChange; + await PreferenceService.SetWorkDate(DateTime.Parse(ReportDate)); if(!string.IsNullOrWhiteSpace(ReportDate)) await FetchReport(ReportDate); @@ -120,16 +120,16 @@ public partial class AdvisorReportViewPage : IDisposable Working = false; } - private void ProfileServiceOnOnChange(UserProfile userProfile) + private void ProfileServiceOnOnChange(UserPreference userPreference) { - Profiles = userProfile; + Profiles = userPreference; ReportDate = Profiles.WorkDate; StateHasChanged(); } public void Dispose() { - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; Interceptor.DisposeEvent(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index 5db3d740..7c669773 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -26,13 +26,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorTaskItemListCrmPage : IDisposable { - [Inject] public UserProfileService UserProfileService { get; set; } + [Inject] public UserPreferenceService UserPreferenceService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } [Inject] public IToastService Toaster { get; set; } - private UserProfile Profile { get; set; } = new(); + private UserPreference Profile { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; private List TaskItems { get; set; } = new(); @@ -40,7 +40,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable protected override async Task OnInitializedAsync() { - Profile = await UserProfileService.GetProfile(); + Profile = await UserPreferenceService.GetProfile(); if(!string.IsNullOrWhiteSpace(Profile.WorkDate)) WorkDate = Profile.WorkDate; diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor index 20254949..eac5c9ec 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor @@ -40,7 +40,10 @@
-
+
+
Prisliste @CountryName
+
+
diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs index 09f58d74..21309f5c 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs @@ -32,7 +32,7 @@ public partial class CatalogCountryPagedListPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICountryCatalogRepository Catalog { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } @@ -42,14 +42,14 @@ public partial class CatalogCountryPagedListPage : IDisposable private List Items { get; set; } = new(); private MetaData PageData { get; set; } = new(); private CatalogPager Paging { get; set; } = new(); - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private UserManagerEditView XUserInfo { get; set; } = new(); private bool Working { get; set; } private string CountryName { get; set; } = ""; protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetProfile(); + Profiles = await PreferenceService.GetProfile(); XUserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profiles.ItemSort; diff --git a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor rename to Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor diff --git a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs similarity index 84% rename from Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs rename to Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs index ba2f27d0..3b4255e8 100644 --- a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs @@ -25,20 +25,23 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeCustomerAdvisorPagedListPage : IDisposable +public partial class OfficeAdvisorCustomerPagedListPage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] public UserProfileService UserProfileService { get; set; } + [Inject] public UserPreferenceService UserPreferenceService { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } + // ############################################################# [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; + // ############################################################# private List CompanyList { get; set; } = new(); private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); - private UserProfile UserProfile { get; set; } = new(); + private UserPreference UserPreference { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool IncludeFolded { get; set; } private bool ShowFolded { get; set; } @@ -54,14 +57,14 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable SalesRep = await UserRepo.GetUserInfo(UserId); // set preferences - UserProfile = await UserProfileService.GetProfile(); - Paging.OrderBy = UserProfile.CompanySort; - Paging.SearchColumn = UserProfile.CompanySearch; - Paging.PageSize = Convert.ToInt32(UserProfile.PageSize); + UserPreference = await UserPreferenceService.GetProfile(); + Paging.OrderBy = UserPreference.CompanySort; + Paging.SearchColumn = UserPreference.CompanySearch; + Paging.PageSize = Convert.ToInt32(UserPreference.PageSize); Paging.HasFolded = IncludeFolded ? 1 : 0; // load saved search - SavedSearch = UserProfile.CompanyFilterPhrase; + SavedSearch = UserPreference.CompanyFilterPhrase; Paging.SearchTerm = SavedSearch; await FetchCompanies(); @@ -113,7 +116,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { SavedSearch = searchTerm; - await UserProfileService.SetCompanyFilterPhrase(searchTerm.Trim()); + await UserPreferenceService.SetCompanyFilterPhrase(searchTerm.Trim()); } } diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs index a9063ab0..c1be1106 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs @@ -32,25 +32,28 @@ namespace Wonky.Client.Pages; public partial class OfficeAdvisorReportViewPage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public IJSRuntime JsRuntime { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public IOrderProcessRepository ProcessRepo { get; set; } + // ############################################################# [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; + // ############################################################# private IJSObjectReference JsModule { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); private bool Working { get; set; } = true; - private UserProfile Profile { get; set; } = new(); + private UserPreference Profile { get; set; } = new(); private string _returnUrl = ""; protected override async Task OnParametersSetAsync() @@ -58,9 +61,9 @@ public partial class OfficeAdvisorReportViewPage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - ProfileService.OnChange += ProfileServiceOnOnChange; + PreferenceService.OnChange += ProfileServiceOnOnChange; - await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); + await PreferenceService.SetWorkDate(DateTime.Parse(ReportDate)); await FetchUserReport(ReportDate); } @@ -160,10 +163,10 @@ public partial class OfficeAdvisorReportViewPage : IDisposable Working = false; } - private void ProfileServiceOnOnChange(UserProfile userProfile) + private void ProfileServiceOnOnChange(UserPreference userPreference) { Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange"); - Profile = userProfile; + Profile = userPreference; Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange => Prefs.WorkDate <= {}", Profile.WorkDate); ReportDate = Profile.WorkDate; @@ -173,6 +176,6 @@ public partial class OfficeAdvisorReportViewPage : IDisposable public void Dispose() { Interceptor.DisposeEvent(); - ProfileService.OnChange -= ProfileServiceOnOnChange; + PreferenceService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs index 7bf009bd..8d056252 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs @@ -28,16 +28,20 @@ namespace Wonky.Client.Pages; public partial class OfficeCustomerCountryPagedListPage : IDisposable { - [Parameter] public string CountryCode { get; set; } = ""; + // ############################################################# [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public UserPreferenceService PreferenceService { get; set; } [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - + + // ############################################################# + [Parameter] public string CountryCode { get; set; } = ""; + + // ############################################################# private List Companies { get; set; } = new(); - private UserProfile Profiles { get; set; } = new(); + private UserPreference Profiles { get; set; } = new(); private UserManagerEditView UserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool ShowFolded { get; set; } @@ -54,7 +58,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // set preferences - Profiles = await ProfileService.GetProfile(); + Profiles = await PreferenceService.GetProfile(); UserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profiles.CompanySort; Paging.SearchColumn = Profiles.CompanySearch; diff --git a/Wonky.Client/Pages/OfficeLandingPage.razor b/Wonky.Client/Pages/OfficeLandingPage.razor index 0fd296d3..370e9cae 100644 --- a/Wonky.Client/Pages/OfficeLandingPage.razor +++ b/Wonky.Client/Pages/OfficeLandingPage.razor @@ -26,14 +26,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
@@ -47,14 +47,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
@@ -68,14 +68,14 @@
- Sælgere + Sælger Liste - Tlf.Ordre + Telefon Bestilling - Priser + Produkt Prisliste
diff --git a/Wonky.Client/Pages/OfficeLandingPage.razor.cs b/Wonky.Client/Pages/OfficeLandingPage.razor.cs index 2f7c48fe..89f76731 100644 --- a/Wonky.Client/Pages/OfficeLandingPage.razor.cs +++ b/Wonky.Client/Pages/OfficeLandingPage.razor.cs @@ -20,5 +20,6 @@ namespace Wonky.Client.Pages; public partial class OfficeLandingPage { + // ############################################################# [Parameter] public string CountryCode { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index 38fed9ed..6a6fd98a 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -35,7 +35,7 @@ namespace Wonky.Client.Pages; public partial class OfficeOrderCreatePage : IDisposable { - // -------------------------------------------------------------------- + // ############################################################# // injected services [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -44,17 +44,17 @@ public partial class OfficeOrderCreatePage : IDisposable [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } [Inject] public ICountryActivityRepository ActivityRepo { get; set; } - [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - // -------------------------------------------------------------------- + // ############################################################# // parameters [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; [CascadingParameter] public DraftStateProvider DraftProvider { get; set; } - // -------------------------------------------------------------------- + // ############################################################# // private variables private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true}; // class objects @@ -62,7 +62,7 @@ public partial class OfficeOrderCreatePage : IDisposable private UserManagerEditView UserInfo { get; set; } = new(); private SalesItemView SelectedItem { get; set; } = new(); private ActivityDto Activity { get; set; } = new(); - private UserManagerEditView SalesRep { get; set; } = new(); + private UserAdvisorInfoView SalesRep { get; set; } = new(); // edit context private EditContext ActivityContext { get; set; } // variables @@ -75,14 +75,14 @@ public partial class OfficeOrderCreatePage : IDisposable private bool PoFormInvalid { get; set; } = true; private bool Working { get; set; } = true; - // -------------------------------------------------------------------- + // ############################################################# // overlays private CatalogPagedOverlay CatalogOverlay { get; set; } = new(); private OfficeCustomerInvoiceListOverlay InvoiceListOverlay { get; set; } = new(); private OfficeCustomerActivityListOverlay ActivityListOverlay { get; set; } = new(); private OfficeOrderInventoryListOverlay InventoryListOverlay { get; set; } = new(); - // -------------------------------------------------------------------- + // ############################################################# // lists private List CompanyInventory { get; set; } = new(); private InvoiceListView CompanyInvoices { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index 59e25cf9..4637d91f 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -30,8 +30,7 @@ namespace Wonky.Client.Pages; public partial class OfficeOrderViewPage : IDisposable { - [Parameter] public string CompanyId { get; set; } = ""; - [Parameter] public string OrderId { get; set; } = ""; + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public ISystemSendMailService MailService { get; set; } @@ -40,7 +39,12 @@ public partial class OfficeOrderViewPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toast { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - + + // ############################################################# + [Parameter] public string CompanyId { get; set; } = ""; + [Parameter] public string OrderId { get; set; } = ""; + + // ############################################################# private ReportItemView ReportItem { get; set; } = new(); private bool IsNotified { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs index bd4064ce..01874e90 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs @@ -26,11 +26,14 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorListPage :IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } + // ############################################################# [Parameter] public string CountryCode { get; set; } = ""; + // ############################################################# private List SalesReps { get; set; } = new(); private bool Working { get; set; } = true; private string CountryName { get; set; } = ""; diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs index ba60d6e0..a0c6d8f5 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs @@ -25,12 +25,17 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorReportListPage : IDisposable { - [Parameter] public string UserId { get; set; } = ""; - [Parameter] public string CountryCode { get; set; } = ""; + // ############################################################# [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } + + // ############################################################# + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string CountryCode { get; set; } = ""; + + // ############################################################# private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; private UserAdvisorInfoView AdvisorInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs index 5ef6e446..a242f8d0 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs @@ -10,11 +10,12 @@ namespace Wonky.Client.Pages; public partial class SupervisorAdvisorListPage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } + // ############################################################# private List Users { get; set; } = new(); - private bool Working { get; set; } = true; protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs index d3fc2900..cb3069da 100644 --- a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs +++ b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs @@ -11,12 +11,14 @@ namespace Wonky.Client.Pages; #pragma warning disable CS8618 public partial class SystemMaintenanceMessagePage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ISystemSendSmsService SmsService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } + // ############################################################# private List Users { get; set; } = new(); private ShortMessage Message { get; set; } = new(); private List Recipients { get; set; } = new(); diff --git a/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs b/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs index 939db23e..c21c3f98 100644 --- a/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs +++ b/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs @@ -20,5 +20,6 @@ namespace Wonky.Client.Pages; public partial class SystemManagerLandingPage { + // ############################################################# [Parameter] public string CountryCode { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs index ac19ab38..5937b676 100644 --- a/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs +++ b/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs @@ -24,12 +24,15 @@ namespace Wonky.Client.Pages; public partial class SystemSupervisorListPage : IDisposable { + // ############################################################# [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } + + // ############################################################# private List Users { get; set; } = new(); - private bool Working { get; set; } = true; + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs index cce0bd2a..1341cfdb 100644 --- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs @@ -26,15 +26,19 @@ namespace Wonky.Client.Pages; public partial class SystemSupervisorViewEditPage : IDisposable { + // ############################################################# [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ILogger Logger { get; set; } + // ############################################################# + [Parameter] public string UserId { get; set; } = ""; + + // ############################################################# private readonly JsonSerializerOptions _options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true - }; - [Parameter] public string UserId { get; set; } = ""; + }; private UserManagerEditView UserData { get; set; } = new(); private bool Working { get; set; } = true; private EditContext UserAssignmentContext { get; set; } diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs index d2b706ce..38a52109 100644 --- a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs +++ b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs @@ -30,10 +30,13 @@ namespace Wonky.Client.Pages; public partial class SystemUserCreatePage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } + + // ############################################################# private UserManagerCreate NewUserInfo { get; set; } = new(); private EditContext NewUserContext { get; set; } private bool ContextInvalid { get; set; } = true; diff --git a/Wonky.Client/Pages/SystemUserListPage.razor.cs b/Wonky.Client/Pages/SystemUserListPage.razor.cs index 3f005d33..d5b9cbee 100644 --- a/Wonky.Client/Pages/SystemUserListPage.razor.cs +++ b/Wonky.Client/Pages/SystemUserListPage.razor.cs @@ -25,12 +25,15 @@ namespace Wonky.Client.Pages; public partial class SystemUserListPage : IDisposable { + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ISystemUserRepository UserRepo { get; set; } + // ############################################################# private List UserList { get; set; } = new(); - private bool Working { get; set; } = true; + + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs index d4ff0cd6..5f4c803f 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs @@ -29,12 +29,18 @@ namespace Wonky.Client.Pages; public partial class SystemUserViewEditPage : IDisposable { - [Parameter] public string UserId { get; set; } = ""; - [Parameter] public string CountryCode { get; set; } = ""; + + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } + + // ############################################################# + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string CountryCode { get; set; } = ""; + + // ############################################################# private UserManagerEditView UserData { get; set; } = new(); private EditContext UserEditContext { get; set; } private ResetPasswordDto Passwords { get; set; } = new(); diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs index 96ec81e9..bce773c8 100644 --- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs @@ -27,16 +27,21 @@ namespace Wonky.Client.Pages; public partial class WarehouseOrderListPage : IDisposable { - [Parameter] public string Status { get; set; } = "none"; - + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } + // ############################################################# + [Parameter] public string Status { get; set; } = "none"; + + // ############################################################# private List OrderList { get; set; } = new(); private bool Working { get; set; } = true; private string Header { get; set; } = "Ubehandlet"; private bool ReadyToShip { get; set; } + + protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index f06c6a42..dc5a9639 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -27,16 +27,21 @@ namespace Wonky.Client.Pages; public partial class WarehouseOrderViewPage : IDisposable { - [Parameter] public string OrderId { get; set; } = ""; + // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IToastService Toast { get; set; } [Inject] public ILogger Logger { get; set; } + // ############################################################# + [Parameter] public string OrderId { get; set; } = ""; + + // ############################################################# private WarehouseOrderView Order { get; set; } = new(); private bool Working { get; set; } = true; + protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index cf376235..7c87c0bd 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -55,7 +55,7 @@ builder.Services.Configure(builder.Configuration.GetSection("ApiConfi builder.Services.Configure(builder.Configuration.GetSection("AppInfo")); // user builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); // crm repositories builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index ebfddf78..72c15e53 100644 --- a/Wonky.Client/Services/AuthenticationService.cs +++ b/Wonky.Client/Services/AuthenticationService.cs @@ -33,7 +33,7 @@ public class AuthenticationService : IAuthenticationService private readonly IOptions _apiConfig; private readonly ILogger _logger; private readonly IUserInfoService _infoService; - private readonly UserProfileService _profile; + private readonly UserPreferenceService _preference; private readonly ILocalStorageService _localStorage; public AuthenticationService( @@ -42,7 +42,7 @@ public class AuthenticationService : IAuthenticationService IOptions apiConfig, ILogger logger, IUserInfoService infoService, - UserProfileService profile, + UserPreferenceService preference, ILocalStorageService localStorage ) { @@ -51,7 +51,7 @@ public class AuthenticationService : IAuthenticationService _apiConfig = apiConfig; _logger = logger; _infoService = infoService; - _profile = profile; + _preference = preference; _localStorage = localStorage; } @@ -124,11 +124,11 @@ public class AuthenticationService : IAuthenticationService public async Task Logout() { - var profileBackup = await _profile.GetProfile(); + var profileBackup = await _preference.GetProfile(); Task.Delay(150); await _localStorage.ClearAsync(); Task.Delay(150); - await _profile.SetProfile(profileBackup); + await _preference.SetProfile(profileBackup); _client.DefaultRequestHeaders.Authorization = null; ((AuthStateProvider)_authStateProvider).NotifyUserLogout(); } diff --git a/Wonky.Client/Services/UserProfileService.cs b/Wonky.Client/Services/UserPreferenceService.cs similarity index 91% rename from Wonky.Client/Services/UserProfileService.cs rename to Wonky.Client/Services/UserPreferenceService.cs index ae5ce16c..a738ac4c 100644 --- a/Wonky.Client/Services/UserProfileService.cs +++ b/Wonky.Client/Services/UserPreferenceService.cs @@ -17,7 +17,7 @@ using Blazored.LocalStorage; namespace Wonky.Client.Services; -public record UserProfile +public record UserPreference { public string CompanyFilterPhrase { get; set; } = ""; public string CompanySearch { get; set; } = "name"; @@ -30,13 +30,13 @@ public record UserProfile public bool DateConfirmed { get; set; } } -public class UserProfileService +public class UserPreferenceService { private readonly ILocalStorageService _localStorageService; private const string KeyName = "preferences"; - public event Action? OnChange; + public event Action? OnChange; - public UserProfileService(ILocalStorageService localStorageService) + public UserPreferenceService(ILocalStorageService localStorageService) { _localStorageService = localStorageService; } @@ -134,12 +134,12 @@ public class UserProfileService OnChange?.Invoke(newPreferences); } - public async Task GetProfile() + public async Task GetProfile() { - return await _localStorageService.GetItemAsync(KeyName) ?? new UserProfile(); + return await _localStorageService.GetItemAsync(KeyName) ?? new UserPreference(); } - public async Task SetProfile(UserProfile profile) + public async Task SetProfile(UserPreference profile) { await _localStorageService.SetItemAsync(KeyName, profile); } diff --git a/Wonky.Client/Services/VatInfoLookupService.cs b/Wonky.Client/Services/VatInfoLookupService.cs index 961b00ee..e36fcfd6 100644 --- a/Wonky.Client/Services/VatInfoLookupService.cs +++ b/Wonky.Client/Services/VatInfoLookupService.cs @@ -27,14 +27,12 @@ public class VatInfoLookupService { private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; private readonly HttpClient _client; - private readonly IOptions _apiConfig; - private readonly ApiConfig _config; + private readonly ApiConfig _api; public VatInfoLookupService(HttpClient client, IOptions apiConfig) { _client = client; - _apiConfig = apiConfig; - _config = _apiConfig.Value; + _api = apiConfig.Value; } public async Task> QueryVirkRegistry(VirkParams query) @@ -52,7 +50,7 @@ public class VatInfoLookupService ["zipCode"] = $"{query.ZipCode}", ["entityName"] = $"{query.EntityName}" }; - var endpoint = QueryHelpers.AddQueryString(_config.ServicesVatDk, queryString); + var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatDk, queryString); var response = await _client.GetAsync(endpoint); var content = await response.Content.ReadAsStringAsync(); @@ -80,7 +78,7 @@ public class VatInfoLookupService ["vatNumber"] = $"{vatNumber}" }; - var endpoint = QueryHelpers.AddQueryString(_config.ServicesVatNo, queryString); + var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatNo, queryString); var response = await _client.GetAsync(endpoint); var content = await response.Content.ReadAsStringAsync(); @@ -102,7 +100,7 @@ public class VatInfoLookupService { ["vatNumber"] = $"{vatNumber}" }; - var endpoint = QueryHelpers.AddQueryString(_config.ServicesVatEu, queryString); + var endpoint = QueryHelpers.AddQueryString(_api.ServicesVatEu, queryString); var response = await _client.GetAsync(endpoint); var content = await response.Content.ReadAsStringAsync();