diff --git a/Wonky.Client/Components/ItemSearchComponent.razor.cs b/Wonky.Client/Components/ItemSearchComponent.razor.cs index aaf38ee8..c0af8bea 100644 --- a/Wonky.Client/Components/ItemSearchComponent.razor.cs +++ b/Wonky.Client/Components/ItemSearchComponent.razor.cs @@ -49,6 +49,7 @@ public partial class ItemSearchComponent : IDisposable _preferenceService.OnChange += ProfileServiceOnOnChange; _preferences = await _preferenceService.GetPreferences(); _selectedItem = _preferences.ItemSearch; + await OnChanged.InvokeAsync(_selectedItem); } /// diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index 598e2ff4..427a84cc 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -17,98 +17,99 @@ @using Wonky.Entity.Views -@* *@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Ordre @ReportItem.ESalesNumber

-
Dato@ReportItem.OrderDateKonto@ReportItem.Company.Account
Telefon@ReportItem.Company.PhoneKøber@ReportItem.YourRef
CVR/VAT@ReportItem.Company.VatNumberRekvisition@ReportItem.ReferenceNumber
Navn@ReportItem.Company.NameLev.Navn@ReportItem.DlvName
Adresse@ReportItem.Company.Address1Lev.Adresse@ReportItem.DlvAddress1
Adresse@ReportItem.Company.Address2Lev.Adresse@ReportItem.DlvAddress2
Postnr By@ReportItem.Company.ZipCode @ReportItem.Company.CityLev.Postnr By@ReportItem.DlvZipCity
- - - - - - - - - - - - - @foreach (var line in ReportItem.Lines) - { - - - - - - - +
+
AntalVarnrBeskrivelsePrisR%Beløb
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

@ReportItem.Company.Name

+
Dato@ReportItem.OrderDateKonto@ReportItem.Company.Account
Telefon@ReportItem.Company.PhoneKøber@ReportItem.YourRef
CVR/VAT@ReportItem.Company.VatNumberRekvisition@ReportItem.ReferenceNumber
Navn@ReportItem.Company.NameLev.Navn@ReportItem.DlvName
Adresse@ReportItem.Company.Address1Lev.Adresse@ReportItem.DlvAddress1
Adresse@ReportItem.Company.Address2Lev.Adresse@ReportItem.DlvAddress2
Postnr By@ReportItem.Company.ZipCode @ReportItem.Company.CityLev.Postnr By@ReportItem.DlvZipCity
+ + + + + + + + + + + + + @foreach (var line in ReportItem.Lines) + { + + + + + + + + + } + + + + + + +
AntalVarnrBeskrivelsePrisR%Beløb
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
Ordresum@ReportItem.OrderAmount
+ @if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) + { +
+

+ @ReportItem.OfficeNote +

+
} - - - Ordresum - @ReportItem.OrderAmount - - - -@if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) -{ -
-

- @ReportItem.OfficeNote -

-
-} + @code{ diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor b/Wonky.Client/Components/SearchPhraseComponent.razor index 84a482cd..d6d74a2b 100644 --- a/Wonky.Client/Components/SearchPhraseComponent.razor +++ b/Wonky.Client/Components/SearchPhraseComponent.razor @@ -17,7 +17,7 @@
+ @bind-value="@_searchTerm" @bind-value:event="oninput" @onkeyup="OnSearchChanged"/>
diff --git a/Wonky.Client/Components/SearchPhraseComponent.razor.cs b/Wonky.Client/Components/SearchPhraseComponent.razor.cs index e0ff7598..c8a8de17 100644 --- a/Wonky.Client/Components/SearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/SearchPhraseComponent.razor.cs @@ -23,27 +23,24 @@ namespace Wonky.Client.Components public partial class SearchPhraseComponent { private Timer _timer = new(); - private string SearchTerm { get; set; } = ""; + private string _searchTerm { get; set; } = ""; [Parameter] public EventCallback OnChanged { get; set; } [Parameter] public string SavedSearch { get; set; } = string.Empty; - - protected override void OnParametersSet() - { - if (!string.IsNullOrWhiteSpace(SavedSearch)) - SearchTerm = SavedSearch; - } - + protected override void OnInitialized() { - if(!string.IsNullOrWhiteSpace(SavedSearch)) - OnSearchChanged(); + if (string.IsNullOrWhiteSpace(SavedSearch)) + return; + + _searchTerm = SavedSearch; + OnSearchChanged(); } private void ClearSearch() { SavedSearch = string.Empty; - SearchTerm = string.Empty; - OnChanged.InvokeAsync(SearchTerm); + _searchTerm = string.Empty; + OnChanged.InvokeAsync(_searchTerm); } private void OnSearchChanged() @@ -56,7 +53,7 @@ namespace Wonky.Client.Components private void OnTimerElapsed(object? sender, ElapsedEventArgs e) { - OnChanged.InvokeAsync(SearchTerm); + OnChanged.InvokeAsync(_searchTerm); _timer.Enabled = false; _timer.Dispose(); } diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs index d9c04f74..98b06eeb 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs @@ -214,6 +214,7 @@ public partial class ActivityNewVisitPage : IDisposable { InvalidActivityType = string.IsNullOrWhiteSpace(_draft.ActivityTypeEnum); } + private async Task DeleteDraft() { await DraftStateProvider.DeleteDraftAsync(); diff --git a/Wonky.Client/Pages/AdminSalesReportListPage.razor b/Wonky.Client/Pages/AdminReportListPage.razor similarity index 100% rename from Wonky.Client/Pages/AdminSalesReportListPage.razor rename to Wonky.Client/Pages/AdminReportListPage.razor diff --git a/Wonky.Client/Pages/AdminSalesReportListPage.razor.cs b/Wonky.Client/Pages/AdminReportListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/AdminSalesReportListPage.razor.cs rename to Wonky.Client/Pages/AdminReportListPage.razor.cs index 089ed6cd..f78a3004 100644 --- a/Wonky.Client/Pages/AdminSalesReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdminReportListPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdminSalesReportListPage : IDisposable +public partial class AdminReportListPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/AdminViewSalesReportPage.razor b/Wonky.Client/Pages/AdminReportViewPage.razor similarity index 95% rename from Wonky.Client/Pages/AdminViewSalesReportPage.razor rename to Wonky.Client/Pages/AdminReportViewPage.razor index 4b28b790..5a137b96 100644 --- a/Wonky.Client/Pages/AdminViewSalesReportPage.razor +++ b/Wonky.Client/Pages/AdminReportViewPage.razor @@ -66,8 +66,6 @@ { @foreach (var item in _items) { -
- -
+ } } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs b/Wonky.Client/Pages/AdminReportViewPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs rename to Wonky.Client/Pages/AdminReportViewPage.razor.cs index 68415808..287e0cfe 100644 --- a/Wonky.Client/Pages/AdminViewSalesReportPage.razor.cs +++ b/Wonky.Client/Pages/AdminReportViewPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdminViewSalesReportPage : IDisposable +public partial class AdminReportViewPage : IDisposable { /// /// Country code from url parameter diff --git a/Wonky.Client/Pages/SalesReportListPage.razor b/Wonky.Client/Pages/AdviserReportListPage.razor similarity index 100% rename from Wonky.Client/Pages/SalesReportListPage.razor rename to Wonky.Client/Pages/AdviserReportListPage.razor diff --git a/Wonky.Client/Pages/SalesReportListPage.razor.cs b/Wonky.Client/Pages/AdviserReportListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/SalesReportListPage.razor.cs rename to Wonky.Client/Pages/AdviserReportListPage.razor.cs index 5c37ec49..bd7ead1a 100644 --- a/Wonky.Client/Pages/SalesReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdviserReportListPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SalesReportListPage : IDisposable +public partial class AdviserReportListPage : IDisposable { [Inject] private IReportHttpRepository _reportRepo { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/SalesReportNewPage.razor b/Wonky.Client/Pages/AdviserReportNewPage.razor similarity index 100% rename from Wonky.Client/Pages/SalesReportNewPage.razor rename to Wonky.Client/Pages/AdviserReportNewPage.razor diff --git a/Wonky.Client/Pages/SalesReportNewPage.razor.cs b/Wonky.Client/Pages/AdviserReportNewPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/SalesReportNewPage.razor.cs rename to Wonky.Client/Pages/AdviserReportNewPage.razor.cs index 7db9b447..50cbe4d2 100644 --- a/Wonky.Client/Pages/SalesReportNewPage.razor.cs +++ b/Wonky.Client/Pages/AdviserReportNewPage.razor.cs @@ -29,14 +29,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SalesReportNewPage : IDisposable +public partial class AdviserReportNewPage : IDisposable { [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private UserPreferenceService _userPrefs { get; set; } [Inject] private IActivityHttpRepository _activityRepo { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } [Inject] private NavigationManager _navigator { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private IToastService _toast { get; set; } private EditContext _editContext { get; set; } private ReportDto _report { get; set; } = new(); diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/AdviserReportViewPage.razor similarity index 88% rename from Wonky.Client/Pages/SalesReportViewPage.razor rename to Wonky.Client/Pages/AdviserReportViewPage.razor index e1cb56f8..3ce15711 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor +++ b/Wonky.Client/Pages/AdviserReportViewPage.razor @@ -20,7 +20,7 @@ @page "/sales-reports/view/{ReportDate}" @attribute [Authorize(Roles = "Adviser,Admin,Supervisor")] -
+

@DateTime.Parse(ReportDate).ToLongDateString()

@@ -36,10 +36,8 @@ @if (!string.IsNullOrWhiteSpace(_report.ReportData.DayTypeEnum)) { @_report.ReportData.Name -
-
-

@_report.ReportData.Name

-
+
+

@_report.ReportData.Name

@@ -59,13 +57,10 @@
}
- @if (_items.Any()) { @foreach (var item in _items) { -
- -
+ } } \ No newline at end of file diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor.cs b/Wonky.Client/Pages/AdviserReportViewPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/SalesReportViewPage.razor.cs rename to Wonky.Client/Pages/AdviserReportViewPage.razor.cs index 76dc1cc4..27fdaa8f 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdviserReportViewPage.razor.cs @@ -20,7 +20,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SalesReportViewPage +public partial class AdviserReportViewPage { [Parameter] public string ReportDate { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 3d46e4d3..f25d782e 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.8.144", + "version": "0.8.152", "isBeta": false, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://staging.innotec.dk", + "innoBaseUrl": "https://production.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "virkUrl": "api/v2/services/virk", diff --git a/Wonky.Client/wwwroot/css/app-144.css b/Wonky.Client/wwwroot/css/app-152.css similarity index 83% rename from Wonky.Client/wwwroot/css/app-144.css rename to Wonky.Client/wwwroot/css/app-152.css index 7f75ad44..db3ad235 100644 --- a/Wonky.Client/wwwroot/css/app-144.css +++ b/Wonky.Client/wwwroot/css/app-152.css @@ -130,24 +130,6 @@ footer.version { display: none; } - -.report-page { - /* despite being deprecated - https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-before - firefox documentation - https://developer.mozilla.org/en-US/docs/Web/CSS/break-before - firefox still needs this - */ - page-break-before: always; - page-break-after: always; - page-break-inside: avoid; - - break-after: page; - break-before: page; - break-inside: avoid; - -} - /* printer classes */ @media print { @page { @@ -164,18 +146,11 @@ footer.version { color-adjust: exact; } .report-page { - /* deprecated style properties */ - page-break-before: always; - page-break-after: always; - page-break-inside: avoid; - - /* new style properties */ + /*break-before: page;*/ break-after: page; - break-before: page; - break-inside: avoid; - + height: initial; - font-size: 10px; + /*font-size: 10px;*/ border: initial; border-radius: initial; box-shadow: initial; diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 2be952bf..e82a70bc 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -13,7 +13,7 @@ - +