Add support to reports

adempiere · May 18, 2024 · cfb8b1e · cfb8b1e
1 parent c829277
commit cfb8b1e
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 13 deletions.
diff --git a/src/main/java/org/spin/report_engine/data/ReportInfo.java b/src/main/java/org/spin/report_engine/data/ReportInfo.java
@@ -17,26 +17,33 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.spin.report_engine.format.PrintFormat;
+import org.spin.report_engine.format.PrintFormatItem;
+
 
 /**
- * CAll Report information is here, name, columns and other
+ * Call Report information is here, name, columns and other
  * @author Yamel Senih, ysenih@erpya.com, ERPCyA http://www.erpya.com
  */
 public class ReportInfo {
 	private String name;
+	private String description;
 	private List<ColumnInfo> columns;
 	private List<Row> rows;
+	private Row temporaryRow;
 	private int printFormatId;
 	private int reportViewId;
 	private boolean isSummary;
 
-	private ReportInfo() {
+	private ReportInfo(PrintFormat printFormat) {
+		name = printFormat.getName();
+		description = printFormat.getDescription();
 		columns = new ArrayList<>();
 		rows = new ArrayList<>();
 	}
 
-	public static ReportInfo newInstance() {
-		return new ReportInfo();
+	public static ReportInfo newInstance(PrintFormat printFormat) {
+		return new ReportInfo(printFormat);
 	}
 
 	public String getName() {
@@ -48,6 +55,15 @@ public ReportInfo withName(String name) {
 		return this;
 	}
 
+	public String getDescription() {
+		return description;
+	}
+
+	public ReportInfo withDescription(String description) {
+		this.description = description;
+		return this;
+	}
+
 	public List<ColumnInfo> getColumns() {
 		return columns;
 	}
@@ -67,6 +83,22 @@ public ReportInfo addRow(Row row) {
 		return this;
 	}
 
+	public ReportInfo addRow() {
+		if(temporaryRow != null) {
+			addRow(Row.newInstance().withCells(temporaryRow.getData()));
+		}
+		temporaryRow = Row.newInstance();
+		return this;
+	}
+
+	public ReportInfo addCell(PrintFormatItem printFormatItem, Cell cell) {
+		if(temporaryRow == null) {
+			temporaryRow = Row.newInstance();
+		}
+		temporaryRow.withCell(printFormatItem.getPrintFormatItemId(), cell);
+		return this;
+	}
+
 	public List<Row> getRows() {
 		return rows;
 	}

diff --git a/src/main/java/org/spin/report_engine/data/Row.java b/src/main/java/org/spin/report_engine/data/Row.java
@@ -23,7 +23,7 @@
  */
 public class Row {
 	/**	Data for Row	*/
-	private Map<String, Cell> data;
+	private Map<Integer, Cell> data;
 
 	private Row() {
 		data = new HashMap<>();
@@ -33,12 +33,17 @@ public static Row newInstance() {
 		return new Row();
 	}
 
-	public Row withCell(String columnCode, Cell cell) {
-		data.put(columnCode, cell);
+	public Row withCell(int printFormatItemId, Cell cell) {
+		data.put(printFormatItemId, cell);
 		return this;
 	}
 
-	public Map<String, Cell> getData() {
+	public Row withCells(Map<Integer, Cell> cells) {
+		data = cells;
+		return this;
+	}
+
+	public Map<Integer, Cell> getData() {
 		return data;
 	}
 

diff --git a/src/main/java/org/spin/report_engine/service/ReportBuilder.java b/src/main/java/org/spin/report_engine/service/ReportBuilder.java
@@ -26,7 +26,6 @@
 import org.spin.report_engine.data.Cell;
 import org.spin.report_engine.data.ColumnInfo;
 import org.spin.report_engine.data.ReportInfo;
-import org.spin.report_engine.data.Row;
 import org.spin.report_engine.format.PrintFormat;
 import org.spin.report_engine.format.QueryDefinition;
 import org.spin.service.grpc.util.query.Filter;
@@ -108,10 +107,9 @@ public ReportInfo run(int limit, int offset) {
 		MPrintFormat printFormat = new MPrintFormat(Env.getCtx(), getPrintFormatId(), null);
 		PrintFormat format = PrintFormat.newInstance(printFormat);
 		QueryDefinition queryDefinition = format.getQuery().withConditions(conditions).withLimit(limit, offset).buildQuery();
-		ReportInfo reportInfo = ReportInfo.newInstance();
+		ReportInfo reportInfo = ReportInfo.newInstance(format);
 		DB.runResultSet(null, queryDefinition.getCompleteQuery(), queryDefinition.getParameters(), resulset -> {
 			while (resulset.next()) {
-				Row row = Row.newInstance();
 				format.getItems().forEach(item -> {
 					reportInfo.addColumn(ColumnInfo.newInstance(item));
 					Cell cell = Cell.newInstance();
@@ -129,11 +127,12 @@ public ReportInfo run(int limit, int offset) {
 							e.printStackTrace();
 						}
 					});
-					row.withCell(item.getColumnName(), cell);
+					reportInfo.addCell(item, cell);
 				});
-				reportInfo.addRow(row);
+				reportInfo.addRow();
 			}
 		});
+		System.out.println(reportInfo);
 		return reportInfo;
 	}