From 757328359f3664f389731ae6751bb8bdcb8f9b1e Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 12 Aug 2017 19:32:27 +0200 Subject: [PATCH] Fixed #146 - report: set size of columns --- .../budgetmaster/logic/report/ColumnType.java | 25 ++++++++++++------- .../logic/report/ReportGenerator.java | 8 +++++- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java b/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java index b7503a80c..e810df617 100644 --- a/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java +++ b/src/de/deadlocker8/budgetmaster/logic/report/ColumnType.java @@ -2,24 +2,31 @@ package de.deadlocker8.budgetmaster.logic.report; public enum ColumnType { - POSITION("Nr."), - DATE("Datum"), - REPEATING("Wiederholend"), - CATEGORY("Kategorie"), - NAME("Name"), - DESCRIPTION("Notiz"), - RATING("Bewertung"), - AMOUNT("Betrag"); + POSITION("Nr.", 1), + DATE("Datum", 2), + REPEATING("Wiederholend", 1), + CATEGORY("Kategorie", 3), + NAME("Name", 3), + DESCRIPTION("Notiz", 3), + RATING("+/-", 1), + AMOUNT("Betrag", 2); private String name; + private float proportion; - private ColumnType(String name) + private ColumnType(String name, float proportion) { this.name = name; + this.proportion = proportion; } public String getName() { return name; } + + public float getProportion() + { + return proportion; + } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java index f259f43fa..0bdce3d28 100644 --- a/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/report/ReportGenerator.java @@ -70,7 +70,13 @@ public class ReportGenerator if(numberOfColumns > 0) { - PdfPTable table = new PdfPTable(numberOfColumns); + float[] proportions = new float[numberOfColumns]; + for(int i = 0; i < columnOrder.getColumns().size(); i++) + { + proportions[i] = columnOrder.getColumns().get(i).getProportion(); + } + + PdfPTable table = new PdfPTable(proportions); table.setWidthPercentage(tableWidth); Font font = new Font(FontFamily.HELVETICA, 8, Font.NORMAL, GrayColor.BLACK); -- GitLab