=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2013-12-20 13:23:31 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2013-12-20 22:02:12 +0000 @@ -288,6 +288,11 @@ * @return the DataElementCategoryCombo. */ DataElementCategoryCombo getDataElementCategoryComboByName( String name ); + + /** + * Returns the default category combo. + */ + DataElementCategoryCombo getDefaultDataElementCategoryCombo(); /** * Retrieves all DataElementCategoryCombos. === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2013-12-20 13:23:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2013-12-20 22:02:12 +0000 @@ -376,6 +376,11 @@ { return i18n( i18nService, categoryComboStore.getByName( name ) ); } + + public DataElementCategoryCombo getDefaultDataElementCategoryCombo() + { + return getDataElementCategoryComboByName( DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME ); + } public int getDataElementCategoryComboCount() { === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2013-12-20 21:52:58 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java 2013-12-20 22:02:12 +0000 @@ -40,6 +40,7 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategory; import org.hisp.dhis.dataelement.DataElementCategoryCombo; +import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; @@ -97,6 +98,13 @@ this.organisationUnitService = organisationUnitService; } + private DataElementCategoryService categoryService; + + public void setCategoryService( DataElementCategoryService categoryService ) + { + this.categoryService = categoryService; + } + private CurrentUserService currentUserService; public void setCurrentUserService( CurrentUserService currentUserService ) @@ -177,6 +185,13 @@ { return categories; } + + private DataElementCategoryCombo defaultCategoryCombo; + + public DataElementCategoryCombo getDefaultCategoryCombo() + { + return defaultCategoryCombo; + } // ------------------------------------------------------------------------- // Action implementation @@ -235,6 +250,8 @@ Collections.sort( categoryCombos, IdentifiableObjectNameComparator.INSTANCE ); Collections.sort( categories, IdentifiableObjectNameComparator.INSTANCE ); + defaultCategoryCombo = categoryService.getDefaultDataElementCategoryCombo(); + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2013-12-20 19:48:58 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml 2013-12-20 22:02:12 +0000 @@ -25,6 +25,7 @@ + === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm 2013-12-20 21:52:58 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm 2013-12-20 22:02:12 +0000 @@ -62,6 +62,8 @@ #end } }, +"defaultCategoryCombo":"${defaultCategoryCombo.uid}", + "categoryCombos": { #set( $size1 = $categoryCombos.size() ) #foreach( $categoryCombo in $categoryCombos )