=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/Concept.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/Concept.java 2010-09-17 21:30:59 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/Concept.java 2010-11-30 06:49:21 +0000 @@ -42,8 +42,8 @@ public class Concept extends IdentifiableObject { - public static String DEFAULT_CONCEPT_NAME = "default"; + // ------------------------------------------------------------------------- // Constructors // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionListSortOrderAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionListSortOrderAction.java 2010-11-29 16:43:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionListSortOrderAction.java 2010-11-30 06:49:21 +0000 @@ -45,13 +45,21 @@ public class GetSectionListSortOrderAction implements Action { + // ------------------------------------------------------------------------- + // Dependencies + // ------------------------------------------------------------------------- + private DataSetService dataSetService; - + public void setDataSetService( DataSetService dataSetService ) { this.dataSetService = dataSetService; } + // ------------------------------------------------------------------------- + // Input & Output + // ------------------------------------------------------------------------- + private Integer dataSetId; public void setDataSetId( Integer dataSetId ) @@ -66,14 +74,18 @@ return sections; } + // ------------------------------------------------------------------------- + // Action implementation + // ------------------------------------------------------------------------- + public String execute() { DataSet dataSet = dataSetService.getDataSet( dataSetId ); - + sections = new ArrayList
( dataSet.getSections() ); - + Collections.sort( sections, new SectionOrderComparator() ); - + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java 2010-06-23 12:06:35 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java 2010-11-30 06:49:21 +0000 @@ -52,8 +52,6 @@ // Dependencies // ------------------------------------------------------------------------- - private SectionService sectionService; - private DataSetService dataSetService; public void setDataSetService( DataSetService dataSetService ) @@ -61,6 +59,8 @@ this.dataSetService = dataSetService; } + private SectionService sectionService; + public void setSectionService( SectionService sectionService ) { this.sectionService = sectionService; === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2010-11-29 16:43:07 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2010-11-30 06:49:21 +0000 @@ -65,17 +65,6 @@ - - - - - - - - - === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2010-11-29 16:21:11 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm 2010-11-30 06:49:21 +0000 @@ -84,7 +84,7 @@ var i18n_please_select_dataset = '$encoder.jsEscape( $i18n.getString( "please_select_dataset" ) , "'" )'; var i18n_please_select_dataset_categorycombo = '$encoder.jsEscape( $i18n.getString( "please_select_dataset_or_categorycombo" ) , "'" )'; - jQuery(document).ready(function(){ - tableSorter( "listTable" ); + jQuery(document).ready(function(){ + //TODO: nothing }); \ No newline at end of file