=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2015-09-04 14:25:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2015-09-10 11:56:07 +0000
@@ -165,6 +165,8 @@
protected AggregationType aggregationType;
+ protected boolean completedOnly;
+
// -------------------------------------------------------------------------
// Analytical properties
// -------------------------------------------------------------------------
@@ -882,6 +884,7 @@
userOrganisationUnit = object.isUserOrganisationUnit();
sortOrder = object.getSortOrder();
topLimit = object.getTopLimit();
+ completedOnly = object.isCompletedOnly();
}
}
@@ -1164,6 +1167,19 @@
this.aggregationType = aggregationType;
}
+ @JsonProperty
+ @JsonView( { DetailedView.class, ExportView.class, DimensionalView.class } )
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public boolean isCompletedOnly()
+ {
+ return completedOnly;
+ }
+
+ public void setCompletedOnly( boolean completedOnly )
+ {
+ this.completedOnly = completedOnly;
+ }
+
// -------------------------------------------------------------------------
// Transient properties
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2015-09-04 11:23:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2015-09-10 11:56:07 +0000
@@ -843,6 +843,11 @@
executeSql( "update categoryoptiongroupset set datadimensiontype = 'DISAGGREGATION' where datadimensiontype is null" );
executeSql( "update categoryoptiongroup set datadimensiontype = 'DISAGGREGATION' where datadimensiontype is null" );
+ executeSql( "update reporttable set completedonly = false where completedonly is null" );
+ executeSql( "update chart set completedonly = false where completedonly is null" );
+ executeSql( "update eventreport set completedonly = false where completedonly is null" );
+ executeSql( "update eventchart set completedonly = false where completedonly is null" );
+
// Remove data mart
executeSql( "drop table aggregateddatasetcompleteness" );
executeSql( "drop table aggregateddatasetcompleteness_temp" );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml 2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml 2015-09-10 11:56:07 +0000
@@ -102,6 +102,8 @@
+
+
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml 2015-06-23 15:59:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml 2015-09-10 11:56:07 +0000
@@ -102,6 +102,8 @@
+
+
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2015-08-04 13:40:59 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml 2015-09-10 11:56:07 +0000
@@ -142,6 +142,8 @@
+
+
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2015-07-12 15:21:01 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml 2015-09-10 11:56:07 +0000
@@ -147,6 +147,8 @@
+
+