From b88a5a37a5b19098b44f74dabd7c3b5af6c1f5a6 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 27 Dec 2022 13:06:12 +0100 Subject: [PATCH] wip --- .../AdvisorActivityKmStartComponent.razor | 6 +- .../Components/CatalogGroupComponent.razor.cs | 2 +- .../CatalogSearchComponent.razor.cs | 10 +-- .../Components/CatalogSortComponent.razor.cs | 10 +-- .../CompanySearchColumnComponent.razor.cs | 10 +-- .../CompanySearchPhraseComponent.razor.cs | 8 +-- .../Components/CompanySortComponent.razor.cs | 10 +-- .../Components/LandingComponentAdmin.razor.cs | 4 +- .../LandingComponentAdvisor.razor.cs | 6 +- .../OfficeReportTableComponent.razor | 46 +------------- .../OfficeReportTableComponent.razor.cs | 5 ++ .../Components/PageSizeComponent.razor.cs | 10 +-- .../Components/ReportListItemComponent.razor | 15 +++-- .../Components/ReportTableComponent.razor | 2 +- .../Components/ReportTableComponent.razor.cs | 7 +++ .../Components/WorkDateComponent.razor.cs | 18 +++--- .../Pages/ActivityCreatePage.razor.cs | 6 +- .../Pages/ActivityListTodayPage.razor.cs | 4 +- Wonky.Client/Pages/CatalogPage.razor.cs | 4 +- Wonky.Client/Pages/CrmReportNewPage.razor.cs | 8 +-- Wonky.Client/Pages/CrmReportViewPage.razor.cs | 1 + .../Pages/CrmTaskItemListPage.razor.cs | 4 +- Wonky.Client/Pages/CustomerListPage.razor.cs | 4 +- .../Pages/OfficeCustomerListPage.razor.cs | 6 +- .../OfficeCustomerSalesRepListPage.razor.cs | 6 +- Wonky.Client/Pages/OfficeReportListPage.razor | 2 +- .../Pages/OfficeReportListPage.razor.cs | 20 +++--- Wonky.Client/Pages/OfficeReportViewPage.razor | 2 +- .../Pages/OfficeReportViewPage.razor.cs | 61 ++++++++++++++----- ...ntOrderPage.razor => PrintFrontPage.razor} | 2 +- ...rPage.razor.cs => PrintFrontPage.razor.cs} | 6 +- Wonky.Client/Pages/PrintReportPage.razor | 2 +- Wonky.Client/Pages/PrintReportPage.razor.cs | 2 +- Wonky.Client/Program.cs | 2 +- ...erPrefService.cs => UserProfileService.cs} | 4 +- Wonky.Client/Shared/PriceListModal.razor.cs | 4 +- Wonky.Client/wwwroot/appsettings.json | 2 +- .../wwwroot/scripts/document-event-load.js | 3 + Wonky.Client/wwwroot/scripts/print-invoke.js | 4 -- 39 files changed, 165 insertions(+), 163 deletions(-) rename Wonky.Client/Pages/{PrintOrderPage.razor => PrintFrontPage.razor} (96%) rename Wonky.Client/Pages/{PrintOrderPage.razor.cs => PrintFrontPage.razor.cs} (94%) rename Wonky.Client/Services/{UserPrefService.cs => UserProfileService.cs} (97%) create mode 100644 Wonky.Client/wwwroot/scripts/document-event-load.js diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index 14309ff6..242a2670 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -8,19 +8,19 @@ @code { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private int KmMorning { get; set; } private UserPref Prefs { get; set; } = new(); protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); KmMorning = Prefs.KmMorning; } private async Task OnKmChanged() { - await PrefService.SetKmMorning(KmMorning); + await ProfileService.SetKmMorning(KmMorning); } } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index 785c5dc9..cd9a7b30 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -23,7 +23,7 @@ namespace Wonky.Client.Components; public partial class CatalogGroupComponent { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs index 6e6ba5a9..dee1c3a4 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 UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged event callback @@ -46,8 +46,8 @@ public partial class CatalogSearchComponent : IDisposable /// protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SearchCol = Prefs.ItemSearch; await OnChanged.InvokeAsync(SearchCol); } @@ -61,7 +61,7 @@ public partial class CatalogSearchComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetItemSearch(val); + await ProfileService.SetItemSearch(val); } /// @@ -79,6 +79,6 @@ public partial class CatalogSearchComponent : IDisposable /// public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.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 e48bee76..b009fb81 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 UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged callback function @@ -46,8 +46,8 @@ public partial class CatalogSortComponent : IDisposable /// protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SortCol = Prefs.ItemSort; } @@ -60,7 +60,7 @@ public partial class CatalogSortComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetItemSort(val); + await ProfileService.SetItemSort(val); } /// @@ -78,6 +78,6 @@ public partial class CatalogSortComponent : IDisposable /// public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs b/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs index 78ebc20b..3b4777bb 100644 --- a/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs +++ b/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs @@ -25,15 +25,15 @@ namespace Wonky.Client.Components; public partial class CompanySearchColumnComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs { get; set; } = new(); private string SearchCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SearchCol = Prefs.CompanySearch; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -41,7 +41,7 @@ public partial class CompanySearchColumnComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetCompanySearch(val); + await ProfileService.SetCompanySearch(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -50,6 +50,6 @@ public partial class CompanySearchColumnComponent : IDisposable } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs index 10afcfd8..aceec932 100644 --- a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs @@ -25,12 +25,12 @@ namespace Wonky.Client.Components private Timer InputTimer { get; set; } = new(); private string SearchTerm { get; set; } = ""; private UserPref Prefs { get; set; } = new (); - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); SearchTerm = string.IsNullOrWhiteSpace(Prefs.CompanyFilterPhrase) ? "" : Prefs.CompanyFilterPhrase.Trim(); if(!string.IsNullOrWhiteSpace(SearchTerm)) @@ -41,13 +41,13 @@ namespace Wonky.Client.Components { InputTimer.Dispose(); SearchTerm = ""; - await PrefService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); await OnChanged.InvokeAsync(SearchTerm); } private async Task OnSearchChanged() { - await PrefService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); InputTimer.Dispose(); InputTimer = new Timer(500); InputTimer.AutoReset = false; diff --git a/Wonky.Client/Components/CompanySortComponent.razor.cs b/Wonky.Client/Components/CompanySortComponent.razor.cs index b04beff9..045ce0d7 100644 --- a/Wonky.Client/Components/CompanySortComponent.razor.cs +++ b/Wonky.Client/Components/CompanySortComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components public partial class CompanySortComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); private string SortCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SortCol = Prefs.CompanySort; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -40,7 +40,7 @@ namespace Wonky.Client.Components var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetCompanySort(val); + await ProfileService.SetCompanySort(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -49,7 +49,7 @@ namespace Wonky.Client.Components } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } } diff --git a/Wonky.Client/Components/LandingComponentAdmin.razor.cs b/Wonky.Client/Components/LandingComponentAdmin.razor.cs index 3fd7eaf5..a342cae0 100644 --- a/Wonky.Client/Components/LandingComponentAdmin.razor.cs +++ b/Wonky.Client/Components/LandingComponentAdmin.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentAdmin : IDisposable { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -52,7 +52,7 @@ public partial class LandingComponentAdmin : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); if(!string.IsNullOrWhiteSpace(Prefs.WorkDate)) WordDate = Prefs.WorkDate; diff --git a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs index 1c54bb5b..c471c4fd 100644 --- a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs +++ b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentAdvisor : IDisposable { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Inteceptor { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -51,7 +51,7 @@ public partial class LandingComponentAdvisor : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); SelectedDate = string.IsNullOrWhiteSpace(Prefs.WorkDate) ? DateTime.Now : DateTime.Parse(Prefs.WorkDate); Inteceptor.RegisterEvent(); @@ -68,7 +68,7 @@ public partial class LandingComponentAdvisor : IDisposable private async Task OnCompleteTask(string taskItemId) { - await PrefService.SetWorkDate(DateTime.Now); + await ProfileService.SetWorkDate(DateTime.Now); var item = TaskItems.Find(x => x.TaskItemId == taskItemId); Navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new"); } diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor b/Wonky.Client/Components/OfficeReportTableComponent.razor index 161542fe..a27ccb29 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor @@ -41,51 +41,7 @@ { @foreach (var report in ReportList) { - - - @* - -
-
- @report.ReportDate -
-
- @{ - switch (report.DayTypeEnum) - { - case "Sales": - Salgsdag - break; - case "SickLeave": - Sygdom - break; - case "Office": - Kontordag - break; - case "Meeting": - Salgsmøde - break; - case "Leave": - Ferie - break; - case "Supervisor": - Supervisor - break; - } - } -
-
- @(report.DayTypeEnum == "Sales" ? report.FromDateTime.Split(" ")[1] : report.FromDateTime.Split(" ")[0]) -
-
- @(report.DayTypeEnum == "Sales" ? report.ToDateTime.Split(" ")[1] : report.ToDateTime.Split(" ")[0]) -
-
- @report.Turnover.ToString(CultureInfo.CurrentUICulture) -
-
- - *@ + } } else diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs index 5f21c66e..88ad540b 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs @@ -23,4 +23,9 @@ public partial class OfficeReportTableComponent [Parameter] public List ReportList { get; set; } = new(); [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public EventCallback OnShowReport { get; set; } + private void ShowThisReport(string reportDate) + { + OnShowReport.InvokeAsync(reportDate); + } } \ No newline at end of file diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index e3318c70..62f3fe9d 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components public partial class PageSizeComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); private string PageSize { get; set; } = ""; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); PageSize = Prefs.PageSize; } private async Task OnSelectChanged(ChangeEventArgs e) @@ -40,7 +40,7 @@ namespace Wonky.Client.Components var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetPageSize(val); + await ProfileService.SetPageSize(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -49,7 +49,7 @@ namespace Wonky.Client.Components } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } } diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor index 36a25c31..9f85ef3d 100644 --- a/Wonky.Client/Components/ReportListItemComponent.razor +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -17,7 +17,8 @@ @using Wonky.Entity.Views - + @code { - [Parameter] - public SalesReportListView Report { get; set; } = new(); + [Parameter] public SalesReportListView Report { get; set; } = new(); + [Parameter] public EventCallback OnShowReport { get; set; } - [Parameter] - public string ViewUrl { get; set; } = ""; + private void ShowThisReport() + { + OnShowReport.InvokeAsync(Report.ReportDate); + } } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 3c4822e8..080da29f 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -39,7 +39,7 @@ { @foreach (var report in ReportList) { - + @* diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index 3f1aa0ac..5045f63b 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -22,9 +22,16 @@ namespace Wonky.Client.Components; public partial class ReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); + [Parameter] public EventCallback OnShowReport { get; set; } private List Reports { get; set; } = new(); protected override void OnParametersSet() { Reports = ReportList; } + + private void ShowThisReport(string reportDate) + { + OnShowReport.InvokeAsync(reportDate); + } + } \ No newline at end of file diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index 58e79de7..31964c32 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -28,7 +28,7 @@ public partial class WorkDateComponent : IDisposable /// User preference service /// [Inject] - public UserPrefService Prefs { get; set; } + public UserProfileService Profiles { get; set; } /// /// OnChanged callback function @@ -49,7 +49,7 @@ public partial class WorkDateComponent : IDisposable /// /// user preferences /// - private UserPref _prefs = new(); + private UserPref Prefs = new(); /// /// Component Initialization @@ -57,11 +57,11 @@ public partial class WorkDateComponent : IDisposable protected override async Task OnInitializedAsync() { WorkDateContext = new EditContext(SelectedDate); - Prefs.OnChange += ProfileServiceOnOnChange; - _prefs = await Prefs.GetPreferences(); - SelectedDate = string.IsNullOrWhiteSpace(_prefs.WorkDate) + Profiles.OnChange += ProfileServiceOnOnChange; + Prefs = await Profiles.GetPreferences(); + SelectedDate = string.IsNullOrWhiteSpace(Prefs.WorkDate) ? DateTime.Now - : DateTime.Parse(_prefs.WorkDate); + : DateTime.Parse(Prefs.WorkDate); } /// @@ -73,7 +73,7 @@ public partial class WorkDateComponent : IDisposable var x = DateTime.TryParse(e.Value.ToString(), out var setDate); if (x) { - await Prefs.SetWorkDate(setDate); + await Profiles.SetWorkDate(setDate); await OnChangedCallback.InvokeAsync($"{setDate:yyyy-MM-dd}"); } } @@ -84,7 +84,7 @@ public partial class WorkDateComponent : IDisposable /// private void ProfileServiceOnOnChange(UserPref newUserPref) { - _prefs = newUserPref; + Prefs = newUserPref; StateHasChanged(); } @@ -93,6 +93,6 @@ public partial class WorkDateComponent : IDisposable /// public void Dispose() { - Prefs.OnChange -= ProfileServiceOnOnChange; + Profiles.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor.cs b/Wonky.Client/Pages/ActivityCreatePage.razor.cs index 42bfe47e..0a901ba1 100644 --- a/Wonky.Client/Pages/ActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/ActivityCreatePage.razor.cs @@ -39,7 +39,7 @@ public partial class ActivityCreatePage : IDisposable // Services [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService Prefs { get; set; } + [Inject] public UserProfileService Profiles { get; set; } [Inject] public IToastService Toast { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } @@ -93,7 +93,7 @@ public partial class ActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // User Preferences - UserPrefs = await Prefs.GetPreferences(); + UserPrefs = await Profiles.GetPreferences(); // User Info ThisUserInfo = await Storage.GetItemAsync("_xu"); // Fetch Customer from http @@ -225,7 +225,7 @@ public partial class ActivityCreatePage : IDisposable /// private async Task WorkDateConfirmCallback() { - await Prefs.SetDateConfirmed(true); + await Profiles.SetDateConfirmed(true); ConfirmWorkDateModal.Hide(); StateHasChanged(); } diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs b/Wonky.Client/Pages/ActivityListTodayPage.razor.cs index 287372ee..ad562cb4 100644 --- a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs +++ b/Wonky.Client/Pages/ActivityListTodayPage.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Pages; public partial class ActivityListTodayPage : IDisposable { - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -44,7 +44,7 @@ public partial class ActivityListTodayPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); SelectedDate = string.IsNullOrWhiteSpace(UserPref.WorkDate) ? DateTime.Now : DateTime.Parse(UserPref.WorkDate); ReportExist = await CrmReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); await GetActivities($"{SelectedDate:yyyy-MM-dd}"); diff --git a/Wonky.Client/Pages/CatalogPage.razor.cs b/Wonky.Client/Pages/CatalogPage.razor.cs index 25823d68..da655145 100644 --- a/Wonky.Client/Pages/CatalogPage.razor.cs +++ b/Wonky.Client/Pages/CatalogPage.razor.cs @@ -34,7 +34,7 @@ public partial class CatalogPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICatalogHttpRepository ItemRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private List Items { get; set; } = new(); private MetaData MetaInfo { get; set; } = new(); private CatalogPagingParams PageParams = new(); @@ -44,7 +44,7 @@ public partial class CatalogPage : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); UserInfo = await Storage.GetItemAsync("_xu"); PageParams.CountryCode = UserInfo.CountryCode; diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs index 261e7a81..4304cdd4 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs @@ -30,7 +30,7 @@ namespace Wonky.Client.Pages; public partial class CrmReportNewPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -64,7 +64,7 @@ public partial class CrmReportNewPage : IDisposable ReportContext.OnFieldChanged += HandleFieldChanged; ReportContext.OnValidationStateChanged += ValidationChanged; - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); _workDate = DateTime.Now; if (!string.IsNullOrWhiteSpace(Prefs.WorkDate)) _workDate = DateTime.Parse(Prefs.WorkDate); @@ -134,9 +134,9 @@ public partial class CrmReportNewPage : IDisposable Toaster.ShowInfo($"{result.Message}", $"HTTP Status"); // reset km and date confirmation - await PrefService.SetKmMorning(0); + await ProfileService.SetKmMorning(0); // reset date confirmed - await PrefService.SetDateConfirmed(false); + await ProfileService.SetDateConfirmed(false); Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); } /// diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index 0514ef0f..d6ebc474 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -70,6 +70,7 @@ public partial class CrmReportViewPage : IDisposable // remove busy signal if report is empty if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) Working = false; + ReportDate = workDate; // return if we are already at it if (Working) { diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs index f492211b..e31a5d55 100644 --- a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs +++ b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Pages; public partial class CrmTaskItemListPage : IDisposable { - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -41,7 +41,7 @@ public partial class CrmTaskItemListPage : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await UserPrefService.GetPreferences(); + Prefs = await UserProfileService.GetPreferences(); if(!string.IsNullOrWhiteSpace(Prefs.WorkDate)) WorkDate = Prefs.WorkDate; diff --git a/Wonky.Client/Pages/CustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListPage.razor.cs index d791ec3e..e72368bb 100644 --- a/Wonky.Client/Pages/CustomerListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerListPage.razor.cs @@ -31,7 +31,7 @@ namespace Wonky.Client.Pages public partial class CustomerListPage : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -54,7 +54,7 @@ namespace Wonky.Client.Pages protected override async Task OnInitializedAsync() { // set preferences - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); UserInfo = await Storage.GetItemAsync("_xu"); PageParams.OrderBy = Prefs.CompanySort; PageParams.SearchColumn = Prefs.CompanySearch; diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs index ec6cf26c..d94f175f 100644 --- a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs @@ -30,7 +30,7 @@ public partial class OfficeCustomerListPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CompanyPagingParams _paging = new(); @@ -45,7 +45,7 @@ public partial class OfficeCustomerListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // set preferences - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; @@ -104,7 +104,7 @@ public partial class OfficeCustomerListPage : IDisposable if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { _savedSearch = searchTerm; - await UserPrefService.SetCompanyFilterPhrase(searchTerm.Trim()); + await UserProfileService.SetCompanyFilterPhrase(searchTerm.Trim()); } } diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs index be61ceef..e99d35d7 100644 --- a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs @@ -30,7 +30,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CompanyPagingParams _paging = new(); @@ -45,7 +45,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // set preferences - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; _paging.OrderBy = UserPref.CompanySort; _paging.SearchColumn = UserPref.CompanySearch; @@ -103,7 +103,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { _savedSearch = searchTerm; - await UserPrefService.SetCompanyFilterPhrase(searchTerm.Trim()); + await UserProfileService.SetCompanyFilterPhrase(searchTerm.Trim()); } } diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor b/Wonky.Client/Pages/OfficeReportListPage.razor index 021c5888..246b0387 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor +++ b/Wonky.Client/Pages/OfficeReportListPage.razor @@ -29,7 +29,7 @@
- +
diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/OfficeReportListPage.razor.cs index eced59ff..9d022ae6 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportListPage.razor.cs @@ -30,30 +30,30 @@ public partial class OfficeReportListPage : IDisposable [Inject] public IOfficeReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IUserHttpRepository UserRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; private WebUserInfoView UserInfo { get; set; } = new(); - - protected override async Task OnInitializedAsync() + protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await Task.Delay(1000); - UserInfo = await UserRepo.GetAdvisorInfo(UserId); - await FetchReports(); - Working = false; - } - private async Task FetchReports() - { - await Task.Delay(1000); + UserInfo = await UserRepo.GetAdvisorInfo(UserId); var reports = await ReportRepo.GetReports(UserId); if (reports.Any()) ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); Working = false; } + private void ShowThisReport(string reportDate) + { + var uri = new Uri(Navigator.Uri); + var url = uri.AbsoluteUri; + Navigator.NavigateTo($"{url}/{reportDate}"); + } + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. public void Dispose() { diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/OfficeReportViewPage.razor index 6aeb9632..14eeb9c7 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor @@ -68,6 +68,6 @@ { foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) { - + } } diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index 919e6650..2857b46e 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.Models; +using Wonky.Client.Services; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -30,18 +31,17 @@ public partial class OfficeReportViewPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; - /// - /// Report date from url parameter - /// - [Parameter] - public string ReportDate { get; set; } = ""; - /// /// User entity Id from url parameter /// [Parameter] public string UserId { get; set; } = ""; + /// + /// Report Date + /// + [Parameter] + public string ReportDate { get; set; } = ""; /// /// Injected interceptor service /// @@ -59,37 +59,58 @@ public partial class OfficeReportViewPage : IDisposable /// [Inject] public NavigationManager Navigator { get; set; } + /// /// Logger service /// - [Inject] public ILogger Logger { get; set; } + [Inject] + public ILogger Logger { get; set; } + /// /// Storage service /// - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] + public ILocalStorageService Storage { get; set; } + + /// + /// Preference service + /// + [Inject] + public UserProfileService ProfileService { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); private bool Working { get; set; } = true; + private UserPref Prefs = new(); + private string ReturnUrl = ""; protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); + await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); + + ProfileService.OnChange += ProfileServiceOnOnChange; + + //ReturnUrl = new Uri(Navigator.Uri).AbsolutePath.Replace($"/{ReportDate}", ""); + ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; + Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); + await FetchUserReport(ReportDate); } - + private void Print(PTarget target) { - var returnUrl = new Uri(Navigator.Uri).AbsolutePath; + + Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); switch (target) { case PTarget.Order: - Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.Report: - Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.None: break; @@ -108,13 +129,15 @@ public partial class OfficeReportViewPage : IDisposable { // remove busy signal if report is empty if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + { Working = false; + } + Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}", false, true); // return if we are already at it if (Working) { return; } - // reset variables Report = new ReportView(); Activities = new List(); @@ -127,14 +150,22 @@ public partial class OfficeReportViewPage : IDisposable // store locally if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { - await Storage.SetItemAsync($"{UserId}-{Report.ReportData.ReportDate}", Report); + await Storage.SetItemAsync($"{UserId}-{workDate}", Report); } // remove busy signal Working = false; } - + + private void ProfileServiceOnOnChange(UserPref userPref) + { + Prefs = userPref; + ReportDate = Prefs.WorkDate; + StateHasChanged(); + } + public void Dispose() { Interceptor.DisposeEvent(); + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/PrintOrderPage.razor b/Wonky.Client/Pages/PrintFrontPage.razor similarity index 96% rename from Wonky.Client/Pages/PrintOrderPage.razor rename to Wonky.Client/Pages/PrintFrontPage.razor index 29806c69..52f4714a 100644 --- a/Wonky.Client/Pages/PrintOrderPage.razor +++ b/Wonky.Client/Pages/PrintFrontPage.razor @@ -25,7 +25,7 @@ Tilbage
- +
diff --git a/Wonky.Client/Pages/PrintOrderPage.razor.cs b/Wonky.Client/Pages/PrintFrontPage.razor.cs similarity index 94% rename from Wonky.Client/Pages/PrintOrderPage.razor.cs rename to Wonky.Client/Pages/PrintFrontPage.razor.cs index 16c4b127..db431e88 100644 --- a/Wonky.Client/Pages/PrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/PrintFrontPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class PrintOrderPage +public partial class PrintFrontPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -29,7 +29,7 @@ public partial class PrintOrderPage [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } @@ -47,7 +47,7 @@ public partial class PrintOrderPage { var uri = new Uri(Navigator.Uri); var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}"; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); Items = Report.ReportItems; diff --git a/Wonky.Client/Pages/PrintReportPage.razor b/Wonky.Client/Pages/PrintReportPage.razor index 2da2978a..b675231b 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor +++ b/Wonky.Client/Pages/PrintReportPage.razor @@ -25,7 +25,7 @@ Tilbage
- +
diff --git a/Wonky.Client/Pages/PrintReportPage.razor.cs b/Wonky.Client/Pages/PrintReportPage.razor.cs index 23896727..f3c7984a 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportPage.razor.cs @@ -39,7 +39,7 @@ public partial class PrintReportPage { var uri = new Uri(Navigator.Uri); var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}" ; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); } diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index 9f7b4002..013ed6af 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -86,7 +86,7 @@ builder.Services.AddScoped(); // vat registry service builder.Services.AddScoped(); // preference service -builder.Services.AddScoped(); +builder.Services.AddScoped(); // activity draft service builder.Services.AddScoped(); diff --git a/Wonky.Client/Services/UserPrefService.cs b/Wonky.Client/Services/UserProfileService.cs similarity index 97% rename from Wonky.Client/Services/UserPrefService.cs rename to Wonky.Client/Services/UserProfileService.cs index 005e24c9..58a9ee32 100644 --- a/Wonky.Client/Services/UserPrefService.cs +++ b/Wonky.Client/Services/UserProfileService.cs @@ -29,11 +29,11 @@ public record UserPref public bool DateConfirmed { get; set; } } -public class UserPrefService +public class UserProfileService { private readonly ILocalStorageService _localStorageService; public event Action? OnChange; - public UserPrefService(ILocalStorageService localStorageService) + public UserProfileService(ILocalStorageService localStorageService) { _localStorageService = localStorageService; } diff --git a/Wonky.Client/Shared/PriceListModal.razor.cs b/Wonky.Client/Shared/PriceListModal.razor.cs index cd014c55..e33958fe 100644 --- a/Wonky.Client/Shared/PriceListModal.razor.cs +++ b/Wonky.Client/Shared/PriceListModal.razor.cs @@ -30,7 +30,7 @@ public partial class PriceListModal : IDisposable [Parameter] public EventCallback OnSelected { get; set; } [Inject] public ICatalogHttpRepository ItemRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; @@ -41,7 +41,7 @@ public partial class PriceListModal : IDisposable protected override async Task OnInitializedAsync() { - _userPref = await UserPrefService.GetPreferences(); + _userPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; _paging.OrderBy = _userPref.ItemSort; _paging.SearchColumn = _userPref.ItemSearch; diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index c24088be..d5f9fe28 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -7,7 +7,7 @@ "image": "grumpy-coder.png" }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", diff --git a/Wonky.Client/wwwroot/scripts/document-event-load.js b/Wonky.Client/wwwroot/scripts/document-event-load.js new file mode 100644 index 00000000..ab266c8b --- /dev/null +++ b/Wonky.Client/wwwroot/scripts/document-event-load.js @@ -0,0 +1,3 @@ +document.addEventListener("load", function() { + window.print(); +}); diff --git a/Wonky.Client/wwwroot/scripts/print-invoke.js b/Wonky.Client/wwwroot/scripts/print-invoke.js index 7623b1e3..ebc0e783 100644 --- a/Wonky.Client/wwwroot/scripts/print-invoke.js +++ b/Wonky.Client/wwwroot/scripts/print-invoke.js @@ -1,7 +1,3 @@ export function printInvoke() { window.print(); } - -document.addEventListener("load", function() { - window.print(); -});