Sorry, there's nothing at this address.
-
+ @if (Env.IsDevelopment())
+ {
+
+ An unhandled exception has occurred. See browser dev tools for details.
+
+ }
+ else
+ {
+
+ An error has occurred. This app may no longer respond until reloaded. Please check logs and submit a bug report on GitHub.
+
+ }
+ Reload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs
index 246fec4..45bc337 100644
--- a/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs
+++ b/OpenBudgeteer.Blazor/HostedDatabaseMigrator.cs
@@ -4,9 +4,9 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
-using OpenBudgeteer.Data;
-using OpenBudgeteer.Data.Initialization;
-using OpenBudgeteer.Data.OnlineChecker;
+using OpenBudgeteer.Core.Data.Entities;
+using OpenBudgeteer.Core.Data.Initialization;
+using OpenBudgeteer.Core.Data.OnlineChecker;
namespace OpenBudgeteer.Blazor;
@@ -16,6 +16,8 @@ public class HostedDatabaseMigrator : IHostedService
private readonly IConfiguration _configuration;
private readonly IDatabaseInitializer _databaseInitializer;
private readonly IDatabaseOnlineChecker _onlineChecker;
+
+ private const string APPSETTINGS_DEMO_DATA = "APPSETTINGS_DEMO_DATA";
public HostedDatabaseMigrator(
DbContextOptions
-
-
-
+
+
-
+
@foreach (var account in _dataContext.Accounts)
{
-
-
- DbContextOptions
-@inject YearMonthSelectorViewModel YearMonthDataContext
-
-
-
+ @account.Account.Name
-Balance: @account.Balance.ToString("C", CultureInfo.CurrentCulture)
- - - -
+
}
@@ -35,8 +25,8 @@
Title="@_editAccountDialogTitle"
DataContext="@_editAccountDialogDataContext"
IsDialogVisible="@_isEditAccountModalDialogVisible"
- OnSaveClickCallback="@(() => SaveChanges(_editAccountDialogDataContext))"
- OnCancelClickCallback="@(() => CancelChanges())"/>
+ OnSaveClickCallback="@(() => SaveChanges(_editAccountDialogDataContext!))"
+ OnCancelClickCallback="@(CancelChanges)"/>
+
@account.Name
+Balance: @account.Balance.ToString("C", CultureInfo.CurrentCulture)
+ + +
-
-
-
-
-
- 
-
-
-
- Income
-
- @_dataContext.Income.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.Income.ToString("C", CultureInfo.CurrentCulture) -
-
-
+
- 
-
-
-
- Expenses
-
- @_dataContext.Expenses.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.Expenses.ToString("C", CultureInfo.CurrentCulture) -
+
+
-
-
-
+
- 
-
-
-
- Month Balance
-
- @_dataContext.MonthBalance.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.MonthBalance.ToString("C", CultureInfo.CurrentCulture) -
+
-
-
-
+
- 
-
-
-
- Bank Balance
-
- @_dataContext.BankBalance.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.BankBalance.ToString("C", CultureInfo.CurrentCulture) -
+
-
-
+
+
+
-
-
+
-
+
- 
-
-
-
- Budget
-
- @_dataContext.Budget.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.Budget.ToString("C", CultureInfo.CurrentCulture) -
+
+
++
+
+
-
-
-
+
- 
-
-
-
- Pending Want
-
- @_dataContext.PendingWant.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.PendingWant.ToString("C", CultureInfo.CurrentCulture) -
+
-
- DbContextOptions
+@using OpenBudgeteer.Core.ViewModels.EntityViewModels
+@using System.Globalization
@inject IFileReaderService FileReaderService
@inject IJSRuntime JSRuntime
@inject NavigationManager NavManager
-
-
+
- 
-
-
-
- Remaining Budget
-
- @_dataContext.RemainingBudget.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.RemainingBudget.ToString("C", CultureInfo.CurrentCulture) -
+
-
-
-
-
+
- 
-
-
-
- Negative Bucket Balance
-
- @_dataContext.NegativeBucketBalance.ToString("C", CultureInfo.CurrentCulture) -
- - @_dataContext.NegativeBucketBalance.ToString("C", CultureInfo.CurrentCulture) -
+
-
@@ -143,140 +79,133 @@
-
-@foreach (var bucketGroup in _dataContext.BucketGroups)
-{
-
-
-
-
-
-
- @foreach (var bucket in bucketGroup.Buckets)
- {
-
+
+
+ }
+
+
DbContextOptions
+@using OpenBudgeteer.Core.Common
}
-@if (_isLoadingDialogVisible)
-{
-
-
-
-
-
-
-
+
+
+
+
+
| Bucket | Balance | InOut | -Want | -In | -Activity | -Details | -+ | Want | +In | +Activity | +Details | +- |
|---|
| + |
-
+
|
}
else
{
- + |
-
- @bucketGroup.BucketGroup.Name
+ @bucketGroup.Name
-
- | @bucketGroup.TotalBalance.ToString("N2") | -- | @(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("N2")) | -@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("N2")) | -@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("N2")) | -- @if (bucketGroup.IsHovered) - { - - - - - - } - | + +@bucketGroup.TotalBalance.ToString("C", CultureInfo.CurrentCulture) | ++ | @(bucketGroup.TotalWant == 0 ? string.Empty : bucketGroup.TotalWant.ToString("C", CultureInfo.CurrentCulture)) | +@(bucketGroup.TotalIn == 0 ? string.Empty : bucketGroup.TotalIn.ToString("C", CultureInfo.CurrentCulture)) | +@(bucketGroup.TotalActivity == 0 ? string.Empty : bucketGroup.TotalActivity.ToString("C", CultureInfo.CurrentCulture)) | ++ | + + + + + + | }||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| - @if (bucket.Bucket.IsInactive) + | |||||||||||||
+
| |||||||||||||
-
-
-}
-
-@code {
- DataConsistencyViewModel _dataContext;
-
- bool _isLoadingDialogVisible;
-
- protected override async Task OnInitializedAsync()
- {
- _isLoadingDialogVisible = true;
- StateHasChanged();
- _dataContext = new DataConsistencyViewModel(DbContextOptions);
- await _dataContext.RunAllChecksAsync();
- _isLoadingDialogVisible = false;
- }
-}
+
-
-
-
+
-
+
@if (_step4Enabled)
{
-
+
}
@if (_dataContext.SelectedImportProfile.ImportProfileId != Guid.Empty)
{
-
-
+
+
}
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
-
-
+
-
e.g. yyyy-MM-dd, dd.MM.yyyy, MM/dd/yyyy
+
+
+
-
+
+
+
+ Use BCP 47 language tag like en-US or de-DE
+
@@ -138,45 +131,45 @@
-
-
+
+
-
+
-
+
-
+
- Additional Mapping Settings:
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- Additional Mapping Settings:
+
+
+
+
+
+
+
+
+
+
+
+
+
@switch (_dataContext.SelectedImportProfile.AdditionalSettingCreditValue)
{
- case 1:
-
+ case ImportProfileViewModel.AdditionalSettingsForCreditValues.CreditInSeparateColumns:
+
break;
- case 2:
-
+ case ImportProfileViewModel.AdditionalSettingsForCreditValues.DebitCreditAlwaysPositive:
+
-
+
break;
- case 0:
+ case ImportProfileViewModel.AdditionalSettingsForCreditValues.NoSettings:
default:
break;
}
@@ -247,7 +238,7 @@
-
+
@@ -255,7 +246,7 @@
@if (_dataContext.SelectedImportProfile.AdditionalSettingAmountCleanup)
{
-
+
@@ -279,34 +270,36 @@
- @if (!_isValidationRunning)
- {
-
- }
- else
- {
-
- }
-
- @if (_dataContext.ValidRecords > 0 && !_isValidationRunning)
- {
- @if (!_isImportRunning)
+
+ @if (!_isValidationRunning)
{
-
-
+
}
else
{
-
}
- }
-
+
+ @if (_dataContext.ValidRecords > 0 && !_isValidationRunning)
+ {
+ @if (!_isImportRunning)
+ {
+
+
+ }
+ else
+ {
+
+ }
+ }
+
+
Total Records: @_dataContext.TotalRecords
Valid Records: @_dataContext.ValidRecords
Records with errors: @_dataContext.RecordsWithErrors
@@ -319,14 +312,14 @@ @if (_dataContext.ParsedRecords.Any(i => i.IsValid)) { -
-
@@ -420,7 +413,7 @@
@if (_isConfirmationModalDialogVisible)
@@ -449,275 +442,18 @@
Title="Import"
Message="@_infoDialogMessage"
IsDialogVisible="@_isInfoDialogVisible"
- OnCloseClickCallback="@(() => _isInfoDialogVisible = false)"
- />
+ IsInteractionEnabled="@_isInfoDialogInteractionEnabled"
+ OnCloseClickCallback="@(() => _isInfoDialogVisible = false)"/>
LoadCsvFromBase64StringAsync(string csv64)
- {
- try
- {
- var csv = Encoding.UTF8.GetString(Convert.FromBase64String(csv64));
- var stream = new MemoryStream();
- var writer = new StreamWriter(stream);
- await writer.WriteAsync(csv);
- await writer.FlushAsync();
- stream.Position = 0;
- var res = await _dataContext.HandleOpenFileAsync(stream);
- if (res.IsSuccessful)
- {
- _step2Enabled = true;
- }
- return res;
- }
- catch (Exception e)
- {
- return new ViewModelOperationResult(false, $"Failed to load CSV: {e.Message}");
- }
- }
-
- async Task ReadFileAsync()
- {
- _step2Enabled = false;
- _step3Enabled = false;
- _step4Enabled = false;
- _dataContext.SelectedImportProfile = _dummyImportProfile;
- _dataContext.SelectedAccount = _dummyAccount;
-
- var file = (await FileReaderService.CreateReference(_inputElement).EnumerateFilesAsync()).FirstOrDefault();
- if (file == null) return;
- HandleResult(await _dataContext.HandleOpenFileAsync(await file.OpenReadAsync()));
- _step2Enabled = true;
- }
-
- void LoadProfile()
- {
- _dataContext.InitializeDataFromImportProfile();
- _step3Enabled =
- _dataContext.SelectedImportProfile.ImportProfileId != Guid.Empty &&
- _dataContext.SelectedImportProfile.ImportProfileId != PlaceholderItemId;
- _dataContext.IdentifiedColumns.Insert(0, DummyColumn);
- CheckColumnMapping();
- StateHasChanged();
- }
-
- void DeleteProfile()
- {
- _isDeleteConfirmationDialogVisible = false;
- HandleResult(_dataContext.DeleteProfile());
- if (_dataContext.SelectedImportProfile.ImportProfileId == Guid.Empty ||
- _dataContext.SelectedImportProfile.ImportProfileId == PlaceholderItemId)
- {
- _dataContext.SelectedImportProfile = _dummyImportProfile;
- _dataContext.AvailableImportProfiles.Insert(0, _dummyImportProfile);
- _dataContext.SelectedAccount = _dummyAccount;
- }
- }
-
- void LoadHeaders()
- {
- var result = _dataContext.LoadHeaders();
- if (result.IsSuccessful)
- {
- _dataContext.IdentifiedColumns.Insert(0, DummyColumn);
- _step3Enabled = true;
- }
- else
- {
- HandleResult(result);
- }
- }
-
- void CheckColumnMapping()
- {
- _step4Enabled = false;
- if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.TransactionDateColumnName) ||
- _dataContext.SelectedImportProfile.TransactionDateColumnName == PlaceholderItemValue) return;
- // Make Payee optional
- //if (string.IsNullOrEmpty(_dataContext.PayeeColumn) || _dataContext.PayeeColumn == _placeholderItemValue) return;
- if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.MemoColumnName) ||
- _dataContext.SelectedImportProfile.MemoColumnName == PlaceholderItemValue) return;
- if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.AmountColumnName) ||
- _dataContext.SelectedImportProfile.AmountColumnName == PlaceholderItemValue) return;
- _step4Enabled = true;
- }
-
- async Task ValidateDataAsync()
- {
- _isValidationRunning = true;
- _dataContext.IdentifiedColumns.Remove(DummyColumn); // Remove DummyColumn to prevent wrong column index
- _validationErrorMessage = (await _dataContext.ValidateDataAsync()).Message;
- _dataContext.IdentifiedColumns.Insert(0, DummyColumn);
- _isValidationRunning = false;
- }
-
- async Task ImportDataAsync(bool withoutDuplicates)
- {
- _isImportRunning = true;
- var result = await _dataContext.ImportDataAsync(withoutDuplicates);
- _importConfirmationMessage = result.Message;
- _isImportRunning = false;
- _isConfirmationModalDialogVisible = true;
- }
-
- async Task ClearFormAsync()
- {
- _isConfirmationModalDialogVisible = false;
- _step2Enabled = false;
- _step3Enabled = false;
- _step4Enabled = false;
- await FileReaderService.CreateReference(_inputElement).ClearValue();
- _dataContext = new ImportDataViewModel(DbContextOptions);
- LoadData();
- _forceShowStep1 = true;
- StateHasChanged();
- }
-
- void ImportProfile_SelectionChanged()
- {
- _step3Enabled = false;
- _step4Enabled = false;
- if (_dataContext.SelectedImportProfile != null &&
- _dataContext.SelectedImportProfile.ImportProfileId != PlaceholderItemId) LoadProfile();
- }
-
- void TargetAccount_SelectionChanged()
- {
- _dataContext.SelectedImportProfile.AccountId = _dataContext.SelectedAccount?.AccountId ?? Guid.Empty;
- }
-
- void AdditionalSettingCreditValue_SelectionChanged(ChangeEventArgs e)
- {
- var value = Convert.ToInt32(e.Value);
- _dataContext.SelectedImportProfile.AdditionalSettingCreditValue = value;
- }
-
- void HandleResult(ViewModelOperationResult result, string successMessage = "")
- {
- if (!result.IsSuccessful)
- {
- _errorModalDialogMessage = result.Message;
- _isErrorModalDialogVisible = true;
- return;
- }
- if (string.IsNullOrEmpty(successMessage)) return;
-
- _infoDialogMessage = successMessage;
- _isInfoDialogVisible = true;
- }
-}
diff --git a/OpenBudgeteer.Blazor/Pages/Import.razor.cs b/OpenBudgeteer.Blazor/Pages/Import.razor.cs
new file mode 100644
index 0000000..9aeb30f
--- /dev/null
+++ b/OpenBudgeteer.Blazor/Pages/Import.razor.cs
@@ -0,0 +1,297 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.JSInterop;
+using OpenBudgeteer.Core.Common;
+using OpenBudgeteer.Core.Data.Contracts.Services;
+using OpenBudgeteer.Core.ViewModels.EntityViewModels;
+using OpenBudgeteer.Core.ViewModels.PageViewModels;
+
+namespace OpenBudgeteer.Blazor.Pages;
+
+public partial class Import : ComponentBase
+{
+ [Inject] private IServiceManager ServiceManager { get; set; } = null!;
+
+ private ImportPageViewModel _dataContext = null!;
+
+ private ElementReference _inputElement;
+ private ElementReference _step1AccordionButtonElement;
+ private ElementReference _step4AccordionButtonElement;
+
+ //private const string DUMMY_COLUMN = "---Select Column---";
+
+ //private ImportProfileViewModel _dummyImportProfile;
+
+ private bool _step2Enabled;
+ private bool _step3Enabled;
+ private bool _step4Enabled;
+ private bool _forceShowStep1;
+ private bool _forceShowStep4;
+
+ private enum MappingColumn
+ {
+ TransactionDate, Payee, Memo, Amount, Credit, CreditColumnIdentifier
+ }
+
+ private bool _isValidationRunning;
+ private bool _isImportRunning;
+
+ private string _validationErrorMessage = string.Empty;
+
+ private bool _isConfirmationModalDialogVisible;
+ private string _importConfirmationMessage = string.Empty;
+
+ private bool _isInfoDialogVisible;
+ private bool _isInfoDialogInteractionEnabled;
+ private string _infoDialogMessage = string.Empty;
+
+ private bool _isDeleteConfirmationDialogVisible;
+
+ private bool _isErrorModalDialogVisible;
+ private string _errorModalDialogMessage = string.Empty;
+
+ protected override void OnInitialized()
+ {
+ _dataContext = new ImportPageViewModel(ServiceManager);
+
+ LoadData();
+ LoadFromQueryParams();
+ }
+
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ await base.OnAfterRenderAsync(firstRender);
+ if (_forceShowStep1)
+ {
+ _forceShowStep1 = false;
+ await JSRuntime.InvokeVoidAsync("ImportPage.triggerClick", _step1AccordionButtonElement);
+ }
+ if (_forceShowStep4)
+ {
+ _forceShowStep4 = false;
+ await JSRuntime.InvokeVoidAsync("ImportPage.triggerClick", _step4AccordionButtonElement);
+ }
+ }
+
+ private void LoadData()
+ {
+ HandleResult(_dataContext.LoadData());
+
+ _step2Enabled = false;
+ _step3Enabled = false;
+ _step4Enabled = false;
+ }
+
+ private async void LoadFromQueryParams()
+ {
+ var uri = NavManager.ToAbsoluteUri(NavManager.Uri);
+ var query = QueryHelpers.ParseQuery(uri.Query);
+
+ if (query.TryGetValue("csv", out var csv64))
+ {
+ HandleResult(await LoadCsvFromBase64StringAsync(csv64!));
+ }
+
+ if (_step2Enabled && query.TryGetValue("profile", out var profileName))
+ {
+ var profile = _dataContext.AvailableImportProfiles.First(i => i.ProfileName == profileName);
+ _dataContext.SelectedImportProfile = profile;
+ SelectedImportProfile_SelectionChanged(profile.ImportProfileId.ToString()); // Dirty solution, to be replaced by API in future
+ }
+
+ if (_step4Enabled)
+ {
+ await ValidateDataAsync();
+ _forceShowStep4 = true;
+ StateHasChanged();
+ }
+ }
+
+ private async Task LoadCsvFromBase64StringAsync(string csv64)
+ {
+ try
+ {
+ var csv = Encoding.UTF8.GetString(Convert.FromBase64String(csv64));
+ var stream = new MemoryStream();
+ var writer = new StreamWriter(stream);
+ await writer.WriteAsync(csv);
+ await writer.FlushAsync();
+ stream.Position = 0;
+ var res = await _dataContext.HandleOpenFileAsync(stream);
+ if (res.IsSuccessful)
+ {
+ _step2Enabled = true;
+ }
+ return res;
+ }
+ catch (Exception e)
+ {
+ return new ViewModelOperationResult(false, $"Failed to load CSV: {e.Message}");
+ }
+ }
+
+ private async Task ReadFileAsync()
+ {
+ LoadData();
+
+ _infoDialogMessage = "Uploading and processing file...";
+ _isInfoDialogInteractionEnabled = false;
+ _isInfoDialogVisible = true;
+
+ var file = (await FileReaderService.CreateReference(_inputElement).EnumerateFilesAsync()).FirstOrDefault();
+ if (file == null) return;
+ HandleResult(await _dataContext.HandleOpenFileAsync(await file.OpenReadAsync()));
+
+ _isInfoDialogVisible = false;
+ _step2Enabled = true;
+ }
+
+ private void LoadProfile()
+ {
+ _dataContext.ResetLoadFigures();
+ _step3Enabled = _dataContext.SelectedImportProfile.ImportProfileId != Guid.Empty;
+ CheckColumnMapping();
+ StateHasChanged();
+ }
+
+ private void DeleteProfile()
+ {
+ _isDeleteConfirmationDialogVisible = false;
+ HandleResult(_dataContext.DeleteProfile());
+ LoadData();
+ _step2Enabled = true;
+ }
+
+ private void LoadHeaders()
+ {
+ var result = _dataContext.LoadHeaders();
+ if (result.IsSuccessful)
+ {
+ _step3Enabled = true;
+ }
+ else
+ {
+ HandleResult(result);
+ }
+ }
+
+ private void CheckColumnMapping()
+ {
+ _step4Enabled = false;
+ if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.TransactionDateColumnName) ||
+ _dataContext.SelectedImportProfile.TransactionDateColumnName == ImportPageViewModel.DummyColumn) return;
+ // Make Payee optional
+ //if (string.IsNullOrEmpty(_dataContext.PayeeColumn) || _dataContext.PayeeColumn == PLACEHOLDER_ITEM_VALUE) return;
+ if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.MemoColumnName) ||
+ _dataContext.SelectedImportProfile.MemoColumnName == ImportPageViewModel.DummyColumn) return;
+ if (string.IsNullOrEmpty(_dataContext.SelectedImportProfile.AmountColumnName) ||
+ _dataContext.SelectedImportProfile.AmountColumnName == ImportPageViewModel.DummyColumn) return;
+ _step4Enabled = true;
+ }
+
+ private async Task ValidateDataAsync()
+ {
+ _isValidationRunning = true;
+ _validationErrorMessage = (await _dataContext.ValidateDataAsync()).Message;
+ _isValidationRunning = false;
+ }
+
+ private async Task ImportDataAsync(bool withoutDuplicates)
+ {
+ _isImportRunning = true;
+ var result = await _dataContext.ImportDataAsync(withoutDuplicates);
+ _importConfirmationMessage = result.Message;
+ _isImportRunning = false;
+ _isConfirmationModalDialogVisible = true;
+ }
+
+ private async Task ClearFormAsync()
+ {
+ _isConfirmationModalDialogVisible = false;
+ _step2Enabled = false;
+ _step3Enabled = false;
+ _step4Enabled = false;
+ await FileReaderService.CreateReference(_inputElement).ClearValue();
+ _dataContext = new ImportPageViewModel(ServiceManager);
+ LoadData();
+ _forceShowStep1 = true;
+ StateHasChanged();
+ }
+
+ private void SelectedImportProfile_SelectionChanged(string? value)
+ {
+ if (string.IsNullOrEmpty(value)) return;
+ var selection = _dataContext.AvailableImportProfiles
+ .First(i => i.ImportProfileId == Guid.Parse(value));
+ // This copy prevents on-the-fly updates e.g. on Profile Name for AvailableImportProfiles
+ _dataContext.SelectedImportProfile = ImportProfileViewModel.CreateAsCopy(selection);
+ _step3Enabled = false;
+ _step4Enabled = false;
+ if (_dataContext.SelectedImportProfile.ImportProfileId != Guid.Empty) LoadProfile();
+ }
+
+ private void TargetAccount_SelectionChanged(string? value)
+ {
+ if (string.IsNullOrEmpty(value)) return;
+ _dataContext.SelectedImportProfile.Account =
+ _dataContext.AvailableAccounts.First(i => i.AccountId == Guid.Parse(value));
+ }
+
+ private void ColumnMapping_SelectionChanged(string? value, MappingColumn mappingColumn)
+ {
+ if (string.IsNullOrEmpty(value)) return;
+ var newValue = value != ImportPageViewModel.DummyColumn ? value : string.Empty;
+ switch (mappingColumn)
+ {
+ case MappingColumn.TransactionDate:
+ _dataContext.SelectedImportProfile.TransactionDateColumnName = newValue;
+ CheckColumnMapping();
+ break;
+ case MappingColumn.Payee:
+ _dataContext.SelectedImportProfile.PayeeColumnName = newValue;
+ break;
+ case MappingColumn.Memo:
+ _dataContext.SelectedImportProfile.MemoColumnName = newValue;
+ CheckColumnMapping();
+ break;
+ case MappingColumn.Amount:
+ _dataContext.SelectedImportProfile.AmountColumnName = newValue;
+ CheckColumnMapping();
+ break;
+ case MappingColumn.Credit:
+ _dataContext.SelectedImportProfile.CreditColumnName = newValue;
+ break;
+ case MappingColumn.CreditColumnIdentifier:
+ _dataContext.SelectedImportProfile.CreditColumnIdentifierColumnName = newValue;
+ break;
+ default:
+ throw new ArgumentOutOfRangeException(nameof(mappingColumn), mappingColumn, null);
+ }
+ }
+
+ private void AdditionalSettingCreditValue_SelectionChanged(ChangeEventArgs e)
+ {
+ var value = Convert.ToInt32(e.Value);
+ _dataContext.SelectedImportProfile.AdditionalSettingCreditValue = (ImportProfileViewModel.AdditionalSettingsForCreditValues)value;
+ }
+
+ private void HandleResult(ViewModelOperationResult result, string successMessage = "")
+ {
+ if (!result.IsSuccessful)
+ {
+ _errorModalDialogMessage = result.Message;
+ _isErrorModalDialogVisible = true;
+ return;
+ }
+ if (string.IsNullOrEmpty(successMessage)) return;
+
+ _infoDialogMessage = successMessage;
+ _isInfoDialogInteractionEnabled = true;
+ _isInfoDialogVisible = true;
+ }
+}
\ No newline at end of file
diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor b/OpenBudgeteer.Blazor/Pages/Index.razor
index 542e72a..a8981f2 100644
--- a/OpenBudgeteer.Blazor/Pages/Index.razor
+++ b/OpenBudgeteer.Blazor/Pages/Index.razor
@@ -16,13 +16,13 @@
-
Valid Records: @_dataContext.ValidRecords
Records with errors: @_dataContext.RecordsWithErrors
@@ -319,14 +312,14 @@ @if (_dataContext.ParsedRecords.Any(i => i.IsValid)) { -
+
-
+
}
-
+
@if (_dataContext.ParsedRecords.Any(i => !i.IsValid))
{
- Preview (Valid Records)
| Date | -Account | -Payee | +Account | +Payee | Memo | Amount | |
|---|---|---|---|---|---|---|---|
| @transaction.Result.TransactionDate.ToShortDateString() | -@_dataContext.SelectedAccount.Name | -@transaction.Result.Payee | +@_dataContext.SelectedImportProfile.Account.Name | +@transaction.Result.Payee | @transaction.Result.Memo | -@transaction.Result.Amount | +@transaction.Result.Amount.ToString("C", CultureInfo.CurrentCulture) |
+
@@ -369,46 +362,46 @@
}
-
+
}
-
+
@if (_dataContext.Duplicates.Any())
{
Records with error:
Potential Duplicates:
| Date | -Account | -Payee | -Memo | -Amount | -- |
|---|---|---|---|---|---|
| Date | +Account | +Payee | +Memo | +Amount | ++ |
| @duplicate.Item1.Result.TransactionDate.ToShortDateString() | +@_dataContext.SelectedImportProfile.Account.Name | +@duplicate.Item1.Result.Payee | +@duplicate.Item1.Result.Memo | +@duplicate.Item1.Result.Amount.ToString("C", CultureInfo.CurrentCulture) | ++ |
| @duplicate.Item1.Result.TransactionDate.ToShortDateString() | -@_dataContext.SelectedAccount.Name | -@duplicate.Item1.Result.Payee | -@duplicate.Item1.Result.Memo | -@duplicate.Item1.Result.Amount | -+ |
| @bankTransaction.TransactionDate.ToShortDateString() | +@_dataContext.SelectedImportProfile.Account.Name | +@bankTransaction.Payee | +@bankTransaction.Memo | +@bankTransaction.Amount.ToString("C", CultureInfo.CurrentCulture) | |
| @bankTransaction.TransactionDate.ToShortDateString() | -@_dataContext.SelectedAccount.Name | -@bankTransaction.Payee | -@bankTransaction.Memo | -@bankTransaction.Amount | -
File Content:
- +
-
-
-
- 
+
+
+
+
+
+
-
+
- OpenBudgeteer Repository
Access source code hosted on Github
@@ -30,12 +30,12 @@
-
-
- 
+
+
+
+
+
-
+
- Create Issue
Found a bug or missing a feature? Create an issue on Github
@@ -43,12 +43,12 @@
-
-
- 
+
+
+
+
+
-
+
}
-
-@code {
- private string _newsSource = "https://raw.githubusercontent.com/TheAxelander/OpenBudgeteer-News/main/README.md";
- private MarkupString _convertedHtml;
- private bool _showErrorMessage;
-
- protected override async Task OnInitializedAsync()
- {
- await base.OnInitializedAsync();
-
- await LoadNewsAsync();
- }
-
- async Task LoadNewsAsync()
- {
- try
- {
- _showErrorMessage = false;
- var httpResponse = await new HttpClient().GetAsync(_newsSource);
- httpResponse.EnsureSuccessStatusCode();
- _convertedHtml = new MarkupString(await httpResponse.Content.ReadAsStringAsync());
- }
- catch
- {
- _convertedHtml = new MarkupString();
- _showErrorMessage = true;
- }
- }
-}
\ No newline at end of file
diff --git a/OpenBudgeteer.Blazor/Pages/Index.razor.cs b/OpenBudgeteer.Blazor/Pages/Index.razor.cs
new file mode 100644
index 0000000..4c93722
--- /dev/null
+++ b/OpenBudgeteer.Blazor/Pages/Index.razor.cs
@@ -0,0 +1,35 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+
+namespace OpenBudgeteer.Blazor.Pages;
+
+public partial class Index : ComponentBase
+{
+ private const string NEWS_SOURCE = "https://raw.githubusercontent.com/TheAxelander/OpenBudgeteer-News/main/README.md";
+ private MarkupString _convertedHtml;
+ private bool _showErrorMessage;
+
+ protected override async Task OnInitializedAsync()
+ {
+ await base.OnInitializedAsync();
+
+ await LoadNewsAsync();
+ }
+
+ private async Task LoadNewsAsync()
+ {
+ try
+ {
+ _showErrorMessage = false;
+ var httpResponse = await new HttpClient().GetAsync(NEWS_SOURCE);
+ httpResponse.EnsureSuccessStatusCode();
+ _convertedHtml = new MarkupString(await httpResponse.Content.ReadAsStringAsync());
+ }
+ catch
+ {
+ _convertedHtml = new MarkupString();
+ _showErrorMessage = true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenBudgeteer.Blazor/Pages/Report.razor b/OpenBudgeteer.Blazor/Pages/Report.razor
index b142253..a721882 100644
--- a/OpenBudgeteer.Blazor/Pages/Report.razor
+++ b/OpenBudgeteer.Blazor/Pages/Report.razor
@@ -1,69 +1,57 @@
@page "/report"
-@using ChartJs.Blazor.ChartJS.BarChart
@using ChartJs.Blazor.Charts
-@using Microsoft.EntityFrameworkCore
-@using OpenBudgeteer.Blazor.ViewModels
-@using OpenBudgeteer.Data
-@inject DbContextOptions DbContextOptions
-
-
Month Balances
-
+
-
+
Month Balances
+
-
Bank Balances
-
+
+
Bank Balances
+
-
-
Income & Expenses per Month
-
+
-
+
Income & Expenses per Month
+
-
Income & Expenses per Year
-
+
+
Income & Expenses per Year
+
-
- > _monthBucketExpensesConfigsLeft;
- List> _monthBucketExpensesConfigsRight;
-
- protected override async Task OnInitializedAsync()
- {
- _monthBucketExpensesConfigsLeft = new List>();
- _monthBucketExpensesConfigsRight = new List>();
-
- _dataContext = new BlazorReportViewModel(DbContextOptions);
- await _dataContext.LoadDataAsync();
-
- var halfIndex = _dataContext.MonthBucketExpensesConfigs.Count / 2;
- _monthBucketExpensesConfigsLeft.AddRange(_dataContext.MonthBucketExpensesConfigs.ToList().GetRange(0,halfIndex));
- _monthBucketExpensesConfigsRight.AddRange(_dataContext.MonthBucketExpensesConfigs.ToList().GetRange(halfIndex,_dataContext.MonthBucketExpensesConfigs.Count - halfIndex));
- }
-}
diff --git a/OpenBudgeteer.Blazor/Pages/Report.razor.cs b/OpenBudgeteer.Blazor/Pages/Report.razor.cs
new file mode 100644
index 0000000..42049f0
--- /dev/null
+++ b/OpenBudgeteer.Blazor/Pages/Report.razor.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using ChartJs.Blazor.ChartJS.BarChart;
+using Microsoft.AspNetCore.Components;
+using OpenBudgeteer.Blazor.ViewModels;
+using OpenBudgeteer.Core.Data.Contracts.Services;
+
+namespace OpenBudgeteer.Blazor.Pages;
+
+public partial class Report : ComponentBase
+{
+ [Inject] private IServiceManager ServiceManager { get; set; } = null!;
+
+ private BlazorReportPageViewModel _dataContext = null!;
+ private List> _monthBucketExpensesConfigsLeft = null!;
+ private List> _monthBucketExpensesConfigsRight = null!;
+
+ protected override async Task OnInitializedAsync()
+ {
+ _monthBucketExpensesConfigsLeft = new List>();
+ _monthBucketExpensesConfigsRight = new List>();
+
+ _dataContext = new BlazorReportPageViewModel(ServiceManager);
+ await _dataContext.LoadDataAsync();
+
+ var halfIndex = _dataContext.MonthBucketExpensesConfigs.Count / 2;
+ _monthBucketExpensesConfigsLeft.AddRange(_dataContext.MonthBucketExpensesConfigs.ToList().GetRange(0,halfIndex));
+ _monthBucketExpensesConfigsRight.AddRange(_dataContext.MonthBucketExpensesConfigs.ToList().GetRange(halfIndex,_dataContext.MonthBucketExpensesConfigs.Count - halfIndex));
+ }
+}
\ No newline at end of file
diff --git a/OpenBudgeteer.Blazor/Pages/Rules.razor b/OpenBudgeteer.Blazor/Pages/Rules.razor
index f2c02ed..4d09cbd 100644
--- a/OpenBudgeteer.Blazor/Pages/Rules.razor
+++ b/OpenBudgeteer.Blazor/Pages/Rules.razor
@@ -1,50 +1,44 @@
@page "/rules"
-@using Microsoft.EntityFrameworkCore
-@using OpenBudgeteer.Core.ViewModels
-@using OpenBudgeteer.Core.ViewModels.ItemViewModels
@using System.Drawing
-@using OpenBudgeteer.Contracts.Models
-@using OpenBudgeteer.Core.Common
-@using OpenBudgeteer.Data
-@inject DbContextOptions DbContextOptions
+@using OpenBudgeteer.Core.Common.Extensions
+@using OpenBudgeteer.Core.ViewModels.EntityViewModels
-
Bucket Monthly Expenses
- @foreach (var config in _monthBucketExpensesConfigsLeft) - { -@config.Item1
-
-
- }
+
+
-
+
Bucket Monthly Expenses
+ @foreach (var config in _monthBucketExpensesConfigsLeft) + { +@config.Item1
+
+
+ }
+
-
-
-@code {
- BlazorReportViewModel _dataContext;
- ListBucket Monthly Expenses
- @foreach (var config in _monthBucketExpensesConfigsRight) - { -@config.Item1
-
-
- }
+
+
+
Bucket Monthly Expenses
+ @foreach (var config in _monthBucketExpensesConfigsRight) + { +@config.Item1
+
+
+ }
+
-
+
- @if (_massEditEnabled)
- {
-
-
- }
- else
- {
-
-
- }
-
+
+ @if (_massEditEnabled)
+ {
+
+
+ }
+ else
+ {
+
+
+ }
@if (_newMappingRuleSetIsEnabled)
{
- | Priority | -Rule Name | -Target Bucket | -Mapping Rules | +Priority | +Rule Name | +Target Bucket | +Mapping Rules | +|
|---|---|---|---|---|---|---|---|---|
| - | - | - |