diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs index 438648c7..97025e6e 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 91ab1cba..b90c0f25 100644 --- a/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor @@ -87,6 +87,6 @@ @code{ [Parameter] - public ReportFiguresModel ReportData { get; set; } = new(); + public ReportFiguresDto ReportData { 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 3e9d9d9a..41ee66d9 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 CompanyModel SelectedCompany { get; set; } = new(); + private CompanyDto SelectedCompany { get; set; } = new(); // ****************************************************** // functions diff --git a/Wonky.Client/Components/ReportActivityLedgerComponent.razor b/Wonky.Client/Components/ReportActivityLedgerComponent.razor index f5b0f8e9..980a2ff3 100644 --- a/Wonky.Client/Components/ReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/ReportActivityLedgerComponent.razor @@ -21,7 +21,7 @@ - Dagens Demo @(ReportDataView.NewDemoCount + ReportDataView.RecallDemoCount) + Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount) Dagens Resultat Måneds Resultat @@ -40,47 +40,47 @@ N - @ReportDataView.NewVisitCount - @ReportDataView.NewDemoCount - @ReportDataView.NewSaleCount - @ReportDataView.NewTurnover - @ReportDataView.NewVisitCountMonth - @ReportDataView.NewDemoCountMonth - @ReportDataView.NewSaleCountMonth - @ReportDataView.NewTurnoverMonth + @ReportData.NewVisitCount + @ReportData.NewDemoCount + @ReportData.NewSaleCount + @ReportData.NewTurnover + @ReportData.NewVisitCountMonth + @ReportData.NewDemoCountMonth + @ReportData.NewSaleCountMonth + @ReportData.NewTurnoverMonth R - @ReportDataView.RecallVisitCount - @ReportDataView.RecallDemoCount - @ReportDataView.RecallSaleCount - @ReportDataView.RecallTurnover - @ReportDataView.RecallVisitCountMonth - @ReportDataView.RecallDemoCountMonth - @ReportDataView.RecallSaleCountMonth - @ReportDataView.RecallTurnoverMonth + @ReportData.RecallVisitCount + @ReportData.RecallDemoCount + @ReportData.RecallSaleCount + @ReportData.RecallTurnover + @ReportData.RecallVisitCountMonth + @ReportData.RecallDemoCountMonth + @ReportData.RecallSaleCountMonth + @ReportData.RecallTurnoverMonth SAS - @ReportDataView.SasCount - @ReportDataView.SasTurnover + @ReportData.SasCount + @ReportData.SasTurnover - @ReportDataView.SasCountMonth - @ReportDataView.SasTurnoverMonth + @ReportData.SasCountMonth + @ReportData.SasTurnoverMonth TOTAL - @ReportDataView.TotalVisitCount - @ReportDataView.TotalDemoCount - @ReportDataView.TotalSaleCount - @ReportDataView.TotalTurnover - @ReportDataView.TotalVisitCountMonth - @ReportDataView.TotalDemoCountMonth - @ReportDataView.TotalSaleCountMonth - @ReportDataView.TotalTurnoverMonth + @ReportData.TotalVisitCount + @ReportData.TotalDemoCount + @ReportData.TotalSaleCount + @ReportData.TotalTurnover + @ReportData.TotalVisitCountMonth + @ReportData.TotalDemoCountMonth + @ReportData.TotalSaleCountMonth + @ReportData.TotalTurnoverMonth @@ -88,5 +88,5 @@ @code{ - [Parameter] public ReportDataView ReportDataView { get; set; } = new(); + [Parameter] public ReportData ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor index 7a5f26f6..aa7f6b5a 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor +++ b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor @@ -26,27 +26,27 @@ Aften - @ReportDataView.KmEvening + @ReportData.KmEvening Morgen - @ReportDataView.KmMorning + @ReportData.KmMorning Kørt Dag - @ReportDataView.Distance + @ReportData.Distance Kørt Md. - @ReportDataView.DistanceMonth + @ReportData.DistanceMonth Privat - @ReportDataView.DistancePrivate + @ReportData.DistancePrivate Privat Md. - @ReportDataView.DistancePrivateMonth + @ReportData.DistancePrivateMonth diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs index ae4780a5..c442fb0c 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 ReportDataView ReportDataView { get; set; } = new(); + [Parameter] public ReportData ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportSummaryComponent.razor index 9522f015..28cde7b2 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor +++ b/Wonky.Client/Components/ReportSummaryComponent.razor @@ -24,20 +24,20 @@ Beskrivelse - @ReportDataView.Description + @ReportData.Description Supervisor - @ReportDataView.SupervisedBy + @ReportData.SupervisedBy Dækkende @{ - switch (ReportDataView.DayTypeEnum) + switch (ReportData.DayTypeEnum) { case "Sales": - Salgsdag @ReportDataView.SalesDayNumber + Salgsdag @ReportData.SalesDayNumber break; case "SickLeave": Sygefravær @@ -65,16 +65,16 @@ Periode @{ - switch (ReportDataView.DayTypeEnum) + switch (ReportData.DayTypeEnum) { case "Sales": - @(ReportDataView.FromDateTime.Split(" ")[1]) + @(ReportData.FromDateTime.Split(" ")[1]) break; case "SickLeave": - @(ReportDataView.FromDateTime.Split(" ")[0]) + @(ReportData.FromDateTime.Split(" ")[0]) break; case "Leave": - @(ReportDataView.FromDateTime.Split(" ")[0]) + @(ReportData.FromDateTime.Split(" ")[0]) break; case "Office": @@ -90,16 +90,16 @@ @{ - switch (ReportDataView.DayTypeEnum) + switch (ReportData.DayTypeEnum) { case "Sales": - @(ReportDataView.ToDateTime.Split(" ")[1]) + @(ReportData.ToDateTime.Split(" ")[1]) break; case "SickLeave": - @(ReportDataView.ToDateTime.Split(" ")[0]) + @(ReportData.ToDateTime.Split(" ")[0]) break; case "Leave": - @(ReportDataView.ToDateTime.Split(" ")[0]) + @(ReportData.ToDateTime.Split(" ")[0]) break; case "Office": diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor.cs b/Wonky.Client/Components/ReportSummaryComponent.razor.cs index e5eb118b..7393374a 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 ReportDataView ReportDataView { get; set; } = new(); + [Parameter] public ReportData ReportData { 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 fb85bc7e..51359c2b 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 030b718c..4b43bf94 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(CompanyModel t) + public bool Validate(CompanyDto t) { if (string.IsNullOrWhiteSpace(t.Name) || string.IsNullOrWhiteSpace(t.ZipCode) diff --git a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs index b0c12ab4..10405db9 100644 --- a/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorActivityRepository.cs @@ -80,11 +80,11 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// /// Create new activity /// - /// + /// /// - public async Task CreateActivity(ActivityModel model) + public async Task CreateActivity(ActivityDto activity) { - var response = await _client.PostAsJsonAsync($"{_api.CrmActivities}", model, _options); + var response = await _client.PostAsJsonAsync($"{_api.CrmActivities}", activity, _options); var content = await response.Content.ReadAsStringAsync(); var result = JsonSerializer.Deserialize(content, _options); if (result.IsSuccess) return result!; @@ -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 ActivityModel(); + .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); + return salesItem ?? new ActivityDto(); } /// @@ -173,7 +173,7 @@ public class AdvisorActivityRepository : IAdvisorActivityRepository /// Update office note for activity /// /// - public async Task UpdateOfficeNote(ActivityOfficeNoteModel model) + public async Task UpdateOfficeNote(ActivityOfficeNote 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 5ef25ce5..28de1616 100644 --- a/Wonky.Client/HttpRepository/AdvisorContactRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorContactRepository.cs @@ -48,12 +48,12 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// Create Contact /// - /// + /// /// - public async Task CreateContact(ContactModel model) + public async Task CreateContact(ContactDto contact) { var response = await _client.PostAsJsonAsync( - $"{_conf.CrmCustomers}/{model.CompanyId}/contacts", model, _options); + $"{_conf.CrmCustomers}/{contact.CompanyId}/contacts", contact, _options); return await response.Content.ReadAsStringAsync(); } @@ -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 @@ -98,11 +98,11 @@ public class AdvisorContactRepository : IAdvisorContactRepository /// /// Update Contact /// - /// + /// /// - public async Task UpdateContact(ContactModel model) + public async Task UpdateContact(ContactDto contact) { await _client.PutAsJsonAsync( - $"{_conf.CrmCustomers}/{model.CompanyId}/contacts/{model.ContactId}", model, _options); + $"{_conf.CrmCustomers}/{contact.CompanyId}/contacts/{contact.ContactId}", contact, _options); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs b/Wonky.Client/HttpRepository/AdvisorCustomerRepository.cs index c9a5e9ce..7eb39288 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,21 +94,21 @@ 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); } /// /// Create Customer (SalesRep) /// - /// + /// /// The Id of the entity - public async Task CreateCompany(CompanyModel model) + public async Task CreateCompany(CompanyDto company) { - var response = await _client.PostAsJsonAsync($"{_conf.CrmCustomers}", model, _options); + var response = await _client.PostAsJsonAsync($"{_conf.CrmCustomers}", company, _options); var content = await response.Content.ReadAsStringAsync(); - var result = JsonSerializer.Deserialize(content, _options); + var result = JsonSerializer.Deserialize(content, _options); return result.CompanyId; } @@ -127,48 +127,48 @@ public class AdvisorCustomerRepository : IAdvisorCustomerRepository /// Update CRM customer properties (SalesRep) /// /// - /// + /// /// A CRM Company entity - public async Task UpdateCrmData(string companyId, CompanyModel model) + public async Task UpdateCrmData(string companyId, CompanyDto company) { - var updateModel = new UpdateCrmModel + var updateModel = new UpdateCrmDto { - Interval = model.Interval, - Note = model.Note, - CrmNotes = model.CrmNotes, - IsHidden = model.IsHidden, - LastVisit = model.LastVisit, - NextVisit = model.NextVisit + Interval = company.Interval, + Note = company.Note, + CrmNotes = company.CrmNotes, + IsHidden = company.IsHidden, + LastVisit = company.LastVisit, + NextVisit = company.NextVisit }; 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); } /// /// Update ERP customer properties (SalesRep) /// /// - /// + /// /// A CRM Company entity - public async Task UpdateErpData(string companyId, CompanyModel model) + public async Task UpdateErpData(string companyId, CompanyDto company) { - var updateModel = new UpdateErpModel + var updateModel = new UpdateErpDto { - Address1 = model.Address1, - Address2 = model.Address2, - Attention = model.Attention, - City = model.City, - Email = model.Email, - Mobile = model.Mobile, - Name = model.Name, - Phone = model.Phone, - ZipCode = model.ZipCode + Address1 = company.Address1, + Address2 = company.Address2, + Attention = company.Attention, + City = company.City, + Email = company.Email, + Mobile = company.Mobile, + Name = company.Name, + Phone = company.Phone, + ZipCode = company.ZipCode }; 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 CompanyModel(); + return new CompanyDto(); var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content) - ?? new CompanyModel { Name = "ERROR", VatNumber = vatNumber, CrmNotes = $"FEJL: {content}" }; + return JsonSerializer.Deserialize(content) + ?? new CompanyDto { 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 ea910e6a..a844a93e 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 ReportInitModel(); + .GetFromJsonAsync($"{_api.CrmReports}/init/{workDate}"); + return initData ?? new ReportInitDto(); } /// /// Create Report for given data - using reportData /// /// - /// + /// /// - public async Task CreateReport(string workDate, ReportModel reportModel) + public async Task CreateReport(string workDate, ReportDto reportDto) { var response = await _client - .PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportModel, _options); + .PostAsJsonAsync($"{_api.CrmReports}/{workDate}", reportDto, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs b/Wonky.Client/HttpRepository/AdvisorTaskItemRepository.cs index aba9a12f..7081b009 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(TaskItemModel taskItem) + public async Task CreateTaskItem(TaskItemDto taskItem) { await _client.PostAsJsonAsync($"{_apiConfig.CrmTasks}", taskItem, _options); } @@ -89,7 +89,7 @@ public class AdvisorTaskItemRepository : IAdvisorTaskItemRepository /// /// /// - public async Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem) + public async Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem) { await _client.PutAsJsonAsync($"{_apiConfig.CrmTasks}/{taskItemId}", taskItem, _options); } diff --git a/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs b/Wonky.Client/HttpRepository/AdvisorWorkplaceRepository.cs index dc6116b1..863e2592 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 WorkplaceModel(); + return result ?? new WorkplaceDto(); } /// @@ -77,7 +77,7 @@ public class AdvisorWorkplaceRepository : IAdvisorWorkplaceRepository /// /// /// - public async Task CreateWorkplace(string companyId, WorkplaceModel workplace) + public async Task CreateWorkplace(string companyId, WorkplaceDto 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, WorkplaceModel workplace) + public async Task UpdateWorkplace(string companyId, WorkplaceDto 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 189c414e..9c896f17 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 ActivityModel(); + .GetFromJsonAsync($"{_api.CrmActivities}/{activityId}"); + return activity ?? new ActivityDto(); } /// @@ -76,7 +76,7 @@ public class CountryActivityRepository : ICountryActivityRepository : JsonSerializer.Deserialize>(content, _options); } - public async Task CreatePhoneOrder(string customerId, ActivityModel activity) + public async Task CreatePhoneOrder(string customerId, ActivityDto activity) { var response = await _client.PostAsJsonAsync($"{_api.OfficeCustomers}/{activity.CountryCode}/id/{customerId}/activities", activity); var content = await response.Content.ReadAsStringAsync(); diff --git a/Wonky.Client/HttpRepository/CountryCustomerRepository.cs b/Wonky.Client/HttpRepository/CountryCustomerRepository.cs index 3a737f5c..670cbbe4 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 CompanyModel(); + var company = await _client.GetFromJsonAsync($"{_api.OfficeCustomers}/{countryCode}/id/{companyId}"); + return company ?? new CompanyDto(); } /// @@ -129,11 +129,11 @@ public class CountryCustomerRepository : ICountryCustomerRepository /// /// /// - /// + /// /// - public async Task UpdateCompany(string countryCode, string companyId, CompanyModel model) + public async Task UpdateCompany(string countryCode, string companyId, CompanyDto company) { - var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}", model); + var response = await _client.PutAsJsonAsync($"{_api.OfficeCustomers}/{countryCode}/{companyId}", company); var content = await response.Content.ReadAsStringAsync(); Console.WriteLine(content); return response.IsSuccessStatusCode; diff --git a/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs index e055498a..51f155a4 100644 --- a/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorActivityRepository.cs @@ -39,9 +39,9 @@ public interface IAdvisorActivityRepository /// /// Create new activity /// - /// + /// /// - Task CreateActivity(ActivityModel model); + Task CreateActivity(ActivityDto activity); /// /// 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(ActivityOfficeNoteModel model); + Task UpdateOfficeNote(ActivityOfficeNote model); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs index 54d2e731..377407b7 100644 --- a/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs +++ b/Wonky.Client/HttpRepository/IAdvisorContactRepository.cs @@ -26,9 +26,9 @@ public interface IAdvisorContactRepository /// /// Create Contact /// - /// + /// /// - Task CreateContact(ContactModel model); + Task CreateContact(ContactDto contact); /// /// 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 @@ -56,7 +56,7 @@ public interface IAdvisorContactRepository /// /// Update Contact /// - /// + /// /// - Task UpdateContact(ContactModel model); + Task UpdateContact(ContactDto contact); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs b/Wonky.Client/HttpRepository/IAdvisorCustomerRepository.cs index 3a556da6..7d63daed 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(CompanyModel model); + Task CreateCompany(CompanyDto company); /// /// Delete the CRM customer (SalesRep) @@ -56,17 +56,17 @@ public interface IAdvisorCustomerRepository /// Update CRM customer properties (SalesRep) /// /// - /// + /// /// A CRM Company entity - Task UpdateCrmData(string companyId, CompanyModel model); + Task UpdateCrmData(string companyId, CompanyDto company); /// /// Update ERP customer properties (SalesRep) /// /// - /// + /// /// A CRM Company entity - Task UpdateErpData(string companyId, CompanyModel model); + Task UpdateErpData(string companyId, CompanyDto company); /// /// 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 84448e59..299d5ce1 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, ReportModel reportModel); + Task CreateReport(string workDate, ReportDto reportDto); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs b/Wonky.Client/HttpRepository/IAdvisorTaskItemRepository.cs index bf91a9b0..d96d5f77 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(TaskItemModel taskItem); + Task CreateTaskItem(TaskItemDto taskItem); /// /// Delete Task Item (SalesRep /// /// /// - Task UpdateTaskItem(string taskItemId, TaskItemModel taskItem); + Task UpdateTaskItem(string taskItemId, TaskItemDto taskItem); /// /// Delete Task Item (SalesRep diff --git a/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs b/Wonky.Client/HttpRepository/IAdvisorWorkplaceRepository.cs index 04ebea79..56159e8c 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, WorkplaceModel workplace); + Task CreateWorkplace(string companyId, WorkplaceDto workplace); /// /// Update workplace given the customer id and updated data @@ -52,7 +52,7 @@ public interface IAdvisorWorkplaceRepository /// /// /// - Task UpdateWorkplace(string companyId, WorkplaceModel workplace); + Task UpdateWorkplace(string companyId, WorkplaceDto workplace); /// /// Delete workplace given customer id and workplace id diff --git a/Wonky.Client/HttpRepository/ICountryActivityRepository.cs b/Wonky.Client/HttpRepository/ICountryActivityRepository.cs index 827c1cd2..b5101d28 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, ActivityModel activity); + Task CreatePhoneOrder(string customerId, ActivityDto activity); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs b/Wonky.Client/HttpRepository/IOfficeCustomerRepository.cs index f5fc7a3f..fb4e0ae5 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,14 +47,14 @@ public interface ICountryCustomerRepository /// /// /// - Task GetByCustomerId(string countryCode, string companyId); + Task GetByCustomerId(string countryCode, string companyId); /// /// Update Company data /// /// /// - /// + /// /// - Task UpdateCompany(string countryCode, string companyId, CompanyModel model); + Task UpdateCompany(string countryCode, string companyId, CompanyDto company); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/IOrderProcessRepository.cs b/Wonky.Client/HttpRepository/IOrderProcessRepository.cs index 5fe97e60..0b0e564e 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(OrderProcessStateModel processStateModel); + Task UpdateWarehouseOrderStatus(OrderProcessState processState); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemSendMailService.cs b/Wonky.Client/HttpRepository/ISystemSendMailService.cs index 20942430..ac27f85f 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, EmailMessageModel messageModel); + Task SendMail(string messageType, EmailMessage message); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemSendSmsService.cs b/Wonky.Client/HttpRepository/ISystemSendSmsService.cs index 0612bab0..c7867caf 100644 --- a/Wonky.Client/HttpRepository/ISystemSendSmsService.cs +++ b/Wonky.Client/HttpRepository/ISystemSendSmsService.cs @@ -27,7 +27,7 @@ public interface ISystemSendSmsService /// Send Mail /// /// - /// + /// /// - Task SendSms(ShortMessageModel messageModel); + Task SendSms(ShortMessage message); } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/ISystemUserRepository.cs b/Wonky.Client/HttpRepository/ISystemUserRepository.cs index 48a68cc1..414d9c6f 100644 --- a/Wonky.Client/HttpRepository/ISystemUserRepository.cs +++ b/Wonky.Client/HttpRepository/ISystemUserRepository.cs @@ -40,14 +40,14 @@ public interface ISystemUserRepository /// /// /// - Task GetUserInfo(string userId); + Task GetUserInfo(string userId); /// /// Update User using userId and updated data /// /// /// - Task CreateUser(UserAdminCreateModel model); + Task CreateUser(UserManagerCreate model); /// /// Update User using userId and updated data @@ -55,7 +55,7 @@ public interface ISystemUserRepository /// /// /// - Task UpdateUserInfo(string userId, UserAdminEditView model); + Task UpdateUserInfo(string userId, UserManagerEditView model); /// /// Delete the user with id diff --git a/Wonky.Client/HttpRepository/OrderProcessRepository.cs b/Wonky.Client/HttpRepository/OrderProcessRepository.cs index 18671dcb..0929f509 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(OrderProcessStateModel processStateModel) + public async Task UpdateWarehouseOrderStatus(OrderProcessState processState) { - _logger.LogDebug("process => {}", JsonSerializer.Serialize(processStateModel, _options)); - await _client.PutAsJsonAsync($"{_api.Warehouse}/{processStateModel.OrderId}", processStateModel, _options); + _logger.LogDebug("process => {}", JsonSerializer.Serialize(processState, _options)); + await _client.PutAsJsonAsync($"{_api.Warehouse}/{processState.OrderId}", processState, _options); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/SystemSendMailService.cs b/Wonky.Client/HttpRepository/SystemSendMailService.cs index 52ad3108..a58e355c 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, EmailMessageModel messageModel) + public async Task SendMail(string messageType, EmailMessage message) { - var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", messageModel, _options); + var response = await _client.PostAsJsonAsync($"{_api.ServicesMail}/{messageType}", message, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/SystemSendSmsService.cs b/Wonky.Client/HttpRepository/SystemSendSmsService.cs index 55b3cf4e..8ae5a48c 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(ShortMessageModel messageModel) + public async Task SendSms(ShortMessage message) { - var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", messageModel, _options); + var response = await _client.PostAsJsonAsync($"{_api.ServicesSms}", message, _options); if (!response.IsSuccessStatusCode) return new ApiResponseView { diff --git a/Wonky.Client/HttpRepository/SystemUserRepository.cs b/Wonky.Client/HttpRepository/SystemUserRepository.cs index 663ae4eb..c261a0b9 100644 --- a/Wonky.Client/HttpRepository/SystemUserRepository.cs +++ b/Wonky.Client/HttpRepository/SystemUserRepository.cs @@ -62,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}"); } /// @@ -72,18 +72,18 @@ public class SystemUserRepository : ISystemUserRepository /// /// /// - public async Task CreateUser(UserAdminCreateModel model) + public async Task CreateUser(UserManagerCreate model) { var result = await _client.PostAsJsonAsync($"{_api.UserManager}", model, _options); if (!result.IsSuccessStatusCode) - return new UserAdminEditView(); + return new UserManagerEditView(); try { - return await result.Content.ReadFromJsonAsync(); + return await result.Content.ReadFromJsonAsync(); } catch { - return new UserAdminEditView(); + return new UserManagerEditView(); } } @@ -93,7 +93,7 @@ public class SystemUserRepository : ISystemUserRepository /// /// /// - public async Task UpdateUserInfo(string userId, UserAdminEditView model) + public async Task UpdateUserInfo(string userId, UserManagerEditView 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 4548938b..1f7b9175 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 6731c144..387a3e95 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 CompanyModel Company { get; set; } = new(); + [Parameter] public CompanyDto 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 ca6d5daa..43768e75 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 CompanyModel Company { get; set; } + [Parameter] public CompanyDto 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 316e5885..09012f5e 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 CompanyModel Company { get; set; } = new(); + [Parameter] public CompanyDto 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 30b12b13..29b723fa 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 CompanyModel Company { get; set; } = new(); + [Parameter] public CompanyDto 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 a07ad556..6dc9db6a 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 CompanyModel Company { get; set; } = new(); + [Parameter] public CompanyDto 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 a2408858..2c0b9c98 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 CompanyModel Company { get; set; } = new(); + [Parameter] public CompanyDto 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 bf072b44..21cbcb89 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 ActivityModel Activity { get; set; } = new(); - private CompanyModel Company { get; set; } = new(); + private ActivityDto Activity { get; set; } = new(); + private CompanyDto 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 UserAdminEditView SalesRep { get; set; } = new(); + private UserManagerEditView 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 6218b35e..8cb5a665 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 4e709e7d..a2da8d68 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 ActivityOfficeNoteModel NoteModel { get; set; } = new(); + private ActivityOfficeNote Note { 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(NoteModel); + NoteContext = new EditContext(Note); NoteContext.OnFieldChanged += HandleFieldChanged; ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); - NoteModel.ActivityId = ReportItem.ActivityId; - NoteModel.OfficeNote = ReportItem.OfficeNote; + Note.ActivityId = ReportItem.ActivityId; + Note.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(NoteModel)); - await AdvisorActivityRepo.UpdateOfficeNote(NoteModel); + Logger.LogDebug("OfficeNote => \n {}", JsonSerializer.Serialize(Note)); + await AdvisorActivityRepo.UpdateOfficeNote(Note); Toaster.ShowInfo($"{ReportItem.ESalesNumber} - notat opdateret"); Navigator.NavigateTo("/advisor/activity-today"); } diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs index 8733fb5d..c34beff0 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 25f73ab3..e64986d7 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 296e8b18..ca8efaf4 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 cfbcb7f8..d4f135ba 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 483d5db9..15075899 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 UserAdminEditView UserInfo { get; set; } = new(); + private UserManagerEditView 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 4c9d6b22..52e82f8d 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 ContactModel SelectedContact { get; set; } = new(); - private ContactModel DefaultContact { get; set; } = new(); + private ContactDto SelectedContact { get; set; } = new(); + private ContactDto DefaultContact { get; set; } = new(); private ContactModal ContactPopup { get; set; } = new(); - private UserAdminEditView UserInfo { get; set; } = new(); + private UserManagerEditView 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 ContactModel { CompanyId = CompanyId, ContactId = "", FirstName = "" }; + DefaultContact = new ContactDto { 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(ContactModel contact) + private void OpenContactPopup(ContactDto 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(ContactModel contact) + private async Task WriteContactCallback(ContactDto contact) { Working = true; // write contact to debug log @@ -265,7 +265,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable } // reset selected contact - SelectedContact = new ContactModel(); + SelectedContact = new ContactDto(); // 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 ContactModel(); + SelectedContact = new ContactDto(); // reload contacts from backend await FetchContacts(CompanyId); Working = false; @@ -366,32 +366,32 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /// /// Prepare vat address from company model /// - /// + /// /// - private static VatAddress PrepareVatAddress(CompanyModel model) + private static VatAddress PrepareVatAddress(CompanyDto company) { var digits = "1234567890".ToCharArray(); // process address1 - var pos1 = model.Address1.IndexOfAny(digits); + var pos1 = company.Address1.IndexOfAny(digits); if (pos1 > 0) { return new VatAddress { - ZipCode = model.ZipCode.Trim(), - StreetName = model.Address1[..pos1].Trim(), - HouseNumber = Regex.Replace(model.Address1[pos1..], "[^0-9]", "").Trim() + ZipCode = company.ZipCode.Trim(), + StreetName = company.Address1[..pos1].Trim(), + HouseNumber = Regex.Replace(company.Address1[pos1..], "[^0-9]", "").Trim() }; } // process address2 - var pos2 = model.Address2.IndexOfAny(digits); + var pos2 = company.Address2.IndexOfAny(digits); if (pos2 > 0) { return new VatAddress { - ZipCode = model.ZipCode.Trim(), - StreetName = model.Address2[..pos2].Trim(), - HouseNumber = Regex.Replace(model.Address2[pos2..], "[^0-9]", "").Trim() + ZipCode = company.ZipCode.Trim(), + StreetName = company.Address2[..pos2].Trim(), + HouseNumber = Regex.Replace(company.Address2[pos2..], "[^0-9]", "").Trim() }; } diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index a8a753e6..22f6d73b 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 ReportModel Report { get; set; } = new(); + private ReportDto Report { get; set; } = new(); private List Activities { get; set; } = new(); - private ReportFiguresModel InitialValues { get; set; } = new(); + private ReportFiguresDto 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 ReportFiguresModel(); - InitialValues = new ReportFiguresModel(); + Report.Figures = new ReportFiguresDto(); + InitialValues = new ReportFiguresDto(); 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 ReportFiguresModel(); - InitialValues = new ReportFiguresModel(); + Report.Figures = new ReportFiguresDto(); + InitialValues = new ReportFiguresDto(); Activities = new List(); Report.Figures.KmEvening = 0; diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index 1ee0ab41..f9311dfa 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.ReportDataView.Name +@Report.ReportData.Name
@@ -36,22 +36,22 @@
- @if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum)) + @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { - @Report.ReportDataView.Name + @Report.ReportData.Name
-

@Report.ReportDataView.Name

+

@Report.ReportData.Name

- +
- +
- + } else { diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index 63b89bc4..cef084bb 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 UserAdminEditView XUserInfo { get; set; } = new(); + private UserManagerEditView 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.ReportDataView.ReportDate)) + if (string.IsNullOrWhiteSpace(Report.ReportData.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.ReportDataView.ReportDate)) + if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { - await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportDataView.ReportDate}", Report); + await Storage.SetItemAsync($"{XUserInfo.UserId}-{Report.ReportData.ReportDate}", Report); } // remove busy signal diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index eda752eb..5db3d740 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 7a6ffe08..b5e3a969 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 TaskItemModel TaskItem { get; set; } = new (); + private TaskItemDto 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 afe596de..71d02038 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 CompanyModel Company { get; set; } = new(); + private CompanyDto 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 1ac85d66..6bf81b6b 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 WorkplaceModel Workplace { get; set; } = new(); + private WorkplaceDto 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 be22df18..09f58d74 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs @@ -43,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 UserAdminEditView XUserInfo { get; set; } = new(); + private UserManagerEditView 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 bf5093a4..a132163d 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 OrderProcessStateModel + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed) diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor index ff9de247..4aaeef5f 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor @@ -29,22 +29,22 @@
- @Report.ReportDataView.Name + @Report.ReportData.Name
-

@Report.ReportDataView.Name

+

@Report.ReportData.Name

- +
- +
- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/Login.razor b/Wonky.Client/Pages/Login.razor index 172ca3c1..f6991495 100644 --- a/Wonky.Client/Pages/Login.razor +++ b/Wonky.Client/Pages/Login.razor @@ -36,7 +36,7 @@
- + @* username *@
@@ -44,8 +44,8 @@ - + @bind-Value="CredentialDto.Email" autocomplete="username"/> +
@* current-password *@
@@ -53,8 +53,8 @@ - + @bind-Value="CredentialDto.Password" autocomplete="current-password"/> +
@* submit button *@
diff --git a/Wonky.Client/Pages/Login.razor.cs b/Wonky.Client/Pages/Login.razor.cs index 4bafaa31..7f727389 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 CredentialModel CredentialModel { get; set; } = new (); + private CredentialDto CredentialDto { 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(CredentialModel); + var result = await AuthenticationService.Login(CredentialDto); if (!result.IsSuccess) { Error = result.ErrorMessage; diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 4b5fb50a..2c800c51 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -35,24 +35,24 @@
- @if (!string.IsNullOrWhiteSpace(Report.ReportDataView.DayTypeEnum)) + @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { - @Report.ReportDataView.Name + @Report.ReportData.Name
-

@Report.ReportDataView.Name

+

@Report.ReportData.Name

- +
- +
- + } else { diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs index c45bb7de..a9063ab0 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs @@ -14,6 +14,7 @@ // +using System.Text.Json; using Blazored.LocalStorage; using Blazored.Toast.Services; using Microsoft.AspNetCore.Components; @@ -31,9 +32,6 @@ namespace Wonky.Client.Pages; public partial class OfficeAdvisorReportViewPage : IDisposable { - [Parameter] public string CountryCode { get; set; } = ""; - [Parameter] public string UserId { get; set; } = ""; - [Parameter] public string ReportDate { get; set; } = ""; [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryReportRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -43,6 +41,11 @@ public partial class OfficeAdvisorReportViewPage : IDisposable [Inject] public IJSRuntime JsRuntime { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public IOrderProcessRepository ProcessRepo { get; set; } + + [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string ReportDate { get; set; } = ""; + private IJSObjectReference JsModule { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); @@ -56,6 +59,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable Interceptor.RegisterBeforeSendEvent(); ProfileService.OnChange += ProfileServiceOnOnChange; + await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); await FetchUserReport(ReportDate); @@ -98,7 +102,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable foreach (var item in orders) { Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); - await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessStateModel + await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed) @@ -115,7 +119,7 @@ public partial class OfficeAdvisorReportViewPage : IDisposable private async Task FetchUserReport(string workDate) { // remove busy signal if report is empty - if (string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) + if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { Working = false; } @@ -138,14 +142,16 @@ public partial class OfficeAdvisorReportViewPage : IDisposable // set busy signal Working = true; + Logger.LogDebug("UserId => {}", UserId); // fetch report Report = await ReportRepo.GetCountryReport(UserId, workDate); - + Logger.LogDebug("Report => {}", JsonSerializer.Serialize(Report, new JsonSerializerOptions(JsonSerializerDefaults.Web))); + // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); // store locally - if (!string.IsNullOrWhiteSpace(Report.ReportDataView.ReportDate)) + if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { await Storage.SetItemAsync($"{UserId}-{workDate}", Report); } diff --git a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs index 464ac7d5..ba2f27d0 100644 --- a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs @@ -35,7 +35,7 @@ public partial class OfficeCustomerAdvisorPagedListPage : IDisposable [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(); @@ -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 c9747074..7bf009bd 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 UserAdminEditView UserInfo { get; set; } = new(); + private UserManagerEditView UserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool ShowFolded { get; set; } private bool Working { get; set; } = true; @@ -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 5b6801c8..38fed9ed 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 CompanyModel Company { get; set; } = new(); - private UserAdminEditView UserInfo { get; set; } = new(); + private CompanyDto Company { get; set; } = new(); + private UserManagerEditView UserInfo { get; set; } = new(); private SalesItemView SelectedItem { get; set; } = new(); - private ActivityModel Activity { get; set; } = new(); - private UserAdminEditView SalesRep { get; set; } = new(); + private ActivityDto Activity { get; set; } = new(); + private UserManagerEditView 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 8b360f17..59e25cf9 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -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 EmailMessageModel + var msg = new EmailMessage { 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 6a2ebdbe..bd4064ce 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs @@ -28,7 +28,9 @@ public partial class OfficeUserAdvisorListPage :IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeUserInfoRepository UserRepo { get; set; } + [Parameter] public string CountryCode { get; set; } = ""; + private List SalesReps { get; set; } = new(); private bool Working { get; set; } = true; private string CountryName { get; set; } = ""; @@ -40,6 +42,7 @@ public partial class OfficeUserAdvisorListPage :IDisposable CountryName = Utils.CountryName(CountryCode); var AdvisorList = await UserRepo.GetUsers("Advisor"); SalesReps = AdvisorList + .Where(x => string.Equals(x.CountryCode, CountryCode, StringComparison.InvariantCultureIgnoreCase)) .OrderBy(x => x.FullName) .ToList(); Working = false; diff --git a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor index 162f85d8..9b5a5462 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 f4dd82f6..d3fc2900 100644 --- a/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs +++ b/Wonky.Client/Pages/SystemMaintenanceMessagePage.razor.cs @@ -18,10 +18,10 @@ public partial class SystemMaintenanceMessagePage : IDisposable [Inject] public IToastService Toaster { get; set; } private List Users { get; set; } = new(); - private ShortMessageModel MessageModel { get; set; } = new(); + private ShortMessage Message { get; set; } = new(); private List Recipients { get; set; } = new(); private ApiResponseView SmsResponse { get; set; } = new(); - private ClxMessageView? ClxMsg { get; set; } = new(); + private ClxMessage? 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(MessageModel.Body)) + if (string.IsNullOrWhiteSpace(Message.Body)) { Toaster.ShowError("Meddelelsesfeltet er tomt!"); return; } - MessageModel.From = "Innotec IT"; - MessageModel.To = string.Join(",", recipients); + Message.From = "Innotec IT"; + Message.To = string.Join(",", recipients); - Logger.LogDebug("{}", JsonSerializer.Serialize(MessageModel, _options)); + Logger.LogDebug("{}", JsonSerializer.Serialize(Message, _options)); - SmsResponse = await SmsService.SendSms(MessageModel); + SmsResponse = await SmsService.SendSms(Message); if (SmsResponse.Code == 201) { - ClxMsg = JsonSerializer.Deserialize(SmsResponse.Message); + ClxMsg = JsonSerializer.Deserialize(SmsResponse.Message); MsgSent = true; } Working = false; diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs index 94ae1fe8..cce0bd2a 100644 --- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs @@ -35,7 +35,7 @@ public partial class SystemSupervisorViewEditPage : IDisposable PropertyNameCaseInsensitive = true }; [Parameter] public string UserId { get; set; } = ""; - private UserAdminEditView UserData { get; set; } = new(); + private UserManagerEditView UserData { get; set; } = new(); private bool Working { get; set; } = true; private EditContext UserAssignmentContext { get; set; } diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs index 68f12562..d2b706ce 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 UserAdminCreateModel NewUserInfo { get; set; } = new(); + private UserManagerCreate 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/SystemUserViewEditPage.razor.cs b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs index b5cb36b9..d4ff0cd6 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 UserAdminEditView UserData { get; set; } = new(); + private UserManagerEditView UserData { get; set; } = new(); private EditContext UserEditContext { get; set; } - private ResetPasswordModel Passwords { get; set; } = new(); + private ResetPasswordDto 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 f6c73965..96ec81e9 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 OrderProcessStateModel + var process = new OrderProcessState { 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 OrderProcessStateModel + var process = new OrderProcessState { OrderId = order.OrderId, ProcessStatusEnum = "shipped" diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index 9a7c8911..f06c6a42 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 OrderProcessStateModel + var process = new OrderProcessState { OrderId = Order.OrderId, ProcessStatusEnum = "picked" @@ -68,7 +68,7 @@ public partial class WarehouseOrderViewPage : IDisposable if (Working) return; Working = true; - var process = new OrderProcessStateModel + var process = new OrderProcessState { OrderId = Order.OrderId, ProcessStatusEnum = "packed" @@ -82,7 +82,7 @@ public partial class WarehouseOrderViewPage : IDisposable if (Working) return; Working = true; - var process = new OrderProcessStateModel + var process = new OrderProcessState { OrderId = Order.OrderId, ProcessStatusEnum = "shipped" diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index ebcfce5d..ebfddf78 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(CredentialModel credentials) + public async Task Login(CredentialDto 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 UserAdminEditView(); + return userInfo ?? new UserManagerEditView(); } } \ No newline at end of file diff --git a/Wonky.Client/Services/IAuthenticationService.cs b/Wonky.Client/Services/IAuthenticationService.cs index 56bddd81..b75bad30 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(CredentialModel credentials); + Task Login(CredentialDto 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 b3e14cf7..0df4fc21 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(UserAdminEditView userInfo); + Task GetUserInfo(); + Task SetUserInfo(UserManagerEditView userInfo); Task GetRefreshToken(); Task SetRefreshToken(string token); Task GetAccessToken(); diff --git a/Wonky.Client/Services/UserInfoService.cs b/Wonky.Client/Services/UserInfoService.cs index d7eab9bb..b0809c78 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(UserAdminEditView userInfo) + public async Task SetUserInfo(UserManagerEditView userInfo) { await _localStorageService.SetItemAsync(_infoKey, userInfo); } diff --git a/Wonky.Client/Shared/ContactModal.razor.cs b/Wonky.Client/Shared/ContactModal.razor.cs index 96f1eb54..6dde285a 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 ContactModel ParamContact { get; set; } = new(); + [Parameter] public ContactDto 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 ContactModel Contact { get; set; } = new(); + private ContactDto 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 ContactModel + Contact = new ContactDto { CompanyId = ParamContact.CompanyId, ContactId = ParamContact.ContactId, @@ -84,7 +84,7 @@ public partial class ContactModal { _modalDisplay = "none;"; _showBackdrop = false; - Contact = new ContactModel(); + Contact = new ContactDto(); StateHasChanged(); } } \ No newline at end of file diff --git a/Wonky.Entity/DTO/ActivityModel.cs b/Wonky.Entity/DTO/ActivityDto.cs similarity index 99% rename from Wonky.Entity/DTO/ActivityModel.cs rename to Wonky.Entity/DTO/ActivityDto.cs index 895a3e04..3c938a19 100644 --- a/Wonky.Entity/DTO/ActivityModel.cs +++ b/Wonky.Entity/DTO/ActivityDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ActivityModel +public class ActivityDto { /// /// Activity entity id diff --git a/Wonky.Entity/DTO/ActivityOfficeNoteModel.cs b/Wonky.Entity/DTO/ActivityOfficeNote.cs similarity index 96% rename from Wonky.Entity/DTO/ActivityOfficeNoteModel.cs rename to Wonky.Entity/DTO/ActivityOfficeNote.cs index 748868cc..2ee0c8f7 100644 --- a/Wonky.Entity/DTO/ActivityOfficeNoteModel.cs +++ b/Wonky.Entity/DTO/ActivityOfficeNote.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class ActivityOfficeNoteModel +public class ActivityOfficeNote { public string ActivityId { get; set; } = ""; public string OfficeNote { get; set; } = ""; diff --git a/Wonky.Entity/DTO/CompanyModel.cs b/Wonky.Entity/DTO/CompanyDto.cs similarity index 99% rename from Wonky.Entity/DTO/CompanyModel.cs rename to Wonky.Entity/DTO/CompanyDto.cs index 514c0543..196cd4dc 100644 --- a/Wonky.Entity/DTO/CompanyModel.cs +++ b/Wonky.Entity/DTO/CompanyDto.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class CompanyModel +public class CompanyDto { /// /// Account number diff --git a/Wonky.Entity/DTO/ContactModel.cs b/Wonky.Entity/DTO/ContactDto.cs similarity index 98% rename from Wonky.Entity/DTO/ContactModel.cs rename to Wonky.Entity/DTO/ContactDto.cs index d7129820..82250d7b 100644 --- a/Wonky.Entity/DTO/ContactModel.cs +++ b/Wonky.Entity/DTO/ContactDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ContactModel +public class ContactDto { public string CompanyId { get; set; } = ""; diff --git a/Wonky.Entity/DTO/CredentialModel.cs b/Wonky.Entity/DTO/CredentialDto.cs similarity index 97% rename from Wonky.Entity/DTO/CredentialModel.cs rename to Wonky.Entity/DTO/CredentialDto.cs index d3647878..64bb9dd1 100644 --- a/Wonky.Entity/DTO/CredentialModel.cs +++ b/Wonky.Entity/DTO/CredentialDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class CredentialModel +public class CredentialDto { /// /// User identification diff --git a/Wonky.Entity/DTO/EmailContactModel.cs b/Wonky.Entity/DTO/EmailContact.cs similarity index 96% rename from Wonky.Entity/DTO/EmailContactModel.cs rename to Wonky.Entity/DTO/EmailContact.cs index 948b2b45..7eab30b2 100644 --- a/Wonky.Entity/DTO/EmailContactModel.cs +++ b/Wonky.Entity/DTO/EmailContact.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class EmailContactModel +public class EmailContact { public string Name { get; set; } = ""; public string Email { get; set; } = ""; diff --git a/Wonky.Entity/DTO/EmailMessageModel.cs b/Wonky.Entity/DTO/EmailMessage.cs similarity index 91% rename from Wonky.Entity/DTO/EmailMessageModel.cs rename to Wonky.Entity/DTO/EmailMessage.cs index c6a22039..7ee965c7 100644 --- a/Wonky.Entity/DTO/EmailMessageModel.cs +++ b/Wonky.Entity/DTO/EmailMessage.cs @@ -16,9 +16,9 @@ namespace Wonky.Entity.DTO; -public class EmailMessageModel +public class EmailMessage { - 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/KrvProductModel.cs b/Wonky.Entity/DTO/KrvProductDto.cs similarity index 97% rename from Wonky.Entity/DTO/KrvProductModel.cs rename to Wonky.Entity/DTO/KrvProductDto.cs index e0800dc0..ce4bd699 100644 --- a/Wonky.Entity/DTO/KrvProductModel.cs +++ b/Wonky.Entity/DTO/KrvProductDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class KrvProductModel +public class KrvProductDto { /// /// Product entity Id diff --git a/Wonky.Entity/DTO/KrvVariantModel.cs b/Wonky.Entity/DTO/KrvVariantDto.cs similarity index 98% rename from Wonky.Entity/DTO/KrvVariantModel.cs rename to Wonky.Entity/DTO/KrvVariantDto.cs index 424faeab..c5fe3514 100644 --- a/Wonky.Entity/DTO/KrvVariantModel.cs +++ b/Wonky.Entity/DTO/KrvVariantDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class KrvVariantModel +public class KrvVariantDto { /// /// Variant entity id diff --git a/Wonky.Entity/DTO/OrderProcessStateModel.cs b/Wonky.Entity/DTO/OrderProcessState.cs similarity index 96% rename from Wonky.Entity/DTO/OrderProcessStateModel.cs rename to Wonky.Entity/DTO/OrderProcessState.cs index 4f465cd5..6b7cfb43 100644 --- a/Wonky.Entity/DTO/OrderProcessStateModel.cs +++ b/Wonky.Entity/DTO/OrderProcessState.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class OrderProcessStateModel +public class OrderProcessState { /// /// Entity id diff --git a/Wonky.Entity/DTO/ReportModel.cs b/Wonky.Entity/DTO/ReportDto.cs similarity index 95% rename from Wonky.Entity/DTO/ReportModel.cs rename to Wonky.Entity/DTO/ReportDto.cs index d86a0950..69d4a425 100644 --- a/Wonky.Entity/DTO/ReportModel.cs +++ b/Wonky.Entity/DTO/ReportDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ReportModel +public class ReportDto { /// /// Report name @@ -62,5 +62,5 @@ public class ReportModel /// /// Report figures /// - public ReportFiguresModel Figures { get; set; } = new(); + public ReportFiguresDto Figures { get; set; } = new(); } diff --git a/Wonky.Entity/DTO/ReportFiguresModel.cs b/Wonky.Entity/DTO/ReportFiguresDto.cs similarity index 99% rename from Wonky.Entity/DTO/ReportFiguresModel.cs rename to Wonky.Entity/DTO/ReportFiguresDto.cs index 0cdc63cf..23c6788c 100644 --- a/Wonky.Entity/DTO/ReportFiguresModel.cs +++ b/Wonky.Entity/DTO/ReportFiguresDto.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class ReportFiguresModel +public class ReportFiguresDto { /// /// Sales day number diff --git a/Wonky.Entity/DTO/ReportInitModel.cs b/Wonky.Entity/DTO/ReportInitDto.cs similarity index 92% rename from Wonky.Entity/DTO/ReportInitModel.cs rename to Wonky.Entity/DTO/ReportInitDto.cs index dc0165d6..26e8933d 100644 --- a/Wonky.Entity/DTO/ReportInitModel.cs +++ b/Wonky.Entity/DTO/ReportInitDto.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Entity.DTO; -public class ReportInitModel +public class ReportInitDto { /// /// Flag to prevent activity to be added to report @@ -28,7 +28,7 @@ public class ReportInitModel /// /// Report figures /// - public ReportFiguresModel ReportData { get; set; } = new(); + public ReportFiguresDto ReportData { get; set; } = new(); /// /// List of activities for report diff --git a/Wonky.Entity/DTO/ResetPasswordModel.cs b/Wonky.Entity/DTO/ResetPasswordDto.cs similarity index 97% rename from Wonky.Entity/DTO/ResetPasswordModel.cs rename to Wonky.Entity/DTO/ResetPasswordDto.cs index f35cdcdd..e61e7c44 100644 --- a/Wonky.Entity/DTO/ResetPasswordModel.cs +++ b/Wonky.Entity/DTO/ResetPasswordDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ResetPasswordModel +public class ResetPasswordDto { /// /// New password diff --git a/Wonky.Entity/DTO/ShortMessageModel.cs b/Wonky.Entity/DTO/ShortMessage.cs similarity index 90% rename from Wonky.Entity/DTO/ShortMessageModel.cs rename to Wonky.Entity/DTO/ShortMessage.cs index 0d6625c7..b6c3c0c5 100644 --- a/Wonky.Entity/DTO/ShortMessageModel.cs +++ b/Wonky.Entity/DTO/ShortMessage.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class ShortMessageModel +public class ShortMessage { [Required] [MaxLength(11)] public string From { get; set; } = ""; diff --git a/Wonky.Entity/DTO/TaskItemModel.cs b/Wonky.Entity/DTO/TaskItemDto.cs similarity index 98% rename from Wonky.Entity/DTO/TaskItemModel.cs rename to Wonky.Entity/DTO/TaskItemDto.cs index 85a5f6a3..7ad82246 100644 --- a/Wonky.Entity/DTO/TaskItemModel.cs +++ b/Wonky.Entity/DTO/TaskItemDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class TaskItemModel +public class TaskItemDto { /// /// Task item entity id diff --git a/Wonky.Entity/DTO/UpdateCrmModel.cs b/Wonky.Entity/DTO/UpdateCrmDto.cs similarity index 97% rename from Wonky.Entity/DTO/UpdateCrmModel.cs rename to Wonky.Entity/DTO/UpdateCrmDto.cs index 553b52a7..eea0cc7e 100644 --- a/Wonky.Entity/DTO/UpdateCrmModel.cs +++ b/Wonky.Entity/DTO/UpdateCrmDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UpdateCrmModel +public class UpdateCrmDto { public string CrmNotes { get; set; } = ""; public int Interval { get; set; } diff --git a/Wonky.Entity/DTO/UpdateErpModel.cs b/Wonky.Entity/DTO/UpdateErpDto.cs similarity index 98% rename from Wonky.Entity/DTO/UpdateErpModel.cs rename to Wonky.Entity/DTO/UpdateErpDto.cs index 8a8be1ec..1e12ea44 100644 --- a/Wonky.Entity/DTO/UpdateErpModel.cs +++ b/Wonky.Entity/DTO/UpdateErpDto.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UpdateErpModel +public class UpdateErpDto { [MaxLength(100)] public string Address1 { get; set; } = ""; [MaxLength(50)] public string Address2 { get; set; } = ""; diff --git a/Wonky.Entity/DTO/UserAdminCreateModel.cs b/Wonky.Entity/DTO/UserManagerCreate.cs similarity index 92% rename from Wonky.Entity/DTO/UserAdminCreateModel.cs rename to Wonky.Entity/DTO/UserManagerCreate.cs index a7948a8d..7607f7fa 100644 --- a/Wonky.Entity/DTO/UserAdminCreateModel.cs +++ b/Wonky.Entity/DTO/UserManagerCreate.cs @@ -18,7 +18,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UserAdminCreateModel +public class UserManagerCreate { [MaxLength(128)] public string CompanyId { get; set; } = ""; [MaxLength(128)] public string ContactId { get; set; } = ""; @@ -34,6 +34,6 @@ public class UserAdminCreateModel [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/UserAdminEditView.cs b/Wonky.Entity/DTO/UserManagerEditView.cs similarity index 92% rename from Wonky.Entity/DTO/UserAdminEditView.cs rename to Wonky.Entity/DTO/UserManagerEditView.cs index 81439823..0f6f9828 100644 --- a/Wonky.Entity/DTO/UserAdminEditView.cs +++ b/Wonky.Entity/DTO/UserManagerEditView.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class UserAdminEditView +public class UserManagerEditView { [MaxLength(128)] public string CompanyId { get; set; } = ""; [MaxLength(128)] public string ContactId { get; set; } = ""; @@ -33,6 +33,6 @@ public class UserAdminEditView [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 AssignedUsers { 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/UserAdminRoleAssignmentView.cs b/Wonky.Entity/DTO/UserRoleAssignment.cs similarity index 95% rename from Wonky.Entity/DTO/UserAdminRoleAssignmentView.cs rename to Wonky.Entity/DTO/UserRoleAssignment.cs index 5677ec87..d9cda211 100644 --- a/Wonky.Entity/DTO/UserAdminRoleAssignmentView.cs +++ b/Wonky.Entity/DTO/UserRoleAssignment.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class UserAdminRoleAssignmentView +public class UserRoleAssignment { public bool Assigned { get; set; } diff --git a/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs b/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs index 578b593d..84ca952d 100644 --- a/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs +++ b/Wonky.Entity/DTO/UserSupervisorAssignmentView.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.DTO; -public class UserAssignmentView +public class SubjectAssignment { public bool Assigned { get; set; } diff --git a/Wonky.Entity/DTO/WorkplaceModel.cs b/Wonky.Entity/DTO/WorkplaceDto.cs similarity index 99% rename from Wonky.Entity/DTO/WorkplaceModel.cs rename to Wonky.Entity/DTO/WorkplaceDto.cs index 2538749a..df76c5a0 100644 --- a/Wonky.Entity/DTO/WorkplaceModel.cs +++ b/Wonky.Entity/DTO/WorkplaceDto.cs @@ -17,7 +17,7 @@ using System.ComponentModel.DataAnnotations; namespace Wonky.Entity.DTO; -public class WorkplaceModel +public class WorkplaceDto { /// /// Workplace entity id diff --git a/Wonky.Entity/Views/ClxMessageView.cs b/Wonky.Entity/Views/ClxMessage.cs similarity index 97% rename from Wonky.Entity/Views/ClxMessageView.cs rename to Wonky.Entity/Views/ClxMessage.cs index 5e6a8fc1..a093334c 100644 --- a/Wonky.Entity/Views/ClxMessageView.cs +++ b/Wonky.Entity/Views/ClxMessage.cs @@ -2,7 +2,7 @@ using System.Text.Json.Serialization; namespace Wonky.Entity.Views; -public class ClxMessageView +public class ClxMessage { [JsonPropertyName("id")] public string Id { get; set; } = ""; diff --git a/Wonky.Entity/Views/ReportDataView.cs b/Wonky.Entity/Views/ReportData.cs similarity index 99% rename from Wonky.Entity/Views/ReportDataView.cs rename to Wonky.Entity/Views/ReportData.cs index cd74c131..72d05645 100644 --- a/Wonky.Entity/Views/ReportDataView.cs +++ b/Wonky.Entity/Views/ReportData.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportDataView +public class ReportData { public string ReportId { get; set; } = ""; public string ErpUserId { get; set; } = ""; diff --git a/Wonky.Entity/Views/ReportItemCustomerView.cs b/Wonky.Entity/Views/ReportItemCustomer.cs similarity index 98% rename from Wonky.Entity/Views/ReportItemCustomerView.cs rename to Wonky.Entity/Views/ReportItemCustomer.cs index e3a996a4..19813e75 100644 --- a/Wonky.Entity/Views/ReportItemCustomerView.cs +++ b/Wonky.Entity/Views/ReportItemCustomer.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportItemCustomerView +public class ReportItemCustomer { /// /// Company entity id diff --git a/Wonky.Entity/Views/ReportItemLineView.cs b/Wonky.Entity/Views/ReportItemLine.cs similarity index 98% rename from Wonky.Entity/Views/ReportItemLineView.cs rename to Wonky.Entity/Views/ReportItemLine.cs index 2a86edd6..52aed60c 100644 --- a/Wonky.Entity/Views/ReportItemLineView.cs +++ b/Wonky.Entity/Views/ReportItemLine.cs @@ -16,7 +16,7 @@ namespace Wonky.Entity.Views; -public class ReportItemLineView +public class ReportItemLine { /// /// Line description diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs index 400b7427..6d7853a9 100644 --- a/Wonky.Entity/Views/ReportItemView.cs +++ b/Wonky.Entity/Views/ReportItemView.cs @@ -20,12 +20,12 @@ public class ReportItemView /// /// Customer company info /// - public ReportItemCustomerView Company { get; set; } = new(); + public ReportItemCustomer 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 ea4e423c..8589eaaa 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 ReportDataView ReportDataView { get; set; } = new(); + public ReportData ReportData { get; set; } = new(); public List ReportItems { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Entity/Views/WarehouseOrderView.cs b/Wonky.Entity/Views/WarehouseOrderView.cs index d9685d98..0ed14d11 100644 --- a/Wonky.Entity/Views/WarehouseOrderView.cs +++ b/Wonky.Entity/Views/WarehouseOrderView.cs @@ -21,7 +21,7 @@ public class WarehouseOrderView /// /// Customer company info /// - public ReportItemCustomerView Company { get; set; } = new(); + public ReportItemCustomer 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