Merge pull request #2551 from CCAFS/A2-621-BI-Embedding-App

A2 621 bi embedding app

Author: MetalPrime

marlo-data/src/main/java/org/cgiar/ccafs/marlo/data/model/BiReports.java

@@ -36,13 +36,7 @@ public class BiReports extends MarloBaseEntity implements java.io.Serializable,
   private String reportDescription;
 
   @Expose
-  private String reportId;
-
-  @Expose
-  private String datasetId;
-
-  @Expose
-  private String embedUrl;
+  private String embedReport;
 
   @Expose
   private Boolean isActive;
@@ -66,14 +60,8 @@ public GlobalUnit getCrp() {
     return crp;
   }
 
-
-  public String getDatasetId() {
-    return datasetId;
-  }
-
-
-  public String getEmbedUrl() {
-    return embedUrl;
+  public String getEmbedReport() {
+    return embedReport;
   }
 
 
@@ -125,11 +113,6 @@ public String getReportDescription() {
   }
 
 
-  public String getReportId() {
-    return reportId;
-  }
-
-
   public String getReportName() {
     return reportName;
   }
@@ -154,13 +137,8 @@ public void setCrp(GlobalUnit crp) {
   }
 
 
-  public void setDatasetId(String datasetId) {
-    this.datasetId = datasetId;
-  }
-
-
-  public void setEmbedUrl(String embedUrl) {
-    this.embedUrl = embedUrl;
+  public void setEmbedReport(String embedReport) {
+    this.embedReport = embedReport;
   }
 
 
@@ -195,11 +173,6 @@ public void setReportDescription(String reportDescription) {
     this.reportDescription = reportDescription;
   }
 
-
-  public void setReportId(String reportId) {
-    this.reportId = reportId;
-  }
-
   public void setReportName(String reportName) {
     this.reportName = reportName;
   }

marlo-data/src/main/resources/xmls/BiReports.hbm.xml

@@ -17,14 +17,8 @@
         <property name="reportDescription" type="string">
             <column name="report_description" />
         </property>
-        <property name="reportId" type="string">
-            <column name="report_id" />
-        </property>
-        <property name="datasetId" type="string">
-            <column name="dataset_id" />
-        </property>
-        <property name="embedUrl" type="string">
-            <column name="embed_url" />
+        <property name="embedReport" type="string">
+            <column name="embed_report" />
         </property>
         <property name="isActive" type="boolean">
             <column name="is_active" not-null="true" />