REPORT-903 - Enable configuring parameter "widgetConfiguration" from …

…yaml report definitions
openmrs · Nov 3, 2023 · c0264d4 · c0264d4
1 parent 8d6efaa
commit c0264d4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/reporting/config/ParameterDescriptor.java b/api/src/main/java/org/openmrs/module/reporting/config/ParameterDescriptor.java
@@ -2,6 +2,8 @@
 
 import org.codehaus.jackson.annotate.JsonProperty;
 
+import java.util.Properties;
+
 public class ParameterDescriptor {
 
  @JsonProperty
@@ -19,6 +21,9 @@ public class ParameterDescriptor {
  @JsonProperty
  private Boolean required;
 
+ @JsonProperty
+ private Properties widgetConfiguration;
+
  public String getKey() {
  return key;
  }
@@ -58,4 +63,12 @@ public Boolean getRequired() {
  public void setRequired(Boolean required) {
  this.required = required;
  }
+
+ public Properties getWidgetConfiguration() {
+ return widgetConfiguration;
+ }
+
+ public void setWidgetConfiguration(Properties widgetConfiguration) {
+ this.widgetConfiguration = widgetConfiguration;
+ }
 }
diff --git a/api/src/main/java/org/openmrs/module/reporting/config/ReportLoader.java b/api/src/main/java/org/openmrs/module/reporting/config/ReportLoader.java
@@ -130,6 +130,7 @@ public static List<Parameter> constructParameters(List<ParameterDescriptor> para
  p.setType(parameterType);
  p.setDefaultValue(getParameterValue(parameterType, parameterDescriptor.getValue()));
  p.setRequired(BooleanUtils.isNotFalse(parameterDescriptor.getRequired()));
+ p.setWidgetConfiguration(parameterDescriptor.getWidgetConfiguration());
  parameters.add(p);
  } catch (Exception e) {
  throw new RuntimeException("Unable to configure parameter " + parameterDescriptor.getKey(), e);