From 5367699cc4da00d2e5088070d5d6cc364b69e33b Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 21 May 2023 14:34:51 +0200 Subject: [PATCH] WIP - navigation and cosmetic fixes to supervisor --- ...upervisorAdvisorActivityListViewPage.razor | 48 --------------- .../Pages/SupervisorAdvisorListPage.razor | 7 ++- ...SupervisorAdvisorReportItemViewPage.razor} | 16 ++++- ...ervisorAdvisorReportItemViewPage.razor.cs} | 2 +- ...rvisorAdvisorReportItemViewPage.razor.css} | 0 ... => SupervisorAdvisorReportListPage.razor} | 13 +++- ... SupervisorAdvisorReportListPage.razor.cs} | 4 +- .../SupervisorAdvisorReportViewPage.razor | 59 +++++++++++++++++++ ... SupervisorAdvisorReportViewPage.razor.cs} | 4 +- .../Pages/SupervisorDocumentListPage.razor | 31 +++++----- .../Pages/SupervisorDocumentNewPage.razor | 43 ++++++++------ .../SupervisorDocumentViewEditPage.razor | 31 +++++----- Wonky.Client/wwwroot/appsettings.json | 2 +- 13 files changed, 151 insertions(+), 109 deletions(-) delete mode 100644 Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor rename Wonky.Client/Pages/{SupervisorAdvisorActivityViewPage.razor => SupervisorAdvisorReportItemViewPage.razor} (91%) rename Wonky.Client/Pages/{SupervisorAdvisorActivityViewPage.razor.cs => SupervisorAdvisorReportItemViewPage.razor.cs} (97%) rename Wonky.Client/Pages/{SupervisorAdvisorActivityViewPage.razor.css => SupervisorAdvisorReportItemViewPage.razor.css} (100%) rename Wonky.Client/Pages/{SupervisorAdvisorViewPage.razor => SupervisorAdvisorReportListPage.razor} (75%) rename Wonky.Client/Pages/{SupervisorAdvisorViewPage.razor.cs => SupervisorAdvisorReportListPage.razor.cs} (93%) create mode 100644 Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor rename Wonky.Client/Pages/{SupervisorAdvisorActivityListViewPage.razor.cs => SupervisorAdvisorReportViewPage.razor.cs} (96%) diff --git a/Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor deleted file mode 100644 index bf1dff28..00000000 --- a/Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor +++ /dev/null @@ -1,48 +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 -@attribute [Authorize(Roles = "Management,Supervisor")] - -@page "/supervisor/advisors/{AdvisorId}/activities/{ReportDate}" - -
- @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) - { - @Report.ReportData.Name -
-
-

@Report.ReportData.Name

-
-
-
-
- -
-
- -
-
- - - } - else - { -
-
Ingen data
-
- } -
diff --git a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor index 620fd03d..4ed23655 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor @@ -17,14 +17,15 @@ @attribute [Authorize(Roles = "Supervisor")] @page "/supervisor" +@page "/supervisor/advisors" Supervisor
-
-

Supervisor Sælger Oversigt

+
+

Supervisor Sælger Oversigt

-
+
diff --git a/Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor similarity index 91% rename from Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor rename to Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor index 7c03c483..26fcca4d 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor @@ -21,12 +21,24 @@ @page "/supervisor/advisors/{AdvisorId}/activities/{ReportDate}/visits/{DocumentId}" @ReportItem.ESalesNumber - @ReportItem.Company.Name - + +
+
+

@ReportItem.Company.Name

+
+ + +
+ +
-

@ReportItem.Company.Name

@if (ReportItem.Express) {

HASTER

diff --git a/Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor.cs rename to Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor.cs index 74a261ab..5eb0f951 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor.cs @@ -28,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SupervisorAdvisorActivityViewPage : IDisposable +public partial class SupervisorAdvisorReportItemViewPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } diff --git a/Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor.css b/Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor.css similarity index 100% rename from Wonky.Client/Pages/SupervisorAdvisorActivityViewPage.razor.css rename to Wonky.Client/Pages/SupervisorAdvisorReportItemViewPage.razor.css diff --git a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor similarity index 75% rename from Wonky.Client/Pages/SupervisorAdvisorViewPage.razor rename to Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor index 1aa0d8f1..f6b30e66 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor @@ -20,10 +20,21 @@ @page "/supervisor/advisors/{AdvisorId}" Rapport Arkiv @InfoAdvisor.FirstName @InfoAdvisor.LastName +
+
+

Support Dokumentation

+
+
+ @* placeholder *@ +
+ +
- Rapport Arkiv - @InfoAdvisor.FirstName @InfoAdvisor.LastName + Rapport Arkiv @InfoAdvisor.FirstName @InfoAdvisor.LastName
diff --git a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor.cs similarity index 93% rename from Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs rename to Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor.cs index 96d42e37..1e7a6b36 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorReportListPage.razor.cs @@ -7,14 +7,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SupervisorAdvisorViewPage : IDisposable +public partial class SupervisorAdvisorReportListPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryUserInfoRepository UserRepo { get; set; } [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } // ############################################################# diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor new file mode 100644 index 00000000..d7168970 --- /dev/null +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor @@ -0,0 +1,59 @@ +@* 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 +@attribute [Authorize(Roles = "Management,Supervisor")] + +@page "/supervisor/advisors/{AdvisorId}/activities/{ReportDate}" + +@Report.ReportData.Name + +
+
+

Support Dokumentation

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

@Report.ReportData.Name

+
+
+
+
+ +
+
+ +
+
+ + +} +else +{ +
+
Ingen data
+
+} diff --git a/Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor.cs rename to Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs index 329b8c09..97fcb25d 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorActivityListViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs @@ -30,13 +30,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class SupervisorAdvisorActivityListViewPage : IDisposable +public partial class SupervisorAdvisorReportViewPage : 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 ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } diff --git a/Wonky.Client/Pages/SupervisorDocumentListPage.razor b/Wonky.Client/Pages/SupervisorDocumentListPage.razor index 43257f4e..ac162f78 100644 --- a/Wonky.Client/Pages/SupervisorDocumentListPage.razor +++ b/Wonky.Client/Pages/SupervisorDocumentListPage.razor @@ -21,27 +21,28 @@ Support Dokumentation
-
-

@Advisor.FullName

+
+

Support Dokumentation

+
+ +
-
-

Support Dokumentation

+
+

@Advisor.FullName

-
- Liste +
+ @* placeholder *@
- -
-
-
-
- Loading... -
+
+
+
+ Loading...
diff --git a/Wonky.Client/Pages/SupervisorDocumentNewPage.razor b/Wonky.Client/Pages/SupervisorDocumentNewPage.razor index c3224cf2..0ec9b348 100644 --- a/Wonky.Client/Pages/SupervisorDocumentNewPage.razor +++ b/Wonky.Client/Pages/SupervisorDocumentNewPage.razor @@ -22,33 +22,38 @@ Support Dokumentation
-
-

@Document.AdvisorName

+
+

Support Dokumentation

+
+ +
-
Support Dokumentation
-
- Liste +
+

@Document.AdvisorName

-
- Tilbage +
+ @* placeholder *@
-
-
-
-
- Loading... -
+
+
+
+ Loading...
-
+
-
-

Opret Dokumentation

+
+
+

Opret Dokumentation

+
@@ -60,9 +65,9 @@
- +
- +
@@ -86,7 +91,7 @@
diff --git a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor index 78fd1716..9aa38dcc 100644 --- a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor +++ b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor @@ -20,26 +20,27 @@ @page "/supervisor/advisors/{AdvisorId}/documents/{DocumentId}"
-
-

@Document.AdvisorName

+
+

Support Dokumentation

+
+ +
-
-

Support Dokumentation

+
+

@Document.AdvisorName

-
- Liste +
+ @* placeholder *@
- -
-
-
-
- Loading... -
+
+
+
+ Loading...
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 5e33601d..3074a5d5 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "145.4", + "version": "146.2", "rc": true, "sandBox": true, "image": "grumpy-coder.png"