diff --git a/src/main/resources/languages/_de.properties b/src/main/resources/languages/_de.properties
index 11cb7e8ccede2b8d6fa49d383ff5f493ff318ce6..ef2ca774437a0cffa9cdeaf5161870c00a15dc52 100644
--- a/src/main/resources/languages/_de.properties
+++ b/src/main/resources/languages/_de.properties
@@ -202,8 +202,14 @@ about.sourcecode=Quellcode:
about.credits=Credits:
# REPORT
+report.settings=Einstellungen
report.columns=Spalten ausw�hlen
report.columns.advice=Hinweis: Du kannst die Reihenfolge der Spalten per Drag&Drop anpassen.
+report.checkbox.include.budget=Budgetkalkulation hinzuf�gen
+report.checkbox.split.tables=Einnahmen und Ausgaben als getrennte Tabellen
+report.checkbox.inclue.categorybudgets=Verbrauch nach Kategorien hinzuf�gen
+report.button.generate=Bericht erzeugen
+
report.position=Nr.
report.date=Datum
report.repeating=Wiederholend
@@ -215,7 +221,7 @@ report.account=Konto
report.rating=+/-
report.amount=Betrag
report.headline=Monatsbericht - {0}
-report.headline.payments.overview=Buchungs�bersicht
+report.headline.transactions.overview=Buchungs�bersicht
report.sum.total=Einnahmen: {0} / Ausgaben: {1}
report.sum=Summe: {0}
report.footer.left=BudgetMaster Monatsbericht
diff --git a/src/main/resources/languages/_en.properties b/src/main/resources/languages/_en.properties
index dcb41491a4e42a6de92ce3297509a8caad7453d9..28e4810abf8fcc4e78689b617e8c609437b5517f 100644
--- a/src/main/resources/languages/_en.properties
+++ b/src/main/resources/languages/_en.properties
@@ -190,8 +190,6 @@ datepicker.label.month=Month:
datepicker.label.year=Year:
datepicker.button.confirm=Apply
-report.generate=Create Report
-
# ABOUT
about=About {0}
about.roadmap.link=Open Roadmap
@@ -203,8 +201,14 @@ about.sourcecode=Sourcecode:
about.credits=Credits:
# REPORT
+report.settings=Settings
report.columns=Select columns
report.columns.advice=Note: You can change the order of the columns by drag&drop.
+report.checkbox.include.budget=Include budget calculation
+report.checkbox.split.tables=Split incomes and payments into separate tables
+report.checkbox.inclue.categorybudgets=Include consumption by categories
+report.button.generate=Create Report
+
report.position=No.
report.date=Date
report.repeating=Repeating
@@ -216,8 +220,8 @@ report.account=Account
report.rating=+/-
report.amount=Amount
report.headline=Month Report - {0}
-report.headline.payments.overview=Payments Overview
-report.sum.total=Incomes: {0} / Payments: {1}
+report.headline.transactions.overview=Transactions Overview
+report.sum.total=Incomes: {0} / Expenditures: {1}
report.sum=Total: {0}
report.footer.left=BudgetMaster Month Report
report.footer.center=Page {0}
@@ -226,7 +230,7 @@ report.repeating.no=No
report.initial.filename=BudgetMaster Month Report - {0}_{1}.pdf
report.budget=Budget
report.incomes=Incomes:
-report.payments=Payments:
+report.payments=Expenditures:
report.budget.rest=Remaining Budget:
# home menu
diff --git a/src/main/resources/static/css/dark/reports.css b/src/main/resources/static/css/dark/reports.css
index d8700e32d55d60cda74277e72a43051a14c7f282..e6fc590274a6eebfb9f9145b44305eb36601e8f4 100644
--- a/src/main/resources/static/css/dark/reports.css
+++ b/src/main/resources/static/css/dark/reports.css
@@ -1,3 +1,13 @@
+.headline-small {
+ font-size: 1.5rem;
+ text-transform: initial;
+ color: #212121;
+}
+
+.report-checkbox-container {
+ margin-bottom: 0.5rem;
+}
+
#columnNames {
border-top: 1px solid #333333;
border-right: 1px solid #333333;
diff --git a/src/main/resources/static/css/reports.css b/src/main/resources/static/css/reports.css
index e777cfae3da665ff423abe49d5d4bf65a085b99b..d0c6f4c76ae11b65c50d41728f1ee16ade390f62 100644
--- a/src/main/resources/static/css/reports.css
+++ b/src/main/resources/static/css/reports.css
@@ -1,3 +1,13 @@
+.headline-small {
+ font-size: 1.5rem;
+ text-transform: initial;
+ color: #212121;
+}
+
+.report-checkbox-container {
+ margin-bottom: 0.5rem;
+}
+
#columnNames {
border-top: 1px solid #ddd;
border-right: 1px solid #ddd;
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 71ba762374ad0efeb3c55dcf3bd1d9b18efb1775..4a24ae25728b920d4855fc2f719c246cf45d50f7 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -17,9 +17,40 @@
<br>
<div class="container">
+ <#-- settings -->
<div class="row">
<div class="col s12 center-align">
- <div class="headline">${locale.getString("report.columns")}</div>
+ <div class="headline-small">${locale.getString("report.settings")}</div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col s12 m8 offset-m2">
+ <div class="report-checkbox-container">
+ <label>
+ <input type="checkbox" id="report-checkbox-include-budget"/>
+ <span class="columnName-label">${locale.getString('report.checkbox.include.budget')}</span>
+ </label>
+ </div>
+ <div class="report-checkbox-container">
+ <label>
+ <input type="checkbox" id="report-checkbox-split-tables">
+ <span class="columnName-label">${locale.getString('report.checkbox.split.tables')}</span>
+ </label>
+ </div>
+ <div class="report-checkbox-container">
+ <label>
+ <input type="checkbox" id="report-checkbox-include-categorybudgets"/>
+ <span class="columnName-label">${locale.getString('report.checkbox.inclue.categorybudgets')}</span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <br>
+
+ <#-- columns -->
+ <div class="row no-margin">
+ <div class="col s12 center-align">
+ <div class="headline-small">${locale.getString("report.columns")}</div>
<table class="no-border-table table-advice">
<tr>
<td><i class="material-icons">info_outline</i></td>
@@ -29,7 +60,7 @@
</div>
</div>
<div class="row">
- <div class="col s12 m6 offset-m3">
+ <div class="col s12 m8 offset-m2">
<div id="columnNames">
<div class="columnName">
<label>
@@ -99,7 +130,7 @@
<div class="row valign-wrapper">
<div class="col s12 center-align"><a href="<@s.url '/reports/generate'/>"
class="waves-effect waves-light btn budgetmaster-blue"><i
- class="material-icons left">save</i>${locale.getString("report.generate")}</a></div>
+ class="material-icons left">save</i>${locale.getString("report.button.generate")}</a></div>
</div>
</div>
</div>