------------------------------------------------------------ revno: 880 committer: Lars Helge Oeverland [email protected] branch nick: trunk timestamp: Mon 2009-10-19 00:44:41 +0200 message: Merged CategoryOptionService, CategoryComboService and CategoryOptionComboService with CategoryService. removed: dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryComboService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboService.java dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryComboService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryOptionComboService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryOptionService.java local/vn/dhis-api-vn/ local/vn/dhis-api-vn/pom.xml local/vn/dhis-api-vn/src/ local/vn/dhis-api-vn/src/main/ local/vn/dhis-api-vn/src/main/java/ local/vn/dhis-api-vn/src/main/java/org/ local/vn/dhis-api-vn/src/main/java/org/hisp/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/DataElementOrderInGroup.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcel.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelCategory.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelGroupListing.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelInterface.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelListing.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelNormal.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelPeriodListing.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelService.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportExcelStore.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/ReportItem.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/comparator/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/comparator/ReportItemNameComparator.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/report/comparator/ReportNameComparator.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/ local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatus.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusService.java local/vn/dhis-api-vn/src/main/java/org/hisp/dhis/vn/status/DataStatusStore.java local/vn/dhis-api-vn/src/main/resources/ local/vn/dhis-service-aggregationengine-default/ local/vn/dhis-service-aggregationengine-default/pom.xml local/vn/dhis-service-aggregationengine-default/src/ local/vn/dhis-service-aggregationengine-default/src/main/ local/vn/dhis-service-aggregationengine-default/src/main/java/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/DefaultAggregationService.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/cache/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/cache/AggregationCache.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/cache/MemoryAggregationCache.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AbstractDataElementAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AverageBoolDataElementAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AverageIntDataElementAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/SumBoolDataElementAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/SumIntDataElementAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/indicator/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/jdbc/ local/vn/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregationStore.java local/vn/dhis-service-aggregationengine-default/src/main/resources/ local/vn/dhis-service-aggregationengine-default/src/main/resources/META-INF/ local/vn/dhis-service-aggregationengine-default/src/main/resources/META-INF/dhis/ local/vn/dhis-service-aggregationengine-default/src/main/resources/META-INF/dhis/beans.xml local/vn/dhis-service-aggregationengine-default/src/test/ local/vn/dhis-service-aggregationengine-default/src/test/java/ local/vn/dhis-service-aggregationengine-default/src/test/java/org/ local/vn/dhis-service-aggregationengine-default/src/test/java/org/hisp/ local/vn/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/ local/vn/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/aggregation/ local/vn/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/aggregation/AggregationServiceTest.java local/vn/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/aggregation/AggregationStoreTest.java local/vn/dhis-service-aggregationengine-default/src/test/resources/ local/vn/dhis-service-vn/ local/vn/dhis-service-vn/pom.xml local/vn/dhis-service-vn/src/ local/vn/dhis-service-vn/src/main/ local/vn/dhis-service-vn/src/main/java/ local/vn/dhis-service-vn/src/main/java/org/ local/vn/dhis-service-vn/src/main/java/org/hisp/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/DefaultReportExcelService.java local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/hibernate/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/report/hibernate/HibernateReportExcelStore.java local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/DefaultDataStatusService.java local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/hibernate/ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/vn/status/hibernate/HibernateDataStatusStore.java local/vn/dhis-service-vn/src/main/resources/ local/vn/dhis-service-vn/src/main/resources/META-INF/ local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/ local/vn/dhis-service-vn/src/main/resources/META-INF/dhis/beans.xml local/vn/dhis-service-vn/src/main/resources/org/ local/vn/dhis-service-vn/src/main/resources/org/hisp/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/status/hibernate/DataStatus.hbm.xml local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/hibernate/ local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/hibernate/DataElementOrderInGroup.hbm.xml local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/hibernate/ReportExcel.hbm.xml local/vn/dhis-service-vn/src/main/resources/org/hisp/dhis/vn/report/hibernate/ReportItem.hbm.xml local/vn/dhis-service-vn/src/test/ local/vn/dhis-service-vn/src/test/java/ local/vn/dhis-service-vn/src/test/java/META-INF/ local/vn/dhis-service-vn/src/test/java/META-INF/MANIFEST.MF local/vn/dhis-service-vn/src/test/java/org/ local/vn/dhis-service-vn/src/test/java/org/hisp/ local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/ local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/ local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/report/ local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/report/DataStatusStoreTest.java local/vn/dhis-service-vn/src/test/java/org/hisp/dhis/vn/report/ReportExcelStoreTest.java local/vn/dhis-web-vn-report/ local/vn/dhis-web-vn-report/lists.js local/vn/dhis-web-vn-report/pom.xml local/vn/dhis-web-vn-report/src/ local/vn/dhis-web-vn-report/src/main/ local/vn/dhis-web-vn-report/src/main/java/ local/vn/dhis-web-vn-report/src/main/java/org/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/admin/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/admin/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/admin/action/GetAdminOptionsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/admin/action/NoAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/admin/action/SaveReportUserRolesAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetFilteredCategoryListAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/categorycombo/action/GetOptionCombosAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetAllDataElementGroupsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupMembersAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetDataElementGroupsAndCateCombosListAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/GetFilteredDataElementListAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/dataelement/action/ValidateAddDataElementAndCateComboInCategoryReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/AddDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/DefaultDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/DeleteDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/GetDataSetAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/GetDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/ListDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/datastatus/action/UpdateDataStatusAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/ReportItemValue.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/DeleteExcelFileAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetInformationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/GetListExcelFileByOrganisationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/ImportDataAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/UploadExcelFileAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/imports/action/ViewDataAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ActionSupport.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/AddReportExcelListingAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/DeleteReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetDataElementOrderAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetNumberOfLevelsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetOrganisationUnitGroupAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/GetReportGroupsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ListReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/OpenReportExcelAssociationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/SelectLevelAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectAllAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UnselectLevelAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateDataElementGroup4ReportCategoryAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateElementMembersAndCateComboReportCategoryAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportAssociationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateReportExcelGroupListingAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/UpdateSortDataElementAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/action/ValidateReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/CustomDataSetReportGenerator.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/GetDataSetAndPeriodByPeriodTypeAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/SelectParamsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/ViewCustomDataSetReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/completed/action/ViewDataSetCompletedAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/GetReportConfigurationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/configuration/action/SetReportConfigurationAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GenerateCategoryReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GenerateNormalReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GenerateReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetOrganisationUnitAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetPeriodAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/GetReportByOrganisationAndGroupAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/ReportExportFlowAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/ReportExportSupportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/SelectFormAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/export/action/ValidateGenerateReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFilteredDataElementsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetFormulaTextAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/GetOptionCombosAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateDenumAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/formula/action/ValidateFormulaForReportCategoryAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/action/ExportXMLAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/action/GeneratePreviewReportAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/action/XMLDescriptionResponse.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/preview/action/XMLStructureResponse.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/ReportLocationManager.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/state/SelectionManager.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/support/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/support/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/support/action/CleanTempDirectoryAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/DateUtils.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/ExcelUtils.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/FileUtils.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/report/utils/MyFile.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/ local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/AddReportItemAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/CopyReportItemsAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/DeleteReportItemAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/GetListSheetAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/GetReportItemAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/ListReportItemAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/UpdateReportItemAction.java local/vn/dhis-web-vn-report/src/main/java/org/hisp/dhis/vn/reportitem/action/ValidateReportItemAction.java local/vn/dhis-web-vn-report/src/main/resources/ local/vn/dhis-web-vn-report/src/main/resources/META-INF/ local/vn/dhis-web-vn-report/src/main/resources/META-INF/dhis/ local/vn/dhis-web-vn-report/src/main/resources/META-INF/dhis/beans.xml local/vn/dhis-web-vn-report/src/main/resources/org/ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/ local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module.properties local/vn/dhis-web-vn-report/src/main/resources/org/hisp/dhis/vn/i18n_module_vi_VN.properties local/vn/dhis-web-vn-report/src/main/resources/struts.xml local/vn/dhis-web-vn-report/src/main/webapp/ local/vn/dhis-web-vn-report/src/main/webapp/META-INF/ local/vn/dhis-web-vn-report/src/main/webapp/META-INF/MANIFEST.MF local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/ local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/lib/ local/vn/dhis-web-vn-report/src/main/webapp/WEB-INF/web.xml local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/addDataStatus.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/categorycombo/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/categorycombo/responseCategories.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/categorycombo/responseError.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/categorycombo/responseOptionComboList.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/categorycombo/responseSuccess.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/configuration.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataSetCompleteReportSelect.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataStatusShow.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataelement/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataelement/responseDataElements.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataelement/responseElementGroupsAndCombosList.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataelement/responseError.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/dataelement/responseSuccess.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/divide.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/group.jpg local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/left_parent.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/minus.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/multiply.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/plus.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/right_parent.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/sort_ascending.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/images/sort_descending.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/importData.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/admin.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/dataSetCompleted.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/dataelement.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/datastatus.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/export.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/imports.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/jquery.autocomplete.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/reportItem.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/reports.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/ui.core.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/javascript/ui.sortable.js local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/listDataStatus.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/listExcelFile.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menu.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/menuWithTree.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportItems.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportUserRoles.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportassociation.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reportparams.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/reports.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDataElementGroups.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDataElementOrder.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDataElements.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDataSetAndPeriodByPeriodType.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDataSets.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseDeleteTempDir.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseError.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseFormulaText.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseListReport.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseOptionCombo.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseOrganisation.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responsePeriods.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReport.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReportGroups.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReportItem.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReportItemValues.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReportItems.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseReportPreview.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/responseSuccess.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/sortDataElements.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/basic.css local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/Thumbs.db local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_flat_0_aaaaaa_40x100.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_flat_75_ffffff_40x100.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_55_fbf9ee_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_65_ffffff_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_75_dadada_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_75_e6e6e6_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_75_ffffff_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_glass_95_fef1ec_1x400.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_highlight-soft_75_cccccc_1x100.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-bg_inset-soft_95_fef1ec_1x100.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-icons_222222_256x240.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-icons_2e83ff_256x240.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-icons_454545_256x240.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-icons_888888_256x240.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/images/ui-icons_cd0a0a_256x240.png local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/jquery.autocomplete.css local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/listTable.css local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/style.css local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/style/ui.theme.css local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/updateDataStatus.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewAdministrator.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewCustomDataSetReport.vm local/vn/dhis-web-vn-report/src/main/webapp/dhis-web-vn-report/viewDataSetCompleted.vm modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/java/org/hisp/dhis/i18n/I18nUpgrader.java dhis-2/dhis-i18n/dhis-i18n-upgrader/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserTest.java dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/outlieranalysis/MinMaxOutlierAnalysisServiceTest.java dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/outlieranalysis/StdDevOutlierAnalysisServiceTest.java dhis-2/dhis-services/dhis-service-aggregationengine-default/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java dhis-2/dhis-services/dhis-service-aggregationengine-default/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/aggregation/AggregationServiceTest.java dhis-2/dhis-services/dhis-service-aggregationengine-default/src/test/java/org/hisp/dhis/aggregation/AggregationStoreTest.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/CategoryOptionShortNamePopulator.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryComboDeletionHandler.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java 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/UuidPopulator.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/MultiDimensionExpressionUpgrader.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboStoreTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryStoreTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueDimensionTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/minmax/MinMaxDataElementStoreTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodServiceTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodStoreTest.java dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/impl/DefaultDataMartService.java dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/crosstab/CrossTabServiceTest.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementCategoryComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementCategoryOptionComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractDataElementCategoryOptionConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryOptionComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryOptionConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryCategoryOptionAssociationConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/DimensionComboConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/DimensionConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/DimensionItemConverter.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/importer/DefaultIXFImportService.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportObjectServiceImportAllTest.java dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportObjectServiceTest.java dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/ObjectMappingGeneratorTest.java dhis-2/dhis-services/dhis-service-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java dhis-2/dhis-services/dhis-service-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandlerTest.java dhis-2/dhis-services/dhis-service-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandlerTest.java dhis-2/dhis-services/dhis-service-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableServiceTest.java dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/CalculateCDEsAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/HistoryAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveCommentAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ViewDataValueAuditPopupAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/SaveValueAction.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/screen/DefaultDataEntryScreenManager.java dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultStatefulDataValueSaver.java dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportExcelSupport.java dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/individual/action/GenerateIndividualReportExcelAction.java dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/importing/action/ImportDataAction.java dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/GeneratePreviewReportExcelSupport.java dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/RemoveDataElementCategoryComboAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/ValidateDataElementCategoryComboAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/AddDataElementCategoryOptionAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/GetDataElementCategoryOptionAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/GetDataElementCategoryOptionListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/RemoveDataElementCategoryOptionAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/UpdateDataElementCategoryOptionAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoption/ValidateDataElementCategoryOptionAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ValidateDataElementAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/extendeddataelement/AddExtendedDataElementAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatordenum/GetFilteredDataElementsAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataElementCategoryComboListAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetCustomValuesAction.java dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java 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-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDefaultDataSetReportAction.java dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableOptionsAction.java dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/SaveTableAction.java dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetFilteredDataElementsAction.java dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationResultDetailsAction.java dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/META-INF/dhis/beans.xml local/vn/dhis-api-chr/pom.xml local/vn/dhis-api-chr/src/main/java/org/hisp/dhis/vn/chr/Element.java local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/formreport/action/GetDataelementsOfDataSet.java local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/AddObjectAction.java local/vn/dhis-web-chr-form/src/main/java/org/hisp/dhis/vn/chr/object/action/ListObjectAction.java local/vn/dhis-web-chr-form/src/main/resources/META-INF/dhis/beans.xml local/vn/pom.xml The size of the diff (36046 lines) is larger than your specified limit of 1000 lines
-- 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. _______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
