clayschaad/AccountingNext
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: clayschaad:1c5227ab9afa017a5a2a5765605f3a7ea54af375
Branches Tags
clayschaad:main
clayschaad:dont-reload
..
compare: clayschaad:97bf85d6a800b2f47bb08c65e340e04372b4fe98
Branches Tags
clayschaad:main
clayschaad:dont-reload

No commits in common. "1c5227ab9afa017a5a2a5765605f3a7ea54af375" and "97bf85d6a800b2f47bb08c65e340e04372b4fe98" have entirely different histories.
1c5227ab9a ... 97bf85d6a8

10 changed files with 237 additions and 215 deletions
Show stats Expand all files Collapse all files

48
Schaad.Accounting.UI/Components/Pages/Reports/BalanceReport.razor
View file

@ -1,4 +1,4 @@
@page "/BalanceReport"
@page "/BalanceReport"
@if (balance is null)
{
@ -6,8 +6,11 @@
return;
}
<ReportHeader Title="@header"/>
<h3>@header</h3>
<a href="javascript:window.print()" class="hidePrint">Print</a>
<br />
<br />
<table class="report">
<thead>
<tr>
@ -17,11 +20,16 @@
<th class="right">Passiven</th>
</tr>
<tr>
<th colspan="4"><hr/></th>
<th colspan="4"><hr /></th>
</tr>
</thead>
<tbody>
<ReportSectionHeader Title="Aktiven" Colspan="4"/>
<tr>
<td colspan="4" class="header">Aktiven</td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
@foreach (var account in balance.ActivaAccountList.OrderBy(m => m.Number))
{
@if (account.BalanceCHF == 0) { continue; }
@ -33,14 +41,23 @@
<td></td>
</tr>
}
<ReportDivider Colspan="4"/>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total">Total Aktiven</td>
<td class="right total">CHF @balance.TotalActivaCHF.ToFormattedString()</td>
<td></td>
</tr>
<ReportDivider Colspan="4"/>
<ReportSectionHeader Title="Passiven" Colspan="4"/>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="4" class="header">Passiven</td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
@foreach (var account in balance.PassivaAccountList.OrderBy(m => m.Number))
{
@if (account.BalanceCHF == 0) { continue; }
@ -52,13 +69,17 @@
<td class="right">@Math.Abs(account.BalanceCHF).ToFormattedString()</td>
</tr>
}
<ReportDivider Colspan="4"/>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total">Total Passiven</td>
<td></td>
<td class="right total">@balance.TotalPassivaCHF.ToFormattedString()</td>
</tr>
<ReportDivider Colspan="4"/>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total">Total</td>
<td class="right">@balance.TotalActivaCHF.ToFormattedString()</td>
@ -74,6 +95,11 @@
<td class="right total sum">CHF @balance.TotalActivaCHF.ToFormattedString()</td>
<td class="right total sum">CHF @((balance.TotalPassivaCHF + win).ToFormattedString())</td>
</tr>
<ReportFooter Footer="@footer" Colspan="4"/>
<tr>
<td colspan="4" style="height: 30px">&nbsp;</td>
</tr>
<tr>
<td colspan="4" class="footer">@footer</td>
</tr>
</tbody>
</table>
</table>

39
Schaad.Accounting.UI/Components/Pages/Reports/BalanceSheetReport.razor
View file

@ -1,4 +1,4 @@
@page "/BalanceSheetReport"
@page "/BalanceSheetReport"
@if (balanceSheet is null)
{
@ -6,11 +6,18 @@
return;
}
<ReportHeader Title="@header"/>
<h3>@header</h3>
<a href="javascript:window.print()" class="hidePrint">Print</a>
<br />
<br />
<table class="report">
<tbody>
<ReportSectionHeader Title="Einnahmen" Colspan="3"/>
<tr>
<td colspan="3" class="header">Einnahmen</td>
</tr>
<tr>
<td colspan="3"><hr /></td>
</tr>
@foreach (var account in balanceSheet.ActivaAccountList.OrderBy(m => m.Number))
{
@if (account.StartBalanceCHF == 0) { continue; }
@ -31,8 +38,15 @@
<td class="right">@Math.Abs(account.BalanceCHF).ToFormattedString()</td>
</tr>
}
<ReportDivider Colspan="3"/>
<ReportSectionHeader Title="Ausgaben" Colspan="3"/>
<tr>
<td colspan="3"><hr /></td>
</tr>
<tr>
<td colspan="3" class="header">Ausgaben</td>
</tr>
<tr>
<td colspan="3"><hr /></td>
</tr>
@foreach (var account in balanceSheet.ExpensesAccountList.OrderBy(m => m.Number))
{
@if (account.BalanceCHF == 0) { continue; }
@ -43,7 +57,9 @@
<td class="right">@account.BalanceCHF.ToFormattedString()</td>
</tr>
}
<ReportDivider Colspan="3"/>
<tr>
<td colspan="3"><hr /></td>
</tr>
<tr>
<td colspan="2">Total Einnahmen</td>
<td class="right">@balanceSheet.ProfitCHF.ToFormattedString()</td>
@ -56,6 +72,11 @@
<td colspan="2" class="total">Übertrag @(balanceSheet.Year + 1)</td>
<td class="right total sum">CHF @win.ToFormattedString()</td>
</tr>
<ReportFooter Footer="@footer"/>
<tr>
<td colspan="4" style="height: 30px">&nbsp;</td>
</tr>
<tr>
<td colspan="4" class="footer">@footer</td>
</tr>
</tbody>
</table>
</table>

150
Schaad.Accounting.UI/Components/Pages/Reports/DetailReport.razor
View file

@ -1,4 +1,4 @@
@page "/DetailReport"
@page "/DetailReport"
@if (accounts is null || transactions is null)
{
@ -6,8 +6,11 @@
return;
}
<ReportHeader Title="@header"/>
<h3>@header</h3>
<a href="javascript:window.print()" class="hidePrint">Print</a>
<br />
<br />
<table class="report">
<thead>
<tr>
@ -16,81 +19,100 @@
<th class="right">Betrag</th>
</tr>
<tr>
<th colspan="3"><hr/></th>
<th colspan="3"><hr /></th>
</tr>
</thead>
<tbody>
<ReportSectionHeader Title="Einkünfte" Colspan="3"/>
@foreach (var account in accounts.Where(m => m.Class == ClassIds.Income).OrderBy(m => m.Number))
<tr>
<td colspan="3" class="header">Einkünfte</td>
</tr>
<tr>
<td colspan="3"><hr /></td>
</tr>
@foreach(var account in accounts.Where(m => m.Class == 3).OrderBy(m => m.Number))
{
@if (account.Balance == 0) {continue;}
<tr>
<td class="header">@account.Number</td>
<td class="header">@account.Name</td>
<td class="header right">@Math.Abs(account.Balance).ToFormattedString()</td>
</tr>
@foreach(var trx in transactions.Where(t => t.TargetAccountId == account.Id || t.OriginAccountId == account.Id).OrderBy(t => t.ValueDate))
{
@if (account.Balance == 0) { continue; }
<tr>
<td class="header">@account.Number</td>
<td class="header">@account.Name</td>
<td class="header right">@Math.Abs(account.Balance).ToFormattedString()</td>
<td>@trx.ValueDate.ToString("dd.MM.yyyy")</td>
<td>@trx.Text</td>
<td class="right">
@if (trx.OriginAccountId == account.Id)
{
@trx.Value.ToFormattedString();
}
else
{
<span>-</span>@trx.Value.ToFormattedString();
}
</td>
</tr>
@foreach (var trx in transactions.Where(t => t.TargetAccountId == account.Id || t.OriginAccountId == account.Id).OrderBy(t => t.ValueDate))
{
<tr>
<td>@trx.ValueDate.ToString("dd.MM.yyyy")</td>
<td>@trx.Text</td>
<td class="right">
@if (trx.OriginAccountId == account.Id)
{
@trx.Value.ToFormattedString();
}
else
{
<span>-</span>
@trx.Value.ToFormattedString();
}
</td>
</tr>
}
<ReportDivider Colspan="3"/>
}
<tr>
<td colspan="2" class="total right">Total Einkünfte</td>
<td class="right total">@profit.ToFormattedString()</td>
<td colspan="3"><hr /></td>
</tr>
<ReportDivider Colspan="3"/>
<ReportSectionHeader Title="Ausgaben" Colspan="3"/>
@foreach (var account in accounts.Where(m => m.Class == ClassIds.Expenses).OrderBy(m => m.Number))
}
<tr>
<td colspan="2" class="total right">Total Einkünfte</td>
<td class="right total">@profit.ToFormattedString()</td>
</tr>
<tr>
<td colspan="3"><hr /></td>
</tr>
<tr>
<td colspan="3" class="header">Ausgaben</td>
</tr>
<tr>
<td colspan="3"><hr /></td>
</tr>
@foreach(var account in accounts.Where(m => m.Class == 4).OrderBy(m => m.Number))
{
@if (account.Balance == 0) {continue;}
<tr>
<td class="header">@account.Number</td>
<td class="header">@account.Name</td>
<td class="header right">@account.Balance.ToFormattedString()</td>
</tr>
@foreach(var trx in transactions.Where(t => t.TargetAccountId == account.Id || t.OriginAccountId == account.Id).OrderBy(t => t.ValueDate))
{
@if (account.Balance == 0) { continue; }
<tr>
<td class="header">@account.Number</td>
<td class="header">@account.Name</td>
<td class="header right">@account.Balance.ToFormattedString()</td>
<td>@trx.ValueDate.ToString("dd.MM.yyyy")</td>
<td>@trx.Text</td>
<td class="right">
@if (trx.TargetAccountId == account.Id)
{
@trx.Value.ToFormattedString();
}
else
{
<span>-</span>@trx.Value.ToFormattedString();
}
</td>
</tr>
@foreach (var trx in transactions.Where(t => t.TargetAccountId == account.Id || t.OriginAccountId == account.Id).OrderBy(t => t.ValueDate))
{
<tr>
<td>@trx.ValueDate.ToString("dd.MM.yyyy")</td>
<td>@trx.Text</td>
<td class="right">
@if (trx.TargetAccountId == account.Id)
{
@trx.Value.ToFormattedString();
}
else
{
<span>-</span>
@trx.Value.ToFormattedString();
}
</td>
</tr>
}
<ReportDivider Colspan="3"/>
}
<tr>
<td colspan="2" class="total right">Total Ausgaben</td>
<td class="right total">@loss.ToFormattedString()</td>
<td colspan="3"><hr /></td>
</tr>
<ReportFooter Footer="@footer"/>
}
<tr>
<td colspan="2" class="total right">Total Ausgaben</td>
<td class="right total">@loss.ToFormattedString()</td>
</tr>
<tr>
<td colspan="4" style="height: 30px">&nbsp;</td>
</tr>
<tr>
<td colspan="4" class="footer">@footer</td>
</tr>
</tbody>
</table>
</table>

140
Schaad.Accounting.UI/Components/Pages/Reports/ProfitLossReport.razor
View file

@ -1,4 +1,4 @@
@page "/ProfitLossReport"
@page "/ProfitLossReport"
@if (accounts is null)
{
@ -6,8 +6,11 @@
return;
}
<ReportHeader Title="@header"/>
<h3>@header</h3>
<a href="javascript:window.print()" class="hidePrint">Print</a>
<br />
<br />
<table class="report">
<thead>
<tr>
@ -17,63 +20,86 @@
<th class="right">Ertrag</th>
</tr>
<tr>
<th colspan="4"><hr/></th>
<th colspan="4"><hr /></th>
</tr>
</thead>
<tbody>
<ReportSectionHeader Title="Einkünfte" Colspan="4"/>
@foreach (var account in accounts.Where(m => m.Class == ClassIds.Income).OrderBy(m => m.Number))
{
@if (account.Balance == 0) { continue; }
<tr>
<td colspan="4" class="header">Einkünfte</td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
@foreach(var account in accounts.Where(m => m.Class == 3).OrderBy(m => m.Number))
{
@if (account.Balance == 0) {continue;}
<tr>
<td>@account.Number</td>
<td>@account.Name</td>
<td></td>
<td class="right">@Math.Abs(account.Balance).ToFormattedString()</td>
</tr>
}
<ReportDivider Colspan="4"/>
<tr>
<td colspan="2" class="total">Total Einkünfte</td>
<td></td>
<td class="right total">@profit.ToFormattedString()</td>
</tr>
<ReportDivider Colspan="4"/>
<ReportSectionHeader Title="Ausgaben" Colspan="4"/>
@foreach (var account in accounts.Where(m => m.Class == ClassIds.Expenses).OrderBy(m => m.Number))
{
@if (account.Balance == 0) { continue; }
<tr>
<td>@account.Number</td>
<td>@account.Name</td>
<td class="right">@Math.Abs(account.Balance).ToFormattedString()</td>
<td></td>
</tr>
}
<ReportDivider Colspan="4"/>
<tr>
<td colspan="2" class="total">Total Ausgaben</td>
<td class="right total">@loss.ToFormattedString()</td>
<td></td>
</tr>
<ReportDivider Colspan="4"/>
<tr>
<td colspan="2" class="total"></td>
<td class="right total">@loss.ToFormattedString()</td>
<td class="right total">@profit.ToFormattedString()</td>
</tr>
<tr>
<td colspan="2" class="total">Gewinn/Verlust</td>
<td class="right total sum">@win.ToFormattedString()</td>
<td class="right total sum"></td>
</tr>
<tr>
<td colspan="2" class="total">Total</td>
<td class="right total sum">@profit.ToFormattedString()</td>
<td class="right total sum">@profit.ToFormattedString()</td>
</tr>
<ReportFooter Footer="@footer" Colspan="4"/>
<tr>
<td>@account.Number</td>
<td>@account.Name</td>
<td></td>
<td class="right">@Math.Abs(account.Balance).ToFormattedString()</td>
</tr>
}
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total">Total Einkünfte</td>
<td></td>
<td class="right total">@profit.ToFormattedString()</td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="4" class="header">Ausgaben</td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
@foreach(var account in accounts.Where(m => m.Class == 4).OrderBy(m => m.Number))
{
@if (account.Balance == 0) {continue;}
<tr>
<td>@account.Number</td>
<td>@account.Name</td>
<td class="right">@Math.Abs(account.Balance).ToFormattedString()</td>
<td></td>
</tr>
}
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total">Total Ausgaben</td>
<td class="right total">@loss.ToFormattedString()</td>
<td></td>
</tr>
<tr>
<td colspan="4"><hr /></td>
</tr>
<tr>
<td colspan="2" class="total"></td>
<td class="right total">@loss.ToFormattedString()</td>
<td class="right total">@profit.ToFormattedString()</td>
</tr>
<tr>
<td colspan="2" class="total">Gewinn/Verlust</td>
<td class="right total sum">@win.ToFormattedString()</td>
<td class="right total sum"></td>
</tr>
<tr>
<td colspan="2" class="total">Total</td>
<td class="right total sum">@profit.ToFormattedString()</td>
<td class="right total sum">@profit.ToFormattedString()</td>
</tr>
<tr>
<td colspan="4" style="height: 30px">&nbsp;</td>
</tr>
<tr>
<td colspan="4" class="footer">@footer</td>
</tr>
</tbody>
</table>
</table>

11
Schaad.Accounting.UI/Components/Pages/Reports/ReportDivider.razor
View file

@ -1,11 +0,0 @@
@* Full-width table divider — <tr><td colspan="N"><hr/></td></tr>.
Callers pass their table's column count. *@
<tr>
<td colspan="@Colspan"><hr/></td>
</tr>
@code {
[Parameter, EditorRequired]
public int Colspan { get; set; }
}

19
Schaad.Accounting.UI/Components/Pages/Reports/ReportFooter.razor
View file

@ -1,19 +0,0 @@
@* Report tail — spacer row + italic footer line ("Stand: dd.MM.yyyy").
Note: the existing code used colspan="4" here even in reports whose
table only has 3 columns; preserved as-is so the visual is unchanged.
Callers can override via the Colspan parameter. *@
<tr>
<td colspan="@Colspan" style="height: 30px">&nbsp;</td>
</tr>
<tr>
<td colspan="@Colspan" class="footer">@Footer</td>
</tr>
@code {
[Parameter, EditorRequired]
public string Footer { get; set; } = "";
[Parameter]
public int Colspan { get; set; } = 4;
}

14
Schaad.Accounting.UI/Components/Pages/Reports/ReportHeader.razor
View file

@ -1,14 +0,0 @@
@* Shared banner used at the top of every printable report.
H3 + browser print trigger + spacer. The Print link is hidden in the
print stylesheet via .hidePrint. *@
<h3>@Title</h3>
<a href="javascript:window.print()" class="hidePrint">Print</a>
<br/>
<br/>
@code {
[Parameter, EditorRequired]
public string Title { get; set; } = "";
}

18
Schaad.Accounting.UI/Components/Pages/Reports/ReportSectionHeader.razor
View file

@ -1,18 +0,0 @@
@* Section header + divider pair — "Aktiven", "Passiven", "Einkünfte",
"Ausgaben", "Einnahmen" etc. Wraps two <tr>s so the caller drops it
into <tbody> as a single element. *@
<tr>
<td colspan="@Colspan" class="header">@Title</td>
</tr>
<tr>
<td colspan="@Colspan"><hr/></td>
</tr>
@code {
[Parameter, EditorRequired]
public string Title { get; set; } = "";
[Parameter, EditorRequired]
public int Colspan { get; set; }
}

7
Schaad.Accounting.UI/wwwroot/app.css
View file

@ -63,13 +63,6 @@ h1:focus {
.hidePrint {
display: none !important;
}
/* Keep report rows intact across page breaks. Without this a row could
be split by the printer between an amount and its label, or between a
section header and its first data row. */
table.report tr {
page-break-inside: avoid;
}
}
table.report

6
UI_IMPROVEMENT_PLAN.md
View file

@ -177,11 +177,7 @@ Split into two PRs on delivery because the header path touches ~15 pages.
### Phase 5 — Home page split
- **U-10** Extract `<StatementImport />` and `<PendingBookings />` components. Home stacks them.
- **U-11** ~~Replace the Home `<input list="texts">` + `<datalist>` with `FluentAutocomplete`.~~ **Won't do.** Two attempts, both broke the UI:
- Attempt 1 (`ceef2c1`, reverted in `2522274`): `FluentCombobox` with `Autocomplete=Both`, a computed-getter `Items` source (fresh `IEnumerable` per access), and inline `@(t => t)` delegates. Suspected root cause: per-render parameter churn triggering re-init inside every row's Combobox, flooding the SignalR circuit.
- Attempt 2 (branch `refactor/pr-u11b-retry`, never merged): all three suspected causes fixed — `sortedBookingTexts` materialised into a real field populated in `LoadDataAsync`, `OptionText`/`OptionValue` extracted to `static readonly Func<string, string>`, `Autocomplete` downgraded to `List`. Same UI lockup.
Conclusion: `FluentCombobox` in Fluent UI Blazor 4.11.8 is not usable inside a per-row `@foreach` on a Blazor Server page with more than a handful of rows, independent of parameter stability. The native `<input list>` + `<datalist>` stays. If someone wants Fluent styling later, options that avoid the per-row Fluent component are: (a) a lightly-styled `<input>` wrapped in Fluent's CSS classes; (b) rendering the suggestions as a single shared component with a `TextChanged` callback that updates the row's `Text` field.
- **U-11** Replace the Home `<input list="texts">` + `<datalist>` with `FluentAutocomplete` so the autocomplete UI is uniform with the split dialog.
### Phase 6 — Report componentization