diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index eca9c56d..5cf6654d 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -17,7 +17,7 @@ @Name @Version@if(IsBeta){-beta} @code { - private const string Version = "0.2.25"; + private const string Version = "0.2.2"; private const string Name = "wwo"; private const bool IsBeta = true; } diff --git a/Wonky.Client/Components/CompanyTable.razor.cs b/Wonky.Client/Components/CompanyTable.razor.cs index 4a7b5198..03b534f1 100644 --- a/Wonky.Client/Components/CompanyTable.razor.cs +++ b/Wonky.Client/Components/CompanyTable.razor.cs @@ -22,7 +22,7 @@ namespace Wonky.Client.Components { public partial class CompanyTable { - [Parameter] public List Companies { get; set; } = new(); + [Parameter] public List Companies { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } [Inject] public NavigationManager NavManager { get; set; } diff --git a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs index 838b1a33..d1874c44 100644 --- a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs +++ b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs @@ -34,7 +34,7 @@ namespace Wonky.Client.HttpRepository; public class CompanyHttpRepository : ICompanyHttpRepository { - private readonly JsonSerializerOptions _options = new JsonSerializerOptions + private readonly JsonSerializerOptions _options = new () { PropertyNameCaseInsensitive = true }; @@ -54,7 +54,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository _apiConfig = apiConfig.Value; } - public async Task> GetCompaniesPaged(CompanyPagingParams pagingParameters) + public async Task> GetCompaniesPaged(CompanyPagingParams pagingParameters) { var queryString = new Dictionary { @@ -70,37 +70,38 @@ public class CompanyHttpRepository : ICompanyHttpRepository 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; } - public async Task GetCompanyByAccount(string accountNumber) + public async Task GetCompanyByAccount(string accountNumber) { - var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCompanies}/account/{accountNumber}"); - return company ?? new DtoNgCrmCompany(); + var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCompanies}/account/{accountNumber}"); + return company ?? new DtoNgCompany(); } - public async Task GetCompanyById(string companyId) + public async Task GetCompanyById(string companyId) { - var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCompanies}/{companyId}"); - return company ?? new DtoNgCrmCompany(); + var company = await _client.GetFromJsonAsync($"{_apiConfig.CrmCompanies}/{companyId}"); + return company ?? new DtoNgCompany(); } - public async Task CreateCompany(DtoNgCrmCompany dtoNgCrmCompany) + public async Task CreateCompany(DtoNgCompany dtoNgCompany) { - var response = await _client.PostAsJsonAsync($"{_apiConfig.CrmCompanies}", dtoNgCrmCompany); + var response = await _client.PostAsJsonAsync($"{_apiConfig.CrmCompanies}", dtoNgCompany); var content = await response.Content.ReadAsStringAsync(); - var result = JsonSerializer.Deserialize(content); + var result = JsonSerializer.Deserialize(content); + Console.WriteLine(content); return result.CompanyId; } - public async Task UpdateCompany(DtoNgCrmCompany dtoNgCrmCompany) + public async Task UpdateCompany(DtoNgCompany dtoNgCompany) { - await _client.PutAsJsonAsync($"{_apiConfig.CrmCompanies}/{dtoNgCrmCompany.CompanyId}", dtoNgCrmCompany); + await _client.PutAsJsonAsync($"{_apiConfig.CrmCompanies}/{dtoNgCompany.CompanyId}", dtoNgCompany); } public async Task DeleteCompany(string companyId) diff --git a/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs b/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs index e931ced2..c3b76c19 100644 --- a/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs +++ b/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs @@ -22,10 +22,10 @@ namespace Wonky.Client.HttpRepository; public interface ICompanyHttpRepository { - Task> GetCompaniesPaged(CompanyPagingParams pagingParameters); - Task GetCompanyByAccount(string accountNumber); - Task GetCompanyById(string companyId); - Task CreateCompany(DtoNgCrmCompany dtoNgCrmCompany); - Task UpdateCompany(DtoNgCrmCompany dtoNgCrmCompany); + Task> GetCompaniesPaged(CompanyPagingParams pagingParameters); + Task GetCompanyByAccount(string accountNumber); + Task GetCompanyById(string companyId); + Task CreateCompany(DtoNgCompany dtoNgCompany); + Task UpdateCompany(DtoNgCompany dtoNgCompany); Task DeleteCompany(string companyId); } \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyCreate.razor b/Wonky.Client/Pages/CompanyCreate.razor index d96c7d68..affd23c3 100644 --- a/Wonky.Client/Pages/CompanyCreate.razor +++ b/Wonky.Client/Pages/CompanyCreate.razor @@ -57,7 +57,7 @@
- + @@ -67,73 +67,73 @@ diff --git a/Wonky.Client/Pages/CompanyCreate.razor.cs b/Wonky.Client/Pages/CompanyCreate.razor.cs index a2ffd2f2..681eae66 100644 --- a/Wonky.Client/Pages/CompanyCreate.razor.cs +++ b/Wonky.Client/Pages/CompanyCreate.razor.cs @@ -43,7 +43,7 @@ namespace Wonky.Client.Pages [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public VatInfoLookupService VatInfoLookupService { get; set; } private List VInfos { get; set; } = new(); - private DtoNgCrmCompany _dtoNgCrmCompany = new(); + private DtoNgCompany _dtoNgCompany = new(); private VirkRegInfo _virkRegInfo = new(); private EditContext _createCompany; private bool _formInvalid = true; @@ -51,12 +51,12 @@ namespace Wonky.Client.Pages protected override async Task OnInitializedAsync() { - _createCompany = new EditContext(_dtoNgCrmCompany); + _createCompany = new EditContext(_dtoNgCompany); _createCompany.OnFieldChanged += HandleFieldChanged; var ux = await StorageService.GetItemAsync("_ux"); - _dtoNgCrmCompany.SalesRepId = ux.Id; - _dtoNgCrmCompany.CountryCode = ux.CountryCode; + _dtoNgCompany.SalesRepId = ux.Id; + _dtoNgCompany.CountryCode = ux.CountryCode; Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); } @@ -91,23 +91,24 @@ namespace Wonky.Client.Pages { _virkRegInfo = (from x in VInfos where x.VatNumber == vatNumber select x).First(); RegState = _virkRegInfo.States[^1].State == "NORMAL" ? "the-good" : "the-ugly"; - _dtoNgCrmCompany.Name = _virkRegInfo.Name; - _dtoNgCrmCompany.Address1 = _virkRegInfo.CoName; - _dtoNgCrmCompany.Address2 = _virkRegInfo.Address; - _dtoNgCrmCompany.ZipCode = _virkRegInfo.ZipCode; - _dtoNgCrmCompany.City = _virkRegInfo.City; - _dtoNgCrmCompany.VatNumber = _virkRegInfo.VatNumber; + _dtoNgCompany.Name = _virkRegInfo.Name; + _dtoNgCompany.Address1 = _virkRegInfo.CoName; + _dtoNgCompany.Address2 = _virkRegInfo.Address; + _dtoNgCompany.ZipCode = _virkRegInfo.ZipCode; + _dtoNgCompany.City = _virkRegInfo.City; + _dtoNgCompany.VatNumber = _virkRegInfo.VatNumber; } private async Task Create() { - var newId = await CompanyRepo.CreateCompany(_dtoNgCrmCompany); - ToastService.ShowSuccess($"Godt så! '{_dtoNgCrmCompany.Name}' er oprettet i CRM."); - Navigation.NavigateTo($"/company/{newId}"); + var newId = await CompanyRepo.CreateCompany(_dtoNgCompany); + Console.WriteLine(newId); + ToastService.ShowSuccess($"Godt så! '{_dtoNgCompany.Name}' er oprettet i CRM."); + Navigation.NavigateTo($"/company/id/{newId}"); } private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - if (!VatUtils.ValidateFormat(_dtoNgCrmCompany.CountryCode, _dtoNgCrmCompany.VatNumber)) + if (!VatUtils.ValidateFormat(_dtoNgCompany.CountryCode, _dtoNgCompany.VatNumber)) { _formInvalid = false; } @@ -121,7 +122,7 @@ namespace Wonky.Client.Pages { _formInvalid = true; _createCompany.OnFieldChanged -= HandleFieldChanged; - _createCompany = new EditContext(_dtoNgCrmCompany); + _createCompany = new EditContext(_dtoNgCompany); _createCompany.OnFieldChanged += HandleFieldChanged; _createCompany.OnValidationStateChanged -= ValidationChanged; } diff --git a/Wonky.Client/Pages/CompanyList.razor.cs b/Wonky.Client/Pages/CompanyList.razor.cs index 06fc5122..1b2ed43a 100644 --- a/Wonky.Client/Pages/CompanyList.razor.cs +++ b/Wonky.Client/Pages/CompanyList.razor.cs @@ -32,7 +32,7 @@ namespace Wonky.Client.Pages [Inject] private UserPreferenceService UserPrefService { get; set; } [Inject] public ICompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - public List? Companies { get; set; } = new(); + public List? Companies { get; set; } = new(); public MetaData? MetaData { get; set; } = new(); private CompanyPagingParams _paging = new(); private Preferences _preferences { get; set; } = new(); @@ -54,21 +54,21 @@ namespace Wonky.Client.Pages private async Task SelectedPage(int page) { - Companies = new List(); + Companies = new List(); _paging.PageNumber = page; await GetCompanies(); } private async Task SetSearchCol(string searchColumn) { - Companies = new List(); + Companies = new List(); _paging.SearchColumn = searchColumn; _paging.PageNumber = 1; await GetCompanies(); } private async Task SetPageSize(string pageSize) { - Companies = new List(); + Companies = new List(); _paging.PageSize = Convert.ToInt32(pageSize); _paging.PageNumber = 1; await GetCompanies(); @@ -76,7 +76,7 @@ namespace Wonky.Client.Pages private async Task SetSearchPhrase(string searchTerm) { - Companies = new List(); + Companies = new List(); _paging.PageNumber = 1; _paging.SearchTerm = searchTerm; await GetCompanies(); @@ -84,14 +84,14 @@ namespace Wonky.Client.Pages private async Task SetSortCol(string orderBy) { - Companies = new List(); + Companies = new List(); _paging.OrderBy = orderBy; await GetCompanies(); } private async Task DeleteCompany(string companyId) { - Companies = new List(); + Companies = new List(); await CompanyRepo.DeleteCompany(companyId); if (_paging.PageNumber > 1 && Companies.Count == 1) _paging.PageNumber--; diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor index 338408ff..cba16754 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor +++ b/Wonky.Client/Pages/CompanyUpdate.razor @@ -20,11 +20,11 @@ @attribute [Authorize(Roles = "Adviser")] @page "/company/{companyId}/update" -@if (DtoNgCrmCompany != null) +@if (DtoNgCompany != null) {
-
@DtoNgCrmCompany.Account - @DtoNgCrmCompany.Name
+
@DtoNgCompany.Account - @DtoNgCompany.Name
@@ -60,65 +60,65 @@
- - + +
- - + +
- +
- +
- - + +
- - + +
- +
- +
- +
- +
@@ -136,7 +136,7 @@
- +
@@ -149,7 +149,7 @@
- Tilbage + Tilbage
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs index 94c452e3..a07f9865 100644 --- a/Wonky.Client/Pages/CompanyUpdate.razor.cs +++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs @@ -39,7 +39,7 @@ public partial class CompanyUpdate : IDisposable [Inject] public VatInfoLookupService VatInfoLookupService { get; set; } [Parameter] public string Account { get; set; } = ""; [Parameter] public string CompanyId { get; set; } = ""; - private DtoNgCrmCompany DtoNgCrmCompany { get; set; } + private DtoNgCompany DtoNgCompany { get; set; } private EditContext _updateCompany { get; set; } private List VInfos { get; set; } = new(); private VirkRegInfo _virkRegInfo { get; set; } = new(); @@ -51,41 +51,41 @@ public partial class CompanyUpdate : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - DtoNgCrmCompany = await CompanyRepo.GetCompanyById(CompanyId); + DtoNgCompany = await CompanyRepo.GetCompanyById(CompanyId); - LastVisit = DateTime.Parse(DtoNgCrmCompany.LastVisit); - NextVisit = DateTime.Parse(DtoNgCrmCompany.NextVisit); - _updateCompany = new EditContext(DtoNgCrmCompany); + LastVisit = DateTime.Parse(DtoNgCompany.LastVisit); + NextVisit = DateTime.Parse(DtoNgCompany.NextVisit); + _updateCompany = new EditContext(DtoNgCompany); - if(DtoNgCrmCompany.HasFolded == 1) + if(DtoNgCompany.HasFolded == 1) { _vatState = "the-dead"; } else { - _vatState = VatUtils.ValidateFormat(DtoNgCrmCompany.CountryCode, DtoNgCrmCompany.VatNumber) ? "the-good" : "the-draw"; + _vatState = VatUtils.ValidateFormat(DtoNgCompany.CountryCode, DtoNgCompany.VatNumber) ? "the-good" : "the-draw"; } } private async Task Update() { - if (!string.IsNullOrWhiteSpace(DtoNgCrmCompany.VatNumber) && !VatUtils.ValidateFormat(DtoNgCrmCompany.CountryCode, DtoNgCrmCompany.VatNumber)) + if (!string.IsNullOrWhiteSpace(DtoNgCompany.VatNumber) && !VatUtils.ValidateFormat(DtoNgCompany.CountryCode, DtoNgCompany.VatNumber)) { ToastService.ShowError($"CVR/VAT/ORG nummer er ugyldig."); StateHasChanged(); return; } - DtoNgCrmCompany.LastVisit = $"{LastVisit:yyyy-MM-dd}"; - DtoNgCrmCompany.NextVisit = $"{NextVisit:yyyy-MM-dd}"; - Console.WriteLine(JsonSerializer.Serialize(DtoNgCrmCompany)); - await CompanyRepo.UpdateCompany(DtoNgCrmCompany); + DtoNgCompany.LastVisit = $"{LastVisit:yyyy-MM-dd}"; + DtoNgCompany.NextVisit = $"{NextVisit:yyyy-MM-dd}"; + Console.WriteLine(JsonSerializer.Serialize(DtoNgCompany)); + await CompanyRepo.UpdateCompany(DtoNgCompany); - ToastService.ShowSuccess($"Godt så. Firma '{DtoNgCrmCompany!.Name}' er opdateret."); - Navigation.NavigateTo($"/company/{DtoNgCrmCompany.CompanyId}"); + ToastService.ShowSuccess($"Godt så. Firma '{DtoNgCompany!.Name}' er opdateret."); + Navigation.NavigateTo($"/company/{DtoNgCompany.CompanyId}"); } private async Task GetInfoFromVat(string vatNumber) { - if (string.IsNullOrWhiteSpace(vatNumber) || !VatUtils.ValidateFormat(DtoNgCrmCompany.CountryCode, DtoNgCrmCompany.VatNumber)) + if (string.IsNullOrWhiteSpace(vatNumber) || !VatUtils.ValidateFormat(DtoNgCompany.CountryCode, DtoNgCompany.VatNumber)) { ToastService.ShowError($"CVR er ugyldigt eller mangler"); return; @@ -120,12 +120,12 @@ public partial class CompanyUpdate : IDisposable private void SelectCompany(string vatNumber) { _virkRegInfo = (from x in VInfos where x.VatNumber == vatNumber select x).First(); - DtoNgCrmCompany.Name = _virkRegInfo.Name; - DtoNgCrmCompany.Address1 = _virkRegInfo.CoName; - DtoNgCrmCompany.Address2 = _virkRegInfo.Address; - DtoNgCrmCompany.ZipCode = _virkRegInfo.ZipCode; - DtoNgCrmCompany.City = _virkRegInfo.City; - DtoNgCrmCompany.VatNumber = _virkRegInfo.VatNumber; + DtoNgCompany.Name = _virkRegInfo.Name; + DtoNgCompany.Address1 = _virkRegInfo.CoName; + DtoNgCompany.Address2 = _virkRegInfo.Address; + DtoNgCompany.ZipCode = _virkRegInfo.ZipCode; + DtoNgCompany.City = _virkRegInfo.City; + DtoNgCompany.VatNumber = _virkRegInfo.VatNumber; } public void Dispose() diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor index 44643a2b..41e14b5c 100644 --- a/Wonky.Client/Pages/CompanyView.razor +++ b/Wonky.Client/Pages/CompanyView.razor @@ -21,56 +21,56 @@ @using Wonky.Client.Helpers @attribute [Authorize(Roles = "Adviser")] -@if (DtoNgCrmCompany != null) +@if (DtoNgCompany != null) {
-
tombstone @DtoNgCrmCompany.Name
+
tombstone @DtoNgCompany.Name
Reg.nr. - +
Firmanavn - - + +
Conavn - +
Adresse - +
Postnr - - + +
Bynavn - - + +
Telefon - +
Mobil - +
Email - +
Attention - +
- + - + - + - + - + - + - + - + - + - - + +
Konto@DtoNgCrmCompany.Account@DtoNgCompany.Account
Conavn@DtoNgCrmCompany.Address1@DtoNgCompany.Address1
Adresse@DtoNgCrmCompany.Address2@DtoNgCompany.Address2
Postnummer@DtoNgCrmCompany.ZipCode@DtoNgCompany.ZipCode
Bynavn@DtoNgCrmCompany.City@DtoNgCompany.City
CVR @DtoNgCrmCompany.VatNumber@DtoNgCompany.VatNumber
Telefon@DtoNgCrmCompany.Phone@DtoNgCompany.Phone
Email@DtoNgCrmCompany.Email@DtoNgCompany.Email
Sidste besøg@DtoNgCrmCompany.LastVisit@DtoNgCompany.LastVisit
Næste besøg@DtoNgCrmCompany.NextVisit@DtoNgCompany.NextVisit
@@ -78,8 +78,8 @@
Tilbage - Rediger - Aktivitet + Rediger + Aktivitet
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs index 383928c5..72db02d2 100644 --- a/Wonky.Client/Pages/CompanyView.razor.cs +++ b/Wonky.Client/Pages/CompanyView.razor.cs @@ -35,7 +35,7 @@ public partial class CompanyView : IDisposable [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public VatInfoLookupService VatInfoLookup { get; set; } [Parameter] public string CompanyId { get; set; } = ""; - private DtoNgCrmCompany DtoNgCrmCompany { get; set; } = new (); + private DtoNgCompany DtoNgCompany { get; set; } = new (); private string _vatState { get; set; } = "the-dead"; private bool _hasFolded { get; set; } @@ -43,15 +43,15 @@ public partial class CompanyView : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - DtoNgCrmCompany = await CompanyRepo.GetCompanyById(CompanyId); + DtoNgCompany = await CompanyRepo.GetCompanyById(CompanyId); - if(DtoNgCrmCompany.HasFolded == 1) + if(DtoNgCompany.HasFolded == 1) { _hasFolded = true; } else { - _vatState = VatUtils.ValidateFormat(DtoNgCrmCompany.CountryCode, DtoNgCrmCompany.VatNumber) ? "the-good" : "the-draw"; + _vatState = VatUtils.ValidateFormat(DtoNgCompany.CountryCode, DtoNgCompany.VatNumber) ? "the-good" : "the-draw"; } } diff --git a/Wonky.Client/Pages/CrmActivityCreate.razor b/Wonky.Client/Pages/CrmActivityCreate.razor index 4a1bf873..4a8f6a65 100644 --- a/Wonky.Client/Pages/CrmActivityCreate.razor +++ b/Wonky.Client/Pages/CrmActivityCreate.razor @@ -19,14 +19,13 @@ @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Adviser")] @using Wonky.Client.Components -@if (_dtoNgCrmCompany != null) +@if (DraftContext != null) {

@_poDraft.Name

- - + + +
- -

-

-
-
- - - - - - - - - - - - - @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) - { - @foreach (var cItem in DraftStateProvider.Draft.Items) - { - - - - - - - - - } - - - - - - - - - } - -
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal - -
Total@DraftStateProvider.Draft.Total
-
-
- + @* Ordrekladde *@ +
+
+ Kladdelinjer Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet)
+
+ + + + + + + + + + + + + @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) + { + @foreach (var cItem in DraftStateProvider.Draft.Items) + { + + + + + + + + + } + + + + + + + + + } + +
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal + +
Total@DraftStateProvider.Draft.Total
+
+
+
+
+ +
+
+
- + + @* Leverings adresse *@

-

-
- -
-
- +
diff --git a/Wonky.Client/Pages/CrmActivityCreate.razor.cs b/Wonky.Client/Pages/CrmActivityCreate.razor.cs index 9bbdec4e..46bbcb94 100644 --- a/Wonky.Client/Pages/CrmActivityCreate.razor.cs +++ b/Wonky.Client/Pages/CrmActivityCreate.razor.cs @@ -44,9 +44,9 @@ public partial class CrmActivityCreate : IDisposable // private MetaData _meta { get; set; } = new(); private Preferences _prefs { get; set; } = new(); private DtoNgSalesRepActivity _poDraft { get; set; } = new(); - private DtoNgCrmCompany _dtoNgCrmCompany = new(); + private DtoNgCompany NgCompany = new(); private CatalogPagingParams _paging = new(); - private EditContext _createActivity { get; set; } + private EditContext DraftContext { get; set; } private bool _poFormInvalid { get; set; } = true; private bool ShowItem { get; set; } private bool HideButtons { get; set; } @@ -54,11 +54,17 @@ public partial class CrmActivityCreate : IDisposable private string Price = "0"; private string Discount = "0"; private bool InvalidActivityType { get; set; } = true; + private bool InvalidStatusType { get; set; } = true; private bool InvalidActivity { get; set; } = true; private bool InvalidCanvas { get; set; } = true; private bool InvalidDate { get; set; } = true; private UserInfoView Ux { get; set; } = new(); - + + protected override void OnParametersSet() + { + base.OnParametersSet(); + } + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); @@ -67,10 +73,10 @@ public partial class CrmActivityCreate : IDisposable _paging.SearchColumn = _prefs.ItemSearch; await GetSalesItems(); Ux = await StorageService.GetItemAsync("_ux"); - _dtoNgCrmCompany = await CompanyRepo.GetCompanyById(CompanyId); + NgCompany = await CompanyRepo.GetCompanyById(CompanyId); - _createActivity = new EditContext(_poDraft); - _createActivity.OnFieldChanged += HandleFieldChanged; + DraftContext = new EditContext(_poDraft); + DraftContext.OnFieldChanged += HandleFieldChanged; // set up indexdb identification _poDraft.SalesHeadId = Guid.NewGuid().ToString(); @@ -81,42 +87,24 @@ public partial class CrmActivityCreate : IDisposable // permanent identifications _poDraft.SalesRep = Ux.Adviser; - _poDraft.Account = _dtoNgCrmCompany.Account; - _poDraft.VatNumber = _dtoNgCrmCompany.VatNumber; - _poDraft.EMail = _dtoNgCrmCompany.Email; - _poDraft.Phone = _dtoNgCrmCompany.Phone; + _poDraft.Account = NgCompany.Account; + _poDraft.VatNumber = NgCompany.VatNumber; + _poDraft.EMail = NgCompany.Email; + _poDraft.Phone = NgCompany.Phone; - _poDraft.Name = _dtoNgCrmCompany.Name; - _poDraft.Address = _dtoNgCrmCompany.Address1; - _poDraft.Address2 = _dtoNgCrmCompany.Address2; - _poDraft.ZipCode = _dtoNgCrmCompany.ZipCode; - _poDraft.City = _dtoNgCrmCompany.City; + _poDraft.Name = NgCompany.Name; + _poDraft.Address = NgCompany.Address1; + _poDraft.Address2 = NgCompany.Address2; + _poDraft.ZipCode = NgCompany.ZipCode; + _poDraft.City = NgCompany.City; - _poDraft.DlvName = _dtoNgCrmCompany.Name; - _poDraft.DlvAddress1 = _dtoNgCrmCompany.Address1; - _poDraft.DlvAddress2 = _dtoNgCrmCompany.Address2; - _poDraft.DlvZipCode = _dtoNgCrmCompany.ZipCode; - _poDraft.DlvCity = _dtoNgCrmCompany.City; + _poDraft.DlvName = NgCompany.Name; + _poDraft.DlvAddress1 = NgCompany.Address1; + _poDraft.DlvAddress2 = NgCompany.Address2; + _poDraft.DlvZipCode = NgCompany.ZipCode; + _poDraft.DlvCity = NgCompany.City; } - private async Task CreateCanvas() - { - HideButtons = true; - await CreateActivity(); - // post to create canvas endpoint - } - private async Task CreateOffer() - { - HideButtons = true; - await CreateActivity(); - // post to create offer endpoint - } - private async Task CreateOrder() - { - HideButtons = true; - await CreateActivity(); - // post to create order endpoint - } private async Task CreateActivity() { HideButtons = true; @@ -152,7 +140,12 @@ public partial class CrmActivityCreate : IDisposable private void CheckActivity() { InvalidActivityType = string.IsNullOrWhiteSpace(_poDraft.ActivityTypeEnum); - Console.WriteLine($"invalidType => {InvalidActivityType}"); + Console.WriteLine($"Type => {InvalidActivityType}"); + } + private void CheckStatus() + { + InvalidStatusType = string.IsNullOrWhiteSpace(_poDraft.ActivityStatusEnum); + Console.WriteLine($"statusType => {InvalidStatusType}"); } private void CheckDate() @@ -228,7 +221,7 @@ public partial class CrmActivityCreate : IDisposable private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - _poFormInvalid = !_createActivity.Validate(); + _poFormInvalid = !DraftContext.Validate(); InvalidCanvas = InvalidActivityType || InvalidDate; InvalidActivity = InvalidActivityType || _poFormInvalid || DraftStateProvider.Draft.Items.Count == 0 || InvalidDate; StateHasChanged(); @@ -237,23 +230,23 @@ public partial class CrmActivityCreate : IDisposable { if (!string.IsNullOrEmpty(_poDraft.VatNumber)) { - if(!VatUtils.ValidateFormat(_dtoNgCrmCompany.CountryCode, _poDraft.VatNumber)) + if(!VatUtils.ValidateFormat(NgCompany.CountryCode, _poDraft.VatNumber)) ToastService.ShowWarning("CVR / ORG nummer er ikke et gyldigt registreringsnummer"); } if (string.IsNullOrEmpty(_poDraft.ActivityTypeEnum)) ToastService.ShowWarning("Aktivitet type kan ikke være tom"); _poFormInvalid = false; - _createActivity.OnFieldChanged -= HandleFieldChanged; - _createActivity = new EditContext(_poDraft); - _createActivity.OnFieldChanged += HandleFieldChanged; - _createActivity.OnValidationStateChanged -= ValidationChanged; + DraftContext.OnFieldChanged -= HandleFieldChanged; + DraftContext = new EditContext(_poDraft); + DraftContext.OnFieldChanged += HandleFieldChanged; + DraftContext.OnValidationStateChanged -= ValidationChanged; } public void Dispose() { Interceptor.DisposeEvent(); - _createActivity.OnFieldChanged -= HandleFieldChanged; - _createActivity.OnValidationStateChanged -= ValidationChanged; + DraftContext.OnFieldChanged -= HandleFieldChanged; + DraftContext.OnValidationStateChanged -= ValidationChanged; } } \ No newline at end of file diff --git a/Wonky.Client/Providers/AuthStateProvider.cs b/Wonky.Client/Providers/AuthStateProvider.cs index 5a5a791a..fe3b4507 100644 --- a/Wonky.Client/Providers/AuthStateProvider.cs +++ b/Wonky.Client/Providers/AuthStateProvider.cs @@ -37,7 +37,7 @@ namespace Wonky.Client.Providers public override async Task GetAuthenticationStateAsync() { // fetch token from localStorage - var token = await _storage.GetItemAsync("_tx"); + var token = await _storage.GetItemAsync("_ax"); if (string.IsNullOrEmpty(token)) // return anonymous if empty diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index 8d815907..b6aa0690 100644 --- a/Wonky.Client/Services/AuthenticationService.cs +++ b/Wonky.Client/Services/AuthenticationService.cs @@ -79,7 +79,7 @@ namespace Wonky.Client.Services // process response content var data = JsonSerializer.Deserialize(resContent, _options); - await _localStorage.SetItemAsync("_tx", data.AccessToken); + await _localStorage.SetItemAsync("_ax", data.AccessToken); await _localStorage.SetItemAsync("_rx", data.RefreshToken); await _localStorage.SetItemAsync("_ex", (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); @@ -117,7 +117,7 @@ namespace Wonky.Client.Services // set default request headers using access_token _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken); - await _localStorage.SetItemAsync("_tx", data.AccessToken); + await _localStorage.SetItemAsync("_ax", data.AccessToken); await _localStorage.SetItemAsync("_rx", data.RefreshToken); await _localStorage.SetItemAsync("_ex", (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); @@ -130,7 +130,7 @@ namespace Wonky.Client.Services public async Task Logout() { // clear localStorage - await _localStorage.RemoveItemAsync("_tx"); + await _localStorage.RemoveItemAsync("_ax"); await _localStorage.RemoveItemAsync("_rx"); await _localStorage.RemoveItemAsync("_ux"); await _localStorage.RemoveItemAsync("_ex"); diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index c8dcecbe..689f4457 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -11,10 +11,10 @@ - - - - + + + + @@ -33,7 +33,6 @@ - diff --git a/Wonky.Entity/DTO/DtoNgSalesRepActivity.cs b/Wonky.Entity/DTO/DtoNgActivity.cs similarity index 94% rename from Wonky.Entity/DTO/DtoNgSalesRepActivity.cs rename to Wonky.Entity/DTO/DtoNgActivity.cs index 3be31299..4fff971e 100644 --- a/Wonky.Entity/DTO/DtoNgSalesRepActivity.cs +++ b/Wonky.Entity/DTO/DtoNgActivity.cs @@ -33,8 +33,8 @@ namespace Wonky.Entity.DTO [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] public string Attention { get; set; } = ""; // Form entries public string SalesRep { get; set; } = ""; - [Required(ErrorMessage = "Vælg aktivitet")] public string ActivityTypeEnum { get; set; } = ""; - public string ActivityStatusEnum { get; set; } = ""; + [Required(ErrorMessage = "Vælg aktivitetstype")] public string ActivityTypeEnum { get; set; } = ""; + [Required(ErrorMessage = "Vælg status for besøg ")] public string ActivityStatusEnum { get; set; } = ""; public bool CheckDate { get; set; } public DateTime ActivityDate { get; set; } [MaxLength(50, ErrorMessage = "Du kan højst bruge 50 tegn")] public string Demo { get; set; } = ""; diff --git a/Wonky.Entity/DTO/DtoNgCrmCompany.cs b/Wonky.Entity/DTO/DtoNgCompany.cs similarity index 98% rename from Wonky.Entity/DTO/DtoNgCrmCompany.cs rename to Wonky.Entity/DTO/DtoNgCompany.cs index 728b9859..7ba3ebe3 100644 --- a/Wonky.Entity/DTO/DtoNgCrmCompany.cs +++ b/Wonky.Entity/DTO/DtoNgCompany.cs @@ -19,7 +19,7 @@ using System.Text.Json.Serialization; namespace Wonky.Entity.DTO; -public class DtoNgCrmCompany +public class DtoNgCompany { [Required(ErrorMessage = "Navn skal udfyldes")] [MaxLength(100, ErrorMessage = "Du kan højst bruge 100 tegn")] public string Name { get; set; } [Required(ErrorMessage = "Postnummer skal udfyldes")] [MaxLength(20, ErrorMessage = "Du kan højst bruge 20 tegn")] public string ZipCode { get; set; } diff --git a/Wonky.Entity/DTO/DtoNgUpdateCompany.cs b/Wonky.Entity/DTO/DtoNgUpdateCompany.cs index 92f37909..00b1640e 100644 --- a/Wonky.Entity/DTO/DtoNgUpdateCompany.cs +++ b/Wonky.Entity/DTO/DtoNgUpdateCompany.cs @@ -19,11 +19,11 @@ namespace Wonky.Entity.DTO; public class DtoNgUpdateCompany { + public string CompanyId { get; set; } = ""; [MaxLength(100)] public string Name { get; set; } = ""; [MaxLength(30)] public string City { get; set; } = ""; [MaxLength(20)] public string ZipCode { get; set; } = ""; [MaxLength(20)] public string VatNumber { get; set; } = ""; - public string CompanyId { get; set; } = ""; [MaxLength(30)] public string Phone { get; set; } = ""; [MaxLength(100)] public string Address1 { get; set; } = ""; [MaxLength(50)] public string Address2 { get; set; } = ""; diff --git a/Wonky.Entity/Wonky.Entity.csproj b/Wonky.Entity/Wonky.Entity.csproj index 44ee6765..132c02c5 100644 --- a/Wonky.Entity/Wonky.Entity.csproj +++ b/Wonky.Entity/Wonky.Entity.csproj @@ -6,8 +6,4 @@ enable - - - -