From d319b195397c3296b7cac40d40bf40e2c52a6fcc Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 7 Jun 2023 11:00:27 +0200 Subject: [PATCH] FEAT add MapOrgState function Refactor namespaces related to Advisor endpoints --- .../AdvisorActivityListComponent.razor | 2 +- .../AdvisorCustomerListComponent.razor | 10 +++- .../OfficeCountryCustomerListComponent.razor | 2 +- .../OfficeReportActivityListComponent.razor | 2 +- .../ReportViewActivityListComponent.razor | 2 +- Wonky.Client/Helpers/Utils.cs | 12 +++- ...sitory.cs => AdvisorActivityRepository.cs} | 8 +-- ...ository.cs => AdvisorContactRepository.cs} | 8 +-- ...cs => AdvisorCustomerHistoryRepository.cs} | 8 +-- ...sitory.cs => AdvisorCustomerRepository.cs} | 8 +-- ...ory.cs => AdvisorSalesReportRepository.cs} | 8 +-- ...sitory.cs => AdvisorTaskItemRepository.cs} | 8 +-- ...itory.cs => AdvisorWorkplaceRepository.cs} | 8 +-- ...sitory.cs => ExternalProductRepository.cs} | 6 +- ...itory.cs => IAdvisorActivityRepository.cs} | 2 +- ...sitory.cs => IAdvisorContactRepository.cs} | 2 +- ...s => IAdvisorCustomerHistoryRepository.cs} | 2 +- ...itory.cs => IAdvisorCustomerRepository.cs} | 2 +- ...ry.cs => IAdvisorSalesReportRepository.cs} | 2 +- ...itory.cs => IAdvisorTaskItemRepository.cs} | 2 +- ...tory.cs => IAdvisorWorkplaceRepository.cs} | 2 +- ...itory.cs => IExternalProductRepository.cs} | 2 +- .../Local.Services/DrawerCabinetService.cs | 12 ++-- .../CustomerInventoryReorderOverlay.razor.cs | 2 +- .../CustomerInvoiceViewOverlay.razor.cs | 2 +- .../ProductHistoryOverlay.razor.cs | 2 +- .../ProductPriceHistoryOverlay.razor.cs | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 8 +-- .../AdvisorActivityTodayListPage.razor.cs | 4 +- .../AdvisorActivityViewEditPage.razor.cs | 6 +- .../AdvisorCustomerActivityListPage.razor.cs | 4 +- .../Pages/AdvisorCustomerCreatePage.razor.cs | 2 +- .../AdvisorCustomerInventoryListPage.razor.cs | 4 +- .../AdvisorCustomerInvoiceListPage.razor.cs | 4 +- .../AdvisorCustomerPagedListPage.razor.cs | 2 +- .../AdvisorCustomerViewEditPage.razor.cs | 10 ++-- .../AdvisorCustomerWorkplaceListPage.razor.cs | 4 +- .../AdvisorCustomerWorkplaceNewPage.razor.cs | 4 +- ...isorCustomerWorkplaceRevisionPage.razor.cs | 4 +- ...isorCustomerWorkplaceViewEditPage.razor.cs | 6 +- .../Pages/AdvisorQuoteListPage.razor.cs | 8 +-- .../Pages/AdvisorReportCreatePage.razor.cs | 8 +-- .../Pages/AdvisorReportListPage.razor.cs | 4 +- .../Pages/AdvisorReportViewPage.razor.cs | 4 +- .../Pages/AdvisorTaskItemListCrmPage.razor.cs | 2 +- .../Pages/AdvisorTaskItemViewCrmPage.razor.cs | 2 +- .../Pages/OfficeOrderViewPage.razor.cs | 6 +- Wonky.Client/Program.cs | 16 ++--- Wonky.Client/wwwroot/appsettings.json | 6 +- .../wwwroot/css/{app.css => 20230607.css} | 60 ++++++++++--------- Wonky.Client/wwwroot/index.html | 2 +- 51 files changed, 161 insertions(+), 147 deletions(-) rename Wonky.Client/HttpRepository/{CrmActivityRepository.cs => AdvisorActivityRepository.cs} (96%) rename Wonky.Client/HttpRepository/{CrmContactRepository.cs => AdvisorContactRepository.cs} (93%) rename Wonky.Client/HttpRepository/{CrmCustomerHistoryRepository.cs => AdvisorCustomerHistoryRepository.cs} (95%) rename Wonky.Client/HttpRepository/{CrmCustomerRepository.cs => AdvisorCustomerRepository.cs} (97%) rename Wonky.Client/HttpRepository/{CrmSalesReportRepository.cs => AdvisorSalesReportRepository.cs} (94%) rename Wonky.Client/HttpRepository/{CrmTaskItemRepository.cs => AdvisorTaskItemRepository.cs} (93%) rename Wonky.Client/HttpRepository/{CrmWorkplaceRepository.cs => AdvisorWorkplaceRepository.cs} (96%) rename Wonky.Client/HttpRepository/{CrmPublicProductRepository.cs => ExternalProductRepository.cs} (81%) rename Wonky.Client/HttpRepository/{ICrmActivityRepository.cs => IAdvisorActivityRepository.cs} (98%) rename Wonky.Client/HttpRepository/{ICrmContactRepository.cs => IAdvisorContactRepository.cs} (97%) rename Wonky.Client/HttpRepository/{ICrmCustomerHistoryRepository.cs => IAdvisorCustomerHistoryRepository.cs} (98%) rename Wonky.Client/HttpRepository/{ICrmCustomerRepository.cs => IAdvisorCustomerRepository.cs} (98%) rename Wonky.Client/HttpRepository/{ICrmSalesReportRepository.cs => IAdvisorSalesReportRepository.cs} (97%) rename Wonky.Client/HttpRepository/{ICrmTaskItemRepository.cs => IAdvisorTaskItemRepository.cs} (97%) rename Wonky.Client/HttpRepository/{ICrmWorkplaceRepository.cs => IAdvisorWorkplaceRepository.cs} (97%) rename Wonky.Client/HttpRepository/{ICrmPublicProductRepository.cs => IExternalProductRepository.cs} (76%) rename Wonky.Client/wwwroot/css/{app.css => 20230607.css} (91%) diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor b/Wonky.Client/Components/AdvisorActivityListComponent.razor index cc12a959..5b67d98a 100644 --- a/Wonky.Client/Components/AdvisorActivityListComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor @@ -60,7 +60,7 @@ @if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { - + } @activity.ESalesNumber diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor b/Wonky.Client/Components/AdvisorCustomerListComponent.razor index 10cb1357..62b5cf61 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor @@ -21,8 +21,9 @@ - - + + + @@ -35,7 +36,10 @@ { + diff --git a/Wonky.Client/Components/ReportViewActivityListComponent.razor b/Wonky.Client/Components/ReportViewActivityListComponent.razor index e3190d5d..1fb1fe3f 100644 --- a/Wonky.Client/Components/ReportViewActivityListComponent.razor +++ b/Wonky.Client/Components/ReportViewActivityListComponent.razor @@ -60,7 +60,7 @@ diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index 905e313e..7bdd00fb 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -334,9 +334,15 @@ public static class Utils } - public static string GetVisitState(string dtNextVisit) + public static string MapOrgState(int validVat) { - if (dtNextVisit is "0001-01-01" or "1970-01-01" or "2010-01-01") + return validVat == 0 ? "no-vat" : "the-good"; + } + + + public static string MapVisitState(string dtNextVisit) + { + if (dtNextVisit is "0001-01-01" or "1970-01-01" or "2010-01-01" or "2020-01-01") return "the-draw"; if (!DateTime.TryParse(dtNextVisit, out _)) return "the-draw"; @@ -350,7 +356,7 @@ public static class Utils } - public static string GetProcessStatus(string processStatus) + public static string MapProcessStatus(string processStatus) { return processStatus.ToLower() switch { diff --git a/Wonky.Client/HttpRepository/CrmActivityRepository.cs b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs similarity index 96% rename from Wonky.Client/HttpRepository/CrmActivityRepository.cs rename to Wonky.Client/HttpRepository/AdvisorActivityRepository.cs index f95ca13c..1763857a 100644 --- a/Wonky.Client/HttpRepository/CrmActivityRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs @@ -26,7 +26,7 @@ namespace Wonky.Client.HttpRepository; /// /// Implementing Interface Activity CRM Http repository /// -public class CrmActivityRepository : ICrmActivityRepository +public class AdvisorActivityRepository : IAdvisorActivityRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions { @@ -34,12 +34,12 @@ public class CrmActivityRepository : ICrmActivityRepository }; private readonly NavigationManager _navigation; - private readonly ILogger _logger; + private readonly ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public CrmActivityRepository(HttpClient client, - ILogger logger, + public AdvisorActivityRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/CrmContactRepository.cs b/Wonky.Client/HttpRepository/AdvisorContactRepository.cs similarity index 93% rename from Wonky.Client/HttpRepository/CrmContactRepository.cs rename to Wonky.Client/HttpRepository/AdvisorContactRepository.cs index 66cde4a9..1575273b 100644 --- a/Wonky.Client/HttpRepository/CrmContactRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorContactRepository.cs @@ -22,7 +22,7 @@ using Wonky.Entity.DTO; namespace Wonky.Client.HttpRepository; -public class CrmContactRepository : ICrmContactRepository +public class AdvisorContactRepository : IAdvisorContactRepository { private readonly JsonSerializerOptions _options = new () { @@ -30,12 +30,12 @@ public class CrmContactRepository : ICrmContactRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _conf; - public CrmContactRepository(HttpClient client, - ILogger logger, + public AdvisorContactRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions apiConfig) { diff --git a/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs similarity index 95% rename from Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs rename to Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs index 68146ecf..b5a98f76 100644 --- a/Wonky.Client/HttpRepository/CrmCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs @@ -22,7 +22,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class CrmCustomerHistoryRepository : ICrmCustomerHistoryRepository +public class AdvisorCustomerHistoryRepository : IAdvisorCustomerHistoryRepository { private readonly JsonSerializerOptions _options = new JsonSerializerOptions { @@ -30,13 +30,13 @@ public class CrmCustomerHistoryRepository : ICrmCustomerHistoryRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public CrmCustomerHistoryRepository( - HttpClient client, ILogger logger, + public AdvisorCustomerHistoryRepository( + HttpClient client, ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/CrmCustomerRepository.cs b/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/CrmCustomerRepository.cs rename to Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs index 23f4b5fe..1fa1097e 100644 --- a/Wonky.Client/HttpRepository/CrmCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs @@ -27,7 +27,7 @@ using Wonky.Entity.Requests; namespace Wonky.Client.HttpRepository; -public class CrmCustomerRepository : ICrmCustomerRepository +public class AdvisorCustomerRepository : IAdvisorCustomerRepository { private readonly JsonSerializerOptions _options = new() { @@ -35,12 +35,12 @@ public class CrmCustomerRepository : ICrmCustomerRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _conf; - public CrmCustomerRepository(HttpClient client, - ILogger logger, + public AdvisorCustomerRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions apiConfig) { diff --git a/Wonky.Client/HttpRepository/CrmSalesReportRepository.cs b/Wonky.Client/HttpRepository/AdvisorSalesReportRepository.cs similarity index 94% rename from Wonky.Client/HttpRepository/CrmSalesReportRepository.cs rename to Wonky.Client/HttpRepository/AdvisorSalesReportRepository.cs index a627b3c7..f74fc532 100644 --- a/Wonky.Client/HttpRepository/CrmSalesReportRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorSalesReportRepository.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class CrmSalesReportRepository : ICrmSalesReportRepository +public class AdvisorSalesReportRepository : IAdvisorSalesReportRepository { private readonly JsonSerializerOptions _options = new JsonSerializerOptions { @@ -31,12 +31,12 @@ public class CrmSalesReportRepository : ICrmSalesReportRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public CrmSalesReportRepository(HttpClient client, - ILogger logger, + public AdvisorSalesReportRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/CrmTaskItemRepository.cs b/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs similarity index 93% rename from Wonky.Client/HttpRepository/CrmTaskItemRepository.cs rename to Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs index 876cfc93..7081b009 100644 --- a/Wonky.Client/HttpRepository/CrmTaskItemRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs @@ -22,7 +22,7 @@ using Wonky.Entity.DTO; namespace Wonky.Client.HttpRepository; -public class CrmTaskItemRepository : ICrmTaskItemRepository +public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository { private readonly JsonSerializerOptions _options = new JsonSerializerOptions { @@ -31,12 +31,12 @@ public class CrmTaskItemRepository : ICrmTaskItemRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _apiConfig; - public CrmTaskItemRepository(HttpClient client, - ILogger logger, + public AdvisorTaskItemRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/CrmWorkplaceRepository.cs b/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs similarity index 96% rename from Wonky.Client/HttpRepository/CrmWorkplaceRepository.cs rename to Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs index 94aba345..2002e855 100644 --- a/Wonky.Client/HttpRepository/CrmWorkplaceRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class CrmWorkplaceRepository : ICrmWorkplaceRepository +public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions { @@ -31,13 +31,13 @@ public class CrmWorkplaceRepository : ICrmWorkplaceRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public CrmWorkplaceRepository(HttpClient client, - ILogger logger, + public AdvisorWorkplaceRepository(HttpClient client, + ILogger logger, NavigationManager navigation, IOptions configuration) { diff --git a/Wonky.Client/HttpRepository/CrmPublicProductRepository.cs b/Wonky.Client/HttpRepository/ExternalProductRepository.cs similarity index 81% rename from Wonky.Client/HttpRepository/CrmPublicProductRepository.cs rename to Wonky.Client/HttpRepository/ExternalProductRepository.cs index 1c7c0edc..abf67546 100644 --- a/Wonky.Client/HttpRepository/CrmPublicProductRepository.cs +++ b/Wonky.Client/HttpRepository/ExternalProductRepository.cs @@ -8,7 +8,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class CrmPublicProductRepository : ICrmPublicProductRepository +public class ExternalProductRepository : IExternalProductRepository { private readonly JsonSerializerOptions? _options = new() { @@ -16,11 +16,11 @@ public class CrmPublicProductRepository : ICrmPublicProductRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public CrmPublicProductRepository(HttpClient client, ILogger logger, + public ExternalProductRepository(HttpClient client, ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/ICrmActivityRepository.cs b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs similarity index 98% rename from Wonky.Client/HttpRepository/ICrmActivityRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs index 08e97092..51f155a4 100644 --- a/Wonky.Client/HttpRepository/ICrmActivityRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface Activity CRM Http repository /// -public interface ICrmActivityRepository +public interface IAdvisorActivityRepository { /// /// Get a list of open quotes diff --git a/Wonky.Client/HttpRepository/ICrmContactRepository.cs b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/ICrmContactRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorContactRepository.cs index 803fb703..d6627c91 100644 --- a/Wonky.Client/HttpRepository/ICrmContactRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.HttpRepository; /// Interface for Contacts CRM Http repository /// /// -public interface ICrmContactRepository +public interface IAdvisorContactRepository { /// /// Create Contact diff --git a/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/IAdvisorCustomerHistoryRepository.cs similarity index 98% rename from Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorCustomerHistoryRepository.cs index 77048762..b268e33c 100644 --- a/Wonky.Client/HttpRepository/ICrmCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorCustomerHistoryRepository.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface Customer History CRM Http repository /// -public interface ICrmCustomerHistoryRepository +public interface IAdvisorCustomerHistoryRepository { /// /// Return invoice list without company information diff --git a/Wonky.Client/HttpRepository/ICrmCustomerRepository.cs b/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs similarity index 98% rename from Wonky.Client/HttpRepository/ICrmCustomerRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs index ef82bc9a..7d63daed 100644 --- a/Wonky.Client/HttpRepository/ICrmCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs @@ -22,7 +22,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface Customer CRM Http repository /// -public interface ICrmCustomerRepository +public interface IAdvisorCustomerRepository { /// /// Get a list of CRM customers (SalesRep) diff --git a/Wonky.Client/HttpRepository/ICrmSalesReportRepository.cs b/Wonky.Client/HttpRepository/IAdvisorSalesReportRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/ICrmSalesReportRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorSalesReportRepository.cs index c624886e..16d225a3 100644 --- a/Wonky.Client/HttpRepository/ICrmSalesReportRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorSalesReportRepository.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface Report Http repository /// -public interface ICrmSalesReportRepository +public interface IAdvisorSalesReportRepository { /// /// Report Exist for given data (SalesRep) diff --git a/Wonky.Client/HttpRepository/ICrmTaskItemRepository.cs b/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/ICrmTaskItemRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs index b20ef1ab..d96d5f77 100644 --- a/Wonky.Client/HttpRepository/ICrmTaskItemRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface for handling CRM Tasks http repository /// -public interface ICrmTaskItemRepository +public interface IAdvisorTaskItemRepository { /// /// Get Task List (SalesRep) diff --git a/Wonky.Client/HttpRepository/ICrmWorkplaceRepository.cs b/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/ICrmWorkplaceRepository.cs rename to Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs index 2b5e37bf..c0f89129 100644 --- a/Wonky.Client/HttpRepository/ICrmWorkplaceRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public interface ICrmWorkplaceRepository +public interface IAdvisorWorkplaceRepository { Task> GetWorkplaces(string companyId); diff --git a/Wonky.Client/HttpRepository/ICrmPublicProductRepository.cs b/Wonky.Client/HttpRepository/IExternalProductRepository.cs similarity index 76% rename from Wonky.Client/HttpRepository/ICrmPublicProductRepository.cs rename to Wonky.Client/HttpRepository/IExternalProductRepository.cs index 4b7b6a16..015b520a 100644 --- a/Wonky.Client/HttpRepository/ICrmPublicProductRepository.cs +++ b/Wonky.Client/HttpRepository/IExternalProductRepository.cs @@ -3,7 +3,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public interface ICrmPublicProductRepository +public interface IExternalProductRepository { Task> GetProducts(); } \ No newline at end of file diff --git a/Wonky.Client/Local.Services/DrawerCabinetService.cs b/Wonky.Client/Local.Services/DrawerCabinetService.cs index 1d5b730c..2b6ccf74 100644 --- a/Wonky.Client/Local.Services/DrawerCabinetService.cs +++ b/Wonky.Client/Local.Services/DrawerCabinetService.cs @@ -14,9 +14,9 @@ public class DrawerCabinetService : IDrawerCabinetService private readonly ILogger _logger; private readonly ILocalStorageService _asyncStorageService; private readonly ISyncLocalStorageService _syncStorageService; - private readonly ICrmActivityRepository _activityRepo; - private readonly ICrmCustomerRepository _customerRepo; - private readonly ICrmCustomerHistoryRepository _historyRepo; + private readonly IAdvisorActivityRepository _activityRepo; + private readonly IAdvisorCustomerRepository _customerRepo; + private readonly IAdvisorCustomerHistoryRepository _historyRepo; private readonly ICountryCatalogRepository _catalogRepo; /// @@ -34,9 +34,9 @@ public class DrawerCabinetService : IDrawerCabinetService ILocalStorageService asyncStorageService, ISyncLocalStorageService syncStorageService, ICountryCatalogRepository catalogRepo, - ICrmCustomerHistoryRepository historyRepo, - ICrmCustomerRepository customerRepo, - ICrmActivityRepository activityRepo) + IAdvisorCustomerHistoryRepository historyRepo, + IAdvisorCustomerRepository customerRepo, + IAdvisorActivityRepository activityRepo) { _logger = logger; _asyncStorageService = asyncStorageService; diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs index ed2c6d4e..a1e195dc 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs @@ -26,7 +26,7 @@ namespace Wonky.Client.OverlayCustomer; public partial class CustomerInventoryReorderOverlay { // ############################################################## - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } // ############################################################## [Parameter] public EventCallback OnSelected { get; set; } diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs index 76f75261..dc4eb63e 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs @@ -26,7 +26,7 @@ public partial class CustomerInvoiceViewOverlay : IDisposable { // ############################################################## [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } // ############################################################## [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs index 7cc88047..3c2aec0d 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.OverlayOrderCreate; public partial class ProductHistoryOverlay { // ############################################################## - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } // ############################################################## [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs index 3dee6aa6..ce7a4a86 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.OverlayOrderCreate; public partial class ProductPriceHistoryOverlay { // ############################################################## - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } // ############################################################## [Parameter] public EventCallback OnSelected { get; set; } diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 0c956b4d..1886269c 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -45,10 +45,10 @@ public partial class AdvisorActivityCreatePage : IDisposable [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } - [Inject] public ICrmCustomerRepository CompanyRepo { get; set; } - [Inject] public ICrmActivityRepository ActivityRepo { get; set; } - [Inject] public ICrmSalesReportRepository ReportRepo { get; set; } - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } + [Inject] public IAdvisorSalesReportRepository ReportRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } [Inject] public IUserInfoService UserInfo { get; set; } [Inject] public IDrawerCabinetService CabinetService { get; set; } diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index 17d9d9ba..43e161ac 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -33,8 +33,8 @@ public partial class AdvisorActivityTodayListPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ICrmActivityRepository ActivityRepo { get; set; } - [Inject] public ICrmSalesReportRepository ReportRepo { get; set; } + [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } + [Inject] public IAdvisorSalesReportRepository ReportRepo { get; set; } [Inject] public IToastService Toaster { get; set; } private ReportStatusView ReportStatusView { get; set; } = new(); private UserPreference UserPreference { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs index 85878c6b..a2da8d68 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs @@ -31,7 +31,7 @@ public partial class AdvisorActivityViewEditPage : IDisposable [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmActivityRepository CrmActivityRepo { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -49,7 +49,7 @@ public partial class AdvisorActivityViewEditPage : IDisposable Interceptor.RegisterBeforeSendEvent(); NoteContext = new EditContext(Note); NoteContext.OnFieldChanged += HandleFieldChanged; - ReportItem = await CrmActivityRepo.GetReportItem(OrderId); + ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); Note.ActivityId = ReportItem.ActivityId; Note.OfficeNote = ReportItem.OfficeNote; Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem)); @@ -66,7 +66,7 @@ public partial class AdvisorActivityViewEditPage : IDisposable Working = true; Disabled = true; Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(Note)); - await CrmActivityRepo.UpdateOfficeNote(Note); + await AdvisorActivityRepo.UpdateOfficeNote(Note); Toaster.ShowInfo($"{ReportItem.ESalesNumber} - notat opdateret"); Navigator.NavigateTo("/advisor/activity-today"); } diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs index f0d8926c..72c3c4e0 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs @@ -30,8 +30,8 @@ public partial class AdvisorCustomerActivityListPage : IDisposable { // ###################################################################### [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmActivityRepository CrmActivityRepo { get; set; } - [Inject] public ICrmCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } [Inject] public IDrawerCabinetService CabinetService { get; set; } [Inject] public ILogger Logger { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs index b00d5c18..f2a0da16 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs @@ -38,7 +38,7 @@ public partial class AdvisorCustomerCreatePage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ICrmCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public VatInfoLookupService VatService { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs index c7a35c31..557bf478 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs @@ -36,8 +36,8 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInventoryListPage : IDisposable { // ############################################################## - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public ICrmCustomerRepository CustomerRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public ILogger Logger { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index fcd92a60..af453495 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -32,9 +32,9 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable { // ############################################################## [Inject] public ILogger Logger { get; set; } - [Inject] public ICrmCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public IDrawerCabinetService CabinetService { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs index 9cde836b..5a2f8d80 100644 --- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs @@ -31,7 +31,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable // ######################################################################3 [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } - [Inject] public ICrmCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs index 51f7fcbb..f8a57e45 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs @@ -39,10 +39,10 @@ public partial class AdvisorCustomerViewEditPage : IDisposable [Inject] public IToastService Toaster { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ICrmActivityRepository ActivityRepo { get; set; } - [Inject] public ICrmCustomerRepository CustomerRepo { get; set; } - [Inject] public ICrmCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public ICrmContactRepository ContactRepo { get; set; } + [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorContactRepository ContactRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public VatInfoLookupService VatService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } @@ -172,7 +172,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /* * display urgency of next visit */ - VisitState = Utils.GetVisitState($"{NextVisit:yyyy-MM-dd}"); + VisitState = Utils.MapVisitState($"{NextVisit:yyyy-MM-dd}"); /* * handle InfoDrawer.Company out of business case */ diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerWorkplaceListPage.razor.cs index 0ae6c3b3..57cf4ce7 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceListPage.razor.cs @@ -27,8 +27,8 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerWorkplaceListPage : IDisposable { // ############################################################### - [Inject] public ICrmWorkplaceRepository WorkplaceRepo { get; set; } - [Inject] public ICrmCustomerRepository CustomerRepo { get; set; } + [Inject] public IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceNewPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerWorkplaceNewPage.razor.cs index 2830b784..867e8868 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceNewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceNewPage.razor.cs @@ -29,8 +29,8 @@ public partial class AdvisorCustomerWorkplaceNewPage : IDisposable { // ############################################################### [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmCustomerRepository CustomerRepo { get; set; } - [Inject] public ICrmWorkplaceRepository WorkplaceRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } + [Inject] public IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceRevisionPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerWorkplaceRevisionPage.razor.cs index 440c9559..81ccbb1d 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceRevisionPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceRevisionPage.razor.cs @@ -34,8 +34,8 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerWorkplaceRevisionPage : IDisposable { // ############################################################# - [Inject] public ICrmWorkplaceRepository WorkplaceRepo { get; set; } - [Inject] public ICrmPublicProductRepository PublicProductRepo { get; set; } + [Inject] public IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } + [Inject] public IExternalProductRepository PublicProductRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs index 3b65cdaf..342007d0 100644 --- a/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerWorkplaceViewEditPage.razor.cs @@ -33,9 +33,9 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerWorkplaceViewEditPage : IDisposable { // ############################################################# - [Inject] public ICrmWorkplaceRepository Workplaces { get; set; } - [Inject] public ICrmCustomerRepository CustomerRepo { get; set; } - [Inject] public ICrmWorkplaceRepository WorkplaceRepo { get; set; } + [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } + [Inject] public IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs index 7ca9602d..4b900784 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs @@ -29,7 +29,7 @@ namespace Wonky.Client.Pages; public partial class AdvisorQuoteListPage : IDisposable { - [Inject] public ICrmActivityRepository CrmActivityRepo { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -44,7 +44,7 @@ public partial class AdvisorQuoteListPage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); Working = true; - QuoteList = await CrmActivityRepo.GetQuotes(); + QuoteList = await AdvisorActivityRepo.GetQuotes(); await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name)); Working = false; // filter quotes - if any - default to QStatus.NoteOpen @@ -76,12 +76,12 @@ public partial class AdvisorQuoteListPage : IDisposable quote.OrderDate = $"{DateTime.Now:yyyy-MM-dd}"; quote.QuoteStatusEnum = Utils.EnumToString(args.Status); // send update request to backend - var response = await CrmActivityRepo.UpdateQuoteStatus(quote); + var response = await AdvisorActivityRepo.UpdateQuoteStatus(quote); Toaster.ShowInfo($"{response.Message}"); // clear and reload quotes QuoteList = new List(); await Storage.RemoveItemAsync("quotes"); - QuoteList = await CrmActivityRepo.GetQuotes(); + QuoteList = await AdvisorActivityRepo.GetQuotes(); // store quotes in local storage await Storage.SetItemAsync("quotes", QuoteList.OrderBy(x => x.Company.Name)); // filter quotes - if any - based on active filter diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 13320653..79b8e9f5 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -34,7 +34,7 @@ public partial class AdvisorReportCreatePage : IDisposable // ########################################################################## [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } - [Inject] public ICrmSalesReportRepository CrmSalesReportRepo { get; set; } + [Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -98,7 +98,7 @@ public partial class AdvisorReportCreatePage : IDisposable ThisWorkDate = DateTime.Parse(WorkDate); } - if (await CrmSalesReportRepo.ReportExist(WorkDate)) + if (await AdvisorSalesReportRepo.ReportExist(WorkDate)) { Navigator.NavigateTo($"/advisor/reports/view/{ThisWorkDate:yyyy-MM-dd}"); } @@ -136,7 +136,7 @@ public partial class AdvisorReportCreatePage : IDisposable InitialValues = new ReportFiguresDto(); Activities = new List(); - var data = await CrmSalesReportRepo.InitializeReportData(WorkDate); + var data = await AdvisorSalesReportRepo.InitializeReportData(WorkDate); if(data.ReportClosed) Navigator.NavigateTo($"/advisor/reports/view/{ThisWorkDate:yyyy-MM-dd}"); @@ -204,7 +204,7 @@ public partial class AdvisorReportCreatePage : IDisposable return; Working = true; - var result = await CrmSalesReportRepo.CreateReport(WorkDate, Report); + var result = await AdvisorSalesReportRepo.CreateReport(WorkDate, Report); Logger.LogDebug("CreateReport.result => {}", JsonSerializer.Serialize(result)); // reset km and date confirmation diff --git a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs index 688a78d3..90226444 100644 --- a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs @@ -24,7 +24,7 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportListPage : IDisposable { - [Inject] public ICrmSalesReportRepository CrmSalesReportRepo { get; set; } + [Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } @@ -39,7 +39,7 @@ public partial class AdvisorReportListPage : IDisposable Working = true; - var reports = await CrmSalesReportRepo.GetReports(); + var reports = await AdvisorSalesReportRepo.GetReports(); if (reports.Any()) ReportList = reports.OrderByDescending(x => x.ReportDate).ToList(); diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index fcea1381..fb27f150 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -30,7 +30,7 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportViewPage : IDisposable { [Parameter] public string ReportDate { get; set; } - [Inject] public ICrmSalesReportRepository CrmSalesReportRepo { get; set; } + [Inject] public IAdvisorSalesReportRepository AdvisorSalesReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } @@ -106,7 +106,7 @@ public partial class AdvisorReportViewPage : IDisposable Working = true; // fetch report - Report = await CrmSalesReportRepo.GetReport(workDate); + Report = await AdvisorSalesReportRepo.GetReport(workDate); // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index 07114053..89941c8e 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -30,7 +30,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ICrmTaskItemRepository TaskRepo { get; set; } + [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } [Inject] public IToastService Toaster { get; set; } private UserPreference Profile { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; diff --git a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs index 62f16620..b5e3a969 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs @@ -28,7 +28,7 @@ public partial class AdvisorTaskItemViewCrmPage : IDisposable { [Parameter] public string TaskItemId { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmTaskItemRepository TaskRepo { get; set; } + [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } private TaskItemDto TaskItem { get; set; } = new (); private EditContext TaskContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index 081dc7fa..83765895 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -32,7 +32,7 @@ public partial class OfficeOrderViewPage : IDisposable { // ############################################################# [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ICrmActivityRepository CrmActivityRepo { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public ISystemSendMailService MailService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICountryUserInfoRepository UserRepo { get; set; } @@ -59,7 +59,7 @@ public partial class OfficeOrderViewPage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // fetch order from backend - ReportItem = await CrmActivityRepo.GetReportItem(OrderId); + ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem, _options)); Working = false; } @@ -75,7 +75,7 @@ public partial class OfficeOrderViewPage : IDisposable Working = true; Logger.LogDebug("GetExpressState => {}", JsonSerializer.Serialize(ReportItem, _options)); // send request to backend - var responseView = await CrmActivityRepo.GetExpressState(ReportItem.ActivityId); + var responseView = await AdvisorActivityRepo.GetExpressState(ReportItem.ActivityId); Logger.LogDebug("SetExpressState => responseView <= {} ", JsonSerializer.Serialize(responseView)); // get user info from storage var user = await UserInfoService.GetUserInfo(); diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index a276b8e0..2fcd2b14 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -59,14 +59,14 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); // crm repositories -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); // administrative repositories builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index c244bb5f..6d7c7645 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,9 +1,9 @@ { "appInfo": { "name": "Wonky Online", - "version": "162.0", + "version": "163.0", "rc": true, - "sandBox": false, + "sandBox": true, "image": "grumpy-coder.png" }, "Logging": { @@ -19,7 +19,7 @@ } }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://eta.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/20230607.css similarity index 91% rename from Wonky.Client/wwwroot/css/app.css rename to Wonky.Client/wwwroot/css/20230607.css index 51c31306..f18e6ce2 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/20230607.css @@ -41,11 +41,11 @@ a, .btn-link { color: #0071c1; } -.btn-primary { - color: #fff; - background-color: #1b6ec2; - border-color: #1861ac; -} +/*.btn-primary {*/ +/* color: #fff;*/ +/* background-color: #1b6ec2;*/ +/* border-color: #1861ac;*/ +/*}*/ .inno { color: #ffaa00; @@ -82,27 +82,6 @@ a, .btn-link { min-width: 16px; min-height: 16px; } -.the-good-bg { - background-color: green; -} -.the-bad-bg { - background-color: orange; -} -.the-ugly-bg { - background-color: #ff0000; -} -.the-draw-bg { - background-color: #9b02fc; -} -.no-vat-bg { - background-color: red; -} -.the-dead-bg { - background-color: #0dcaf0; -} -.the-fast { - color: orange; -} .the-good { color: green; } @@ -110,11 +89,36 @@ a, .btn-link { color: orange; } .the-ugly { - color: #ff0000; + color: red; } .the-dead { - color: #0dcaf0; + color: black; } +.the-fast { + color: orange; +} +.the-draw { + color: mediumpurple; +} +.the-good-bg { + background-color: green; +} +.the-bad-bg { + background-color: orange; +} +.the-ugly-bg { + background-color: red; +} +.the-draw-bg { + background-color: mediumpurple; +} +.no-vat-bg { + background-color: lightskyblue; +} +.the-dead-bg { + background-color: black; +} + /* end state elements */ diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 7b85f5c5..a04ff0c2 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -17,7 +17,7 @@ - +
BS Navn Konto Tlf
- + + + @if (!string.IsNullOrWhiteSpace(company.Note)) diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index 37689bc0..d1355f81 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -39,7 +39,7 @@
Telefon
@company.Phone
Besøg
-
@company.LastVisit
+
@company.LastVisit
Adresse
diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor b/Wonky.Client/Components/OfficeReportActivityListComponent.razor index 35abbaed..0d5633f2 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor @@ -60,7 +60,7 @@
@if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { - + }
@if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { - + }