From dc3323ba234bbdfe0f7bfe0d85015f644483cc59 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Sun, 26 Jun 2022 09:44:05 +0200 Subject: [PATCH] pushed v0.8.37-beta --- .../Components/ActivityTableComponent.razor | 2 +- .../Components/CompanyTableComponent.razor | 15 +++--- Wonky.Client/Components/Home.razor | 2 +- .../Components/ItemTableComponent.razor | 2 +- .../ProductInventoryTableComponent.razor | 14 ++--- .../ProductLineTableComponent.razor | 4 +- .../Components/ReportSummaryComponent.razor | 6 +-- .../Components/ReportTableComponent.razor | 2 +- .../Components/TaskItemTableComponent.razor | 33 ++++++++++-- .../TaskItemTableComponent.razor.cs | 10 ++++ Wonky.Client/Pages/ActivityList.razor | 19 ------- Wonky.Client/Pages/ActivityList.razor.cs | 14 ----- Wonky.Client/Pages/CompanyList.razor | 46 +++++++++-------- Wonky.Client/Pages/ItemCatalog.razor | 51 ++++++++++--------- Wonky.Client/Shared/Confirmation.razor.cs | 2 +- Wonky.Client/wwwroot/css/app.css | 4 ++ 16 files changed, 117 insertions(+), 109 deletions(-) delete mode 100644 Wonky.Client/Pages/ActivityList.razor delete mode 100644 Wonky.Client/Pages/ActivityList.razor.cs diff --git a/Wonky.Client/Components/ActivityTableComponent.razor b/Wonky.Client/Components/ActivityTableComponent.razor index dc7fef0c..396a8422 100644 --- a/Wonky.Client/Components/ActivityTableComponent.razor +++ b/Wonky.Client/Components/ActivityTableComponent.razor @@ -19,7 +19,7 @@ { - + diff --git a/Wonky.Client/Components/CompanyTableComponent.razor b/Wonky.Client/Components/CompanyTableComponent.razor index 4ad49faf..b1b40627 100644 --- a/Wonky.Client/Components/CompanyTableComponent.razor +++ b/Wonky.Client/Components/CompanyTableComponent.razor @@ -21,9 +21,9 @@ @if (Companies.Any()) {
-
+
-
+
Besøg
@@ -39,15 +39,15 @@ Bynavn
- +
-
+
@foreach (var company in Companies) { - +
-
+
@@ -68,7 +68,8 @@ ActionLink="/companies/$ID$/activity/new" ButtonText="Besøg" ButtonType="primary" - Enabled="@company.ValidVat"> + Enabled="@company.ValidVat"> +
diff --git a/Wonky.Client/Components/Home.razor b/Wonky.Client/Components/Home.razor index 7110ef08..b7e8e938 100644 --- a/Wonky.Client/Components/Home.razor +++ b/Wonky.Client/Components/Home.razor @@ -22,7 +22,7 @@
-

Kalender

+

@(DateTime.Parse(_workDate).ToLongDateString())

diff --git a/Wonky.Client/Components/ItemTableComponent.razor b/Wonky.Client/Components/ItemTableComponent.razor index 4543be67..04ff6ca3 100644 --- a/Wonky.Client/Components/ItemTableComponent.razor +++ b/Wonky.Client/Components/ItemTableComponent.razor @@ -19,7 +19,7 @@ {
Besøg Demo Salg
- + diff --git a/Wonky.Client/Components/ProductInventoryTableComponent.razor b/Wonky.Client/Components/ProductInventoryTableComponent.razor index c1338c76..27f2eae1 100644 --- a/Wonky.Client/Components/ProductInventoryTableComponent.razor +++ b/Wonky.Client/Components/ProductInventoryTableComponent.razor @@ -1,16 +1,16 @@ @if (Inventory.Any()) {
-
+
-
-

Produkt

+
+ Produkt
-
-

Varenr.

+
+ Varenr.
-
-

Antal

+
+ Antal
diff --git a/Wonky.Client/Components/ProductLineTableComponent.razor b/Wonky.Client/Components/ProductLineTableComponent.razor index f7c688a0..fb367703 100644 --- a/Wonky.Client/Components/ProductLineTableComponent.razor +++ b/Wonky.Client/Components/ProductLineTableComponent.razor @@ -1,8 +1,8 @@ @if (ProductHistory.Any()) { -
Navn Fork Varenr
+
- + diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportSummaryComponent.razor index 20963cc3..2e77f0ec 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor +++ b/Wonky.Client/Components/ReportSummaryComponent.razor @@ -17,7 +17,7 @@
Dato
- + @@ -84,7 +84,7 @@
Dagens Demo @(Report.NewDemoCount + Report.RecallDemoCount) Dagens Resultat
- + @@ -120,7 +120,7 @@ {
Km Aften
- + diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 2eedb6d6..65a5a7f7 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -1,7 +1,7 @@ @if (ReportList != null) {
-
+
Dato diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor index e474c8e8..fa79157e 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor +++ b/Wonky.Client/Components/TaskItemTableComponent.razor @@ -18,21 +18,44 @@ @if (TaskItemList.Any()) {
- @foreach (var task in TaskItemList) - { +
+
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+
+ @foreach (var task in TaskItemList) + {
- + @task.Name
+ @task.DueTimestamp
+ @(task.Text[..50]) ...
+ +
+
+
- } + }
-} +} \ No newline at end of file diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor.cs b/Wonky.Client/Components/TaskItemTableComponent.razor.cs index 8b64aee2..4a6e180e 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor.cs +++ b/Wonky.Client/Components/TaskItemTableComponent.razor.cs @@ -14,7 +14,10 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Runtime.InteropServices; using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; using Wonky.Client.Shared; using Wonky.Entity.DTO; @@ -25,7 +28,10 @@ namespace Wonky.Client.Components [Parameter] public List TaskItemList { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } + [Parameter] public EventCallback OnDone { get; set; } + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private ITaskItemHttpRepository _taskRepo { get; set; } private Confirmation _confirmation = new (); private string _taskItemId = ""; @@ -35,6 +41,10 @@ namespace Wonky.Client.Components _confirmation.Show(); } + private async Task CloseTaskItem(string taskItemId) + { + await OnDone.InvokeAsync(_taskItemId); + } private async Task DeleteTaskItem() { _confirmation.Hide(); diff --git a/Wonky.Client/Pages/ActivityList.razor b/Wonky.Client/Pages/ActivityList.razor deleted file mode 100644 index 209bc374..00000000 --- a/Wonky.Client/Pages/ActivityList.razor +++ /dev/null @@ -1,19 +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] -// -*@ - -@page "/ActivityList" -

ActivityList

diff --git a/Wonky.Client/Pages/ActivityList.razor.cs b/Wonky.Client/Pages/ActivityList.razor.cs deleted file mode 100644 index 7d6bc7a9..00000000 --- a/Wonky.Client/Pages/ActivityList.razor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Toolbelt.Blazor; -using Wonky.Client.HttpRepository; -using Wonky.Entity.Views; - -namespace Wonky.Client.Pages; - -public partial class ActivityList -{ - [Inject] private IActivityHttpRepository _activityRepo { get; set; } - [Inject] private IHttpClientInterceptor _interceptor { get; set; } - - -} \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyList.razor index 50ddd9b3..0836ee9d 100644 --- a/Wonky.Client/Pages/CompanyList.razor +++ b/Wonky.Client/Pages/CompanyList.razor @@ -21,30 +21,32 @@ @attribute [Authorize(Roles = "Adviser")] -
-
-
- +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
-
- +
+
+ +
+
+
+
+ Opret kunde +
-
- -
-
- -
-
-
-
-
- -
-
-
-
- Opret kunde
diff --git a/Wonky.Client/Pages/ItemCatalog.razor b/Wonky.Client/Pages/ItemCatalog.razor index 2098e7cd..72281426 100644 --- a/Wonky.Client/Pages/ItemCatalog.razor +++ b/Wonky.Client/Pages/ItemCatalog.razor @@ -21,30 +21,31 @@ @attribute [Authorize(Roles = "Adviser,Admin")] -
-
- -
-
- -
-
- -
-
- -
-
- +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
-
-
- -
-
-
-
- -
-
\ No newline at end of file + + diff --git a/Wonky.Client/Shared/Confirmation.razor.cs b/Wonky.Client/Shared/Confirmation.razor.cs index d4e60393..636c5f04 100644 --- a/Wonky.Client/Shared/Confirmation.razor.cs +++ b/Wonky.Client/Shared/Confirmation.razor.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.Shared; public partial class Confirmation { private string _modalDisplay = ""; - private bool _showBackdrop = false; + private bool _showBackdrop; [Parameter] public string BodyMessage { get; set; } = ""; [Parameter] public EventCallback OnOkClicked { get; set; } diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index 31605ce2..c0f5d926 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -1,4 +1,7 @@ @import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); +body { + font-size: 16px; +} .draft-expires-msg { font-size: 0.8em; @@ -7,6 +10,7 @@ height: 48px; } .workDate { + font-size: 1.25em; font-variant: small-caps; } /* visit / vat state classes */
Tekst Medkørende Supervisor