avni-product#1181 | Include columns for decision observations in the …

…generated view
avniproject · Jun 16, 2021 · ceea63e · ceea63e
1 parent 5cec1dd
commit ceea63e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/openchs-server-api/src/main/java/org/openchs/application/DecisionConcept.java b/openchs-server-api/src/main/java/org/openchs/application/DecisionConcept.java
@@ -38,4 +38,12 @@ public Concept getConcept() {
     public void setConcept(Concept concept) {
         this.concept = concept;
     }
+
+    public Form getForm() {
+        return form;
+    }
+
+    public void setForm(Form form) {
+        this.form = form;
+    }
 }
diff --git a/openchs-server-api/src/main/java/org/openchs/application/Form.java b/openchs-server-api/src/main/java/org/openchs/application/Form.java
@@ -139,6 +139,7 @@ public Set<Concept> getDecisionConcepts() {
     public void addDecisionConcept(Concept concept) {
         DecisionConcept decisionConcept = new DecisionConcept();
         decisionConcept.setConcept(concept);
+        decisionConcept.setForm(this);
         this.decisionConcepts.add(decisionConcept);
     }
 

diff --git a/openchs-server-api/src/main/java/org/openchs/domain/Concept.java b/openchs-server-api/src/main/java/org/openchs/domain/Concept.java
@@ -200,6 +200,7 @@ public Object getDbValue(Object value, Boolean isSingleSelect) {
     @JsonIgnore
     public ConceptContract toConceptContract() {
         ConceptContract conceptContract = new ConceptContract();
+        conceptContract.setId(this.getId());
         conceptContract.setName(this.getName());
         conceptContract.setUuid(this.getUuid());
         conceptContract.setDataType(this.getDataType());