diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs index 710ba07d..69872ad0 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs @@ -42,7 +42,7 @@ public partial class OfficeCountryCustomerListComponent // ****************************************************** // injects [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public ICountryActivityRepository ActivityRepo { get; set; } + [Inject] public ICountryCustomerActivityRepository CustomerActivityRepo { get; set; } // ****************************************************** // overlays @@ -67,7 +67,7 @@ public partial class OfficeCountryCustomerListComponent // call erp to crm sync before requesting invoices var newSyncDate = await HistoryRepo.RequestErpToCrmSync(CountryCode, companyId, SelectedCompany.HistorySync); await Task.Delay(500); - InvoiceList = await HistoryRepo.RequestInvoiceList(CountryCode, companyId); + InvoiceList = await HistoryRepo.GetInvoiceList(CountryCode, companyId); if(!string.IsNullOrWhiteSpace(newSyncDate)) SelectedCompany.HistorySync = newSyncDate; InvoiceListOverlay.Show(); } @@ -77,7 +77,7 @@ public partial class OfficeCountryCustomerListComponent // check for console manipulation if (!Utils.Validate(ValidateType.Id, companyId)) return; SelectedCompany = CompanyList.First(x => x.CompanyId == companyId); - ActivityList = await ActivityRepo.RequestActivityList(companyId); + ActivityList = await CustomerActivityRepo.GetActivityList(companyId); ActivityListOverlay.Show(); } @@ -90,7 +90,7 @@ public partial class OfficeCountryCustomerListComponent var newSyncDate = await HistoryRepo.RequestErpToCrmSync(CountryCode, companyId, SelectedCompany.HistorySync); await Task.Delay(500); if(!string.IsNullOrWhiteSpace(newSyncDate)) SelectedCompany.HistorySync = newSyncDate; - ProductList = await HistoryRepo.RequestInventory(SelectedCompany.CountryCode, SelectedCompany.CompanyId); + ProductList = await HistoryRepo.GetInventory(SelectedCompany.CountryCode, SelectedCompany.CompanyId); ProductListOverlay.Show(); } diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index 685ab1eb..b179a7f3 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -39,7 +39,7 @@ public static class Utils new (){ Name = "Advisor", Assigned = model.Advisor}, new (){ Name = "EDoc", Assigned = model.EDoc}, new (){ Name = "EShop", Assigned = model.EShop}, - new (){ Name = "Managment", Assigned = model.Management}, + new (){ Name = "Management", Assigned = model.Management}, new (){ Name = "Office", Assigned = model.Office}, new (){ Name = "Supervisor", Assigned = model.Supervisor}, new (){ Name = "Warehouse", Assigned = model.Warehouse} diff --git a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs index 10405db9..1763857a 100644 --- a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs @@ -58,9 +58,11 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository if (!result.IsSuccessStatusCode) return new List(); var content = await result.Content.ReadAsStringAsync(); - return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); + if (string.IsNullOrWhiteSpace(content)) + { + return new List(); + } + return JsonSerializer.Deserialize>(content, _options) ?? new List(); } /// @@ -70,11 +72,22 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// public async Task UpdateQuoteStatus(ReportItemView activity) { + var resp = new ApiResponseView + { + Code = 404, + IsSuccess = false, + Message = "", + Id = "" + }; var response = await _client.PutAsJsonAsync( $"{_api.CrmActivities}/quote/{activity.ActivityId}", activity, _options); var content = await response.Content.ReadAsStringAsync(); + if (string.IsNullOrWhiteSpace(content)) + { + return resp; + } _logger.LogDebug("UpdateQuote Response Content <= {}", content); - return JsonSerializer.Deserialize(content, _options); + return JsonSerializer.Deserialize(content, _options) ?? resp; } /// diff --git a/Wonky.Client/HttpRepository/CountryActivityRepository.cs b/Wonky.Client/HttpRepository/CountryActivityRepository.cs index 9c896f17..5942cd0b 100644 --- a/Wonky.Client/HttpRepository/CountryActivityRepository.cs +++ b/Wonky.Client/HttpRepository/CountryActivityRepository.cs @@ -23,9 +23,6 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -/// -/// Implementing Interface Activity CRM Http repository -/// public class CountryActivityRepository : ICountryActivityRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions @@ -38,6 +35,7 @@ public class CountryActivityRepository : ICountryActivityRepository private readonly HttpClient _client; private readonly ApiConfig _api; + public CountryActivityRepository(HttpClient client, ILogger logger, NavigationManager navigation, IOptions configuration) @@ -48,40 +46,27 @@ public class CountryActivityRepository : ICountryActivityRepository _api = configuration.Value; } - /// - /// Get activity data by id - /// - /// - /// - public async Task RequestActivity(string activityId) + + public async Task GetActivity(string activityId) { var activity = await _client - .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); - return activity ?? new ActivityDto(); + .GetFromJsonAsync($"{_api.OfficeActivities}/id/{activityId}"); + + return activity ?? new ReportItemView(); } - /// - /// Get activities for customer Id - /// - /// - /// - public async Task> RequestActivityList(string customerId) + + public async Task> GetActivityList(string companyId) { - var response = await _client.GetAsync($"{_api.CrmActivities}/company/{customerId}"); + var response = await _client.GetAsync($"{_api.OfficeActivities}/company/{companyId}"); + var content = await response.Content.ReadAsStringAsync(); - if (!response.IsSuccessStatusCode) + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { return new List(); - return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); - } - - public async Task CreatePhoneOrder(string customerId, ActivityDto activity) - { - var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}/{activity.CountryCode}/id/{customerId}/activities", activity); - var content = await response.Content.ReadAsStringAsync(); - return string.IsNullOrWhiteSpace(content) - ? new ApiResponseView { Code = 0, Id = "", IsSuccess = false, Message = "Ukendt fejl er opstået." } - : JsonSerializer.Deserialize(content, _options); + } + + return JsonSerializer.Deserialize>(content, _options) ?? new List(); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/CountryCustomerActivityRepository.cs b/Wonky.Client/HttpRepository/CountryCustomerActivityRepository.cs new file mode 100644 index 00000000..88745f79 --- /dev/null +++ b/Wonky.Client/HttpRepository/CountryCustomerActivityRepository.cs @@ -0,0 +1,86 @@ +// 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.Net.Http.Json; +using System.Text.Json; +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Options; +using Wonky.Entity.Configuration; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public class CountryCustomerActivityRepository : ICountryCustomerActivityRepository +{ + private readonly JsonSerializerOptions? _options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + + private readonly NavigationManager _navigation; + private readonly ILogger _logger; + private readonly HttpClient _client; + private readonly ApiConfig _api; + + + public CountryCustomerActivityRepository(HttpClient client, + ILogger logger, + NavigationManager navigation, IOptions configuration) + { + _client = client; + _logger = logger; + _navigation = navigation; + _api = configuration.Value; + } + + + public async Task GetActivity(string activityId) + { + var activity = await _client + .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); + + return activity ?? new ActivityDto(); + } + + + public async Task> GetActivityList(string customerId) + { + var response = await _client.GetAsync($"{_api.CrmActivities}/company/{customerId}"); + + var content = await response.Content.ReadAsStringAsync(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { + return new List(); + } + + return JsonSerializer.Deserialize>(content, _options) ?? new List(); + } + + + public async Task PostPhoneOrder(string customerId, ActivityDto activity) + { + var respView = new ApiResponseView + { Code = 0, Id = "", IsSuccess = false, Message = "Ukendt fejl er opstået." }; + var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}/{activity.CountryCode}/id/{customerId}/activities", activity); + var content = await response.Content.ReadAsStringAsync(); + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { + return respView; + } + return JsonSerializer.Deserialize(content, _options) ?? respView; + } +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs index 89891423..3c51ad5c 100644 --- a/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs +++ b/Wonky.Client/HttpRepository/CountryCustomerHistoryRepository.cs @@ -44,109 +44,104 @@ public class CountryCustomerHistoryRepository : ICountryCustomerHistoryRepositor _api = configuration.Value; } - /// - /// Fetch Invoice LIst - /// - /// - /// - /// - public async Task RequestInvoiceList(string countryCode, string companyId) + + public async Task GetInvoiceList(string countryCode, string companyId) { - var response = await _client.GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/invoices"); - - if (!response.IsSuccessStatusCode) return new InvoiceListView(); + var response = await _client + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/invoices"); var content = await response.Content.ReadAsStringAsync(); - return response.IsSuccessStatusCode - ? JsonSerializer.Deserialize(content, _options) - : new InvoiceListView(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { + return new InvoiceListView(); + } + + return JsonSerializer.Deserialize(content, _options) + ?? new InvoiceListView(); } - /// - /// Fetch given invoice for given customer - /// - /// - /// - /// - /// - public async Task FetchInvoice(string countryCode, string companyId, string invoiceId) + + public async Task GetInvoice(string countryCode, string companyId, string invoiceId) { var response = await _client .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/invoices/{invoiceId}"); - if (!response.IsSuccessStatusCode) return new InvoiceView(); + var content = await response.Content.ReadAsStringAsync(); - - return response.IsSuccessStatusCode - ? JsonSerializer.Deserialize(content, _options) - : new InvoiceView(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { + return new InvoiceView(); + } + + return JsonSerializer.Deserialize(content, _options) + ?? new InvoiceView(); } - /// - /// Fetch inventory from given customer - /// - /// - /// - /// - public async Task> RequestInventory(string countryCode, string companyId) + + public async Task> GetInventory(string countryCode, string companyId) { - var response = await _client.GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/inventory"); - if (!response.IsSuccessStatusCode) + var response = await _client + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/inventory"); + + var content = await response.Content.ReadAsStringAsync(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { return new List(); - var content = await response.Content.ReadAsStringAsync(); - return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); + } + + return JsonSerializer.Deserialize>(content, _options) + ?? new List(); } - /// - /// Fetch History for given customer - /// - /// - /// - /// - public async Task> FetchHistory(string countryCode, string companyId) + + public async Task> GetHistory(string countryCode, string companyId) { - var response = await _client.GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/products"); - - if (!response.IsSuccessStatusCode) return new List(); + var response = await _client + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/products"); var content = await response.Content.ReadAsStringAsync(); - return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); - } - /// - /// Fetch history for given customer and a given product - /// - /// - /// - /// - /// - public async Task> FetchHistorySku(string countryCode, string companyId, string sku) - { - var response = await _client.GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/products/{sku}"); - if (!response.IsSuccessStatusCode) + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { return new List(); - var content = await response.Content.ReadAsStringAsync(); - return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); + } + + return JsonSerializer.Deserialize>(content, _options) + ?? new List(); } - /// - /// RPC call to initiate remote server sync for given customer - /// - /// - /// - /// - /// + + public async Task> GetSkuHistory(string countryCode, string companyId, string sku) + { + var response = await _client + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/history/products/{sku}"); + + var content = await response.Content.ReadAsStringAsync(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { + return new List(); + } + + return JsonSerializer.Deserialize>(content, _options) + ?? new List(); + } + + public async Task RequestErpToCrmSync(string countryCode, string companyId, string syncDate) { - var x = await _client.GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/{_api.SyncRpcInvoiceExt}/{syncDate}"); - if (!x.IsSuccessStatusCode) + var response = await _client + .GetAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}/{_api.SyncRpcInvoiceExt}/{syncDate}"); + + var content = await response.Content.ReadAsStringAsync(); + + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { return string.Empty; - var content = await x.Content.ReadAsStringAsync(); + } + return content.Replace("\"", ""); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs b/Wonky.Client/HttpRepository/CountryUserInfoRepository.cs similarity index 92% rename from Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs rename to Wonky.Client/HttpRepository/CountryUserInfoRepository.cs index cf1f08ca..9d85fbcc 100644 --- a/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs +++ b/Wonky.Client/HttpRepository/CountryUserInfoRepository.cs @@ -22,7 +22,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class OfficeUserInfoRepository : IOfficeUserInfoRepository +public class CountryUserInfoRepository : ICountryUserInfoRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions { @@ -30,11 +30,11 @@ public class OfficeUserInfoRepository : IOfficeUserInfoRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public OfficeUserInfoRepository(HttpClient client, ILogger logger, + public CountryUserInfoRepository(HttpClient client, ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/HttpRepository/EvaluationRepository.cs b/Wonky.Client/HttpRepository/EvaluationRepository.cs index f4fa8b81..1de5a77b 100644 --- a/Wonky.Client/HttpRepository/EvaluationRepository.cs +++ b/Wonky.Client/HttpRepository/EvaluationRepository.cs @@ -34,7 +34,7 @@ public class EvaluationRepository : IEvaluationRepository public async Task GetManagerByUserId(string userId) { var result = await _client - .GetFromJsonAsync($"{_api.MemberEvaluation}", _options); + .GetFromJsonAsync($"{_api.MemberEvaluation}/id/manager/{userId}", _options); return result ?? new ManagerView(); } @@ -43,13 +43,13 @@ public class EvaluationRepository : IEvaluationRepository public async Task GetMemberByUserId(string userId) { var result = await _client - .GetFromJsonAsync($"{_api.MemberEvaluation}", _options); + .GetFromJsonAsync($"{_api.MemberEvaluation}/id/member/{userId}", _options); return result ?? new MemberView(); } - public async Task> GetByManager(string managerId) + public async Task> GetEvaluationsByManagerId(string managerId) { var result = await _client .GetFromJsonAsync>( @@ -59,7 +59,7 @@ public class EvaluationRepository : IEvaluationRepository } - public async Task> GetByMember(string memberId) + public async Task> GetEvaluationsByMemberId(string memberId) { var result = await _client .GetFromJsonAsync>( diff --git a/Wonky.Client/HttpRepository/ICountryActivityRepository.cs b/Wonky.Client/HttpRepository/ICountryActivityRepository.cs index b5101d28..48580a18 100644 --- a/Wonky.Client/HttpRepository/ICountryActivityRepository.cs +++ b/Wonky.Client/HttpRepository/ICountryActivityRepository.cs @@ -18,24 +18,9 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -/// -/// Interface Activity CRM Http repository -/// public interface ICountryActivityRepository { - /// - /// Get activity data by id - /// - /// - /// - Task RequestActivity(string activityId); - - /// - /// Get activities for customer Id - /// - /// - /// - Task> RequestActivityList(string customerId); + Task GetActivity(string activityId); - Task CreatePhoneOrder(string customerId, ActivityDto activity); + Task> GetActivityList(string companyId); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeCatalogRepository.cs b/Wonky.Client/HttpRepository/ICountryCatalogRepository.cs similarity index 100% rename from Wonky.Client/HttpRepository/IOfficeCatalogRepository.cs rename to Wonky.Client/HttpRepository/ICountryCatalogRepository.cs diff --git a/Wonky.Client/HttpRepository/ICountryCustomerActivityRepository.cs b/Wonky.Client/HttpRepository/ICountryCustomerActivityRepository.cs new file mode 100644 index 00000000..c85c9320 --- /dev/null +++ b/Wonky.Client/HttpRepository/ICountryCustomerActivityRepository.cs @@ -0,0 +1,28 @@ +// 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.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public interface ICountryCustomerActivityRepository +{ + Task GetActivity(string activityId); + + Task> GetActivityList(string customerId); + + Task PostPhoneOrder(string customerId, ActivityDto activity); +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ICountryCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/ICountryCustomerHistoryRepository.cs new file mode 100644 index 00000000..564a8e0a --- /dev/null +++ b/Wonky.Client/HttpRepository/ICountryCustomerHistoryRepository.cs @@ -0,0 +1,33 @@ +// 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.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public interface ICountryCustomerHistoryRepository +{ + Task GetInvoiceList(string countryCode, string companyId); + + Task GetInvoice(string countryCode, string companyId, string invoiceId); + + Task> GetInventory(string countryCode, string companyId); + + Task> GetHistory(string countryCode, string companyId); + + Task> GetSkuHistory(string countryCode, string companyId, string sku); + + Task RequestErpToCrmSync(string countryCode, string companyId, string syncDate); +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs b/Wonky.Client/HttpRepository/ICountryCustomerRepository.cs similarity index 100% rename from Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs rename to Wonky.Client/HttpRepository/ICountryCustomerRepository.cs diff --git a/Wonky.Client/HttpRepository/IOfficeReportRepository.cs b/Wonky.Client/HttpRepository/ICountryReportRepository.cs similarity index 100% rename from Wonky.Client/HttpRepository/IOfficeReportRepository.cs rename to Wonky.Client/HttpRepository/ICountryReportRepository.cs diff --git a/Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs b/Wonky.Client/HttpRepository/ICountryUserInfoRepository.cs similarity index 97% rename from Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs rename to Wonky.Client/HttpRepository/ICountryUserInfoRepository.cs index 3cebd1ba..4d5ed643 100644 --- a/Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs +++ b/Wonky.Client/HttpRepository/ICountryUserInfoRepository.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.HttpRepository; /// /// Interface for User handling over http /// -public interface IOfficeUserInfoRepository +public interface ICountryUserInfoRepository { /// /// Get Users diff --git a/Wonky.Client/HttpRepository/IEvaluationRepository.cs b/Wonky.Client/HttpRepository/IEvaluationRepository.cs index acc93398..9868f57b 100644 --- a/Wonky.Client/HttpRepository/IEvaluationRepository.cs +++ b/Wonky.Client/HttpRepository/IEvaluationRepository.cs @@ -7,8 +7,8 @@ public interface IEvaluationRepository { Task GetManagerByUserId(string userId); Task GetMemberByUserId(string userId); - Task> GetByManager(string managerId); - Task> GetByMember(string memberId); + Task> GetEvaluationsByManagerId(string managerId); + Task> GetEvaluationsByMemberId(string memberId); Task GetById(string evaluationId); Task CreateEvaluation(EvaluationEditView evaluationEditView); Task UpdateEvaluation(string evaluationId, EvaluationEditView evaluationEditView); diff --git a/Wonky.Client/HttpRepository/IOfficeCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/IOfficeCustomerHistoryRepository.cs deleted file mode 100644 index 01e016f5..00000000 --- a/Wonky.Client/HttpRepository/IOfficeCustomerHistoryRepository.cs +++ /dev/null @@ -1,69 +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.Entity.Views; - -namespace Wonky.Client.HttpRepository; - -/// -/// Interface Customer History CRM Http repository -/// -public interface ICountryCustomerHistoryRepository -{ - /// - /// Fetch Invoice LIst - /// - /// - /// - Task RequestInvoiceList(string countryCode, string companyId); - - /// - /// Fetch given invoice for given customer - /// - /// - /// - /// - Task FetchInvoice(string countryCode, string companyId, string invoiceId); - - /// - /// Fetch inventory from given customer - /// - /// - /// - Task> RequestInventory(string countryCode, string companyId); - - /// - /// Fetch History for given customer - /// - /// - /// - Task> FetchHistory(string countryCode, string companyId); - - /// - /// Fetch history for given customer and a given product - /// - /// - /// - /// - Task> FetchHistorySku(string countryCode, string companyId, string sku); - - /// - /// RPC call to initiate remote server sync for given customer - /// - /// - /// - /// - Task RequestErpToCrmSync(string countryCode, string companyId, string syncDate); -} \ No newline at end of file diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs index 43768e75..ac88d156 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs @@ -42,7 +42,7 @@ public partial class OfficeCustomerInventoryReorderOverlay if (string.IsNullOrWhiteSpace(SalesItem.Sku)) return; - History = await HistoryRepo.FetchHistorySku(Company.CountryCode, Company.CompanyId, SalesItem.Sku); + History = await HistoryRepo.GetSkuHistory(Company.CountryCode, Company.CompanyId, SalesItem.Sku); // if (!History.Any()) // await Task.Delay(500); SelectedItem.Item = SalesItem; diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs index 4698cda3..cd6e92c6 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs @@ -41,7 +41,7 @@ public partial class OfficeCustomerInvoiceViewOverlay : IDisposable if (!string.IsNullOrWhiteSpace(InvoiceId)) { - Invoice = await HistoryRepo.FetchInvoice( CountryCode, CompanyId, InvoiceId); + Invoice = await HistoryRepo.GetInvoice( CountryCode, CompanyId, InvoiceId); } } diff --git a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs index 2c0b9c98..119cba3c 100644 --- a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs @@ -42,7 +42,7 @@ public partial class OfficeOrderInventoryReorderOverlay if (string.IsNullOrWhiteSpace(SalesItem.Sku)) return; - ProductHistory = await HistoryRepo.FetchHistorySku(Company.CountryCode, Company.CompanyId, SalesItem.Sku); + ProductHistory = await HistoryRepo.GetSkuHistory(Company.CountryCode, Company.CompanyId, SalesItem.Sku); if (!ProductHistory.Any()) await Task.Delay(250); SelectedItem.Item = SalesItem; diff --git a/Wonky.Client/Pages/ManagerEvaluationListPage.razor b/Wonky.Client/Pages/ManagerEvaluationListPage.razor index 3b684cea..19d0ecc6 100644 --- a/Wonky.Client/Pages/ManagerEvaluationListPage.razor +++ b/Wonky.Client/Pages/ManagerEvaluationListPage.razor @@ -16,7 +16,7 @@ @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Management,Supervisor")] -@page "/management/members/{UserId}/evaluations" +@page "/supervisor/members/{UserId}/evaluations" Evalueringer @@ -26,7 +26,7 @@
- Opret Evaluering + Opret Evaluering @*
public string OfficeBase { get; set; } = ""; + /// + /// Office activity url + /// + public string OfficeActivities { get; set; } = ""; + /// /// Application uri for administration of sales representatives ///