------------------------------------------------------------
revno: 11021
committer: Lars Helge Øverland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Mon 2013-05-27 18:33:14 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== 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 2013-05-25 13:59:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2013-05-27 16:33:14 +0000
@@ -57,6 +57,7 @@
import org.hisp.dhis.common.view.ExportView;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryDimension;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementOperand;
import org.hisp.dhis.dataset.DataSet;
@@ -142,6 +143,8 @@
// -------------------------------------------------------------------------
protected transient List<OrganisationUnit> transientOrganisationUnits = new ArrayList<OrganisationUnit>();
+
+ protected transient List<DataElementCategoryOptionCombo> transientCategoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>();
protected transient Date relativePeriodDate;
@@ -236,6 +239,12 @@
type = DimensionType.ORGANISATIONUNIT;
}
+ else if ( CATEGORYOPTIONCOMBO_DIM_ID.equals( dimension ) )
+ {
+ items.addAll( transientCategoryOptionCombos );
+
+ type = DimensionType.CATEGORY_OPTION_COMBO;
+ }
else if ( categoryDims.contains( dimension ) )
{
DataElementCategoryDimension categoryDimension = categoryDimensions.get( categoryDims.indexOf( dimension ) );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-05-23 16:57:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2013-05-27 16:33:14 +0000
@@ -273,11 +273,6 @@
*/
private OrganisationUnit parentOrganisationUnit;
- /**
- * The category option combos derived from the dimension set.
- */
- private List<DataElementCategoryOptionCombo> categoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>();
-
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@@ -386,10 +381,10 @@
if ( isDimensional() )
{
- categoryOptionCombos = new ArrayList<DataElementCategoryOptionCombo>( getCategoryCombo().getOptionCombos() );
- verify( nonEmptyLists( categoryOptionCombos ) == 1, "Category option combos size must be larger than 0" );
+ transientCategoryOptionCombos.addAll( getCategoryCombo().getSortedOptionCombos() );
+ verify( nonEmptyLists( transientCategoryOptionCombos ) == 1, "Category option combos size must be larger than 0" );
}
-
+
// Populate grid
this.populateGridColumnsAndRows( date, user, format );
@@ -1014,18 +1009,6 @@
this.parentOrganisationUnit = parentOrganisationUnit;
}
- @JsonIgnore
- public List<DataElementCategoryOptionCombo> getCategoryOptionCombos()
- {
- return categoryOptionCombos;
- }
-
- @JsonIgnore
- public void setCategoryOptionCombos( List<DataElementCategoryOptionCombo> categoryOptionCombos )
- {
- this.categoryOptionCombos = categoryOptionCombos;
- }
-
@Override
public void mergeWith( IdentifiableObject other )
{
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
