From ceea63e009aa0597e06ced593d9c78505c564f18 Mon Sep 17 00:00:00 2001
From: Hiren Thacker <hithacker@gmail.com>
Date: Wed, 16 Jun 2021 11:32:36 +0530
Subject: [PATCH] avni-product#1181 | Include columns for decision observations
 in the generated view

---
 .../java/org/openchs/application/DecisionConcept.java     | 8 ++++++++
 .../src/main/java/org/openchs/application/Form.java       | 1 +
 .../src/main/java/org/openchs/domain/Concept.java         | 1 +
 3 files changed, 10 insertions(+)

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
index 3d8c3230a..30a92776a 100644
--- 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;
+    }
 }
\ No newline at end of file
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
index 1bdef7a79..9515b66bf 100644
--- 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
index e86635e15..ed34eaf57 100644
--- 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());