From fc0682c747523ecec29f56f0ab34f46382dab889 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 30 Jan 2023 14:20:42 +0100 Subject: [PATCH] overlay customer activity list view and single view --- .../AdvisorActivityListComponent.razor | 2 +- .../CustomerVisitListComponent.razor | 75 ++++++++++++ .../CustomerVisitListComponent.razor.cs | 41 +++++++ .../Components/ReportItemComponent.razor | 8 +- .../Pages/AdvisorActivityCreatePage.razor | 21 ++-- .../Pages/AdvisorActivityCreatePage.razor.cs | 48 +++++--- .../AdvisorCustomerActivityListPage.razor | 58 +--------- .../AdvisorCustomerInventoryListPage.razor | 2 +- .../AdvisorCustomerInventoryListPage.razor.cs | 4 +- .../AdvisorCustomerInvoiceListPage.razor | 2 +- .../AdvisorCustomerInvoiceListPage.razor.cs | 2 +- .../Pages/AdvisorReportViewPage.razor | 2 +- .../OfficeCustomerCreatePhoneOrderPage.razor | 2 +- ...fficeCustomerCreatePhoneOrderPage.razor.cs | 4 +- .../OfficeUserAdvisorReportViewPage.razor | 2 +- Wonky.Client/Pages/ReportPrintOrderPage.razor | 2 +- .../Pages/ReportPrintSummaryPage.razor | 6 +- ... => ConfirmProductCheckModalOverlay.razor} | 0 ... ConfirmProductCheckModalOverlay.razor.cs} | 2 +- ...azor => ConfirmWorkDateModalOverlay.razor} | 0 ...s => ConfirmWorkDateModalOverlay.razor.cs} | 2 +- .../CustomerActivityListModalOverlay.razor | 19 +++ .../CustomerActivityListModalOverlay.razor.cs | 34 ++++++ .../CustomerActivityViewModalOverlay.razor | 109 ++++++++++++++++++ .../CustomerActivityViewModalOverlay.razor.cs | 48 ++++++++ ...or => CustomerInventoryModalOverlay.razor} | 2 +- ...=> CustomerInventoryModalOverlay.razor.cs} | 8 +- ...azor => CustomerInvoiceModalOverlay.razor} | 2 +- ...s => CustomerInvoiceModalOverlay.razor.cs} | 6 +- ...zor => InventoryReorderModalOverlay.razor} | 0 ... => InventoryReorderModalOverlay.razor.cs} | 2 +- ...al.razor => InvoiceViewModalOverlay.razor} | 0 ...or.cs => InvoiceViewModalOverlay.razor.cs} | 3 +- ...y.razor => PriceCatalogModalOverlay.razor} | 0 ...r.cs => PriceCatalogModalOverlay.razor.cs} | 2 +- ...razor => ProductHistoryModalOverlay.razor} | 0 ...cs => ProductHistoryModalOverlay.razor.cs} | 2 +- Wonky.Client/wwwroot/appsettings.json | 4 +- Wonky.Client/wwwroot/css/print.css | 7 +- 39 files changed, 411 insertions(+), 122 deletions(-) create mode 100644 Wonky.Client/Components/CustomerVisitListComponent.razor create mode 100644 Wonky.Client/Components/CustomerVisitListComponent.razor.cs rename Wonky.Client/Shared/{ConfirmProductCheckOverlay.razor => ConfirmProductCheckModalOverlay.razor} (100%) rename Wonky.Client/Shared/{ConfirmProductCheckOverlay.razor.cs => ConfirmProductCheckModalOverlay.razor.cs} (96%) rename Wonky.Client/Shared/{ConfirmWorkDateOverlay.razor => ConfirmWorkDateModalOverlay.razor} (100%) rename Wonky.Client/Shared/{ConfirmWorkDateOverlay.razor.cs => ConfirmWorkDateModalOverlay.razor.cs} (96%) create mode 100644 Wonky.Client/Shared/CustomerActivityListModalOverlay.razor create mode 100644 Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs create mode 100644 Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor create mode 100644 Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor.cs rename Wonky.Client/Shared/{CustomerInventoryOverlay.razor => CustomerInventoryModalOverlay.razor} (85%) rename Wonky.Client/Shared/{CustomerInventoryOverlay.razor.cs => CustomerInventoryModalOverlay.razor.cs} (88%) rename Wonky.Client/Shared/{CustomerInvoiceOverlay.razor => CustomerInvoiceModalOverlay.razor} (89%) rename Wonky.Client/Shared/{CustomerInvoiceOverlay.razor.cs => CustomerInvoiceModalOverlay.razor.cs} (87%) rename Wonky.Client/Shared/{InventoryReorderModal.razor => InventoryReorderModalOverlay.razor} (100%) rename Wonky.Client/Shared/{InventoryReorderModal.razor.cs => InventoryReorderModalOverlay.razor.cs} (98%) rename Wonky.Client/Shared/{InvoiceViewModal.razor => InvoiceViewModalOverlay.razor} (100%) rename Wonky.Client/Shared/{InvoiceViewModal.razor.cs => InvoiceViewModalOverlay.razor.cs} (97%) rename Wonky.Client/Shared/{PriceCatalogOverlay.razor => PriceCatalogModalOverlay.razor} (100%) rename Wonky.Client/Shared/{PriceCatalogOverlay.razor.cs => PriceCatalogModalOverlay.razor.cs} (98%) rename Wonky.Client/Shared/{ProductHistoryOverlay.razor => ProductHistoryModalOverlay.razor} (100%) rename Wonky.Client/Shared/{ProductHistoryOverlay.razor.cs => ProductHistoryModalOverlay.razor.cs} (97%) diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor b/Wonky.Client/Components/AdvisorActivityListComponent.razor index d767624d..6edc5e8e 100644 --- a/Wonky.Client/Components/AdvisorActivityListComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor @@ -38,7 +38,7 @@ @foreach (var activity in ActivityList) { - @activity.Company.Name + @activity.Company.Name @activity.Company.City @activity.Demo @activity.Sales diff --git a/Wonky.Client/Components/CustomerVisitListComponent.razor b/Wonky.Client/Components/CustomerVisitListComponent.razor new file mode 100644 index 00000000..2d50f39f --- /dev/null +++ b/Wonky.Client/Components/CustomerVisitListComponent.razor @@ -0,0 +1,75 @@ +@* +// 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] +// +*@ + +
+
+
+
+

Dato

+
+
+

Demo

+
+
+

Salg

+
+
+

Ordre Note

+
+
+

Ordre Note

+
+
+
+ @if (Activities.Any()) + { + @foreach (var activity in Activities) + { +
+
+
+ @activity.OrderDate +
+
+ @activity.Demo +
+
+ @activity.Sales +
+
+ @activity.OfficeNote +
+
+ @activity.CrmNote +
+
+
+ } + } + else + { +
+
+
+ Ingen data +
+
+
+ } +
+ + \ No newline at end of file diff --git a/Wonky.Client/Components/CustomerVisitListComponent.razor.cs b/Wonky.Client/Components/CustomerVisitListComponent.razor.cs new file mode 100644 index 00000000..e33aaf63 --- /dev/null +++ b/Wonky.Client/Components/CustomerVisitListComponent.razor.cs @@ -0,0 +1,41 @@ +// 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 System.Globalization; +using System.Runtime.InteropServices; +using Blazored.LocalStorage; +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterfaces; +using Wonky.Client.Models; +using Wonky.Client.Shared; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.Components; + +public partial class CustomerVisitListComponent +{ + [Parameter] public List Activities { get; set; } = new(); + private CustomerActivityViewModalOverlay ActivityViewOverlay { get; set; } = new(); + + private ReportItemView Activity { get; set; } = new(); + + private void ShowVisitOverlay(string activityId) + { + Activity = Activities.First(x => x.ActivityId == activityId); + ActivityViewOverlay.Show(); + } + +} \ No newline at end of file diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index ea3dedab..d37c73e6 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -22,7 +22,7 @@ -
+

@ReportItem.Company.Name

@if (ReportItem.Express) { @@ -134,10 +134,10 @@ @if (!string.IsNullOrWhiteSpace(@ReportItem.OfficeNote)) { -
-

+
+

@ReportItem.OfficeNote -

+

}
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index c9f96d25..79f87352 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -20,7 +20,7 @@ @attribute [Authorize(Roles = "Advisor")] @page "/advisor/customers/{CompanyId}/activities/new" -Rådgiver Opret Aktivetet for @Company.Name +Ny aktivitet - @Company.Name
@@ -161,7 +161,8 @@ else
- + + @* *@
@@ -335,21 +336,23 @@ else
} - - - + - - + - \ No newline at end of file + + + \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 51c672a8..d959414d 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -39,10 +39,10 @@ public partial class AdvisorActivityCreatePage : IDisposable [Inject] private IToastService Toaster { get; set; } [Inject] private NavigationManager Navigator { get; set; } [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ICountryCatalogRepository Catalog { get; set; } - [Inject] private IAdvisorCustomerRepository Companies { get; set; } - [Inject] private IAdvisorActivityRepository Actitivites { get; set; } - [Inject] private IAdvisorReportRepository Reports { get; set; } + [Inject] private ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] private IAdvisorActivityRepository ActivityRepo { get; set; } + [Inject] private IAdvisorReportRepository ReportRepo { get; set; } [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } [CascadingParameter] private DraftStateProvider DraftProvider { get; set; } = new(); @@ -71,18 +71,20 @@ public partial class AdvisorActivityCreatePage : IDisposable private string PromptDateConfirm { get; set; } = ""; // OVERLAY PAGES - private PriceCatalogOverlay CatalogOverlay { get; set; } = new(); - private ProductHistoryOverlay ProductOverlay { get; set; } = new(); + private PriceCatalogModalOverlay CatalogOverlay { get; set; } = new(); + private ProductHistoryModalOverlay ProductOverlay { get; set; } = new(); private ProductPriceHistoryModal PriceOverlay { get; set; } = new(); - private ConfirmWorkDateOverlay WorkDateOverlay { get; set; } = new(); - private ConfirmProductCheckOverlay ProductCheckOverlay { get; set; } = new(); - private CustomerInvoiceOverlay InvoiceOverlay { get; set; } = new(); - private CustomerInventoryOverlay InventoryOverlay { get; set; } = new(); - + private ConfirmWorkDateModalOverlay WorkDateOverlay { get; set; } = new(); + private ConfirmProductCheckModalOverlay ProductCheckOverlay { get; set; } = new(); + private CustomerInvoiceModalOverlay InvoiceOverlay { get; set; } = new(); + private CustomerInventoryModalOverlay InventoryOverlay { get; set; } = new(); + private CustomerActivityListModalOverlay ActivityListOverlay { get; set; } = new(); private List Inventory { get; set; } = new(); private List CheckList { get; set; } = new(); private InvoiceListView CompanyInvoices { get; set; } = new(); + private List Activities { get; set; } = new(); + private string ButtonText { get; set; } = "Gem besøg"; private bool OrgWarning { get; set; } @@ -103,7 +105,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // User Info SalesRep = await Storage.GetItemAsync("_xu"); // Fetch Customer from http - Company = await Companies.GetCompanyById(CompanyId); + Company = await CompanyRepo.GetCompanyById(CompanyId); if (Company.HasFolded == 1) // Company has shutdown activities Activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt."; @@ -143,7 +145,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // Initialize date variable SelectedDate = string.IsNullOrWhiteSpace(UserPrefs.WorkDate) ? DateTime.Now : DateTime.Parse(UserPrefs.WorkDate); // raise flag if report is closed - ReportClosed = await Reports.ReportExist($"{SelectedDate:yyyy-MM-dd}"); + ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); // Ask for confirmation of date Logger.LogDebug("Preferences.DateConfirmed => {}", UserPrefs.DateConfirmed); if (!UserPrefs.DateConfirmed) @@ -162,6 +164,17 @@ public partial class AdvisorActivityCreatePage : IDisposable Working = false; } + private async Task ShowVisitOverlay() + { + Logger.LogDebug("ShowInventoryOverlay - wait for visits"); + + ActivityListOverlay.Show(); + + Activities = await ActivityRepo.GetCustomerActivities(CompanyId); + + await Task.Delay(500); + } + private async Task ShowInventoryOverlay() { Logger.LogDebug("ShowInventoryOverlay - wait for inventory"); @@ -169,6 +182,7 @@ public partial class AdvisorActivityCreatePage : IDisposable InventoryOverlay.Show(); Inventory = await HistoryRepo.FetchInventory(CompanyId); + await Task.Delay(500); } @@ -313,7 +327,7 @@ public partial class AdvisorActivityCreatePage : IDisposable /// private async Task WorkDateComponentCallback(string workDate) { - ReportClosed = await Reports.ReportExist(workDate); + ReportClosed = await ReportRepo.ReportExist(workDate); SelectedDate = DateTime.Parse(workDate); Activity.ActivityDate = workDate; } @@ -335,7 +349,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // get selected item if (string.IsNullOrWhiteSpace(sku.ItemId)) return; - SelectedItem = await Catalog.GetSalesItemId(SalesRep.CountryCode.ToLower(), sku.ItemId); + SelectedItem = await CatalogRepo.GetSalesItemId(SalesRep.CountryCode.ToLower(), sku.ItemId); ShowItem = true; Price = sku.Rate; Quantity = sku.Quantity; @@ -412,7 +426,7 @@ public partial class AdvisorActivityCreatePage : IDisposable { Company.Phone = Activity.Phone; Activity.OrderMessage = $"Telefonnr. opdateret.\n{Activity.OrderMessage}"; - await Companies.UpdateErpData(Company.CompanyId, Company); + await CompanyRepo.UpdateErpData(Company.CompanyId, Company); } // begin assembling activity Activity.ActivityDate = $"{SelectedDate:yyyy-MM-dd}"; @@ -448,7 +462,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // debug logging Logger.LogDebug("CrmNewActivityPage => \n {}", JsonSerializer.Serialize(Activity)); // post to api - var result = await Actitivites.CreateActivity(Activity); + var result = await ActivityRepo.CreateActivity(Activity); // debug logging Logger.LogDebug("ApiResponseView => \n {}", JsonSerializer.Serialize(result)); // show result message diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor index 3b8434bc..080a68da 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor @@ -36,63 +36,7 @@
-
-
-
-
-

Dato

-
-
-

Demo

-
-
-

Salg

-
-
-

Note /Kontor

-
-
-

Note /Selv

-
-
-
- - @if (Activities.Any()) - { - @foreach (var activity in Activities) - { -
-
-
- @activity.OrderDate -
-
- @activity.Demo -
-
- @activity.Sales -
-
- @activity.OfficeNote -
-
- @activity.CrmNote -
-
-
- } - } - else - { -
-
-
- Ingen data -
-
-
- } -
+ } @if (Working) { diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor index 3bac9e39..08891c4a 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor @@ -34,7 +34,7 @@ - + @if (Working) { diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs index 981ab8b4..726978de 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs @@ -44,7 +44,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; private SalesItemView SalesItem { get; set; } = new(); - private InventoryReorderModal ReorderModal { get; set; } = new(); + private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new(); private List Inventory { get; set; } = new(); @@ -65,7 +65,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable { // fetch item from http repo SalesItem = await Catalog.GetSalesItemSku(Company.CountryCode.ToLower(), sku); - ReorderModal.Show(); + InventoryOverlay.Show(); } private async Task OnSelectedItem(DraftItem draftItem) diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor index efd48402..6fa6ca85 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor @@ -33,7 +33,7 @@ - + } @if (Working) diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index 16c3b976..4bf3ef09 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -23,7 +23,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable [Inject] private ILogger Logger { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); private CompanyDto Company { get; set; } = new(); - private InvoiceViewModal InvoiceView { get; set; } = new(); + private InvoiceViewModalOverlay InvoiceView { get; set; } = new(); private string InvoiceId { get; set; } = ""; private bool Working { get; set; } private bool AllSet { get; set; } diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index aa9607f0..3b50ff35 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -36,7 +36,7 @@ -
+
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { @Report.ReportData.Name diff --git a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor index 6ad6b026..481cc0d6 100644 --- a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor +++ b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor @@ -225,4 +225,4 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs index 0ceabe67..d729f0ef 100644 --- a/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCreatePhoneOrderPage.razor.cs @@ -59,7 +59,7 @@ public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable private bool ReportClosed { get; set; } private bool PoFormInvalid { get; set; } = true; private bool Working { get; set; } - private PriceCatalogOverlay PriceCatalog { get; set; } = new(); + private PriceCatalogModalOverlay CatalogOverlay { get; set; } = new(); protected override async Task OnInitializedAsync() @@ -126,7 +126,7 @@ public partial class OfficeCustomerCreatePhoneOrderPage : IDisposable private void CallPriceListModal() { - PriceCatalog.Show(); + CatalogOverlay.Show(); } private async Task PriceListCallback(SelectedSku sku) diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor index e000f4b7..3eb8c142 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor @@ -41,7 +41,7 @@ { @Report.ReportData.Name
-
+

@Report.ReportData.Name

diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor b/Wonky.Client/Pages/ReportPrintOrderPage.razor index 7bb79bbf..384751d5 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor @@ -26,7 +26,7 @@
- + diff --git a/Wonky.Client/Pages/ReportPrintSummaryPage.razor b/Wonky.Client/Pages/ReportPrintSummaryPage.razor index a8c06d77..ef738bb0 100644 --- a/Wonky.Client/Pages/ReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/ReportPrintSummaryPage.razor @@ -32,8 +32,10 @@
@Report.ReportData.Name
-
-

@Report.ReportData.Name

+
+
+

@Report.ReportData.Name

+
diff --git a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor similarity index 100% rename from Wonky.Client/Shared/ConfirmProductCheckOverlay.razor rename to Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor diff --git a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs similarity index 96% rename from Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs rename to Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs index 2fc90c97..bd270a99 100644 --- a/Wonky.Client/Shared/ConfirmProductCheckOverlay.razor.cs +++ b/Wonky.Client/Shared/ConfirmProductCheckModalOverlay.razor.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Shared; -public partial class ConfirmProductCheckOverlay +public partial class ConfirmProductCheckModalOverlay { private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor similarity index 100% rename from Wonky.Client/Shared/ConfirmWorkDateOverlay.razor rename to Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor diff --git a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs similarity index 96% rename from Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs rename to Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs index 63f0b047..1ef8619f 100644 --- a/Wonky.Client/Shared/ConfirmWorkDateOverlay.razor.cs +++ b/Wonky.Client/Shared/ConfirmWorkDateModalOverlay.razor.cs @@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Shared; -public partial class ConfirmWorkDateOverlay +public partial class ConfirmWorkDateModalOverlay { private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor new file mode 100644 index 00000000..b6c2cbed --- /dev/null +++ b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor @@ -0,0 +1,19 @@ +@using Wonky.Client.Components + + +@if (_showBackdrop) +{ +
+} diff --git a/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs new file mode 100644 index 00000000..e8899d4a --- /dev/null +++ b/Wonky.Client/Shared/CustomerActivityListModalOverlay.razor.cs @@ -0,0 +1,34 @@ +using System.Text.Json; +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpInterfaces; +using Wonky.Client.Models; +using Wonky.Client.Shared; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.Shared; + +public partial class CustomerActivityListModalOverlay +{ + [Parameter] public string CompanyName { get; set; } = ""; + [Parameter] public List Activities { get; set; } = new(); + + private string _modalDisplay = ""; + private bool _showBackdrop; + + public void Show() + { + _modalDisplay = "block;"; + _showBackdrop = true; + StateHasChanged(); + } + + private void Hide() + { + _modalDisplay = "none;"; + _showBackdrop = false; + StateHasChanged(); + } + +} \ No newline at end of file diff --git a/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor new file mode 100644 index 00000000..f807b9af --- /dev/null +++ b/Wonky.Client/Shared/CustomerActivityViewModalOverlay.razor @@ -0,0 +1,109 @@ +@* +// 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] +// +*@ + +