Skip to content
Snippets Groups Projects
Commit 73790ac3 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#725 - refactor: converted Budget to record

parent 41e8e1f7
Branches
Tags
No related merge requests found
package de.deadlocker8.budgetmaster.reports;
public class Budget
public record Budget(int incomeSum, int expenditureSum)
{
private int incomeSum;
private int expenditureSum;
public Budget(int incomeSum, int expenditureSum)
{
this.incomeSum = incomeSum;
this.expenditureSum = expenditureSum;
}
public int getIncomeSum()
{
return incomeSum;
}
public int getExpenditureSum()
{
return expenditureSum;
}
public int getRest()
{
return incomeSum + expenditureSum;
......
......@@ -94,8 +94,8 @@ public class ReportGeneratorService
{
PdfPCell cellTotal;
String total = "";
String totalIncomeString = currencyService.getCurrencyString(reportConfiguration.getBudget().getIncomeSum());
String totalExpenditureString = currencyService.getCurrencyString(reportConfiguration.getBudget().getExpenditureSum());
String totalIncomeString = currencyService.getCurrencyString(reportConfiguration.getBudget().incomeSum());
String totalExpenditureString = currencyService.getCurrencyString(reportConfiguration.getBudget().expenditureSum());
switch(amountType)
{
case BOTH:
......@@ -189,11 +189,11 @@ public class ReportGeneratorService
Budget budget = reportConfiguration.getBudget();
Paragraph paragraph = new Paragraph();
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_INCOMES) + currencyService.getCurrencyString(budget.getIncomeSum()), fontGreen));
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_INCOMES) + currencyService.getCurrencyString(budget.incomeSum()), fontGreen));
paragraph.add(new Chunk(" "));
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_PAYMENTS) + currencyService.getCurrencyString(budget.getExpenditureSum()), fontRed));
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_PAYMENTS) + currencyService.getCurrencyString(budget.expenditureSum()), fontRed));
paragraph.add(new Chunk(" "));
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_BUDGET_REST) + currencyService.getCurrencyString(budget.getIncomeSum() + budget.getExpenditureSum()), fontBlack));
paragraph.add(new Chunk(Localization.getString(Strings.REPORT_BUDGET_REST) + currencyService.getCurrencyString(budget.incomeSum() + budget.expenditureSum()), fontBlack));
paragraph.setAlignment(Element.ALIGN_JUSTIFIED);
final Paragraph paragraphBudgetHeadline = new Paragraph(Localization.getString(Strings.REPORT_BUDGET), headerFont);
......
......@@ -26,13 +26,13 @@
<div class="col s4">
<div class="icon-block center-align">
<img class="budget-headline-icon" src="<@s.url '/images/piggy_income.svg'/>">
<h5 class="budget">${currencyService.getCurrencyString(budget.getIncomeSum())}</h5>
<h5 class="budget">${currencyService.getCurrencyString(budget.incomeSum())}</h5>
</div>
</div>
<div class="col s4">
<div class="icon-block center-align">
<img class="budget-headline-icon" src="<@s.url '/images/piggy_expenditure.svg'/>">
<h5 class="center budget">${currencyService.getCurrencyString(budget.getExpenditureSum())}</h5>
<h5 class="center budget">${currencyService.getCurrencyString(budget.expenditureSum())}</h5>
</div>
</div>
<div class="col s4">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment