Skip to content

Commit bf78e2f

Browse files
mierin12buchen
authored andcommitted
fix label of Payment Interest charts
interest are for account, not for security
1 parent de1b383 commit bf78e2f

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/payments/PaymentsPerMonthChartBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ private void buildTabularData(PaymentsViewModel model, int month, Builder builde
7070

7171
int noOfYears = (totalNoOfMonths / 12) + (totalNoOfMonths % 12 > month ? 1 : 0);
7272

73-
builder.addColumns(new Column(Messages.ColumnSecurity, SWT.LEFT, 220).withLogo());
73+
var firstColumnLabel = switch (model.getMode())
74+
{
75+
case INTEREST -> Messages.ColumnAccount;
76+
default -> Messages.ColumnSecurity;
77+
};
78+
builder.addColumns(new Column(firstColumnLabel, SWT.LEFT, 220).withLogo());
7479
for (int year = 0; year < noOfYears; year++)
7580
{
7681
builder.addColumns(new Column(String.valueOf(model.getStartYear() + year))

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/payments/PaymentsPerQuarterChartBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ private void buildTabularData(PaymentsViewModel model, int quarter, TabularDataS
7171

7272
int noOfYears = (totalNoOfMonths / 12) + (totalNoOfMonths % 12 > quarter * 3 ? 1 : 0);
7373

74-
builder.addColumns(new Column(Messages.ColumnSecurity, SWT.LEFT, 220).withLogo());
74+
var firstColumnLabel = switch (model.getMode())
75+
{
76+
case INTEREST -> Messages.ColumnAccount;
77+
default -> Messages.ColumnSecurity;
78+
};
79+
builder.addColumns(new Column(firstColumnLabel, SWT.LEFT, 220).withLogo());
7580
for (int year = 0; year < noOfYears; year++)
7681
{
7782
builder.addColumns(new Column(String.valueOf(model.getStartYear() + year))

name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/payments/PaymentsPerYearChartBuilder.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,13 @@ private void buildTabularData(PaymentsViewModel model, int year, TabularDataSour
6767
.sorted((l1, l2) -> TextUtil.compare(l1.getVehicle().getName(), l2.getVehicle().getName()))
6868
.toList();
6969

70+
var firstColumnLabel = switch (model.getMode())
71+
{
72+
case INTEREST -> Messages.ColumnAccount;
73+
default -> Messages.ColumnSecurity;
74+
};
7075
builder.addColumns( //
71-
new Column(Messages.ColumnSecurity, SWT.LEFT, 220).withLogo(),
76+
new Column(firstColumnLabel, SWT.LEFT, 220).withLogo(),
7277
new Column(String.valueOf(model.getStartYear() + year))
7378
.withBackgroundColor(PaymentsColors.getColor(model.getStartYear() + year))
7479
.withFormatter(cell -> Values.Amount.format((long) cell)));

0 commit comments

Comments
 (0)