#384 small improvement to allow TODAY and HEUTE as special values for…

… dates
HBTGmbH · Jul 19, 2024 · 1d9dd93 · 1d9dd93
1 parent 199485c
commit 1d9dd93
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/org/tb/reporting/action/ExecuteReportAction.java b/src/main/java/org/tb/reporting/action/ExecuteReportAction.java
@@ -167,8 +167,14 @@ private static Map<String, Object> getParameterMap(List<ReportParameter> paramet
         var result = new HashMap<String, Object>();
         for (ReportParameter parameter : nonEmpty(parameters)) {
             switch (parameter.getType()) {
-                case "string", "number" -> result.put(parameter.getName(), parameter.getValue());
-                case "date" -> result.put(parameter.getName(), DateUtils.parse(parameter.getValue()));
+                case "date" -> {
+                    if(parameter.getValue().equals("TODAY") || parameter.getValue().equals("HEUTE")) {
+                        result.put(parameter.getName(), DateUtils.today());
+                    } else {
+                        result.put(parameter.getName(), DateUtils.parse(parameter.getValue()));
+                    }
+                }
+                default -> result.put(parameter.getName(), parameter.getValue());
             }
         }
         return result;