From c27626f46ebaff31f59432294c3426452a3305b8 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Thu, 7 Jul 2022 14:43:24 +0200 Subject: [PATCH] testing v0.8.135-beta --- .../Components/CompanyTableComponent.razor | 93 ++++----- .../Components/CompanyTableComponent.razor.cs | 6 + .../Components/ReportItemComponent.razor | 182 +++++++++--------- Wonky.Client/Pages/ActivityNewVisitPage.razor | 31 +-- .../Pages/ActivityNewVisitPage.razor.cs | 3 +- .../Pages/AdminSalesReportViewPage.razor | 70 ------- .../Pages/AdminVewSalesReportPage.razor | 73 +++++++ ...or.cs => AdminVewSalesReportPage.razor.cs} | 12 +- ...yListPage.razor => CustomerListPage.razor} | 6 +- ...age.razor.cs => CustomerListPage.razor.cs} | 5 +- ...anyNewPage.razor => CustomerNewPage.razor} | 0 ...Page.razor.cs => CustomerNewPage.razor.cs} | 4 +- ...yViewPage.razor => CustomerViewPage.razor} | 0 ...age.razor.cs => CustomerViewPage.razor.cs} | 4 +- Wonky.Client/Pages/SalesReportViewPage.razor | 56 +++--- .../Pages/SalesReportViewPage.razor.cs | 2 + Wonky.Client/Properties/launchSettings.json | 20 ++ Wonky.Client/Shared/MainLayout.razor.css | 4 +- Wonky.Client/Shared/NavMenu.razor | 7 + Wonky.Client/Shared/NavMenu.razor.css | 2 +- Wonky.Client/Wonky.Client.csproj | 4 - Wonky.Client/wwwroot/appsettings.json | 4 +- .../wwwroot/css/{app.css => app-135.css} | 21 ++ Wonky.Client/wwwroot/index.html | 2 +- Wonky.Client/wwwroot/scripts/scripts.js | 16 ++ 25 files changed, 347 insertions(+), 280 deletions(-) delete mode 100644 Wonky.Client/Pages/AdminSalesReportViewPage.razor create mode 100644 Wonky.Client/Pages/AdminVewSalesReportPage.razor rename Wonky.Client/Pages/{AdminSalesReportViewPage.razor.cs => AdminVewSalesReportPage.razor.cs} (92%) rename Wonky.Client/Pages/{CompanyListPage.razor => CustomerListPage.razor} (91%) rename Wonky.Client/Pages/{CompanyListPage.razor.cs => CustomerListPage.razor.cs} (96%) rename Wonky.Client/Pages/{CompanyNewPage.razor => CustomerNewPage.razor} (100%) rename Wonky.Client/Pages/{CompanyNewPage.razor.cs => CustomerNewPage.razor.cs} (98%) rename Wonky.Client/Pages/{CompanyViewPage.razor => CustomerViewPage.razor} (100%) rename Wonky.Client/Pages/{CompanyViewPage.razor.cs => CustomerViewPage.razor.cs} (98%) rename Wonky.Client/wwwroot/css/{app.css => app-135.css} (86%) create mode 100644 Wonky.Client/wwwroot/scripts/scripts.js diff --git a/Wonky.Client/Components/CompanyTableComponent.razor b/Wonky.Client/Components/CompanyTableComponent.razor index 8c4bce6d..3b9e85b6 100644 --- a/Wonky.Client/Components/CompanyTableComponent.razor +++ b/Wonky.Client/Components/CompanyTableComponent.razor @@ -20,61 +20,50 @@ @if (Companies.Any()) { -
-
-
-
- Besøg -
-
- Navn -
-
- Konto -
-
- Telefon -
-
- Bynavn -
-
- -
-
-
+ + + + + + + + + + + + @foreach (var company in Companies) { - -
-
- - -
-
- @company.Name -
-
- @company.Account -
-
- @company.Phone -
-
- @company.City -
-
- - -
-
- + + + + + + + + } - + + +
BSNavnKontoTlfBynavn
+ + + + @company.Name + + @company.Account + + @company.Phone + + @company.City + + + +
} else { diff --git a/Wonky.Client/Components/CompanyTableComponent.razor.cs b/Wonky.Client/Components/CompanyTableComponent.razor.cs index f03ae6f7..868cd676 100644 --- a/Wonky.Client/Components/CompanyTableComponent.razor.cs +++ b/Wonky.Client/Components/CompanyTableComponent.razor.cs @@ -29,6 +29,7 @@ namespace Wonky.Client.Components [Parameter] public List Companies { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } + [Inject] private NavigationManager _navigator { get; set; } private Confirmation _confirmation = new (); private string _companyId = ""; @@ -39,6 +40,11 @@ namespace Wonky.Client.Components await base.OnInitializedAsync(); } + private void ViewCustomer(string companyId) + { + _navigator.NavigateTo($"/companies/{companyId}"); + } + private void CallConfirmationModal(string companyId) { _companyId = companyId; diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index 7be30a3a..598e2ff4 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -17,100 +17,98 @@ @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}")
Ordresum@ReportItem.OrderAmount
- @if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) +@* *@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

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) { -
-

- @ReportItem.OfficeNote -

-
+ + + + + + + + } - + + + + + + +
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 +

+
+} @code{ diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor index 04f284d8..e5fef4f1 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor @@ -121,7 +121,7 @@
@* Order draft lines *@ - +
@@ -336,16 +336,23 @@
-
-
- Til Oversigt + @if (HideButtons) + { + + } + else + { +
+
+ Til Oversigt +
+
+ Annuller +
+
+ +
-
- Annuller -
-
- -
-
+ }
\ No newline at end of file diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs index 1d58abb3..7afaee6d 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs @@ -99,8 +99,7 @@ public partial class ActivityNewVisitPage : IDisposable _draft.ActivityDate = $"{_workDate:yyyy-MM-dd}" ; - // todo - does it make sense to continue if _reportClosed is true? - _paging.SearchColumn = _prefs.ItemSearch ?? "name"; + _paging.SearchColumn = string.IsNullOrWhiteSpace(_prefs.ItemSearch) ? "name" : _prefs.ItemSearch; _paging.PageSize = Convert.ToInt32(_prefs.PageSize); await GetSalesItems(); diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor b/Wonky.Client/Pages/AdminSalesReportViewPage.razor deleted file mode 100644 index ec2c8d67..00000000 --- a/Wonky.Client/Pages/AdminSalesReportViewPage.razor +++ /dev/null @@ -1,70 +0,0 @@ -@* -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// -*@ - -@using Wonky.Client.Components -@using Microsoft.AspNetCore.Authorization -@page "/admin/users/advisers/{CountryCode}/{UserId}/reports/{ReportDate}" -@attribute [Authorize(Roles = "Admin")] - -@if (Report != null) -{ -
-
- @Report.ReportData.Name -
-
- @if (!string.IsNullOrWhiteSpace(ReportDate)) - { -

@DateTime.Parse(ReportDate).ToLongDateString()

- } -
-
- -
-
- -
-
-

@Report.ReportData.Name

-
-
-
-
- -
-
- -
-
- - - -
-
-} -else -{ - -} - -@if (_items.Any()) -{ - @foreach (var item in _items) - { - - } -} \ No newline at end of file diff --git a/Wonky.Client/Pages/AdminVewSalesReportPage.razor b/Wonky.Client/Pages/AdminVewSalesReportPage.razor new file mode 100644 index 00000000..f98409ba --- /dev/null +++ b/Wonky.Client/Pages/AdminVewSalesReportPage.razor @@ -0,0 +1,73 @@ +@* +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +*@ + +@using Wonky.Client.Components +@using Microsoft.AspNetCore.Authorization +@page "/admin/users/advisers/{CountryCode}/{UserId}/reports/{ReportDate}" +@attribute [Authorize(Roles = "Admin")] + +
+ +
+
+

@DateTime.Parse(ReportDate).ToLongDateString()

+
+
+ +
+
+ +
+
+ + @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) + { + @Report.ReportData.Name +
+
+

@Report.ReportData.Name

+
+
+
+
+ +
+
+ +
+
+ + + } + else + { +
+
Ingen data
+
+ } + +
+ +@if (_items.Any()) +{ + @foreach (var item in _items) + { +
+ +
+ } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs b/Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs similarity index 92% rename from Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs rename to Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs index 452b52d8..7753fbbd 100644 --- a/Wonky.Client/Pages/AdminSalesReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminVewSalesReportPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdminSalesReportViewPage : IDisposable +public partial class AdminVewSalesReportPage : IDisposable { /// /// Country code from url parameter @@ -54,6 +54,7 @@ public partial class AdminSalesReportViewPage : IDisposable private ReportView Report { get; set; } = new(); private List _items { get; set; } = new(); + private string _workDate { get; set; } = ""; protected override async Task OnParametersSetAsync() { @@ -69,11 +70,18 @@ public partial class AdminSalesReportViewPage : IDisposable /// private async Task GetReport(string workDate) { - if(workDate != ReportDate) + if (workDate != ReportDate) + { _navigator.NavigateTo($"/admin/users/advisers/{CountryCode}/{UserId}/reports/{workDate}"); + return; + } + Report = new ReportView(); + _items = new List(); + Report = await GetUserReport(UserId, workDate); _items = Report.ReportItems.Where(x => x.OrderAmount > 0).ToList(); + } /// /// Get report for user with entity Id for work date diff --git a/Wonky.Client/Pages/CompanyListPage.razor b/Wonky.Client/Pages/CustomerListPage.razor similarity index 91% rename from Wonky.Client/Pages/CompanyListPage.razor rename to Wonky.Client/Pages/CustomerListPage.razor index f33cf3c0..5cee3df0 100644 --- a/Wonky.Client/Pages/CompanyListPage.razor +++ b/Wonky.Client/Pages/CustomerListPage.razor @@ -38,11 +38,11 @@
-
+
-
- Opret kunde +
+ Opret kunde
diff --git a/Wonky.Client/Pages/CompanyListPage.razor.cs b/Wonky.Client/Pages/CustomerListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/CompanyListPage.razor.cs rename to Wonky.Client/Pages/CustomerListPage.razor.cs index 0c5b6b21..507400ee 100644 --- a/Wonky.Client/Pages/CompanyListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerListPage.razor.cs @@ -26,12 +26,13 @@ using Wonky.Entity.Requests; namespace Wonky.Client.Pages { - public partial class CompanyListPage : IDisposable + public partial class CustomerListPage : IDisposable { [Inject] private ILocalStorageService _storage { get; set; } [Inject] private UserPreferenceService _preferenceService { get; set; } [Inject] private ICompanyHttpRepository _companyRepo { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private NavigationManager _navigator { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CompanyPagingParams _paging = new(); @@ -82,7 +83,7 @@ namespace Wonky.Client.Pages private async Task SetSearchPhrase(string searchTerm) { _savedSearch = searchTerm; - await _preferenceService.SetCompanyFilterPhrase(searchTerm); + await _preferenceService.SetCompanyFilterPhrase(searchTerm.Trim()); _companyList = new List(); _paging.PageNumber = 1; _paging.SearchTerm = searchTerm; diff --git a/Wonky.Client/Pages/CompanyNewPage.razor b/Wonky.Client/Pages/CustomerNewPage.razor similarity index 100% rename from Wonky.Client/Pages/CompanyNewPage.razor rename to Wonky.Client/Pages/CustomerNewPage.razor diff --git a/Wonky.Client/Pages/CompanyNewPage.razor.cs b/Wonky.Client/Pages/CustomerNewPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/CompanyNewPage.razor.cs rename to Wonky.Client/Pages/CustomerNewPage.razor.cs index 7202a74d..b8737975 100644 --- a/Wonky.Client/Pages/CompanyNewPage.razor.cs +++ b/Wonky.Client/Pages/CustomerNewPage.razor.cs @@ -35,10 +35,10 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages { - public partial class CompanyNewPage : IDisposable + public partial class CustomerNewPage : IDisposable { [Inject] private IToastService _toast { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private ILocalStorageService _storage { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private ICompanyHttpRepository _companyRepo { get; set; } diff --git a/Wonky.Client/Pages/CompanyViewPage.razor b/Wonky.Client/Pages/CustomerViewPage.razor similarity index 100% rename from Wonky.Client/Pages/CompanyViewPage.razor rename to Wonky.Client/Pages/CustomerViewPage.razor diff --git a/Wonky.Client/Pages/CompanyViewPage.razor.cs b/Wonky.Client/Pages/CustomerViewPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/CompanyViewPage.razor.cs rename to Wonky.Client/Pages/CustomerViewPage.razor.cs index 1ac59ab8..6dbcfecd 100644 --- a/Wonky.Client/Pages/CompanyViewPage.razor.cs +++ b/Wonky.Client/Pages/CustomerViewPage.razor.cs @@ -33,11 +33,11 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CompanyViewPage : IDisposable +public partial class CustomerViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Inject] private IToastService _toast { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private ICompanyHttpRepository _companyRepo { get; set; } [Inject] private IHistoryHttpRepository _historyRepo { get; set; } diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor b/Wonky.Client/Pages/SalesReportViewPage.razor index e84c789d..ae26d401 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor +++ b/Wonky.Client/Pages/SalesReportViewPage.razor @@ -20,24 +20,24 @@ @page "/sales-reports/view/{ReportDate}" @attribute [Authorize(Roles = "Adviser,Admin,Supervisor")] -@if (_report != null) -{ -
+
+
+
+

@DateTime.Parse(ReportDate).ToLongDateString()

+
+
+ +
+
+ +
+
+ + @if (!string.IsNullOrWhiteSpace(_report.ReportData.DayTypeEnum)) + { @_report.ReportData.Name
-
- @if (!string.IsNullOrWhiteSpace(ReportDate)) - { -

@DateTime.Parse(ReportDate).ToLongDateString()

- } -
-
- -
-
- -
-
+

@_report.ReportData.Name

@@ -49,22 +49,16 @@
+ + + } + else + {
-
- -
+
Ingen data
-
-
- -
-
-
-} -else -{ - -} + } +
@if (_items.Any()) { @@ -72,4 +66,4 @@ else { } -} +} \ No newline at end of file diff --git a/Wonky.Client/Pages/SalesReportViewPage.razor.cs b/Wonky.Client/Pages/SalesReportViewPage.razor.cs index 666b0367..76dc1cc4 100644 --- a/Wonky.Client/Pages/SalesReportViewPage.razor.cs +++ b/Wonky.Client/Pages/SalesReportViewPage.razor.cs @@ -38,6 +38,8 @@ public partial class SalesReportViewPage private async Task GetReport(string workDate) { + _report = new ReportView(); + _items = new List(); if(workDate != ReportDate) _navigator.NavigateTo($"/sales-reports/view/{workDate}"); _report = await _reportRepo.GetReport(workDate); diff --git a/Wonky.Client/Properties/launchSettings.json b/Wonky.Client/Properties/launchSettings.json index e14599a8..f67c91cc 100644 --- a/Wonky.Client/Properties/launchSettings.json +++ b/Wonky.Client/Properties/launchSettings.json @@ -18,6 +18,26 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, + "Chrome": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7174;http://localhost:5280", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Firefox": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7174;http://localhost:5280", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, diff --git a/Wonky.Client/Shared/MainLayout.razor.css b/Wonky.Client/Shared/MainLayout.razor.css index b194747b..671e2c9c 100644 --- a/Wonky.Client/Shared/MainLayout.razor.css +++ b/Wonky.Client/Shared/MainLayout.razor.css @@ -39,7 +39,7 @@ main { text-overflow: ellipsis; } -@media (max-width: 640.98px) { +@media (max-width: 1024px) { .top-row:not(.auth) { display: none; } @@ -53,7 +53,7 @@ main { } } -@media (min-width: 641px) { +@media (min-width: 1025px) { .page { flex-direction: row; } diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index dddc574f..4175aeca 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -95,6 +95,13 @@ Hjælp + +
+ + Log af + +
+ diff --git a/Wonky.Client/Shared/NavMenu.razor.css b/Wonky.Client/Shared/NavMenu.razor.css index e681f238..8c60c76c 100644 --- a/Wonky.Client/Shared/NavMenu.razor.css +++ b/Wonky.Client/Shared/NavMenu.razor.css @@ -50,7 +50,7 @@ color: white; } -@media (min-width: 641px) { +@media (min-width: 1025px) { .navbar-toggler { display: none; } diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 537702ec..40f7798a 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -100,8 +100,4 @@ <_ContentIncludedByDefault Remove="wwwroot\css\bootstrap\js\bootstrap.min.js.map" /> - - - - diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 8eb4f28e..af82130f 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,9 +1,9 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.8.122", + "version": "0.8.135", "isBeta": true, - "sandBox": true, + "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app-135.css similarity index 86% rename from Wonky.Client/wwwroot/css/app.css rename to Wonky.Client/wwwroot/css/app-135.css index a9fa47ee..38cd9de1 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app-135.css @@ -123,8 +123,24 @@ footer.version { padding: 0 10px 0 0; } +.back-to-top { + position: fixed; + bottom: 25px; + right: 25px; + 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; } /* printer classes */ @@ -143,9 +159,14 @@ footer.version { color-adjust: exact; } .report-page { + /* deprecated properties */ page-break-before: always; page-break-after: always; page-break-inside: avoid; + /* new properties */ + break-after: page; + break-inside: avoid; + height: initial; font-size: 10px; border: initial; diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 8ac4b78a..98ea1bf5 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -13,7 +13,7 @@ - + diff --git a/Wonky.Client/wwwroot/scripts/scripts.js b/Wonky.Client/wwwroot/scripts/scripts.js new file mode 100644 index 00000000..9444efad --- /dev/null +++ b/Wonky.Client/wwwroot/scripts/scripts.js @@ -0,0 +1,16 @@ +(document).ready(function(){ + $(window).scroll(function () { + if ($(this).scrollTop() > 50) { + $('#back-to-top').fadeIn(); + } else { + $('#back-to-top').fadeOut(); + } + }); + // scroll body to 0px on click + $('#back-to-top').click(function () { + $('body,html').animate({ + scrollTop: 0 + }, 400); + return false; + }); +}); \ No newline at end of file
@@ -208,7 +208,7 @@ @_selectedItem.Sku - +