diff --git a/Wonky.Client/App.razor b/Wonky.Client/App.razor index 59adcbee..a1252801 100644 --- a/Wonky.Client/App.razor +++ b/Wonky.Client/App.razor @@ -13,6 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ +@using Wonky.Client.Pages @@ -30,7 +31,7 @@ - + diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs index 97025e6e..438648c7 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs @@ -29,7 +29,7 @@ namespace Wonky.Client.Components; public partial class AdvisorCustomerListComponent { - [Parameter] public List CompanyList { get; set; } = new(); + [Parameter] public List CompanyList { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } [Inject] public NavigationManager Navigator { get; set; } diff --git a/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor b/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor index b90c0f25..91ab1cba 100644 --- a/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor @@ -87,6 +87,6 @@ @code{ [Parameter] - public ReportFiguresDto ReportData { get; set; } = new(); + public ReportFiguresModel ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index 7b47a3b8..80ad87e5 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -32,7 +32,7 @@ public partial class CatalogGroupComponent private async Task OnSelectionChanged(ChangeEventArgs e) { - var val = e.Value.ToString(); + var val = e.Value!.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); } diff --git a/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor.cs b/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor.cs index c56454b8..9b7da14d 100644 --- a/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeCountryAdvisorListComponent.razor.cs @@ -15,10 +15,11 @@ using Microsoft.AspNetCore.Components; using Wonky.Entity.DTO; +using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class OfficeCountryAdvisorListComponent { - [Parameter] public List UserList { get; set; } = new(); + [Parameter] public List UserList { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs index 41ee66d9..3e9d9d9a 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs @@ -34,7 +34,7 @@ public partial class OfficeCountryCustomerListComponent // ****************************************************** // parameters [Parameter] public string CountryCode { get; set; } = ""; - [Parameter] public List CompanyList { get; set; } = new(); + [Parameter] public List CompanyList { get; set; } = new(); // [Parameter] public EventCallback OnOrderItem { get; set; } [CascadingParameter] public DraftStateProvider DraftProvider { get; set; } @@ -54,7 +54,7 @@ public partial class OfficeCountryCustomerListComponent private InvoiceListView InvoiceList { get; set; } = new(); private List ActivityList { get; set; } = new(); private List ProductList { get; set; } = new(); - private CompanyDto SelectedCompany { get; set; } = new(); + private CompanyModel SelectedCompany { get; set; } = new(); // ****************************************************** // functions diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor b/Wonky.Client/Components/OfficeReportActivityListComponent.razor index 633379ca..35abbaed 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor @@ -15,7 +15,7 @@ @using Wonky.Client.Helpers -@using Wonky.Client.Helpers + @if (ActivityList.Any()) { diff --git a/Wonky.Client/Components/ReportActivityLedgerComponent.razor b/Wonky.Client/Components/ReportActivityLedgerComponent.razor index 980a2ff3..f5b0f8e9 100644 --- a/Wonky.Client/Components/ReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/ReportActivityLedgerComponent.razor @@ -21,7 +21,7 @@ - + @@ -40,47 +40,47 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - - - + + + + + + + +
Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount)Dagens Demo @(ReportDataView.NewDemoCount + ReportDataView.RecallDemoCount) Dagens Resultat Måneds Resultat
N@ReportData.NewVisitCount@ReportData.NewDemoCount@ReportData.NewSaleCount@ReportData.NewTurnover@ReportData.NewVisitCountMonth@ReportData.NewDemoCountMonth@ReportData.NewSaleCountMonth@ReportData.NewTurnoverMonth@ReportDataView.NewVisitCount@ReportDataView.NewDemoCount@ReportDataView.NewSaleCount@ReportDataView.NewTurnover@ReportDataView.NewVisitCountMonth@ReportDataView.NewDemoCountMonth@ReportDataView.NewSaleCountMonth@ReportDataView.NewTurnoverMonth
R@ReportData.RecallVisitCount@ReportData.RecallDemoCount@ReportData.RecallSaleCount@ReportData.RecallTurnover@ReportData.RecallVisitCountMonth@ReportData.RecallDemoCountMonth@ReportData.RecallSaleCountMonth@ReportData.RecallTurnoverMonth@ReportDataView.RecallVisitCount@ReportDataView.RecallDemoCount@ReportDataView.RecallSaleCount@ReportDataView.RecallTurnover@ReportDataView.RecallVisitCountMonth@ReportDataView.RecallDemoCountMonth@ReportDataView.RecallSaleCountMonth@ReportDataView.RecallTurnoverMonth
SAS @ReportData.SasCount@ReportData.SasTurnover@ReportDataView.SasCount@ReportDataView.SasTurnover @ReportData.SasCountMonth@ReportData.SasTurnoverMonth@ReportDataView.SasCountMonth@ReportDataView.SasTurnoverMonth
TOTAL@ReportData.TotalVisitCount@ReportData.TotalDemoCount@ReportData.TotalSaleCount@ReportData.TotalTurnover@ReportData.TotalVisitCountMonth@ReportData.TotalDemoCountMonth@ReportData.TotalSaleCountMonth@ReportData.TotalTurnoverMonth@ReportDataView.TotalVisitCount@ReportDataView.TotalDemoCount@ReportDataView.TotalSaleCount@ReportDataView.TotalTurnover@ReportDataView.TotalVisitCountMonth@ReportDataView.TotalDemoCountMonth@ReportDataView.TotalSaleCountMonth@ReportDataView.TotalTurnoverMonth
@@ -88,5 +88,5 @@ @code{ - [Parameter] public ReportData ReportData { get; set; } = new(); + [Parameter] public ReportDataView ReportDataView { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor index aa7f6b5a..7a5f26f6 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor +++ b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor @@ -26,27 +26,27 @@ Aften - @ReportData.KmEvening + @ReportDataView.KmEvening Morgen - @ReportData.KmMorning + @ReportDataView.KmMorning Kørt Dag - @ReportData.Distance + @ReportDataView.Distance Kørt Md. - @ReportData.DistanceMonth + @ReportDataView.DistanceMonth Privat - @ReportData.DistancePrivate + @ReportDataView.DistancePrivate Privat Md. - @ReportData.DistancePrivateMonth + @ReportDataView.DistancePrivateMonth diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs index c442fb0c..ae4780a5 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs +++ b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs @@ -20,6 +20,6 @@ namespace Wonky.Client.Components; public partial class ReportDistanceLedgerComponent { - [Parameter] public ReportData ReportData { get; set; } = new(); + [Parameter] public ReportDataView ReportDataView { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportSummaryComponent.razor index 28cde7b2..9522f015 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor +++ b/Wonky.Client/Components/ReportSummaryComponent.razor @@ -24,20 +24,20 @@ Beskrivelse - @ReportData.Description + @ReportDataView.Description Supervisor - @ReportData.SupervisedBy + @ReportDataView.SupervisedBy Dækkende @{ - switch (ReportData.DayTypeEnum) + switch (ReportDataView.DayTypeEnum) { case "Sales": - Salgsdag @ReportData.SalesDayNumber + Salgsdag @ReportDataView.SalesDayNumber break; case "SickLeave": Sygefravær @@ -65,16 +65,16 @@ Periode @{ - switch (ReportData.DayTypeEnum) + switch (ReportDataView.DayTypeEnum) { case "Sales": - @(ReportData.FromDateTime.Split(" ")[1]) + @(ReportDataView.FromDateTime.Split(" ")[1]) break; case "SickLeave": - @(ReportData.FromDateTime.Split(" ")[0]) + @(ReportDataView.FromDateTime.Split(" ")[0]) break; case "Leave": - @(ReportData.FromDateTime.Split(" ")[0]) + @(ReportDataView.FromDateTime.Split(" ")[0]) break; case "Office": @@ -90,16 +90,16 @@ @{ - switch (ReportData.DayTypeEnum) + switch (ReportDataView.DayTypeEnum) { case "Sales": - @(ReportData.ToDateTime.Split(" ")[1]) + @(ReportDataView.ToDateTime.Split(" ")[1]) break; case "SickLeave": - @(ReportData.ToDateTime.Split(" ")[0]) + @(ReportDataView.ToDateTime.Split(" ")[0]) break; case "Leave": - @(ReportData.ToDateTime.Split(" ")[0]) + @(ReportDataView.ToDateTime.Split(" ")[0]) break; case "Office": diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor.cs b/Wonky.Client/Components/ReportSummaryComponent.razor.cs index 7393374a..e5eb118b 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor.cs +++ b/Wonky.Client/Components/ReportSummaryComponent.razor.cs @@ -21,6 +21,6 @@ namespace Wonky.Client.Components; public partial class ReportSummaryComponent { - [Parameter] public ReportData ReportData { get; set; } = new(); + [Parameter] public ReportDataView ReportDataView { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor.cs b/Wonky.Client/Components/TaskItemTableComponent.razor.cs index 51359c2b..fb85bc7e 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor.cs +++ b/Wonky.Client/Components/TaskItemTableComponent.razor.cs @@ -24,7 +24,7 @@ namespace Wonky.Client.Components; public partial class TaskItemTableComponent { - [Parameter] public List TaskItemList { get; set; } = new(); + [Parameter] public List TaskItemList { get; set; } = new(); [Parameter] public EventCallback OnDeleteTask { get; set; } [Parameter] public EventCallback OnCompleteTask { get; set; } [Parameter] public EventCallback OnTaskCompleted { get; set; } diff --git a/Wonky.Client/Helpers/CustomerValidator.cs b/Wonky.Client/Helpers/CustomerValidator.cs index 4b43bf94..030b718c 100644 --- a/Wonky.Client/Helpers/CustomerValidator.cs +++ b/Wonky.Client/Helpers/CustomerValidator.cs @@ -22,9 +22,9 @@ internal interface IValidator bool Validate(T t); } -public class CustomerValidator : IValidator +public class CustomerValidator : IValidator { - public bool Validate(CompanyDto t) + public bool Validate(CompanyModel t) { if (string.IsNullOrWhiteSpace(t.Name) || string.IsNullOrWhiteSpace(t.ZipCode) diff --git a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs index 09fa805a..c34059ac 100644 --- a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs +++ b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs @@ -50,7 +50,7 @@ public class HttpInterceptorService public void RegisterEvent() { - _interceptor.AfterSend += AfterSend; + _interceptor.AfterSend += AfterSend!; } public void RegisterBeforeSendEvent() @@ -60,7 +60,7 @@ public class HttpInterceptorService public void DisposeEvent() { - _interceptor.AfterSend -= AfterSend; + _interceptor.AfterSend -= AfterSend!; _interceptor.BeforeSendAsync -= InterceptBeforeSend; } diff --git a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs index f5a652e3..b0c12ab4 100644 --- a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs @@ -82,7 +82,7 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// /// /// - public async Task CreateActivity(ActivityDto model) + public async Task CreateActivity(ActivityModel model) { var response = await _client.PostAsJsonAsync($"{_api.CrmActivities}", model, _options); var content = await response.Content.ReadAsStringAsync(); @@ -115,11 +115,11 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// /// /// - public async Task GetActivity(string activityId) + public async Task GetActivity(string activityId) { var salesItem = await _client - .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); - return salesItem ?? new ActivityDto(); + .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); + return salesItem ?? new ActivityModel(); } /// @@ -173,7 +173,7 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// Update office note for activity /// /// - public async Task UpdateOfficeNote(ActivityOfficeNote model) + public async Task UpdateOfficeNote(ActivityOfficeNoteModel model) { await _client.PutAsJsonAsync($"{_api.CrmActivities}/note/{model.ActivityId}", model, _options); } diff --git a/Wonky.Client/HttpRepository/AdvisorContactRepository.cs b/Wonky.Client/HttpRepository/AdvisorContactRepository.cs index b848d335..5ef25ce5 100644 --- a/Wonky.Client/HttpRepository/AdvisorContactRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorContactRepository.cs @@ -50,7 +50,7 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// /// - public async Task CreateContact(ContactDto model) + public async Task CreateContact(ContactModel model) { var response = await _client.PostAsJsonAsync( $"{_conf.CrmCustomers}/{model.CompanyId}/contacts", model, _options); @@ -63,9 +63,9 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// /// - public async Task GetContact(string companyId, string contactId) + public async Task GetContact(string companyId, string contactId) { - return await _client.GetFromJsonAsync( + return await _client.GetFromJsonAsync( $"{_conf.CrmCustomers}/{companyId}/contacts/{contactId}"); } @@ -74,14 +74,14 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// /// - public async Task> GetContacts(string companyId) + public async Task> GetContacts(string companyId) { var response = await _client.GetAsync( $"{_conf.CrmCustomers}/{companyId}/contacts"); var content = await response.Content.ReadAsStringAsync(); return string.IsNullOrWhiteSpace(content) - ? new List() - : JsonSerializer.Deserialize>(content, _options); + ? new List() + : JsonSerializer.Deserialize>(content, _options); } /// /// Delete Contact @@ -100,7 +100,7 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// /// - public async Task UpdateContact(ContactDto model) + public async Task UpdateContact(ContactModel model) { await _client.PutAsJsonAsync( $"{_conf.CrmCustomers}/{model.CompanyId}/contacts/{model.ContactId}", model, _options); diff --git a/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs b/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs index f7b53ac1..c9a5e9ce 100644 --- a/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs @@ -55,7 +55,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// A paged response defined by pagingParameters - public async Task> GetCompanies(CustomerPaging pagingParameters) + public async Task> GetCompanies(CustomerPaging pagingParameters) { var queryString = new Dictionary { @@ -71,18 +71,18 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository if (!response.IsSuccessStatusCode) { - return new PagingResponse + return new PagingResponse { - Items = new List(), + Items = new List(), MetaData = new MetaData() }; } var content = await response.Content.ReadAsStringAsync(); - var pagingResponse = new PagingResponse + var pagingResponse = new PagingResponse { - Items = JsonSerializer.Deserialize>(content, _options), + Items = JsonSerializer.Deserialize>(content, _options), MetaData = JsonSerializer.Deserialize(response.Headers.GetValues("X-Pagination").First(), _options) }; @@ -94,9 +94,9 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// A CRM Company entity - public async Task GetCompanyById(string companyId) + public async Task GetCompanyById(string companyId) { - return await _client.GetFromJsonAsync($"{_conf.CrmCustomers}/{companyId}", _options); + return await _client.GetFromJsonAsync($"{_conf.CrmCustomers}/{companyId}", _options); } /// @@ -104,11 +104,11 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// The Id of the entity - public async Task CreateCompany(CompanyDto model) + public async Task CreateCompany(CompanyModel model) { var response = await _client.PostAsJsonAsync($"{_conf.CrmCustomers}", model, _options); var content = await response.Content.ReadAsStringAsync(); - var result = JsonSerializer.Deserialize(content, _options); + var result = JsonSerializer.Deserialize(content, _options); return result.CompanyId; } @@ -129,9 +129,9 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// A CRM Company entity - public async Task UpdateCrmData(string companyId, CompanyDto model) + public async Task UpdateCrmData(string companyId, CompanyModel model) { - var updateModel = new UpdateCrmDto + var updateModel = new UpdateCrmModel { Interval = model.Interval, Note = model.Note, @@ -142,7 +142,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository }; var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/crmData", updateModel, _options); var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content); + return JsonSerializer.Deserialize(content); } /// @@ -151,9 +151,9 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// A CRM Company entity - public async Task UpdateErpData(string companyId, CompanyDto model) + public async Task UpdateErpData(string companyId, CompanyModel model) { - var updateModel = new UpdateErpDto + var updateModel = new UpdateErpModel { Address1 = model.Address1, Address2 = model.Address2, @@ -168,7 +168,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/erpData", updateModel, _options); var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content); + return JsonSerializer.Deserialize(content); } /// @@ -177,7 +177,7 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// /// /// A CRM Company entity - public async Task UpdateCompanyVat(string companyId, string vatNumber) + public async Task UpdateCompanyVat(string companyId, string vatNumber) { var model = new Dictionary { @@ -185,10 +185,10 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository }; var response = await _client.PutAsJsonAsync($"{_conf.CrmCustomers}/{companyId}/vat", model, _options); if (!response.IsSuccessStatusCode) - return new CompanyDto(); + return new CompanyModel(); var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content) - ?? new CompanyDto { Name = "ERROR", VatNumber = vatNumber, CrmNotes = $"FEJL: {content}" }; + return JsonSerializer.Deserialize(content) + ?? new CompanyModel { Name = "ERROR", VatNumber = vatNumber, CrmNotes = $"FEJL: {content}" }; } // public async Task ToggleVisibility(string companyId, bool hide) diff --git a/Wonky.Client/HttpRepository/AdvisorReportRepository.cs b/Wonky.Client/HttpRepository/AdvisorReportRepository.cs index a844a93e..ea910e6a 100644 --- a/Wonky.Client/HttpRepository/AdvisorReportRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorReportRepository.cs @@ -85,23 +85,23 @@ public class AdvisorReportRepository : IAdvisorReportRepository /// /// /// - public async Task InitializeReportData(string workDate) + public async Task InitializeReportData(string workDate) { var initData = await _client - .GetFromJsonAsync($"{_api.CrmReports}/init/{workDate}"); - return initData ?? new ReportInitDto(); + .GetFromJsonAsync($"{_api.CrmReports}/init/{workDate}"); + return initData ?? new ReportInitModel(); } /// /// Create Report for given data - using reportData /// /// - /// + /// /// - public async Task CreateReport(string workDate, ReportDto reportDto) + public async Task CreateReport(string workDate, ReportModel reportModel) { var response = await _client - .PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportDto, _options); + .PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportModel, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs b/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs index d7a6a615..aba9a12f 100644 --- a/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs @@ -49,9 +49,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// Get Task List (SalesRep) /// /// - public async Task?> GetTaskList() + public async Task> GetTaskList() { - return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTasks}", _options); + return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTasks}", _options); } /// @@ -59,9 +59,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// /// /// - public async Task?> GetTaskList(string workDate) + public async Task> GetTaskList(string workDate) { - return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTasks}/date/{workDate}", _options); + return await _client.GetFromJsonAsync>($"{_apiConfig.CrmTasks}/date/{workDate}", _options); } /// @@ -69,9 +69,9 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// /// /// - public async Task GetTaskItem(string taskItemId) + public async Task GetTaskItem(string taskItemId) { - return await _client.GetFromJsonAsync($"{_apiConfig.CrmTasks}/{taskItemId}", _options); + return await _client.GetFromJsonAsync($"{_apiConfig.CrmTasks}/{taskItemId}", _options); } /// @@ -79,7 +79,7 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// /// /// - public async Task CreateTaskItem(TaskItemDto taskItem) + public async Task CreateTaskItem(TaskItemModel taskItem) { await _client.PostAsJsonAsync($"{_apiConfig.CrmTasks}", taskItem, _options); } @@ -89,7 +89,7 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// /// /// - public async Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem) + public async Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem) { await _client.PutAsJsonAsync($"{_apiConfig.CrmTasks}/{taskItemId}", taskItem, _options); } diff --git a/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs b/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs index 863e2592..dc6116b1 100644 --- a/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs @@ -64,11 +64,11 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository /// /// /// - public async Task GetWorkplace(string companyId, string workplaceId) + public async Task GetWorkplace(string companyId, string workplaceId) { - var result = await _client.GetFromJsonAsync( + var result = await _client.GetFromJsonAsync( $"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}/{workplaceId}", _options); - return result ?? new WorkplaceDto(); + return result ?? new WorkplaceModel(); } /// @@ -77,7 +77,7 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository /// /// /// - public async Task CreateWorkplace(string companyId, WorkplaceDto workplace) + public async Task CreateWorkplace(string companyId, WorkplaceModel workplace) { await _client.PostAsJsonAsync( $"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}", workplace, _options); @@ -89,7 +89,7 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository /// /// /// - public async Task UpdateWorkplace(string companyId, WorkplaceDto workplace) + public async Task UpdateWorkplace(string companyId, WorkplaceModel workplace) { await _client.PutAsJsonAsync( $"{_api.CrmCustomers}/{companyId}/{_api.CrmWorkplaceExt}/{workplace.WorkplaceId}", workplace, _options); diff --git a/Wonky.Client/HttpRepository/CountryActivityRepository.cs b/Wonky.Client/HttpRepository/CountryActivityRepository.cs index 9c896f17..189c414e 100644 --- a/Wonky.Client/HttpRepository/CountryActivityRepository.cs +++ b/Wonky.Client/HttpRepository/CountryActivityRepository.cs @@ -53,11 +53,11 @@ public class CountryActivityRepository : ICountryActivityRepository /// /// /// - public async Task RequestActivity(string activityId) + public async Task RequestActivity(string activityId) { var activity = await _client - .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); - return activity ?? new ActivityDto(); + .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); + return activity ?? new ActivityModel(); } /// @@ -76,7 +76,7 @@ public class CountryActivityRepository : ICountryActivityRepository : JsonSerializer.Deserialize>(content, _options); } - public async Task CreatePhoneOrder(string customerId, ActivityDto activity) + public async Task CreatePhoneOrder(string customerId, ActivityModel activity) { var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}/{activity.CountryCode}/id/{customerId}/activities", activity); var content = await response.Content.ReadAsStringAsync(); diff --git a/Wonky.Client/HttpRepository/CountryCustomerRepository.cs b/Wonky.Client/HttpRepository/CountryCustomerRepository.cs index 61aa060d..3a737f5c 100644 --- a/Wonky.Client/HttpRepository/CountryCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/CountryCustomerRepository.cs @@ -56,7 +56,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository /// /// /// - public async Task> GetCompaniesPaged(string countryCode, CustomerPaging paging) + public async Task> GetCompaniesPaged(string countryCode, CustomerPaging paging) { var queryString = new Dictionary { @@ -72,9 +72,9 @@ public class CountryCustomerRepository : ICountryCustomerRepository var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}", queryString)); var content = await response.Content.ReadAsStringAsync(); - var pagingResponse = new PagingResponse + var pagingResponse = new PagingResponse { - Items = JsonSerializer.Deserialize>(content, _options), + Items = JsonSerializer.Deserialize>(content, _options), MetaData = JsonSerializer.Deserialize(response.Headers.GetValues("X-Pagination").First(), _options) }; return pagingResponse; @@ -87,7 +87,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository /// /// /// - public async Task> GetCompaniesPaged(string countryCode, string salesRepId, + public async Task> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging) { var queryString = new Dictionary @@ -103,9 +103,9 @@ public class CountryCustomerRepository : ICountryCustomerRepository var response = await _client.GetAsync(QueryHelpers.AddQueryString($"{_api.OfficeCustomers}/{countryCode}/salesRep/{salesRepId}/", queryString)); var content = await response.Content.ReadAsStringAsync(); - var pagingResponse = new PagingResponse + var pagingResponse = new PagingResponse { - Items = JsonSerializer.Deserialize>(content, _options), + Items = JsonSerializer.Deserialize>(content, _options), MetaData = JsonSerializer.Deserialize(response.Headers.GetValues("X-Pagination").First(), _options) }; return pagingResponse; @@ -118,10 +118,10 @@ public class CountryCustomerRepository : ICountryCustomerRepository /// /// /// - public async Task GetByCustomerId(string countryCode, string companyId) + public async Task GetByCustomerId(string countryCode, string companyId) { - var company = await _client.GetFromJsonAsync($"{_api.OfficeCustomers}/{countryCode}/id/{companyId}"); - return company ?? new CompanyDto(); + var company = await _client.GetFromJsonAsync($"{_api.OfficeCustomers}/{countryCode}/id/{companyId}"); + return company ?? new CompanyModel(); } /// @@ -131,7 +131,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository /// /// /// - public async Task UpdateCompany(string countryCode, string companyId, CompanyDto model) + public async Task UpdateCompany(string countryCode, string companyId, CompanyModel model) { var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}", model); var content = await response.Content.ReadAsStringAsync(); diff --git a/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs index a5a8b6bd..e055498a 100644 --- a/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs @@ -41,7 +41,7 @@ public interface IAdvisorActivityRepository /// /// /// - Task CreateActivity(ActivityDto model); + Task CreateActivity(ActivityModel model); /// /// Get activities by date @@ -55,7 +55,7 @@ public interface IAdvisorActivityRepository /// /// /// - Task GetActivity(string activityId); + Task GetActivity(string activityId); /// /// Get activities for customer Id @@ -82,5 +82,5 @@ public interface IAdvisorActivityRepository /// Update office note for activity /// /// - Task UpdateOfficeNote(ActivityOfficeNote model); + Task UpdateOfficeNote(ActivityOfficeNoteModel model); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs index ccbe5822..54d2e731 100644 --- a/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs @@ -28,7 +28,7 @@ public interface IAdvisorContactRepository /// /// /// - Task CreateContact(ContactDto model); + Task CreateContact(ContactModel model); /// /// Get Contact @@ -36,14 +36,14 @@ public interface IAdvisorContactRepository /// /// /// - Task GetContact(string companyId, string contactId); + Task GetContact(string companyId, string contactId); /// /// Get Contacts /// /// /// - Task> GetContacts(string companyId); + Task> GetContacts(string companyId); /// /// Delete Contact @@ -58,5 +58,5 @@ public interface IAdvisorContactRepository /// /// /// - Task UpdateContact(ContactDto model); + Task UpdateContact(ContactModel model); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs b/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs index 3a1f0908..3a556da6 100644 --- a/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs @@ -29,21 +29,21 @@ public interface IAdvisorCustomerRepository /// /// /// A paged response defined by pagingParameters - Task> GetCompanies(CustomerPaging pagingParameters); + Task> GetCompanies(CustomerPaging pagingParameters); /// /// Get CRM customer by Id (SalesRep) /// /// /// A CRM Company entity - Task GetCompanyById(string companyId); + Task GetCompanyById(string companyId); /// /// Create Customer (SalesRep) /// /// /// The Id of the entity - Task CreateCompany(CompanyDto model); + Task CreateCompany(CompanyModel model); /// /// Delete the CRM customer (SalesRep) @@ -58,7 +58,7 @@ public interface IAdvisorCustomerRepository /// /// /// A CRM Company entity - Task UpdateCrmData(string companyId, CompanyDto model); + Task UpdateCrmData(string companyId, CompanyModel model); /// /// Update ERP customer properties (SalesRep) @@ -66,7 +66,7 @@ public interface IAdvisorCustomerRepository /// /// /// A CRM Company entity - Task UpdateErpData(string companyId, CompanyDto model); + Task UpdateErpData(string companyId, CompanyModel model); /// /// Update customer Vat Number (SalesRep) @@ -74,7 +74,7 @@ public interface IAdvisorCustomerRepository /// /// /// A CRM Company entity - Task UpdateCompanyVat(string companyId, string vatNumber); + Task UpdateCompanyVat(string companyId, string vatNumber); // Task ToggleVisibility(string companyId, bool hide); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorReportRepository.cs b/Wonky.Client/HttpRepository/IAdvisorReportRepository.cs index 299d5ce1..84448e59 100644 --- a/Wonky.Client/HttpRepository/IAdvisorReportRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorReportRepository.cs @@ -48,13 +48,13 @@ public interface IAdvisorReportRepository /// /// /// - Task InitializeReportData(string workDate); + Task InitializeReportData(string workDate); /// /// Create Report for given data - using reportData /// /// - /// + /// /// - Task CreateReport(string workDate, ReportDto reportDto); + Task CreateReport(string workDate, ReportModel reportModel); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs b/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs index d96d5f77..bf91a9b0 100644 --- a/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs @@ -26,35 +26,35 @@ public interface IAdvisorTaskItemRepository /// Get Task List (SalesRep) /// /// - Task> GetTaskList(); + Task> GetTaskList(); /// /// Get Task List for given workDate (SalesRep) /// /// /// - Task> GetTaskList(string workDate); + Task> GetTaskList(string workDate); /// /// Get Task Item by id (SalesRep) /// /// /// - Task GetTaskItem(string taskItemId); + Task GetTaskItem(string taskItemId); /// /// Create task using taskItem (SalesRep) /// /// /// - Task CreateTaskItem(TaskItemDto taskItem); + Task CreateTaskItem(TaskItemModel taskItem); /// /// Delete Task Item (SalesRep /// /// /// - Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem); + Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem); /// /// Delete Task Item (SalesRep diff --git a/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs b/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs index 56159e8c..04ebea79 100644 --- a/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs @@ -36,7 +36,7 @@ public interface IAdvisorWorkplaceRepository /// /// /// - Task GetWorkplace(string companyId, string workplaceId); + Task GetWorkplace(string companyId, string workplaceId); /// /// Create new workplace given the customer id and workplace data @@ -44,7 +44,7 @@ public interface IAdvisorWorkplaceRepository /// /// /// - Task CreateWorkplace(string companyId, WorkplaceDto workplace); + Task CreateWorkplace(string companyId, WorkplaceModel workplace); /// /// Update workplace given the customer id and updated data @@ -52,7 +52,7 @@ public interface IAdvisorWorkplaceRepository /// /// /// - Task UpdateWorkplace(string companyId, WorkplaceDto workplace); + Task UpdateWorkplace(string companyId, WorkplaceModel workplace); /// /// Delete workplace given customer id and workplace id diff --git a/Wonky.Client/HttpRepository/ICountryActivityRepository.cs b/Wonky.Client/HttpRepository/ICountryActivityRepository.cs index b5101d28..827c1cd2 100644 --- a/Wonky.Client/HttpRepository/ICountryActivityRepository.cs +++ b/Wonky.Client/HttpRepository/ICountryActivityRepository.cs @@ -28,7 +28,7 @@ public interface ICountryActivityRepository /// /// /// - Task RequestActivity(string activityId); + Task RequestActivity(string activityId); /// /// Get activities for customer Id @@ -37,5 +37,5 @@ public interface ICountryActivityRepository /// Task> RequestActivityList(string customerId); - Task CreatePhoneOrder(string customerId, ActivityDto activity); + Task CreatePhoneOrder(string customerId, ActivityModel activity); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs b/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs index b10f21ba..f5fc7a3f 100644 --- a/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs +++ b/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs @@ -30,7 +30,7 @@ public interface ICountryCustomerRepository /// /// /// - Task> GetCompaniesPaged(string countryCode, CustomerPaging paging); + Task> GetCompaniesPaged(string countryCode, CustomerPaging paging); /// /// Get customers paged for given sales rep @@ -39,7 +39,7 @@ public interface ICountryCustomerRepository /// /// /// - Task> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging); + Task> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging); /// /// Get customer by Id @@ -47,7 +47,7 @@ public interface ICountryCustomerRepository /// /// /// - Task GetByCustomerId(string countryCode, string companyId); + Task GetByCustomerId(string countryCode, string companyId); /// /// Update Company data @@ -56,5 +56,5 @@ public interface ICountryCustomerRepository /// /// /// - Task UpdateCompany(string countryCode, string companyId, CompanyDto model); + Task UpdateCompany(string countryCode, string companyId, CompanyModel model); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs b/Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs new file mode 100644 index 00000000..0e1567e1 --- /dev/null +++ b/Wonky.Client/HttpRepository/IOfficeUserInfoRepository.cs @@ -0,0 +1,50 @@ +// 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; + +/// +/// Interface for User handling over http +/// +public interface IOfficeUserInfoRepository +{ + /// + /// Get Users + /// + /// + Task> GetUsers(); + + /// + /// Get Users in role + /// + /// + Task> GetUsers(string role); + + /// + /// Get users for logged in supervisor + /// + /// + Task> GetSupervisorUsers(); + + /// + /// Get User Info for given userId + /// + /// + /// + Task GetUserInfo(string userId); +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOrderProcessRepository.cs b/Wonky.Client/HttpRepository/IOrderProcessRepository.cs index 0b0e564e..5fe97e60 100644 --- a/Wonky.Client/HttpRepository/IOrderProcessRepository.cs +++ b/Wonky.Client/HttpRepository/IOrderProcessRepository.cs @@ -48,7 +48,7 @@ public interface IOrderProcessRepository /// /// Update Order status setting new process status /// - /// + /// /// - Task UpdateWarehouseOrderStatus(OrderProcessState processState); + Task UpdateWarehouseOrderStatus(OrderProcessStateModel processStateModel); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemSendMailService.cs b/Wonky.Client/HttpRepository/ISystemSendMailService.cs index ac27f85f..20942430 100644 --- a/Wonky.Client/HttpRepository/ISystemSendMailService.cs +++ b/Wonky.Client/HttpRepository/ISystemSendMailService.cs @@ -27,7 +27,7 @@ public interface ISystemSendMailService /// Send Mail /// /// - /// + /// /// - Task SendMail(string messageType, EmailMessage message); + Task SendMail(string messageType, EmailMessageModel messageModel); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemSendSmsService.cs b/Wonky.Client/HttpRepository/ISystemSendSmsService.cs index c7867caf..0612bab0 100644 --- a/Wonky.Client/HttpRepository/ISystemSendSmsService.cs +++ b/Wonky.Client/HttpRepository/ISystemSendSmsService.cs @@ -27,7 +27,7 @@ public interface ISystemSendSmsService /// Send Mail /// /// - /// + /// /// - Task SendSms(ShortMessage message); + Task SendSms(ShortMessageModel messageModel); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemUserRepository.cs b/Wonky.Client/HttpRepository/ISystemUserRepository.cs index ae98f89c..48a68cc1 100644 --- a/Wonky.Client/HttpRepository/ISystemUserRepository.cs +++ b/Wonky.Client/HttpRepository/ISystemUserRepository.cs @@ -14,6 +14,7 @@ // using Wonky.Entity.DTO; +using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; @@ -23,32 +24,38 @@ namespace Wonky.Client.HttpRepository; public interface ISystemUserRepository { /// - /// Get Advisors (Office) + /// Get Users /// /// - Task> GetUsers(); + Task> GetUsers(); /// - /// Get Advisor Info for given userId + /// Get Users in role + /// + /// + Task> GetUsers(string role); + + /// + /// Get User Info for given userId /// /// /// - Task GetUserInfo(string userId); + Task GetUserInfo(string userId); /// - /// Update Advisor using userId and updated data + /// Update User using userId and updated data /// /// /// - Task CreateUser(UserManagerCreate model); + Task CreateUser(UserAdminCreateModel model); /// - /// Update Advisor using userId and updated data + /// Update User using userId and updated data /// /// /// /// - Task UpdateUserInfo(string userId, UserManagerEditView model); + Task UpdateUserInfo(string userId, UserAdminEditView model); /// /// Delete the user with id @@ -58,7 +65,7 @@ public interface ISystemUserRepository Task DeleteUser(string userId); /// - /// Set new user password + /// Set user user password /// /// /// diff --git a/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs b/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs new file mode 100644 index 00000000..84da6e93 --- /dev/null +++ b/Wonky.Client/HttpRepository/OfficeUserInfoRepository.cs @@ -0,0 +1,83 @@ +// 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 OfficeUserInfoRepository : IOfficeUserInfoRepository +{ + private readonly JsonSerializerOptions? _options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + + private readonly NavigationManager _navigation; + private ILogger _logger; + private readonly HttpClient _client; + private readonly ApiConfig _api; + + public OfficeUserInfoRepository(HttpClient client, ILogger logger, + NavigationManager navigation, IOptions configuration) + { + _client = client; + _logger = logger; + _navigation = navigation; + _api = configuration.Value; + } + + /// + /// Get Users + /// + /// + public async Task> GetUsers() + { + return await _client.GetFromJsonAsync>(_api.UserData); + } + + /// + /// Get Users in role + /// + /// + public async Task> GetUsers(string role) + { + return await _client.GetFromJsonAsync>($"{_api.UserData}/role/{role}"); + } + + /// + /// Get users for logged in supervisor + /// + /// + public async Task> GetSupervisorUsers() + { + return await _client.GetFromJsonAsync>($"{_api.UserData}/supervisor"); + } + + /// + /// Get Advisor Info for given userId + /// + /// + /// + public async Task GetUserInfo(string userId) + { + return await _client.GetFromJsonAsync($"{_api.UserData}/{userId}"); + } + +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/OrderProcessRepository.cs b/Wonky.Client/HttpRepository/OrderProcessRepository.cs index 0929f509..18671dcb 100644 --- a/Wonky.Client/HttpRepository/OrderProcessRepository.cs +++ b/Wonky.Client/HttpRepository/OrderProcessRepository.cs @@ -81,11 +81,11 @@ public class OrderProcessRepository : IOrderProcessRepository /// /// Update Order status setting new process status /// - /// + /// /// - public async Task UpdateWarehouseOrderStatus(OrderProcessState processState) + public async Task UpdateWarehouseOrderStatus(OrderProcessStateModel processStateModel) { - _logger.LogDebug("process => {}", JsonSerializer.Serialize(processState, _options)); - await _client.PutAsJsonAsync($"{_api.Warehouse}/{processState.OrderId}", processState, _options); + _logger.LogDebug("process => {}", JsonSerializer.Serialize(processStateModel, _options)); + await _client.PutAsJsonAsync($"{_api.Warehouse}/{processStateModel.OrderId}", processStateModel, _options); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/SystemSendMailService.cs b/Wonky.Client/HttpRepository/SystemSendMailService.cs index a58e355c..52ad3108 100644 --- a/Wonky.Client/HttpRepository/SystemSendMailService.cs +++ b/Wonky.Client/HttpRepository/SystemSendMailService.cs @@ -48,11 +48,11 @@ public class SystemSendMailService : ISystemSendMailService /// Send Mail /// /// - /// + /// /// - public async Task SendMail(string messageType, EmailMessage message) + public async Task SendMail(string messageType, EmailMessageModel messageModel) { - var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", message, _options); + var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", messageModel, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/SystemSendSmsService.cs b/Wonky.Client/HttpRepository/SystemSendSmsService.cs index 8ae5a48c..55b3cf4e 100644 --- a/Wonky.Client/HttpRepository/SystemSendSmsService.cs +++ b/Wonky.Client/HttpRepository/SystemSendSmsService.cs @@ -47,11 +47,11 @@ public class SystemSendSmsService : ISystemSendSmsService /// /// Send Mail /// - /// + /// /// - public async Task SendSms(ShortMessage message) + public async Task SendSms(ShortMessageModel messageModel) { - var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", message, _options); + var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", messageModel, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/SystemUserRepository.cs b/Wonky.Client/HttpRepository/SystemUserRepository.cs index 454347ff..663ae4eb 100644 --- a/Wonky.Client/HttpRepository/SystemUserRepository.cs +++ b/Wonky.Client/HttpRepository/SystemUserRepository.cs @@ -44,12 +44,17 @@ public class SystemUserRepository : ISystemUserRepository } /// - /// Get Advisors (Office) + /// Get Users /// /// - public async Task> GetUsers() + public async Task> GetUsers() { - return await _client.GetFromJsonAsync>(_api.UserManager); + return await _client.GetFromJsonAsync>(_api.UserManager); + } + + public async Task> GetUsers(string role) + { + return await _client.GetFromJsonAsync>($"{_api.UserRoles}/role/{role}"); } /// @@ -57,9 +62,9 @@ public class SystemUserRepository : ISystemUserRepository /// /// /// - public async Task GetUserInfo(string userId) + public async Task GetUserInfo(string userId) { - return await _client.GetFromJsonAsync($"{_api.UserManager}/{userId}"); + return await _client.GetFromJsonAsync($"{_api.UserManager}/{userId}"); } /// @@ -67,18 +72,18 @@ public class SystemUserRepository : ISystemUserRepository /// /// /// - public async Task CreateUser(UserManagerCreate model) + public async Task CreateUser(UserAdminCreateModel model) { var result = await _client.PostAsJsonAsync($"{_api.UserManager}", model, _options); if (!result.IsSuccessStatusCode) - return new UserManagerEditView(); + return new UserAdminEditView(); try { - return await result.Content.ReadFromJsonAsync(); + return await result.Content.ReadFromJsonAsync(); } catch { - return new UserManagerEditView(); + return new UserAdminEditView(); } } @@ -88,7 +93,7 @@ public class SystemUserRepository : ISystemUserRepository /// /// /// - public async Task UpdateUserInfo(string userId, UserManagerEditView model) + public async Task UpdateUserInfo(string userId, UserAdminEditView model) { await _client.PutAsJsonAsync($"{_api.UserManager}/{userId}", model, _options); } diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs index 1f7b9175..4548938b 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs @@ -38,7 +38,7 @@ public partial class CustomerInventoryListOverlay : IDisposable private string _modalDisplay = ""; private bool _showBackdrop; - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); // private List ProductList { get; set; } = new(); private DraftItem DraftItem { get; set; } = new(); private SalesItemView SalesItem { get; set; } = new(); diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs index 387a3e95..6731c144 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs @@ -22,7 +22,7 @@ namespace Wonky.Client.OverlayOffice; public partial class OfficeCustomerActivityListOverlay { - [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public CompanyModel Company { get; set; } = new(); [Parameter] public List ActivityList { get; set; } = new(); private string _modalDisplay = ""; diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs index 43768e75..ca6d5daa 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs @@ -26,7 +26,7 @@ namespace Wonky.Client.OverlayOffice; public partial class OfficeCustomerInventoryReorderOverlay { - [Parameter] public CompanyDto Company { get; set; } + [Parameter] public CompanyModel Company { get; set; } [Parameter] public SalesItemView SalesItem { get; set; } = new(); [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } [Parameter] public EventCallback OrderItemCallback { get; set; } diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs index 09012f5e..316e5885 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.OverlayOffice; public partial class OfficeCustomerInvoiceListOverlay { [Parameter] public InvoiceListView InvoiceList { get; set; } = new(); - [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public CompanyModel Company { get; set; } = new(); // dependency injection [Inject] public ILogger Logger { get; set; } private string InvoiceId { get; set; } = ""; diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs index 29b723fa..30b12b13 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs @@ -38,7 +38,7 @@ public partial class OfficeCustomerProductListOverlay : IDisposable private OfficeCustomerInventoryReorderOverlay ReorderOverlay { get; set; } = new(); private bool Descending { get; set; } - [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public CompanyModel Company { get; set; } = new(); [Parameter] public List Inventory { get; set; } = new(); protected override void OnParametersSet() diff --git a/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor.cs index 6dc9db6a..a07ad556 100644 --- a/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor.cs @@ -30,7 +30,7 @@ public partial class OfficeOrderInventoryListOverlay : IDisposable [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } [Inject] public ILogger Logger { get; set; } - [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public CompanyModel Company { get; set; } = new(); [Parameter] public List Inventory { get; set; } = new(); [Parameter] public EventCallback OnSelected { get; set; } diff --git a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs index 2c0b9c98..a2408858 100644 --- a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.OverlayOffice; public partial class OfficeOrderInventoryReorderOverlay { [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } - [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public CompanyModel Company { get; set; } = new(); [Parameter] public SalesItemView SalesItem { get; set; } = new(); [Parameter] public EventCallback OnSelected { get; set; } private List? ProductHistory { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 21cbcb89..bf072b44 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -64,8 +64,8 @@ public partial class AdvisorActivityCreatePage : IDisposable private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; private SalesItemView SelectedItem { get; set; } = new(); private UserProfile UserProfile { get; set; } = new(); - private ActivityDto Activity { get; set; } = new(); - private CompanyDto Company { get; set; } = new(); + private ActivityModel Activity { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private EditContext? ActivityContext { get; set; } private bool PoFormInvalid { get; set; } = true; private bool ShowItem { get; set; } @@ -77,7 +77,7 @@ public partial class AdvisorActivityCreatePage : IDisposable private bool InvalidActivity { get; set; } = true; private bool ReportClosed { get; set; } private bool Working { get; set; } = true; - private UserManagerEditView SalesRep { get; set; } = new(); + private UserAdminEditView SalesRep { get; set; } = new(); private DateTime SelectedDate { get; set; } private string OldPhone { get; set; } = ""; private string PromptDateConfirm { get; set; } = ""; diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor index 8cb5a665..6218b35e 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor @@ -136,7 +136,7 @@
- +
Ordre noten lukkes efter @GraceTime minutter eller når den er plukket.
diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs index a2da8d68..4e709e7d 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor.cs @@ -36,7 +36,7 @@ public partial class AdvisorActivityViewEditPage : IDisposable [Inject] public IToastService Toaster { get; set; } [Inject] public NavigationManager Navigator { get; set; } private ReportItemView ReportItem { get; set; } = new(); - private ActivityOfficeNote Note { get; set; } = new(); + private ActivityOfficeNoteModel NoteModel { get; set; } = new(); private EditContext NoteContext { get; set; } private bool Disabled { get; set; } private int GraceTime { get; set; } = 60; @@ -47,11 +47,11 @@ public partial class AdvisorActivityViewEditPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - NoteContext = new EditContext(Note); + NoteContext = new EditContext(NoteModel); NoteContext.OnFieldChanged += HandleFieldChanged; ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); - Note.ActivityId = ReportItem.ActivityId; - Note.OfficeNote = ReportItem.OfficeNote; + NoteModel.ActivityId = ReportItem.ActivityId; + NoteModel.OfficeNote = ReportItem.OfficeNote; Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem)); Working = false; } @@ -65,8 +65,8 @@ public partial class AdvisorActivityViewEditPage : IDisposable { Working = true; Disabled = true; - Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(Note)); - await AdvisorActivityRepo.UpdateOfficeNote(Note); + Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(NoteModel)); + await AdvisorActivityRepo.UpdateOfficeNote(NoteModel); 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 c34beff0..8733fb5d 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs @@ -31,7 +31,7 @@ public partial class AdvisorCustomerActivityListPage : IDisposable [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } private List ActivityList { get; set; } = new(); - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private bool Working { get; set; } = true; protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs index e64986d7..25f73ab3 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs @@ -44,7 +44,7 @@ public partial class AdvisorCustomerCreatePage : IDisposable [Inject] public IUserInfoService UserInfoService { get; set; } private EditContext CompanyContext { get; set; } - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private VatAddress CompanyVatAddress { get; set; } = new(); private VatLookupDkModal VatLookupPopup { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs index ca8efaf4..296e8b18 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 readonly JsonSerializerOptions _options = new JsonSerializerOptions(JsonSerializerDefaults.Web); - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private bool Working { get; set; } = true; private SalesItemView SalesItem { get; set; } = new(); private CustomerInventoryReorderOverlay ReorderOverlay { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index d4f135ba..cfbcb7f8 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -38,7 +38,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable [Parameter] public string CompanyId { get; set; } = ""; private InvoiceListView CompanyInvoices { get; set; } = new(); - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private CustomerInvoiceViewOverlay CustomerInvoiceView { get; set; } = new(); private string InvoiceId { get; set; } = ""; private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs index 15075899..483d5db9 100644 --- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs @@ -35,9 +35,9 @@ public partial class AdvisorCustomerPagedListPage : IDisposable [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - private List CompanyList { get; set; } = new(); + private List CompanyList { get; set; } = new(); private UserProfile Profile { get; set; } = new(); - private UserManagerEditView UserInfo { get; set; } = new(); + private UserAdminEditView UserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool Working { get; set; } = true; private MetaData PageData { get; set; } = new(); @@ -78,7 +78,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable Working = true; ShowFolded = !ShowFolded; ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = 1; Paging.HasFolded = ShowFolded ? 1 : 0; await FetchCustomers(); @@ -89,7 +89,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable Working = true; ShowHidden = !ShowHidden; ToggleHiddenText = ShowHidden ? "Normal Visning" : "Inkl. Skjulte"; - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = 1; Paging.IsHidden = ShowHidden ? 1 : 0; await FetchCustomers(); @@ -97,14 +97,14 @@ public partial class AdvisorCustomerPagedListPage : IDisposable private async Task SetSelectedPage(int page) { - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = page; await FetchCustomers(); } private async Task SetSearchCol(string searchColumn) { - CompanyList = new List(); + CompanyList = new List(); Paging.SearchColumn = searchColumn; Paging.PageNumber = 1; await FetchCustomers(); @@ -112,7 +112,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable private async Task SetPageSize(string pageSize) { - CompanyList = new List(); + CompanyList = new List(); Paging.PageSize = Convert.ToInt32(pageSize); Paging.PageNumber = 1; await FetchCustomers(); @@ -120,7 +120,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable private async Task SetSearchPhrase(string searchTerm) { - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = 1; Paging.SearchTerm = searchTerm; await FetchCustomers(); @@ -128,7 +128,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable private async Task SetSortCol(string orderBy) { - CompanyList = new List(); + CompanyList = new List(); Paging.OrderBy = orderBy; await FetchCustomers(); } @@ -139,7 +139,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable /// private async Task DeleteCompany(string companyId) { - CompanyList = new List(); + CompanyList = new List(); await CompanyRepo.DeleteCompany(companyId); if (Paging.PageNumber > 1 && CompanyList.Count == 1) Paging.PageNumber--; @@ -158,7 +158,7 @@ public partial class AdvisorCustomerPagedListPage : IDisposable } else { - CompanyList = new List(); + CompanyList = new List(); PageData = new MetaData(); } } diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs index ebb3282a..4c9d6b22 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs @@ -47,7 +47,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable [Inject] public IUserInfoService UserInfoService { get; set; } private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private EditContext ErpContext { get; set; } private DateTime LastVisit { get; set; } private DateTime NextVisit { get; set; } @@ -64,12 +64,12 @@ public partial class AdvisorCustomerViewEditPage : IDisposable private bool CountryIsDk { get; set; } = true; private bool ErpEditDisabled { get; set; } = true; private bool VatEditDisabled { get; set; } = true; - private List Contacts { get; set; } = new(); + private List Contacts { get; set; } = new(); private VatLookupDkModal VatLookupPopup { get; set; } = new(); - private ContactDto SelectedContact { get; set; } = new(); - private ContactDto DefaultContact { get; set; } = new(); + private ContactModel SelectedContact { get; set; } = new(); + private ContactModel DefaultContact { get; set; } = new(); private ContactModal ContactPopup { get; set; } = new(); - private UserManagerEditView UserInfo { get; set; } = new(); + private UserAdminEditView UserInfo { get; set; } = new(); private string ToggleButtonText { get; set; } = ""; protected override async Task OnInitializedAsync() @@ -79,7 +79,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // initialize default contact - DefaultContact = new ContactDto { CompanyId = CompanyId, ContactId = "", FirstName = "" }; + DefaultContact = new ContactModel { CompanyId = CompanyId, ContactId = "", FirstName = "" }; // setup form context ErpContext = new EditContext(Company); @@ -229,7 +229,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /// Open contact edit popup ///
/// - private void OpenContactPopup(ContactDto contact) + private void OpenContactPopup(ContactModel contact) { // write contact to debug log Logger.LogDebug("CompanyView => SaveContactCallback <= {}", JsonSerializer.Serialize(contact)); @@ -243,7 +243,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /// Callback for writing contact to backend /// /// - private async Task WriteContactCallback(ContactDto contact) + private async Task WriteContactCallback(ContactModel contact) { Working = true; // write contact to debug log @@ -265,7 +265,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable } // reset selected contact - SelectedContact = new ContactDto(); + SelectedContact = new ContactModel(); // reload contacts from backend await FetchContacts(CompanyId); Working = false; @@ -282,7 +282,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable // send delete request to backend await AdvisorContactRepo.DeleteContact(CompanyId, contactId); // reset selected contact - SelectedContact = new ContactDto(); + SelectedContact = new ContactModel(); // reload contacts from backend await FetchContacts(CompanyId); Working = false; @@ -368,7 +368,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /// /// /// - private static VatAddress PrepareVatAddress(CompanyDto model) + private static VatAddress PrepareVatAddress(CompanyModel model) { var digits = "1234567890".ToCharArray(); // process address1 diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 22f6d73b..a8a753e6 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -39,9 +39,9 @@ public partial class AdvisorReportCreatePage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } private EditContext ReportContext { get; set; } - private ReportDto Report { get; set; } = new(); + private ReportModel Report { get; set; } = new(); private List Activities { get; set; } = new(); - private ReportFiguresDto InitialValues { get; set; } = new(); + private ReportFiguresModel InitialValues { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); private bool FormInvalid { get; set; } = true; private bool NoFigures { get; set; } = true; @@ -117,8 +117,8 @@ public partial class AdvisorReportCreatePage : IDisposable return; Working = true; - Report.Figures = new ReportFiguresDto(); - InitialValues = new ReportFiguresDto(); + Report.Figures = new ReportFiguresModel(); + InitialValues = new ReportFiguresModel(); Activities = new List(); var data = await AdvisorReportRepo.InitializeReportData(WorkDate); @@ -283,8 +283,8 @@ public partial class AdvisorReportCreatePage : IDisposable ThisWorkDate = DateTime.Parse(workDate); NoFigures = true; - Report.Figures = new ReportFiguresDto(); - InitialValues = new ReportFiguresDto(); + Report.Figures = new ReportFiguresModel(); + InitialValues = new ReportFiguresModel(); Activities = new List(); Report.Figures.KmEvening = 0; diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index f9311dfa..1ee0ab41 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -19,7 +19,7 @@ @using Wonky.Client.Models @attribute [Authorize(Roles = "Advisor")] @page "/advisor/reports/view/{ReportDate}" -@Report.ReportData.Name +@Report.ReportDataView.Name
@@ -36,22 +36,22 @@
- @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) + @if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum)) { - @Report.ReportData.Name + @Report.ReportDataView.Name
-

@Report.ReportData.Name

+

@Report.ReportDataView.Name

- +
- +
- + } else { diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index cef084bb..63b89bc4 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -41,7 +41,7 @@ public partial class AdvisorReportViewPage : IDisposable private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new (); private bool Working { get; set; } - private UserManagerEditView XUserInfo { get; set; } = new(); + private UserAdminEditView XUserInfo { get; set; } = new(); private string ReturnUrl { get; set; } = ""; protected override async Task OnInitializedAsync() @@ -83,7 +83,7 @@ public partial class AdvisorReportViewPage : IDisposable { // remove busy signal if report is empty - if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + if (string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) { Working = false; } @@ -111,9 +111,9 @@ public partial class AdvisorReportViewPage : IDisposable Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); // store the report locally - if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + if (!string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) { - await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportData.ReportDate}", Report); + await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportDataView.ReportDate}", Report); } // remove busy signal diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index 5db3d740..eda752eb 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -35,7 +35,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable private UserProfile Profile { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; - private List TaskItems { get; set; } = new(); + private List TaskItems { get; set; } = new(); private bool Working { get; set; } = true; protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs index b5e3a969..7a6ffe08 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs @@ -29,7 +29,7 @@ public partial class AdvisorTaskItemViewCrmPage : IDisposable [Parameter] public string TaskItemId { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } - private TaskItemDto TaskItem { get; set; } = new (); + private TaskItemModel TaskItem { get; set; } = new (); private EditContext TaskContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs index 71d02038..afe596de 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs @@ -30,7 +30,7 @@ public partial class AdvisorWorkplaceListPage : IDisposable [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } private List WorkplaceList { get; set; } = new(); - private CompanyDto Company { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); private bool Working { get; set; } = true; protected override async Task OnParametersSetAsync() diff --git a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs index 6bf81b6b..1ac85d66 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs @@ -31,7 +31,7 @@ public partial class AdvisorWorkplaceViewPage : IDisposable [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } - private WorkplaceDto Workplace { get; set; } = new(); + private WorkplaceModel Workplace { get; set; } = new(); private EditContext WorkplaceContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs index 2940a218..be22df18 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs @@ -21,7 +21,6 @@ using Wonky.Client.HttpRepository; using Wonky.Client.Services; using Wonky.Entity.Requests; using Wonky.Entity.Views; -using Wonky.Client.Services; using Wonky.Entity.DTO; #pragma warning disable CS8618 @@ -44,7 +43,7 @@ public partial class CatalogCountryPagedListPage : IDisposable private MetaData PageData { get; set; } = new(); private CatalogPager Paging { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); - private UserManagerEditView XUserInfo { get; set; } = new(); + private UserAdminEditView XUserInfo { get; set; } = new(); private bool Working { get; set; } private string CountryName { get; set; } = ""; diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs index a132163d..bf5093a4 100644 --- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs @@ -71,7 +71,7 @@ public partial class CommonReportPrintOrderPage foreach (var item in orders) { Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); - await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessStateModel { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed) diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor index 4aaeef5f..ff9de247 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor @@ -29,22 +29,22 @@
- @Report.ReportData.Name + @Report.ReportDataView.Name
-

@Report.ReportData.Name

+

@Report.ReportDataView.Name

- +
- +
- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/Login.razor b/Wonky.Client/Pages/Login.razor index f6991495..172ca3c1 100644 --- a/Wonky.Client/Pages/Login.razor +++ b/Wonky.Client/Pages/Login.razor @@ -36,7 +36,7 @@
- + @* username *@
@@ -44,8 +44,8 @@ - + @bind-Value="CredentialModel.Email" autocomplete="username"/> +
@* current-password *@
@@ -53,8 +53,8 @@ - + @bind-Value="CredentialModel.Password" autocomplete="current-password"/> +
@* submit button *@
diff --git a/Wonky.Client/Pages/Login.razor.cs b/Wonky.Client/Pages/Login.razor.cs index 7f727389..4bafaa31 100644 --- a/Wonky.Client/Pages/Login.razor.cs +++ b/Wonky.Client/Pages/Login.razor.cs @@ -27,7 +27,7 @@ public partial class Login [Inject] public IAuthenticationService AuthenticationService { get; set; } [Inject] public ILogger Logger { get; set; } [Parameter] public string ReturnUrl { get; set; } = ""; - private CredentialDto CredentialDto { get; set; } = new (); + private CredentialModel CredentialModel { get; set; } = new (); private bool ShowAuthError { get; set; } private string? Error { get; set; } private bool execLogin = false; @@ -37,7 +37,7 @@ public partial class Login ShowAuthError = false; execLogin = true; - var result = await AuthenticationService.Login(CredentialDto); + var result = await AuthenticationService.Login(CredentialModel); if (!result.IsSuccess) { Error = result.ErrorMessage; diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 2c800c51..4b5fb50a 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -35,24 +35,24 @@
- @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) + @if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum)) { - @Report.ReportData.Name + @Report.ReportDataView.Name
-

@Report.ReportData.Name

+

@Report.ReportDataView.Name

- +
- +
- + } else { diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs index 9237614e..c45bb7de 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs @@ -98,7 +98,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable foreach (var item in orders) { Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); - await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessStateModel { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed) @@ -115,7 +115,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable private async Task FetchUserReport(string workDate) { // remove busy signal if report is empty - if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + if (string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) { Working = false; } @@ -145,7 +145,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); // store locally - if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + if (!string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) { await Storage.SetItemAsync($"{UserId}-{workDate}", Report); } diff --git a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs index f8b6c539..464ac7d5 100644 --- a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs @@ -30,12 +30,12 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; - private List CompanyList { get; set; } = new(); + private List CompanyList { get; set; } = new(); private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); private UserProfile UserProfile { get; set; } = new(); @@ -44,7 +44,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable private bool ShowFolded { get; set; } private string ToggleFoldedText { get; set; } = "Vis Lukkede"; private bool Working { get; set; } = true; - private UserManagerEditView SalesRep { get; set; } = new(); + private UserAdvisorInfoView SalesRep { get; set; } = new(); protected override async Task OnParametersSetAsync() { @@ -73,7 +73,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable Working = true; ShowFolded = !ShowFolded; ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = 1; Paging.HasFolded = ShowFolded ? 1 : 0; await FetchCompanies(); @@ -81,14 +81,14 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable private async Task SetSelectedPage(int page) { - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = page; await FetchCompanies(); } private async Task SetSearchCol(string searchColumn) { - CompanyList = new List(); + CompanyList = new List(); Paging.SearchColumn = searchColumn; Paging.PageNumber = 1; await FetchCompanies(); @@ -96,7 +96,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable private async Task SetPageSize(string pageSize) { - CompanyList = new List(); + CompanyList = new List(); Paging.PageSize = Convert.ToInt32(pageSize); Paging.PageNumber = 1; await FetchCompanies(); @@ -106,7 +106,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable { // if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.Length < 3) return; - CompanyList = new List(); + CompanyList = new List(); Paging.PageNumber = 1; Paging.SearchTerm = searchTerm; await FetchCompanies(); @@ -119,7 +119,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable private async Task SetSortCol(string orderBy) { - CompanyList = new List(); + CompanyList = new List(); Paging.OrderBy = orderBy; await FetchCompanies(); } diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs index afe9b304..c9747074 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs @@ -36,9 +36,9 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } - private List Companies { get; set; } = new(); + private List Companies { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); - private UserManagerEditView XUserInfo { get; set; } = new(); + private UserAdminEditView UserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool ShowFolded { get; set; } private bool Working { get; set; } = true; @@ -55,7 +55,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable // set preferences Profiles = await ProfileService.GetProfile(); - XUserInfo = await UserInfoService.GetUserInfo(); + UserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profiles.CompanySort; Paging.SearchColumn = Profiles.CompanySearch; Paging.PageSize = Convert.ToInt32(Profiles.PageSize); @@ -74,7 +74,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable Working = true; ShowFolded = !ShowFolded; ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; - Companies = new List(); + Companies = new List(); Paging.PageNumber = 1; Paging.HasFolded = ShowFolded ? 1 : 0; await FetchCustomers(); @@ -83,7 +83,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable private async Task SetSelectedPage(int page) { Working = true; - Companies = new List(); + Companies = new List(); Paging.PageNumber = page; await FetchCustomers(); } @@ -91,7 +91,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable private async Task SetSearchCol(string searchColumn) { Working = true; - Companies = new List(); + Companies = new List(); Paging.SearchColumn = searchColumn; Paging.PageNumber = 1; await FetchCustomers(); @@ -99,7 +99,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable private async Task SetPageSize(string pageSize) { Working = true; - Companies = new List(); + Companies = new List(); Paging.PageSize = Convert.ToInt32(pageSize); Paging.PageNumber = 1; await FetchCustomers(); @@ -108,7 +108,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable private async Task SetSearchPhrase(string searchTerm) { Working = true; - Companies = new List(); + Companies = new List(); Paging.PageNumber = 1; Paging.SearchTerm = searchTerm; await FetchCustomers(); @@ -117,7 +117,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable private async Task SetSortCol(string orderBy) { Working = true; - Companies = new List(); + Companies = new List(); Paging.OrderBy = orderBy; await FetchCustomers(); } @@ -134,7 +134,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable } else { - Companies = new List(); + Companies = new List(); PageData = new MetaData(); } } diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index 38fed9ed..5b6801c8 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -58,11 +58,11 @@ public partial class OfficeOrderCreatePage : IDisposable // private variables private readonly JsonSerializerOptions _options = new() {PropertyNameCaseInsensitive = true}; // class objects - private CompanyDto Company { get; set; } = new(); - private UserManagerEditView UserInfo { get; set; } = new(); + private CompanyModel Company { get; set; } = new(); + private UserAdminEditView UserInfo { get; set; } = new(); private SalesItemView SelectedItem { get; set; } = new(); - private ActivityDto Activity { get; set; } = new(); - private UserManagerEditView SalesRep { get; set; } = new(); + private ActivityModel Activity { get; set; } = new(); + private UserAdminEditView SalesRep { get; set; } = new(); // edit context private EditContext ActivityContext { get; set; } // variables diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index 09ec6246..8b360f17 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -36,7 +36,7 @@ public partial class OfficeOrderViewPage : IDisposable [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } [Inject] public ISystemSendMailService MailService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toast { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } @@ -76,7 +76,7 @@ public partial class OfficeOrderViewPage : IDisposable // get user info from storage var user = await UserInfoService.GetUserInfo(); // fetch sales rep from response - var salesRep = await SystemUserRepo.GetUserInfo(responseView.Id); + var salesRep = await UserRepo.GetUserInfo(responseView.Id); Logger.LogDebug("SetExpressState => salesRep => {}", JsonSerializer.Serialize(salesRep)); // create email notification body var body = new StringBuilder(); @@ -90,7 +90,7 @@ public partial class OfficeOrderViewPage : IDisposable body.AppendLine($"{user.FirstName} {user.LastName}"); body.AppendLine($"{user.PhoneNumber}"); // create a list of mail addresses - var sendTo = new List + var sendTo = new List { new() { @@ -99,7 +99,7 @@ public partial class OfficeOrderViewPage : IDisposable } }; // create an email - var msg = new EmailMessage + var msg = new EmailMessageModel { Body = body.ToString(), Subject = $"Haste ordre til {ReportItem.Company.Name} er modtaget.", diff --git a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs index 0409a2bd..6a2ebdbe 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs @@ -18,6 +18,8 @@ using Wonky.Client.Helpers; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Entity.DTO; +using Wonky.Entity.Views; + #pragma warning disable CS8618 namespace Wonky.Client.Pages; @@ -25,9 +27,9 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorListPage :IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Parameter] public string CountryCode { get; set; } = ""; - private List SalesReps { get; set; } = new(); + private List SalesReps { get; set; } = new(); private bool Working { get; set; } = true; private string CountryName { get; set; } = ""; @@ -36,9 +38,9 @@ public partial class OfficeUserAdvisorListPage :IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); CountryName = Utils.CountryName(CountryCode); - var AdvisorList = await SystemUserRepo.GetUsers(); + var AdvisorList = await UserRepo.GetUsers("Advisor"); SalesReps = AdvisorList - .Where(x => x.CountryCode.ToLower() == CountryCode && int.TryParse(x.SalesRep, out _)) + .OrderBy(x => x.FullName) .ToList(); Working = false; } diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor index 7f8b5f4a..ceb07958 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor @@ -19,11 +19,11 @@ @attribute [Authorize(Roles = "Admin,Office")] @page "/office/users/advisors/{CountryCode}/{UserId}/reports" -Rapport Arkiv @UserInfo.FirstName @UserInfo.LastName +Rapport Arkiv @AdvisorInfo.FirstName @AdvisorInfo.LastName
- Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName + Rapport Arkiv - @AdvisorInfo.FirstName @AdvisorInfo.LastName
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs index 621d4fac..ba60d6e0 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs @@ -29,11 +29,11 @@ public partial class OfficeUserAdvisorReportListPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; - private UserManagerEditView UserInfo { get; set; } = new(); + private UserAdvisorInfoView AdvisorInfo { get; set; } = new(); /// /// override OnParametersSeAsync @@ -43,8 +43,8 @@ public partial class OfficeUserAdvisorReportListPage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserInfo = await SystemUserRepo.GetUserInfo(UserId); - while (string.IsNullOrWhiteSpace(UserInfo.UserId)) + AdvisorInfo = await UserRepo.GetUserInfo(UserId); + while (string.IsNullOrWhiteSpace(AdvisorInfo.UserId)) { await Task.Delay(500); } diff --git a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs index 0453d3a0..04460874 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor.cs @@ -35,9 +35,9 @@ public partial class OfficeUserAdvisorViewEditPage : IDisposable [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } - private UserManagerEditView UserInfo { get; set; } = new(); + private UserAdminEditView UserInfo { get; set; } = new(); private EditContext UserEditContext { get; set; } - private ResetPasswordDto Passwords { get; set; } = new(); + private ResetPasswordModel Passwords { get; set; } = new(); private EditContext PasswdContext { get; set; } private bool PwInvalid { get; set; } = true; private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor new file mode 100644 index 00000000..7115a6c2 --- /dev/null +++ b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor @@ -0,0 +1,82 @@ +@* 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 Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "Supervisor")] +@page "/supervisor/salesReps" + +Supervisor Sælger Oversigt +
+
+

Supervisor Sælger Oversigt

+
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
Navn
+
+
+
Email
+
+
+
Telefon
+
+
+
+ +
+
+ + @if (Users.Any()) + { + foreach (var user in Users) + { + +
+
+ @user.CountryCode @user.SalesRep +
+
+ @user.FullName +
+
+ @user.Email +
+
+ @user.PhoneNumber +
+
+ @user.Description +
+
+ + } + } +
diff --git a/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs new file mode 100644 index 00000000..5ef6e446 --- /dev/null +++ b/Wonky.Client/Pages/SupervisorAdvisorListPage.razor.cs @@ -0,0 +1,35 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +namespace Wonky.Client.Pages; + +#pragma warning disable CS8618 + +public partial class SupervisorAdvisorListPage : IDisposable +{ + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } + + private List Users { get; set; } = new(); + + private bool Working { get; set; } = true; + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + Users = await UserRepo.GetSupervisorUsers(); + + Working = false; + + } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor index 9b5a5462..162f85d8 100644 --- a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor +++ b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor @@ -33,7 +33,7 @@
- +
diff --git a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs index e5925ad9..f4dd82f6 100644 --- a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs +++ b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs @@ -17,11 +17,11 @@ public partial class SystemMaintenanceMessagePage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } - private List Users { get; set; } = new(); - private ShortMessage Message { get; set; } = new(); + private List Users { get; set; } = new(); + private ShortMessageModel MessageModel { get; set; } = new(); private List Recipients { get; set; } = new(); private ApiResponseView SmsResponse { get; set; } = new(); - private ClxMessage? ClxMsg { get; set; } = new(); + private ClxMessageView? ClxMsg { get; set; } = new(); private bool Working { get; set; } = true; private bool MsgSent { get; set; } @@ -58,20 +58,20 @@ public partial class SystemMaintenanceMessagePage : IDisposable return; } - if (string.IsNullOrWhiteSpace(Message.Body)) + if (string.IsNullOrWhiteSpace(MessageModel.Body)) { Toaster.ShowError("Meddelelsesfeltet er tomt!"); return; } - Message.From = "Innotec IT"; - Message.To = string.Join(",", recipients); + MessageModel.From = "Innotec IT"; + MessageModel.To = string.Join(",", recipients); - Logger.LogDebug("{}", JsonSerializer.Serialize(Message, _options)); + Logger.LogDebug("{}", JsonSerializer.Serialize(MessageModel, _options)); - SmsResponse = await SmsService.SendSms(Message); + SmsResponse = await SmsService.SendSms(MessageModel); if (SmsResponse.Code == 201) { - ClxMsg = JsonSerializer.Deserialize(SmsResponse.Message); + ClxMsg = JsonSerializer.Deserialize(SmsResponse.Message); MsgSent = true; } Working = false; diff --git a/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs b/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs index 13bb63ad..939db23e 100644 --- a/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs +++ b/Wonky.Client/Pages/SystemManagerLandingPage.razor.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Components; - +#pragma warning disable CS8618 namespace Wonky.Client.Pages; public partial class SystemManagerLandingPage diff --git a/Wonky.Client/Pages/SystemSupervisorListPage.razor b/Wonky.Client/Pages/SystemSupervisorListPage.razor index dac7e481..ea657404 100644 --- a/Wonky.Client/Pages/SystemSupervisorListPage.razor +++ b/Wonky.Client/Pages/SystemSupervisorListPage.razor @@ -19,17 +19,66 @@ @page "/system/supervisors" Supervisor Oversigt - -
-
-
- Supervisor Oversigt -
+
+
+

Supervisor Oversigt

-
+
+
+
+ +
+
-@code { - -} \ No newline at end of file + +
+
+
+
+
+
+
Navn
+
+
+
Email
+
+
+
Telefon
+
+
+ Opret Supervisor +
+ +
+
+ + @if (Users.Any()) + { + foreach (var user in Users) + { + +
+
+ @user.CountryCode @user.SalesRep +
+
+ @user.FullName +
+
+ @user.Email +
+
+ @user.PhoneNumber +
+
+ @user.Description +
+
+ + } + } +
\ No newline at end of file diff --git a/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs new file mode 100644 index 00000000..ac19ab38 --- /dev/null +++ b/Wonky.Client/Pages/SystemSupervisorListPage.razor.cs @@ -0,0 +1,45 @@ +// 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 Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + +#pragma warning disable CS8618 +namespace Wonky.Client.Pages; + +public partial class SystemSupervisorListPage : IDisposable +{ + [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + private List Users { get; set; } = new(); + + private bool Working { get; set; } = true; + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + Users = await UserRepo.GetUsers("Supervisor"); + Working = false; + } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor new file mode 100644 index 00000000..eee45ea5 --- /dev/null +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor @@ -0,0 +1,66 @@ +@* 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 Microsoft.AspNetCore.Authorization +@using System.Text.Json +@attribute [Authorize(Roles = "Admin")] +@page "/system/supervisors/{UserId}" + +Supervisor Sælger Tilknytning +
+
+

Supervisor Sælger Tilknytning

+
+
+
+
+ +
+
+
+
+ +
+
+
+ @UserData.FirstName @UserData.LastName +
+
+
+
+ Supervisor for valgte sælgere +
+
+
+ @if (UserData.AssignedUsers.Any()) + { + foreach (var user in UserData.AssignedUsers) + { +
+ + +
+ } + } +
+
+
+ +
+
+
+ diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs new file mode 100644 index 00000000..94ae1fe8 --- /dev/null +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs @@ -0,0 +1,65 @@ +// 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.Text.Json; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.DTO; + +#pragma warning disable CS8618 + +namespace Wonky.Client.Pages; + +public partial class SystemSupervisorViewEditPage : IDisposable +{ + [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ILogger Logger { get; set; } + + private readonly JsonSerializerOptions _options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + [Parameter] public string UserId { get; set; } = ""; + private UserAdminEditView UserData { get; set; } = new(); + private bool Working { get; set; } = true; + private EditContext UserAssignmentContext { get; set; } + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + UserAssignmentContext = new EditContext(UserData); + + UserData = await UserRepo.GetUserInfo(UserId); + + Working = false; + + Logger.LogDebug("UserData => {}", JsonSerializer.Serialize(UserData, _options)); + } + + private async Task SaveChanges() + { + await UserRepo.UpdateUserInfo(UserId, UserData); + } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } +} diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs index d2b706ce..68f12562 100644 --- a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs +++ b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs @@ -34,7 +34,7 @@ public partial class SystemUserCreatePage : IDisposable [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } - private UserManagerCreate NewUserInfo { get; set; } = new(); + private UserAdminCreateModel NewUserInfo { get; set; } = new(); private EditContext NewUserContext { get; set; } private bool ContextInvalid { get; set; } = true; private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/SystemUserListPage.razor b/Wonky.Client/Pages/SystemUserListPage.razor index d6585efc..5fdebc04 100644 --- a/Wonky.Client/Pages/SystemUserListPage.razor +++ b/Wonky.Client/Pages/SystemUserListPage.razor @@ -38,18 +38,18 @@
-
+
-
+
Navn
-
+
Email
-
+
Telefon
-
+
Opret bruger
@@ -74,7 +74,9 @@
@user.PhoneNumber
-
+
+ @user.Description +
} diff --git a/Wonky.Client/Pages/SystemUserListPage.razor.cs b/Wonky.Client/Pages/SystemUserListPage.razor.cs index 98b076be..3f005d33 100644 --- a/Wonky.Client/Pages/SystemUserListPage.razor.cs +++ b/Wonky.Client/Pages/SystemUserListPage.razor.cs @@ -18,7 +18,9 @@ using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Entity.DTO; +using Wonky.Entity.Views; +#pragma warning disable CS8618 namespace Wonky.Client.Pages; public partial class SystemUserListPage : IDisposable @@ -26,7 +28,7 @@ public partial class SystemUserListPage : IDisposable [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ISystemUserRepository UserRepo { get; set; } - private List UserList { get; set; } = new(); + private List UserList { get; set; } = new(); private bool Working { get; set; } = true; protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor b/Wonky.Client/Pages/SystemUserViewEditPage.razor index 7225d541..424a055c 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor @@ -59,15 +59,21 @@ Email - - +
+ + + +
Mobilnummer - - +
+ + + +
@@ -75,8 +81,11 @@ Sælgernr. - - +
+ + + +
Landekode @@ -91,13 +100,16 @@ Spærret - - + + Beskrivelse - - +
+ + + +
diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs index d4ff0cd6..b5cb36b9 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs @@ -35,9 +35,9 @@ public partial class SystemUserViewEditPage : IDisposable [Inject] public ISystemUserRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } - private UserManagerEditView UserData { get; set; } = new(); + private UserAdminEditView UserData { get; set; } = new(); private EditContext UserEditContext { get; set; } - private ResetPasswordDto Passwords { get; set; } = new(); + private ResetPasswordModel Passwords { get; set; } = new(); private EditContext PasswdContext { get; set; } private bool PwInvalid { get; set; } = true; private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs index 96ec81e9..f6c73965 100644 --- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs @@ -85,7 +85,7 @@ public partial class WarehouseOrderListPage : IDisposable Working = true; var order = OrderList.First(x => x.OrderId == orderId); order.ProcessStatusEnum = "packed"; - var process = new OrderProcessState + var process = new OrderProcessStateModel { OrderId = order.OrderId, ProcessStatusEnum = "packed" @@ -103,7 +103,7 @@ public partial class WarehouseOrderListPage : IDisposable foreach (var order in OrderList.Where(order => order.ProcessStatusEnum.ToLower() == "packed")) { order.ProcessStatusEnum = "shipped"; - var process = new OrderProcessState + var process = new OrderProcessStateModel { OrderId = order.OrderId, ProcessStatusEnum = "shipped" diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index f06c6a42..9a7c8911 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -54,7 +54,7 @@ public partial class WarehouseOrderViewPage : IDisposable return; Working = true; - var process = new OrderProcessState + var process = new OrderProcessStateModel { OrderId = Order.OrderId, ProcessStatusEnum = "picked" @@ -68,7 +68,7 @@ public partial class WarehouseOrderViewPage : IDisposable if (Working) return; Working = true; - var process = new OrderProcessState + var process = new OrderProcessStateModel { OrderId = Order.OrderId, ProcessStatusEnum = "packed" @@ -82,7 +82,7 @@ public partial class WarehouseOrderViewPage : IDisposable if (Working) return; Working = true; - var process = new OrderProcessState + var process = new OrderProcessStateModel { OrderId = Order.OrderId, ProcessStatusEnum = "shipped" diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index ebfddf78..ebcfce5d 100644 --- a/Wonky.Client/Services/AuthenticationService.cs +++ b/Wonky.Client/Services/AuthenticationService.cs @@ -55,7 +55,7 @@ public class AuthenticationService : IAuthenticationService _localStorage = localStorage; } - public async Task Login(CredentialDto credentials) + public async Task Login(CredentialModel credentials) { var credForm = new Dictionary { @@ -133,13 +133,13 @@ public class AuthenticationService : IAuthenticationService ((AuthStateProvider)_authStateProvider).NotifyUserLogout(); } - public async Task UserInfo(bool write = false) + public async Task UserInfo(bool write = false) { var response = await _client.GetAsync(_apiConfig.Value.UserInfo).ConfigureAwait(true); var content = await response.Content.ReadAsStringAsync(); - var userInfo = JsonSerializer.Deserialize(content, _options); + var userInfo = JsonSerializer.Deserialize(content, _options); if(write) await _infoService.SetUserInfo(userInfo); - return userInfo ?? new UserManagerEditView(); + return userInfo ?? new UserAdminEditView(); } } \ No newline at end of file diff --git a/Wonky.Client/Services/IAuthenticationService.cs b/Wonky.Client/Services/IAuthenticationService.cs index b75bad30..56bddd81 100644 --- a/Wonky.Client/Services/IAuthenticationService.cs +++ b/Wonky.Client/Services/IAuthenticationService.cs @@ -21,8 +21,8 @@ namespace Wonky.Client.Services; public interface IAuthenticationService { - Task Login(CredentialDto credentials); + Task Login(CredentialModel credentials); Task Logout(); Task RefreshToken(); - Task UserInfo(bool write = false); + Task UserInfo(bool write = false); } \ No newline at end of file diff --git a/Wonky.Client/Services/IUserInfoService.cs b/Wonky.Client/Services/IUserInfoService.cs index 0df4fc21..b3e14cf7 100644 --- a/Wonky.Client/Services/IUserInfoService.cs +++ b/Wonky.Client/Services/IUserInfoService.cs @@ -20,8 +20,8 @@ namespace Wonky.Client.Services; public interface IUserInfoService { - Task GetUserInfo(); - Task SetUserInfo(UserManagerEditView userInfo); + Task GetUserInfo(); + Task SetUserInfo(UserAdminEditView userInfo); Task GetRefreshToken(); Task SetRefreshToken(string token); Task GetAccessToken(); diff --git a/Wonky.Client/Services/UserInfoService.cs b/Wonky.Client/Services/UserInfoService.cs index b0809c78..d7eab9bb 100644 --- a/Wonky.Client/Services/UserInfoService.cs +++ b/Wonky.Client/Services/UserInfoService.cs @@ -36,12 +36,12 @@ public class UserInfoService : IUserInfoService _localStorageService = localStorageService; } - public async Task GetUserInfo() + public async Task GetUserInfo() { - return await _localStorageService.GetItemAsync(_infoKey); + return await _localStorageService.GetItemAsync(_infoKey); } - public async Task SetUserInfo(UserManagerEditView userInfo) + public async Task SetUserInfo(UserAdminEditView userInfo) { await _localStorageService.SetItemAsync(_infoKey, userInfo); } diff --git a/Wonky.Client/Shared/ContactModal.razor.cs b/Wonky.Client/Shared/ContactModal.razor.cs index 6dde285a..96f1eb54 100644 --- a/Wonky.Client/Shared/ContactModal.razor.cs +++ b/Wonky.Client/Shared/ContactModal.razor.cs @@ -30,13 +30,13 @@ namespace Wonky.Client.Shared; public partial class ContactModal { - [Parameter] public ContactDto ParamContact { get; set; } = new(); + [Parameter] public ContactModel ParamContact { get; set; } = new(); [Parameter] public string CompanyName { get; set; } = ""; [Parameter] public IAdvisorContactRepository ContactRepo { get; set; } [Parameter] public HttpInterceptorService Interceptor { get; set; } - [Parameter] public EventCallback OnSaveClicked { get; set; } + [Parameter] public EventCallback OnSaveClicked { get; set; } [Parameter] public EventCallback OnDeleteClicked { get; set; } - private ContactDto Contact { get; set; } = new(); + private ContactModel Contact { get; set; } = new(); private string _modalDisplay = ""; private bool _showBackdrop; private bool DisableDelete { get; set; } @@ -44,7 +44,7 @@ public partial class ContactModal protected override void OnParametersSet() { - Contact = new ContactDto + Contact = new ContactModel { CompanyId = ParamContact.CompanyId, ContactId = ParamContact.ContactId, @@ -84,7 +84,7 @@ public partial class ContactModal { _modalDisplay = "none;"; _showBackdrop = false; - Contact = new ContactDto(); + Contact = new ContactModel(); StateHasChanged(); } } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 52811655..3096dedf 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,14 +1,14 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.120.4", + "version": "0.121.0", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "Logging": { "LogLevel": { - "Default": "Information", + "Default": "Debug", "System": "Information", "Microsoft": "Information" }, @@ -19,7 +19,7 @@ } }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", @@ -43,9 +43,11 @@ "servicesAuth": "token", "syncRpc": "api/v2/rpc", "syncRpcInvoiceExt": "invoices", + "userData": "/api/v2/client/users", "userInfo": "api/v2/auth/userinfo", "userManager": "api/v2/app/manage/users", - "userManagerSetPasswd": "api/v2/app/manage/users/passwd", + "userManagerSetPasswd": "api/v2/app/manage/passwd", + "userRoles": "api/v2/app/manage/roles", "warehouse": "api/v2/warehouse/packages" } } diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs index d5a9b3a6..f154c81e 100644 --- a/Wonky.Entity/Configuration/ApiConfig.cs +++ b/Wonky.Entity/Configuration/ApiConfig.cs @@ -137,6 +137,11 @@ public class ApiConfig ///
public string SyncRpcInvoiceExt { get; set; } = ""; + /// + /// Application uri for user information request + /// + public string UserData { get; set; } = ""; + /// /// Application uri for user information request /// @@ -152,6 +157,11 @@ public class ApiConfig ///
public string UserManagerSetPasswd { get; set; } = ""; + /// + /// Application uri for user roles + /// + public string UserRoles { get; set; } = ""; + /// /// Uri for warehouse requests /// diff --git a/Wonky.Entity/Configuration/AppInfo.cs b/Wonky.Entity/Configuration/AppInfo.cs index 51695f4e..6ca0e4df 100644 --- a/Wonky.Entity/Configuration/AppInfo.cs +++ b/Wonky.Entity/Configuration/AppInfo.cs @@ -21,17 +21,17 @@ public class AppInfo /// /// Application version /// - public string Version { get; set; } + public string Version { get; set; } = ""; /// /// Application name /// - public string Name { get; set; } + public string Name { get; set; } = ""; /// /// Application picture name /// - public string Image { get; set; } + public string Image { get; set; } = ""; /// /// Application beta version flag diff --git a/Wonky.Entity/DTO/ActivityDto.cs b/Wonky.Entity/DTO/ActivityModel.cs similarity index 99% rename from Wonky.Entity/DTO/ActivityDto.cs rename to Wonky.Entity/DTO/ActivityModel.cs index 3c938a19..895a3e04 100644 --- a/Wonky.Entity/DTO/ActivityDto.cs +++ b/Wonky.Entity/DTO/ActivityModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ActivityDto +public class ActivityModel { /// /// Activity entity id diff --git a/Wonky.Entity/DTO/ActivityOfficeNote.cs b/Wonky.Entity/DTO/ActivityOfficeNoteModel.cs similarity index 96% rename from Wonky.Entity/DTO/ActivityOfficeNote.cs rename to Wonky.Entity/DTO/ActivityOfficeNoteModel.cs index 2ee0c8f7..748868cc 100644 --- a/Wonky.Entity/DTO/ActivityOfficeNote.cs +++ b/Wonky.Entity/DTO/ActivityOfficeNoteModel.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class ActivityOfficeNote +public class ActivityOfficeNoteModel { public string ActivityId { get; set; } = ""; public string OfficeNote { get; set; } = ""; diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyModel.cs similarity index 99% rename from Wonky.Entity/DTO/CompanyDto.cs rename to Wonky.Entity/DTO/CompanyModel.cs index 196cd4dc..514c0543 100644 --- a/Wonky.Entity/DTO/CompanyDto.cs +++ b/Wonky.Entity/DTO/CompanyModel.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class CompanyDto +public class CompanyModel { /// /// Account number diff --git a/Wonky.Entity/DTO/ContactDto.cs b/Wonky.Entity/DTO/ContactModel.cs similarity index 98% rename from Wonky.Entity/DTO/ContactDto.cs rename to Wonky.Entity/DTO/ContactModel.cs index 82250d7b..d7129820 100644 --- a/Wonky.Entity/DTO/ContactDto.cs +++ b/Wonky.Entity/DTO/ContactModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ContactDto +public class ContactModel { public string CompanyId { get; set; } = ""; diff --git a/Wonky.Entity/DTO/CredentialDto.cs b/Wonky.Entity/DTO/CredentialModel.cs similarity index 97% rename from Wonky.Entity/DTO/CredentialDto.cs rename to Wonky.Entity/DTO/CredentialModel.cs index 64bb9dd1..d3647878 100644 --- a/Wonky.Entity/DTO/CredentialDto.cs +++ b/Wonky.Entity/DTO/CredentialModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class CredentialDto +public class CredentialModel { /// /// User identification diff --git a/Wonky.Entity/DTO/EmailContact.cs b/Wonky.Entity/DTO/EmailContactModel.cs similarity index 96% rename from Wonky.Entity/DTO/EmailContact.cs rename to Wonky.Entity/DTO/EmailContactModel.cs index 7eab30b2..948b2b45 100644 --- a/Wonky.Entity/DTO/EmailContact.cs +++ b/Wonky.Entity/DTO/EmailContactModel.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class EmailContact +public class EmailContactModel { public string Name { get; set; } = ""; public string Email { get; set; } = ""; diff --git a/Wonky.Entity/DTO/EmailMessage.cs b/Wonky.Entity/DTO/EmailMessageModel.cs similarity index 91% rename from Wonky.Entity/DTO/EmailMessage.cs rename to Wonky.Entity/DTO/EmailMessageModel.cs index 7ee965c7..c6a22039 100644 --- a/Wonky.Entity/DTO/EmailMessage.cs +++ b/Wonky.Entity/DTO/EmailMessageModel.cs @@ -16,9 +16,9 @@ namespace Wonky.Entity.DTO; -public class EmailMessage +public class EmailMessageModel { - public List To { get; set; } = new(); + public List To { get; set; } = new(); public string Subject { get; set; } = ""; public string Body { get; set; } = ""; public bool IsBodyHtml { get; set; } diff --git a/Wonky.Entity/DTO/KrvProductDto.cs b/Wonky.Entity/DTO/KrvProductModel.cs similarity index 97% rename from Wonky.Entity/DTO/KrvProductDto.cs rename to Wonky.Entity/DTO/KrvProductModel.cs index ce4bd699..e0800dc0 100644 --- a/Wonky.Entity/DTO/KrvProductDto.cs +++ b/Wonky.Entity/DTO/KrvProductModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class KrvProductDto +public class KrvProductModel { /// /// Product entity Id diff --git a/Wonky.Entity/DTO/KrvVariantDto.cs b/Wonky.Entity/DTO/KrvVariantModel.cs similarity index 98% rename from Wonky.Entity/DTO/KrvVariantDto.cs rename to Wonky.Entity/DTO/KrvVariantModel.cs index c5fe3514..424faeab 100644 --- a/Wonky.Entity/DTO/KrvVariantDto.cs +++ b/Wonky.Entity/DTO/KrvVariantModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class KrvVariantDto +public class KrvVariantModel { /// /// Variant entity id diff --git a/Wonky.Entity/DTO/OrderProcessState.cs b/Wonky.Entity/DTO/OrderProcessStateModel.cs similarity index 96% rename from Wonky.Entity/DTO/OrderProcessState.cs rename to Wonky.Entity/DTO/OrderProcessStateModel.cs index 6b7cfb43..4f465cd5 100644 --- a/Wonky.Entity/DTO/OrderProcessState.cs +++ b/Wonky.Entity/DTO/OrderProcessStateModel.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class OrderProcessState +public class OrderProcessStateModel { /// /// Entity id diff --git a/Wonky.Entity/DTO/ReportFiguresDto.cs b/Wonky.Entity/DTO/ReportFiguresModel.cs similarity index 99% rename from Wonky.Entity/DTO/ReportFiguresDto.cs rename to Wonky.Entity/DTO/ReportFiguresModel.cs index 23c6788c..0cdc63cf 100644 --- a/Wonky.Entity/DTO/ReportFiguresDto.cs +++ b/Wonky.Entity/DTO/ReportFiguresModel.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class ReportFiguresDto +public class ReportFiguresModel { /// /// Sales day number diff --git a/Wonky.Entity/DTO/ReportInitDto.cs b/Wonky.Entity/DTO/ReportInitModel.cs similarity index 87% rename from Wonky.Entity/DTO/ReportInitDto.cs rename to Wonky.Entity/DTO/ReportInitModel.cs index 742d2539..dc0165d6 100644 --- a/Wonky.Entity/DTO/ReportInitDto.cs +++ b/Wonky.Entity/DTO/ReportInitModel.cs @@ -18,21 +18,21 @@ using Wonky.Entity.Views; namespace Wonky.Entity.DTO; -public class ReportInitDto +public class ReportInitModel { /// /// Flag to prevent activity to be added to report /// public bool ReportClosed { get; set; } - + /// /// Report figures /// - public ReportFiguresDto ReportData { get; set; } - + public ReportFiguresModel ReportData { get; set; } = new(); + /// /// List of activities for report /// - public List ReportItems { get; set; } + public List ReportItems { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Entity/DTO/ReportDto.cs b/Wonky.Entity/DTO/ReportModel.cs similarity index 95% rename from Wonky.Entity/DTO/ReportDto.cs rename to Wonky.Entity/DTO/ReportModel.cs index 69d4a425..d86a0950 100644 --- a/Wonky.Entity/DTO/ReportDto.cs +++ b/Wonky.Entity/DTO/ReportModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ReportDto +public class ReportModel { /// /// Report name @@ -62,5 +62,5 @@ public class ReportDto /// /// Report figures /// - public ReportFiguresDto Figures { get; set; } = new(); + public ReportFiguresModel Figures { get; set; } = new(); } diff --git a/Wonky.Entity/DTO/ResetPasswordDto.cs b/Wonky.Entity/DTO/ResetPasswordModel.cs similarity index 97% rename from Wonky.Entity/DTO/ResetPasswordDto.cs rename to Wonky.Entity/DTO/ResetPasswordModel.cs index e61e7c44..f35cdcdd 100644 --- a/Wonky.Entity/DTO/ResetPasswordDto.cs +++ b/Wonky.Entity/DTO/ResetPasswordModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ResetPasswordDto +public class ResetPasswordModel { /// /// New password diff --git a/Wonky.Entity/DTO/ShortMessage.cs b/Wonky.Entity/DTO/ShortMessageModel.cs similarity index 90% rename from Wonky.Entity/DTO/ShortMessage.cs rename to Wonky.Entity/DTO/ShortMessageModel.cs index b6c3c0c5..0d6625c7 100644 --- a/Wonky.Entity/DTO/ShortMessage.cs +++ b/Wonky.Entity/DTO/ShortMessageModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ShortMessage +public class ShortMessageModel { [Required] [MaxLength(11)] public string From { get; set; } = ""; diff --git a/Wonky.Entity/DTO/TaskItemDto.cs b/Wonky.Entity/DTO/TaskItemModel.cs similarity index 98% rename from Wonky.Entity/DTO/TaskItemDto.cs rename to Wonky.Entity/DTO/TaskItemModel.cs index 7ad82246..85a5f6a3 100644 --- a/Wonky.Entity/DTO/TaskItemDto.cs +++ b/Wonky.Entity/DTO/TaskItemModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class TaskItemDto +public class TaskItemModel { /// /// Task item entity id diff --git a/Wonky.Entity/DTO/UpdateCrmDto.cs b/Wonky.Entity/DTO/UpdateCrmModel.cs similarity index 97% rename from Wonky.Entity/DTO/UpdateCrmDto.cs rename to Wonky.Entity/DTO/UpdateCrmModel.cs index eea0cc7e..553b52a7 100644 --- a/Wonky.Entity/DTO/UpdateCrmDto.cs +++ b/Wonky.Entity/DTO/UpdateCrmModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UpdateCrmDto +public class UpdateCrmModel { public string CrmNotes { get; set; } = ""; public int Interval { get; set; } diff --git a/Wonky.Entity/DTO/UpdateErpDto.cs b/Wonky.Entity/DTO/UpdateErpModel.cs similarity index 98% rename from Wonky.Entity/DTO/UpdateErpDto.cs rename to Wonky.Entity/DTO/UpdateErpModel.cs index 1e12ea44..8a8be1ec 100644 --- a/Wonky.Entity/DTO/UpdateErpDto.cs +++ b/Wonky.Entity/DTO/UpdateErpModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UpdateErpDto +public class UpdateErpModel { [MaxLength(100)] public string Address1 { get; set; } = ""; [MaxLength(50)] public string Address2 { get; set; } = ""; diff --git a/Wonky.Entity/DTO/UserManagerCreate.cs b/Wonky.Entity/DTO/UserAdminCreateModel.cs similarity index 92% rename from Wonky.Entity/DTO/UserManagerCreate.cs rename to Wonky.Entity/DTO/UserAdminCreateModel.cs index 7607f7fa..a7948a8d 100644 --- a/Wonky.Entity/DTO/UserManagerCreate.cs +++ b/Wonky.Entity/DTO/UserAdminCreateModel.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UserManagerCreate +public class UserAdminCreateModel { [MaxLength(128)] public string CompanyId { get; set; } = ""; [MaxLength(128)] public string ContactId { get; set; } = ""; @@ -34,6 +34,6 @@ public class UserManagerCreate [Required(ErrorMessage = "Telefon nummer skal udfyldes")][MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til telefon nummber")] public string PhoneNumber { get; set; } = ""; [Required(ErrorMessage = "Medarbejder ID skal udfyldes")][MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til medarbejder ID")] public string SalesRep { get; set; } = ""; public string UserId { get; set; } = ""; - public List AssignedRoles { get; set; } = new(); - public List AssignedSubjects { get; set; } = new(); + public List AssignedRoles { get; set; } = new(); + public List AssignedSubjects { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserManagerEditView.cs b/Wonky.Entity/DTO/UserAdminEditView.cs similarity index 85% rename from Wonky.Entity/DTO/UserManagerEditView.cs rename to Wonky.Entity/DTO/UserAdminEditView.cs index 13de6ea8..81439823 100644 --- a/Wonky.Entity/DTO/UserManagerEditView.cs +++ b/Wonky.Entity/DTO/UserAdminEditView.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UserManagerEditView +public class UserAdminEditView { [MaxLength(128)] public string CompanyId { get; set; } = ""; [MaxLength(128)] public string ContactId { get; set; } = ""; @@ -30,9 +30,9 @@ public class UserManagerEditView [Required(ErrorMessage = "Efternavn skal udfyldes")][MaxLength(50, ErrorMessage = "Der er afsat 50 tegn til efternavn")] public string LastName { get; set; } = ""; public bool LockoutEnabled { get; set; } public string Passwd { get; set; } = ""; - [Required(ErrorMessage = "Telefon nummer skal udfyldes")][MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til telefon nummber")] public string PhoneNumber { get; set; } = ""; + [MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til telefon nummber")] public string PhoneNumber { get; set; } = ""; [MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til Sælger No.")] public string SalesRep { get; set; } = ""; public string UserId { get; set; } = ""; - public List AssignedRoles { get; set; } = new(); - public List Subjects { get; set; } = new(); + public List AssignedRoles { get; set; } = new(); + public List AssignedUsers { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserRoleAssignment.cs b/Wonky.Entity/DTO/UserAdminRoleAssignmentView.cs similarity index 90% rename from Wonky.Entity/DTO/UserRoleAssignment.cs rename to Wonky.Entity/DTO/UserAdminRoleAssignmentView.cs index 749b93d7..5677ec87 100644 --- a/Wonky.Entity/DTO/UserRoleAssignment.cs +++ b/Wonky.Entity/DTO/UserAdminRoleAssignmentView.cs @@ -16,8 +16,9 @@ namespace Wonky.Entity.DTO; -public class UserRoleAssignment +public class UserAdminRoleAssignmentView { - public string Name { get; set; } public bool Assigned { get; set; } + + public string Name { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/DTO/SubjectAssignment.cs b/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs similarity index 87% rename from Wonky.Entity/DTO/SubjectAssignment.cs rename to Wonky.Entity/DTO/UserSupervisorAssignmentView.cs index 98c547fb..578b593d 100644 --- a/Wonky.Entity/DTO/SubjectAssignment.cs +++ b/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs @@ -16,9 +16,11 @@ namespace Wonky.Entity.DTO; -public class SubjectAssignment +public class UserAssignmentView { - public string Name { get; set; } - public string UserId { get; set; } public bool Assigned { get; set; } + + public string FullName { get; set; } = ""; + + public string UserId { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/DTO/WorkplaceDto.cs b/Wonky.Entity/DTO/WorkplaceModel.cs similarity index 99% rename from Wonky.Entity/DTO/WorkplaceDto.cs rename to Wonky.Entity/DTO/WorkplaceModel.cs index df76c5a0..2538749a 100644 --- a/Wonky.Entity/DTO/WorkplaceDto.cs +++ b/Wonky.Entity/DTO/WorkplaceModel.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class WorkplaceDto +public class WorkplaceModel { /// /// Workplace entity id diff --git a/Wonky.Entity/Views/ClxMessage.cs b/Wonky.Entity/Views/ClxMessageView.cs similarity index 97% rename from Wonky.Entity/Views/ClxMessage.cs rename to Wonky.Entity/Views/ClxMessageView.cs index a093334c..5e6a8fc1 100644 --- a/Wonky.Entity/Views/ClxMessage.cs +++ b/Wonky.Entity/Views/ClxMessageView.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; namespace Wonky.Entity.Views; -public class ClxMessage +public class ClxMessageView { [JsonPropertyName("id")] public string Id { get; set; } = ""; diff --git a/Wonky.Entity/Views/ReportData.cs b/Wonky.Entity/Views/ReportDataView.cs similarity index 99% rename from Wonky.Entity/Views/ReportData.cs rename to Wonky.Entity/Views/ReportDataView.cs index 72d05645..cd74c131 100644 --- a/Wonky.Entity/Views/ReportData.cs +++ b/Wonky.Entity/Views/ReportDataView.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportData +public class ReportDataView { public string ReportId { get; set; } = ""; public string ErpUserId { get; set; } = ""; diff --git a/Wonky.Entity/Views/ReportItemCustomer.cs b/Wonky.Entity/Views/ReportItemCustomerView.cs similarity index 98% rename from Wonky.Entity/Views/ReportItemCustomer.cs rename to Wonky.Entity/Views/ReportItemCustomerView.cs index 19813e75..e3a996a4 100644 --- a/Wonky.Entity/Views/ReportItemCustomer.cs +++ b/Wonky.Entity/Views/ReportItemCustomerView.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportItemCustomer +public class ReportItemCustomerView { /// /// Company entity id diff --git a/Wonky.Entity/Views/ReportItemLine.cs b/Wonky.Entity/Views/ReportItemLineView.cs similarity index 98% rename from Wonky.Entity/Views/ReportItemLine.cs rename to Wonky.Entity/Views/ReportItemLineView.cs index 52aed60c..2a86edd6 100644 --- a/Wonky.Entity/Views/ReportItemLine.cs +++ b/Wonky.Entity/Views/ReportItemLineView.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportItemLine +public class ReportItemLineView { /// /// Line description diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs index 6d7853a9..400b7427 100644 --- a/Wonky.Entity/Views/ReportItemView.cs +++ b/Wonky.Entity/Views/ReportItemView.cs @@ -20,12 +20,12 @@ public class ReportItemView /// /// Customer company info /// - public ReportItemCustomer Company { get; set; } = new(); + public ReportItemCustomerView Company { get; set; } = new(); /// /// Lines /// - public List Lines { get; set; } = new(); + public List Lines { get; set; } = new(); /// /// Activity entity id diff --git a/Wonky.Entity/Views/ReportView.cs b/Wonky.Entity/Views/ReportView.cs index 8589eaaa..ea4e423c 100644 --- a/Wonky.Entity/Views/ReportView.cs +++ b/Wonky.Entity/Views/ReportView.cs @@ -17,6 +17,6 @@ namespace Wonky.Entity.Views; public class ReportView { - public ReportData ReportData { get; set; } = new(); + public ReportDataView ReportDataView { get; set; } = new(); public List ReportItems { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Entity/Views/UserAdvisorInfoView.cs b/Wonky.Entity/Views/UserAdvisorInfoView.cs new file mode 100644 index 00000000..d80453e7 --- /dev/null +++ b/Wonky.Entity/Views/UserAdvisorInfoView.cs @@ -0,0 +1,15 @@ +namespace Wonky.Entity.Views; + +public class UserAdvisorInfoView +{ + public string CountryCode { get; set; } = ""; + public string Description { get; set; } = ""; + public string Email { get; set; } = ""; + public bool EmailConfirmed { get; set; } + public bool EShop { get; set; } + public string FirstName { get; set; } = ""; + public string LastName { get; set; } = ""; + public string PhoneNumber { get; set; } = ""; + public string SalesRep { get; set; } = ""; + public string UserId { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/Views/UserCustomerInfoView.cs b/Wonky.Entity/Views/UserCustomerInfoView.cs new file mode 100644 index 00000000..5b556ced --- /dev/null +++ b/Wonky.Entity/Views/UserCustomerInfoView.cs @@ -0,0 +1,15 @@ +namespace Wonky.Entity.Views; + +public class UserCustomerInfoView +{ + public string CompanyId { get; set; } = ""; + public string ContactId { get; set; } = ""; + public string CountryCode { get; set; } = ""; + public string Description { get; set; } = ""; + public string Email { get; set; } = ""; + public string FirstName { get; set; } = ""; + public string LastName { get; set; } = ""; + public string PhoneNumber { get; set; } = ""; + public string SalesRep { get; set; } = ""; + public string UserId { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserManagerListView.cs b/Wonky.Entity/Views/UserInfoListView.cs similarity index 90% rename from Wonky.Entity/DTO/UserManagerListView.cs rename to Wonky.Entity/Views/UserInfoListView.cs index 43b7faab..3086adbd 100644 --- a/Wonky.Entity/DTO/UserManagerListView.cs +++ b/Wonky.Entity/Views/UserInfoListView.cs @@ -14,14 +14,21 @@ // -namespace Wonky.Entity.DTO; +namespace Wonky.Entity.Views; -public class UserManagerListView +public class UserInfoListView { public string CountryCode { get; set; } = ""; + + public string Description { get; set; } = ""; + public string Email { get; set; } = ""; + public string FullName { get; set; } = ""; + public string PhoneNumber { get; set; } = ""; + public string SalesRep { get; set; } = ""; + public string UserId { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/Views/WarehouseOrderView.cs b/Wonky.Entity/Views/WarehouseOrderView.cs index 0ed14d11..d9685d98 100644 --- a/Wonky.Entity/Views/WarehouseOrderView.cs +++ b/Wonky.Entity/Views/WarehouseOrderView.cs @@ -21,7 +21,7 @@ public class WarehouseOrderView /// /// Customer company info /// - public ReportItemCustomer Company { get; set; } = new(); + public ReportItemCustomerView Company { get; set; } = new(); /// /// Entity id (reference to SalesHeadId) /// @@ -61,5 +61,5 @@ public class WarehouseOrderView /// /// Lines /// - public List Lines { get; set; } = new(); + public List Lines { get; set; } = new(); } \ No newline at end of file