DHIS

lp:dhis2

Created by Lars Helge Øverland on 2009-03-03 and last modified on 2016-08-29

The trunk is where the mainline development takes place.

Get this branch:: bzr branch lp:dhis2

Members of DHIS 2 core developers can upload to this branch. Log in for directions.

Branch merges

6 branches proposed for merging into this one.

No branches dependent on this one.

Merged into lp:~tw-msf/dhis2/dhis2 at revision 14679

Lars Helge Øverland: Pending requested 2014-05-12

On hold for merging into lp:~murodlatifov/dhis2/HSIP-PBF

tjkhealth: Pending requested 2013-08-16

Diff: 1311687 lines (+683116/-467981) (has conflicts)

7463 files modified

.bzrignore (+2/-0)
dhis-2/build-nocompr.sh (+7/-0)
dhis-2/build.bat (+0/-7)
dhis-2/dhis-api/pom.xml (+36/-8)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/IntegrationTest.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValue.java (+0/-194)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java (+0/-300)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java (+0/-278)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedIndicatorValue.java (+0/-250)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedOrgUnitDataValueService.java (+0/-69)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedOrgUnitDataValueStore.java (+0/-59)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregationService.java (+0/-117)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregationStore.java (+0/-70)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/StoreIterator.java (+0/-59)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/AggregationType.java (+59/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/DataType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventDataType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventOutputType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java (+103/-36)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppActivities.java (+16/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppDeveloper.java (+17/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppDhis.java (+13/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppIcons.java (+10/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/AppManager.java (+102/-50)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java (+224/-34)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java (+218/-34)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java (+84/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValue.java (+69/-19)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeSortOrderComparator.java (+16/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/comparator/AttributeValueSortOrderComparator.java (+62/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/AbstractCalendar.java (+266/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/Calendar.java (+410/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarComparator.java (+45/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/CalendarService.java (+94/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/ChronologyBasedCalendar.java (+316/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateFormat.java (+71/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateInterval.java (+119/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateIntervalType.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateTimeUnit.java (+436/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitPeriodTypeParser.java (+300/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/DateUnitType.java (+92/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/PeriodTypeParser.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/CopticCalendar.java (+60/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/EthiopianCalendar.java (+233/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/GregorianCalendar.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/IslamicCalendar.java (+60/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/Iso8601Calendar.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/JulianCalendar.java (+60/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/NepaliCalendar.java (+623/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/calendar/impl/ThaiCalendar.java (+60/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQueries.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/AggregationQuery.java (+139/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregateSchedule.java (+35/-34)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java (+111/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionService.java (+232/-33)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStore.java (+163/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java (+546/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java (+62/-367)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java (+32/-19)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartStore.java (+0/-42)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java (+101/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorService.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java (+106/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Access.java (+0/-113)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AccessStringHelper.java (+0/-123)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AggregatedValue.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObject.java (+55/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticalObjectStore.java (+55/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AnalyticsType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AuditLogUtil.java (+20/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AuditType.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java (+801/-350)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseCollection.java (+0/-104)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java (+260/-66)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java (+196/-72)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseLinkableObject.java (+16/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java (+97/-43)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java (+14/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CombinationGenerator.java (+17/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionItem.java (+268/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DataDimensionType.java (+62/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DeleteNotAllowedException.java (+10/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DigitGroupSeparator.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionService.java (+26/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionType.java (+18/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java (+120/-28)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObjectUtils.java (+288/-34)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayProperty.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DxfNamespaces.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/EventAnalyticalObject.java (+70/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java (+0/-42)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java (+76/-26)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericNameableObjectStore.java (+34/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericStore.java (+73/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Grid.java (+68/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java (+109/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridValue.java (+106/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java (+25/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java (+89/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectUtils.java (+266/-44)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableProperty.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IllegalQueryException.java (+16/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ImportableObject.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/LinkableObject.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ListMap.java (+25/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MaintenanceModeException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MapMap.java (+39/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/MergeStrategy.java (+48/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Mergeable.java (+13/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NameableObject.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NameableObjectUtils.java (+219/-28)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NamedProvider.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NumericSortWrapper.java (+100/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java (+16/-18)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/OrganisationUnitSelectionMode.java (+46/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Pager.java (+21/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/PagerUtils.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/PresetProvider.java (+38/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ProcessState.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryFilter.java (+220/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java (+266/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryOperator.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/RegexUtils.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ServiceProvider.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SetMap.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java (+0/-332)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ValueType.java (+114/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/VersionedObject.java (+50/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Weighted.java (+0/-36)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/BaseIdentifiableObjectXmlAdapter.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonMapListIdentifiableObjectSerializer.java (+0/-86)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java (+105/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitGroupSymbolSerializer.java (+103/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java (+18/-17)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodSerializer.java (+15/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeDeserializer.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodTypeSerializer.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonRowDataSerializer.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/MapViewXmlAdapter.java (+0/-60)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameter.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/Parameters.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/ParametersMapXmlAdapter.java (+12/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/annotation/Description.java (+44/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/annotation/Scanned.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/cache/CacheStrategy.java (+45/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/cache/Cacheable.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectCodeComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/LocaleNameComparator.java (+47/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/ObjectStringValueComparator.java (+52/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilter.java (+101/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/filter/MetaDataFilterService.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/BasicView.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/DetailedView.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/DimensionalView.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/ExportView.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/view/ShortNameView.java (+0/-35)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessEngine.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessResult.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessService.java (+17/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java (+29/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/comparator/DataSetCompletenessResultComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/Concept.java (+0/-105)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/concept/ConceptService.java (+0/-69)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java (+106/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java (+23/-48)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/ConstantService.java (+19/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java (+193/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardConfiguration.java (+0/-91)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContent.java (+0/-254)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContentStore.java (+0/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardContents.java (+0/-61)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java (+444/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemStore.java (+53/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardManager.java (+0/-50)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardSearchResult.java (+260/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardService.java (+57/-36)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/RssItem.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisService.java (+15/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/DataAnalysisStore.java (+31/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataanalysis/MinMaxDataAnalysisService.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java (+354/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalAndPermissions.java (+113/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java (+234/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java (+260/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelStore.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissions.java (+140/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java (+115/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalState.java (+168/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStateRequest.java (+117/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStateRequests.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStateResponse.java (+158/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStateResponses.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStatus.java (+124/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java (+105/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataApprovalException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeAcceptedException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeApprovedException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnacceptedException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnapprovedException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotAcceptDataException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnacceptDataException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnapproveDataException.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataArchiveOperation.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataArchiveService.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataArchiveStore.java (+22/-21)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataarchive/DataEliminationStrategy.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/DataBrowserGridService.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/DataBrowserGridStore.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/databrowser/MetaValue.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datacompletion/CompleteDataSetRegistrationRequest.java (+159/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datacompletion/CompleteDataSetRegistrationRequests.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionary.java (+0/-217)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java (+0/-102)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java (+171/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboStore.java (+43/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionComboStore.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java (+193/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java (+198/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSetStore.java (+43/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupStore.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionStore.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryStore.java (+47/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java (+319/-297)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java (+69/-98)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java (+109/-76)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDimension.java (+49/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java (+181/-92)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java (+71/-69)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java (+364/-170)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementDomain.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java (+44/-32)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java (+81/-93)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetStore.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupStore.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java (+154/-114)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperandService.java (+24/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperandStore.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java (+117/-120)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java (+96/-82)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryComboSizeComparator.java (+8/-5)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementOperandNameComparator.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementSortOrderComparator.java (+0/-54)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java (+35/-72)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java (+26/-30)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java (+17/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityReport.java (+330/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/DataIntegrityService.java (+30/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataintegrity/FlattenedDataIntegrityReport.java (+246/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartEngine.java (+0/-81)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeService.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneService.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataprune/DataPruneStore.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistration.java (+72/-34)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationService.java (+56/-62)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStore.java (+25/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrations.java (+74/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java (+312/-187)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java (+88/-95)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java (+18/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/FormType.java (+55/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/LockException.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/LockExceptionStore.java (+14/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java (+106/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/SectionService.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/SectionStore.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetFrequencyComparator.java (+69/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetSortOrderComparator.java (+0/-55)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/LockExceptionNameComparator.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/SectionOrderComparator.java (+13/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportService.java (+27/-19)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datasetreport/DataSetReportStore.java (+17/-17)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java (+180/-111)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAudit.java (+122/-63)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAuditService.java (+78/-24)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueAuditStore.java (+80/-24)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java (+112/-63)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueStore.java (+79/-47)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DeflatedDataValue.java (+34/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dbms/DbmsManager.java (+13/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java (+42/-36)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/DocumentService.java (+12/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/email/Email.java (+140/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/email/EmailService.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/event/EventStatus.java (+77/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java (+442/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChartService.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java (+628/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReportService.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Expression.java (+77/-72)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/ExpressionService.java (+170/-80)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/MissingValueStrategy.java (+61/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/expression/Operator.java (+29/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/ConfigurationManager.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/configuration/NoConfigurationFoundException.java (+10/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManager.java (+19/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManagerException.java (+11/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResource.java (+201/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceContentStore.java (+60/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceDomain.java (+52/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/fileresource/FileResourceService.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/help/HelpManager.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/hierarchy/HierarchyViolationException.java (+11/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18n.java (+11/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/I18nFormat.java (+95/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/I18nLocale.java (+74/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/i18n/locale/LocaleManager.java (+15/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/AssociationType.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberAssociation.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java (+10/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java (+148/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java (+20/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java (+14/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObjectStatus.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportStrategy.java (+38/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/ImportObjectComparator.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java (+119/-116)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java (+34/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java (+44/-64)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java (+39/-43)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java (+16/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java (+25/-61)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorSortOrderComparator.java (+0/-55)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/Interpretation.java (+116/-42)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/InterpretationComment.java (+13/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/InterpretationService.java (+35/-21)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/interpretation/InterpretationStore.java (+21/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java (+40/-54)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendService.java (+69/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java (+55/-60)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceService.java (+21/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/maintenance/MaintenanceStore.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java (+36/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java (+48/-33)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java (+47/-54)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayerStore.java (+13/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendSetStore.java (+0/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLegendStore.java (+0/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapStore.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java (+278/-300)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapViewStore.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java (+61/-78)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLayerNameComparator.java (+0/-45)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLegendComparator.java (+0/-47)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/Message.java (+10/-38)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java (+160/-66)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversationStore.java (+20/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversations.java (+0/-61)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageSender.java (+12/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageService.java (+49/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/UserMessage.java (+10/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElement.java (+13/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElementService.java (+14/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/minmax/MinMaxDataElementStore.java (+13/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java (+295/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Deserializer.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/LinearNodePipeline.java (+87/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java (+158/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeDeserializer.java (+46/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodePipeline.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodePropertyConverter.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeSerializer.java (+46/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeService.java (+93/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeTransformer.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeType.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/NodeUtils.java (+94/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Pipeline.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/PropertyConverter.java (+70/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Provider.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Serializer.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Transformer.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/NodeAnnotation.java (+43/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/NodeCollection.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/NodeComplex.java (+51/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/NodeRoot.java (+51/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/annotation/NodeSimple.java (+53/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/config/Config.java (+71/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/config/InclusionStrategy.java (+94/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/DuplicateNodeException.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/exception/InvalidTypeException.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/CollectionNode.java (+94/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/ComplexNode.java (+43/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/RootNode.java (+70/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java (+90/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/Option.java (+76/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionService.java (+42/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java (+115/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionStore.java (+21/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/CoordinatesTuple.java (+14/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/FeatureType.java (+46/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java (+419/-200)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitDataSetAssociationSet.java (+21/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java (+44/-115)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java (+31/-28)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java (+92/-76)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetStore.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupStore.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchy.java (+22/-21)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java (+43/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevelStore.java (+10/-18)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitQueryParams.java (+212/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitRelationship.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java (+236/-148)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitStore.java (+75/-76)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitByLevelComparator.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitComparator.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitLevelComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionService.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeGroupStore.java (+0/-46)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOption.java (+0/-131)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOptionService.java (+0/-50)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttributeOptionStore.java (+0/-46)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifier.java (+0/-140)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierService.java (+0/-71)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierStore.java (+0/-68)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierType.java (+0/-198)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java (+0/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeStore.java (+0/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java (+0/-132)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java (+0/-104)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java (+0/-82)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormStore.java (+0/-46)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAggregateReport.java (+0/-322)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAggregateReportService.java (+0/-55)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientAggregateReportStore.java (+0/-46)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReport.java (+0/-252)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReportService.java (+0/-53)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/PatientTabularReportStore.java (+0/-45)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientreport/TabularReportColumn.java (+0/-161)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/BiMonthlyPeriodType.java (+78/-86)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Cal.java (+119/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/CalendarPeriodType.java (+107/-55)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/ConfigurablePeriod.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/DailyPeriodType.java (+78/-91)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialAprilPeriodType.java (+25/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialJulyPeriodType.java (+24/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialOctoberPeriodType.java (+25/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/FinancialPeriodType.java (+89/-91)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/MonthlyPeriodType.java (+78/-96)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PastPeriodPredicate.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java (+118/-92)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodHierarchy.java (+18/-17)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodService.java (+51/-64)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodStore.java (+26/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/PeriodType.java (+250/-117)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/QuarterlyPeriodType.java (+117/-97)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriodEnum.java (+23/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/RelativePeriods.java (+352/-253)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAbstractPeriodType.java (+177/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyAprilPeriodType.java (+117/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/SixMonthlyPeriodType.java (+43/-162)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/TwoYearlyPeriodType.java (+53/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/WeeklyPeriodType.java (+95/-164)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/YearlyPeriodType.java (+83/-74)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/AscendingPeriodComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/AscendingPeriodEndDateComparator.java (+15/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/comparator/PeriodComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java (+579/-380)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramDataEntryService.java (+49/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpression.java (+55/-33)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramExpressionService.java (+74/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java (+211/-116)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorService.java (+132/-21)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicatorStore.java (+12/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java (+200/-180)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceQueryParams.java (+406/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceService.java (+320/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstanceStore.java (+217/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java (+217/-31)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java (+336/-96)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java (+105/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementService.java (+47/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElementStore.java (+23/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstance.java (+97/-140)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceService.java (+122/-90)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageInstanceStore.java (+102/-88)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java (+113/-78)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionService.java (+48/-26)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionStore.java (+23/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageService.java (+49/-16)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageStore.java (+24/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStatus.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java (+52/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java (+173/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramType.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java (+65/-112)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationResult.java (+63/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationService.java (+67/-20)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidationStore.java (+20/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SchedulingProgramObject.java (+40/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageDataElementSortOrderComparator.java (+0/-47)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceDueDateComparator.java (+14/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageInstanceVisitDateComparator.java (+16/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageMinDaysComparator.java (+28/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageSectionSortOrderComparator.java (+13/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java (+220/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java (+301/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionService.java (+86/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionStore.java (+51/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionType.java (+62/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleService.java (+106/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleStore.java (+69/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java (+221/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariableService.java (+88/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariableSourceType.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariableStore.java (+51/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Conjunction.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criteria.java (+90/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Criterion.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Disjunction.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Junction.java (+55/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/MutableResult.java (+49/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Operator.java (+117/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Order.java (+119/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Query.java (+176/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/QueryEngine.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/QueryException.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/QueryService.java (+45/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Restriction.java (+123/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/RestrictionException.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Restrictions.java (+102/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Result.java (+71/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/ResultTransformer.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/ResultTransformers.java (+75/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/query/Typed.java (+87/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/Relationship.java (+78/-68)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipService.java (+76/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipStore.java (+43/-21)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java (+64/-59)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipTypeService.java (+111/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipTypeStore.java (+22/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java (+75/-86)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java (+54/-28)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportParams.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java (+332/-278)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableData.java (+15/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java (+40/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableService.java (+37/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/resourcetable/ResourceTableStore.java (+48/-15)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskCategory.java (+16/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/TaskId.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Klass.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Property.java (+806/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/PropertyIntrospectorService.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/PropertyType.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schema.java (+613/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/SchemaDescriptor.java (+37/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/SchemaService.java (+87/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/SchemaUtils.java (+159/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/Schemas.java (+69/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/annotation/Property.java (+44/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/annotation/PropertyRange.java (+56/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/AttributeSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryComboSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionComboSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionGroupSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategoryOptionSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/CategorySchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ChartSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ColorSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ColorSetSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ConstantSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardItemSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DashboardSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataApprovalLevelSchemaDescriptor.java (+62/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementGroupSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementOperandSchemaDescriptor.java (+58/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataElementSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DataSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/DocumentSchemaDescriptor.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventChartSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/EventReportSchemaDescriptor.java (+61/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/FileResourceSchemaDescriptor.java (+58/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorGroupSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/IndicatorTypeSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationCommentSchemaDescriptor.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/InterpretationSchemaDescriptor.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/LegendSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/LegendSetSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapLayerSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MapViewSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MessageConversationSchemaDescriptor.java (+58/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/MetaDataFilterSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OAuth2ClientSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OptionSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitGroupSetSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitLevelSchemaDescriptor.java (+62/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/OrganisationUnitSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramIndicatorSchemaDescriptor.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramRuleActionSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramRuleSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramRuleVariableSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageDataElementSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramStageSectionSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ProgramValidationSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/RelationshipTypeSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportSchemaDescriptor.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ReportTableSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SectionSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/SqlViewSchemaDescriptor.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeGroupSchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityAttributeSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntityInstanceSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TrackedEntitySchemaDescriptor.java (+64/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/TranslationSchemaDescriptor.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserCredentialsSchemaDescriptor.java (+55/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserGroupSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserRoleSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/UserSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationCriteriaSchemaDescriptor.java (+56/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleGroupSchemaDescriptor.java (+65/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/schema/descriptors/ValidationRuleSchemaDescriptor.java (+63/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/Authority.java (+95/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/AuthorityType.java (+43/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/Access.java (+142/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AccessStringHelper.java (+152/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/acl/AclService.java (+222/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java (+187/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2ClientService.java (+51/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2ClientStore.java (+48/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/StyleManager.java (+10/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSetting.java (+12/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java (+164/-82)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingStore.java (+40/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/TranslateSystemSettingManager.java (+41/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageQueue.java (+42/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/MessageSender.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsConfigurationManager.java (+0/-40)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsConsumer.java (+35/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsSender.java (+48/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceException.java (+10/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsServiceNotEnabledException.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/SmsTransportProviderNotFoundException.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/BulkSmsGatewayConfig.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/ClickatellGatewayConfig.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfig.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/ModemGatewayConfig.java (+12/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SMPPGatewayConfig.java (+28/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SmsConfigurable.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SmsConfiguration.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SmsConfigurationManager.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/SmsGatewayConfig.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/config/package-info.java (+23/-22)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSms.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsListener.java (+14/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java (+74/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/SmsMessageEncoding.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/incoming/SmsMessageStatus.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSms.java (+16/-23)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsService.java (+21/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsStatus.java (+11/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsStore.java (+24/-19)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsTransportService.java (+25/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserManager.java (+30/-2)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/ParserType.java (+31/-1)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sms/parse/SMSParserException.java (+28/-2)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCode.java (+0/-93)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCommand.java (+0/-268)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCommandService.java (+0/-48)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/smscommand/SMSCommandStore.java (+0/-46)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/Source.java (+0/-91)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/ResourceTableNameMap.java (+0/-79)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java (+197/-69)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewJoinLib.java (+0/-157)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewService.java (+96/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewStore.java (+44/-5)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlViewType.java (+34/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntity.java (+103/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java (+339/-134)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeDimension.java (+206/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java (+55/-61)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupService.java (+115/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeService.java (+174/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStore.java (+47/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAudit.java (+26/-26)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAuditService.java (+63/-27)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStore.java (+38/-18)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityDataElementDimension.java (+207/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java (+122/-532)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceQueryParams.java (+733/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java (+158/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderService.java (+113/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceService.java (+234/-202)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStore.java (+37/-65)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityService.java (+142/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityStore.java (+36/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/comparator/TrackedEntityAttributeGroupSortOrderComparator.java (+28/-25)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/comparator/TrackedEntityAttributeSortOrderComparator.java (+30/-29)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/comparator/TrackedEntityAttributeSortOrderInListNoProgramComparator.java (+59/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValue.java (+143/-90)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueService.java (+96/-51)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStore.java (+95/-42)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitycomment/TrackedEntityComment.java (+28/-17)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentService.java (+47/-25)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValue.java (+63/-41)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueService.java (+110/-39)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStore.java (+96/-33)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java (+83/-57)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationService.java (+92/-49)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/TranslationStore.java (+77/-68)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/comparator/TranslationLocaleSpecificityComparator.java (+54/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/CurrentUserService.java (+33/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java (+319/-56)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java (+124/-58)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroupStore.java (+48/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java (+374/-141)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentialsStore.java (+20/-146)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java (+112/-55)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroupAccess.java (+25/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroupAccessService.java (+12/-11)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroupService.java (+30/-12)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserInvitationStatus.java (+57/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserQueryParams.java (+250/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserService.java (+201/-200)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSetting.java (+30/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingService.java (+133/-24)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingStore.java (+88/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserStore.java (+25/-45)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/Users.java (+66/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserComparator.java (+21/-10)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserGroupComparator.java (+0/-54)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UserRoleComparator.java (+0/-54)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/comparator/UsernameComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/LoginFailure.java (+0/-82)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/UserAuditService.java (+0/-40)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/useraudit/UserAuditStore.java (+0/-49)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/util/ObjectUtils.java (+79/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/util/Timer.java (+100/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/Importance.java (+39/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/RuleType.java (+38/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationCriteria.java (+17/-44)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationCriteriaService.java (+14/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationResult.java (+215/-40)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java (+314/-93)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java (+72/-53)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java (+74/-52)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java (+16/-14)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationSummary.java (+81/-0)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationCriteriaComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationResultComparator.java (+11/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/Version.java (+10/-9)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionService.java (+14/-13)
dhis-2/dhis-api/src/main/java/org/hisp/dhis/version/VersionStore.java (+10/-9)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/appmanager/AppTest.java (+11/-9)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/DateTimeUnitPeriodTypeParserTest.java (+115/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/DateTimeUnitTest.java (+145/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/impl/EthiopianCalendarTest.java (+161/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/calendar/impl/NepaliCalendarTest.java (+63/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/AccessStringHelperTest.java (+42/-17)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/BaseAnalyticalObjectTest.java (+105/-24)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CodeGeneratorTest.java (+11/-10)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CombinationGeneratorTest.java (+19/-19)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/DimensionalObjectTest.java (+54/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/DimensionalObjectUtilsTest.java (+58/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dashboard/DashboardTest.java (+153/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/CategoryComboMapTest.java (+163/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboTest.java (+10/-9)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/DataElementTest.java (+10/-9)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataelement/OperandTest.java (+25/-25)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataentryform/DataEntryFormTest.java (+0/-85)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataset/DataSetTest.java (+104/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/dataset/comparator/DataSetFrequencyComparatorTest.java (+79/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/datavalue/DataValueTest.java (+20/-17)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/mock/MockI18nFormat.java (+10/-10)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchyTest.java (+50/-54)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitTest.java (+93/-13)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/patient/PatientTest.java (+0/-60)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/BiMonthlyPeriodTypeTest.java (+72/-75)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/FinancialAprilPeriodTypeTest.java (+68/-70)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/FinancialJulyPeriodTypeTest.java (+69/-70)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/FinancialOctoberPeriodTypeTest.java (+68/-70)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/MonthlyPeriodTypeTest.java (+121/-117)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/PeriodTypeTest.java (+33/-27)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/QuarterlyPeriodTypeTest.java (+105/-91)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/RelativePeriodTest.java (+249/-216)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/SixMonthlyAprilPeriodTypeTest.java (+250/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/SixMonthlyPeriodTypeTest.java (+126/-69)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/StringFormatTest.java (+15/-11)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/WeeklyPeriodTypeTest.java (+113/-61)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/period/YearlyPeriodTypeTest.java (+60/-62)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/program/ProgramIndicatorTest.java (+51/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/program/ProgramTest.java (+73/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/query/QueryTest.java (+120/-0)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfigTest.java (+12/-11)
dhis-2/dhis-api/src/test/java/org/hisp/dhis/sqlview/SqlViewTest.java (+70/-0)
dhis-2/dhis-api/src/test/resources/manifest.webapp (+0/-3)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/DefaultInputValidationService.java (+0/-163)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/InputValidationService.java (+0/-65)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/BaseEventService.java (+0/-336)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Coordinate.java (+0/-98)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/DataValue.java (+0/-94)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Event.java (+0/-206)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/EventService.java (+0/-48)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/Events.java (+0/-101)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/event/JacksonEventService.java (+0/-113)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/message/Message.java (+0/-151)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExchangeClasses.java (+0/-202)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java (+0/-142)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java (+0/-67)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java (+0/-233)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/AbstractObjectHandler.java (+0/-56)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java (+0/-194)
dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/OrganisationUnitUtils.java (+0/-105)
dhis-2/dhis-services/dhis-service-administration/pom.xml (+3/-3)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/DefaultDataBrowserGridService.java (+49/-58)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/JDBCDataBrowserStore.java (+80/-34)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java (+212/-112)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/tasks/DataIntegrityTask.java (+152/-0)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java (+15/-14)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java (+17/-14)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/DefaultMaintenanceService.java (+96/-10)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/maintenance/jdbc/JdbcMaintenanceStore.java (+11/-9)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java (+312/-272)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/jdbc/JdbcResourceTableStore.java (+358/-39)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/scheduling/ResourceTableTask.java (+75/-13)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/statement/CreateCategoryOptionGroupSetTableStatement.java (+72/-0)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/statement/CreateCategoryTableStatement.java (+17/-19)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/statement/CreateDataElementGroupSetTableStatement.java (+17/-19)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/statement/CreateIndicatorGroupSetTableStatement.java (+19/-21)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/statement/CreateOrganisationUnitGroupSetTableStatement.java (+17/-19)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/DefaultSqlViewService.java (+222/-108)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/sqlview/jdbc/JdbcSqlViewStore.java (+99/-59)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/StatisticsProvider.java (+10/-9)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java (+21/-12)
dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/useraudit/DefaultUserAuditService.java (+0/-65)
dhis-2/dhis-services/dhis-service-administration/src/main/resources/META-INF/dhis/beans.xml (+14/-16)
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/sqlview/hibernate/SqlView.hbm.xml (+31/-4)
dhis-2/dhis-services/dhis-service-administration/src/main/resources/org/hisp/dhis/useraudit/hibernate/LoginFailure.hbm.xml (+0/-18)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java (+0/-479)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserStoreTest.java (+0/-561)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserTest.java (+0/-368)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/dataintegrity/DataIntegrityServiceTest.java (+31/-66)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/maintenance/MaintenanceStoreTest.java (+16/-14)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/resourcetable/ResourceTableServiceTest.java (+0/-59)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/sqlview/SqlViewServiceTest.java (+167/-135)
dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/statistics/StatisticsProviderTest.java (+0/-89)
dhis-2/dhis-services/dhis-service-analytics/pom.xml (+7/-11)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsIndex.java (+12/-9)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java (+16/-12)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsSecurityManager.java (+66/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java (+91/-16)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTable.java (+251/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java (+53/-58)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableService.java (+17/-11)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsUtils.java (+140/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryGroups.java (+15/-14)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java (+974/-499)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionItem.java (+37/-15)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/MeasureFilter.java (+10/-9)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/Partitions.java (+165/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/QueryPlanner.java (+47/-9)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/SortOrder.java (+38/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java (+1101/-534)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java (+437/-297)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/JdbcAnalyticsManager.java (+253/-145)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/MockAnalyticsService.java (+67/-40)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/dimension/DefaultDimensionService.java (+582/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsManager.java (+43/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventAnalyticsService.java (+112/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java (+660/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryPlanner.java (+62/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java (+749/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java (+301/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java (+643/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/partition/JdbcPartitionManager.java (+102/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/partition/PartitionManager.java (+52/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/scheduling/AnalyticsTableTask.java (+0/-100)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/security/DefaultAnalyticsSecurityManager.java (+249/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java (+202/-84)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java (+160/-111)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcAnalyticsTableManager.java (+357/-175)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java (+95/-62)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java (+90/-49)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java (+445/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcOrgUnitTargetTableManager.java (+194/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/PartitionUtils.java (+107/-71)
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/scheduling/AnalyticsTableTask.java (+186/-0)
dhis-2/dhis-services/dhis-service-analytics/src/main/resources/META-INF/dhis/beans.xml (+40/-6)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryGroupsTest.java (+42/-45)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryParamsTest.java (+86/-29)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DimensionOptionTest.java (+14/-13)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsManagerTest.java (+13/-12)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java (+461/-45)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.java (+354/-225)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/dimension/DimensionServiceTest.java (+249/-0)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/EventQueryParamsTest.java (+95/-0)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java (+353/-0)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java (+184/-0)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/AnalyticsTableTest.java (+78/-0)
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/PartitionUtilsTest.java (+139/-64)
dhis-2/dhis-services/dhis-service-core/pom.xml (+45/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java (+0/-206)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedOrgUnitDataValueService.java (+0/-106)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java (+0/-448)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedOrgUnitDataValueStore.java (+0/-155)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcStoreIterator.java (+0/-118)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/DefaultAppManager.java (+255/-77)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/AttributeValueDeletionHandler.java (+20/-15)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java (+137/-77)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeStore.java (+133/-72)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/calendar/DefaultCalendarService.java (+179/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/color/DefaultColorService.java (+68/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DataDimensionTypeUserType.java (+43/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultDimensionService.java (+0/-321)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java (+743/-247)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/IdentityPopulator.java (+66/-63)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateAnalyticalObjectStore.java (+102/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateDimensionalObjectStore.java (+0/-50)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java (+438/-10)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/commons/filter/DefaultMetaDataFilterService.java (+131/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/concept/DefaultConceptService.java (+0/-118)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/ConfigurationDeletionHandler.java (+30/-13)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java (+18/-10)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/constant/DefaultConstantService.java (+48/-19)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/DefaultFollowupAnalysisService.java (+68/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/FollowupAnalysisService.java (+0/-64)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisService.java (+69/-48)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/StdDevOutlierAnalysisService.java (+36/-32)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataanalysis/jdbc/JdbcDataAnalysisStore.java (+89/-45)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalDeletionHandler.java (+77/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissionsEvaluator.java (+241/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java (+766/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java (+534/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalLevelStore.java (+63/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java (+490/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryDeletionHandler.java (+0/-85)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java (+0/-135)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupDeletionHandler.java (+66/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSetDeletionHandler.java (+65/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryComboDeletionHandler.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDeletionHandler.java (+18/-71)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryDimensionDeletionHandler.java (+69/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboDeletionHandler.java (+60/-34)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionDeletionHandler.java (+18/-28)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDefaultDimensionPopulator.java (+11/-42)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDeletionHandler.java (+24/-45)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementDomainUserType.java (+43/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupDeletionHandler.java (+17/-28)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSetDeletionHandler.java (+16/-22)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java (+701/-296)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementOperandService.java (+89/-73)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java (+180/-212)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryComboStore.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionComboStore.java (+68/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupSetStore.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionGroupStore.java (+62/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryOptionStore.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateCategoryStore.java (+70/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementGroupSetStore.java (+39/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementGroupStore.java (+39/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementOperandStore.java (+73/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java (+129/-132)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java (+54/-114)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java (+140/-98)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java (+21/-71)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationDeletionHandler.java (+21/-12)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetDeletionHandler.java (+49/-46)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultCompleteDataSetRegistrationService.java (+79/-60)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java (+181/-154)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultSectionService.java (+31/-20)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/SectionDeletionHandler.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateCompleteDataSetRegistrationStore.java (+73/-60)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java (+28/-34)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java (+13/-10)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateSectionStore.java (+11/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueAuditDeletionHandler.java (+14/-19)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DataValueDeletionHandler.java (+12/-11)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueAuditService.java (+59/-43)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/DefaultDataValueService.java (+188/-53)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueAuditStore.java (+97/-88)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datavalue/hibernate/HibernateDataValueStore.java (+217/-126)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java (+129/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/eventchart/DefaultEventChartService.java (+89/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java (+86/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/eventreport/DefaultEventReportService.java (+89/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java (+88/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/DefaultExpressionService.java (+391/-99)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/ExpressionDeletionHandler.java (+10/-23)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/OperatorUserType.java (+18/-15)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java (+508/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/FieldFilterService.java (+58/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/FieldMap.java (+85/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceContentStore.java (+322/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fileresource/DefaultFileResourceService.java (+147/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/help/DefaultHelpManager.java (+22/-16)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/hibernate/EnumUserType.java (+12/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/hibernate/HibernateEventListenerWiring.java (+174/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nLocaleService.java (+211/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/DefaultI18nService.java (+96/-99)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nLocaleService.java (+71/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nLocaleStore.java (+40/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nManager.java (+53/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nService.java (+20/-15)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/I18nUtils.java (+17/-16)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/hibernate/HibernateI18nLocaleStore.java (+48/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/interceptor/I18nTranslationInterceptor.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/DefaultI18nManager.java (+147/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/locale/UserSettingLocaleManager.java (+129/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/DefaultResourceBundleManager.java (+262/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/ResourceBundleManager.java (+51/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/i18n/ui/resourcebundle/ResourceBundleManagerException.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java (+118/-103)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorDeletionHandler.java (+12/-18)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupDeletionHandler.java (+18/-28)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSetDeletionHandler.java (+17/-21)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/hibernate/HibernateIndicatorStore.java (+20/-16)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/legend/DefaultLegendService.java (+112/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/legend/LegendSetDeletionHandler.java (+21/-24)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java (+97/-194)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/MapDeletionHandler.java (+84/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/MapViewDeletionHandler.java (+45/-149)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMapLayerStore.java (+16/-13)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMapLegendSetStore.java (+0/-41)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMapLegendStore.java (+0/-41)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMapStore.java (+20/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMapViewStore.java (+41/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/DefaultMessageService.java (+150/-36)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java (+132/-53)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/MessageConversationDeletionHandler.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/hibernate/HibernateMessageConversationStore.java (+66/-42)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/DefaultMinMaxDataElementService.java (+26/-12)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/MinMaxDataElementDeletionHandler.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/minmax/hibernate/HibernateMinMaxDataElementStore.java (+22/-13)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/AbstractNodePropertyConverter.java (+61/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/AbstractNodeSerializer.java (+163/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/DefaultNodeService.java (+164/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/converters/IsEmptyNodePropertyConverter.java (+72/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/converters/IsNotEmptyNodePropertyConverter.java (+72/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/converters/SizeNodePropertyConverter.java (+71/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/presets/AllPresetProvider.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/presets/IdentifiablePresetProvider.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/presets/NameablePresetProvider.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/CsvNodeSerializer.java (+189/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.java (+239/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/Jackson2JsonNodeSerializer.java (+165/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/PdfNodeSerializer.java (+188/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/StAXNodeSerializer.java (+205/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/transformers/RenameNodeTransformer.java (+62/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/DefaultObjectFilterService.java (+181/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/FilterOps.java (+62/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/Filters.java (+160/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ObjectFilterService.java (+47/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/OpFactory.java (+103/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/EmptyCollectionOp.java (+69/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/EndsWithOp.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/EqOp.java (+106/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/GtOp.java (+85/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/GteOp.java (+85/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/InOp.java (+107/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/LikeOp.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/LtOp.java (+85/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/LteOp.java (+85/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/NLikeOp.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/NeqOp.java (+56/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/NnullOp.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/NullOp.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/Op.java (+66/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/OpStatus.java (+37/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/objectfilter/ops/StartsWithOp.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/DefaultOptionService.java (+137/-53)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/option/hibernate/HibernateOptionStore.java (+78/-18)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java (+114/-42)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java (+581/-398)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitDeletionHandler.java (+31/-47)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupDeletionHandler.java (+16/-41)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetDeletionHandler.java (+15/-21)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetPopulator.java (+0/-89)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitGroupSetStore.java (+42/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitGroupStore.java (+15/-13)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitLevelStore.java (+16/-24)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java (+250/-151)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/parser/DefaultParserService.java (+146/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/parser/ParserService.java (+57/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/DefaultPeriodService.java (+95/-66)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/PeriodTypePopulator.java (+11/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/period/hibernate/HibernatePeriodStore.java (+36/-50)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java (+871/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java (+234/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java (+805/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java (+706/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramService.java (+597/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java (+87/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java (+407/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java (+101/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java (+257/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/EventStatusUserType.java (+44/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java (+101/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java (+133/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramIndicatorDeletionHandler.java (+74/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java (+103/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageDeletionHandler.java (+74/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java (+89/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java (+48/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramTypeUserType.java (+45/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java (+75/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramIndicatorStore.java (+42/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java (+550/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageDataElementStore.java (+55/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java (+500/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java (+58/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java (+55/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java (+87/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java (+56/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/DefaultProgramRuleActionService.java (+92/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/DefaultProgramRuleService.java (+105/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/DefaultProgramRuleVariableService.java (+93/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/ProgramRuleActionDeletionHandler.java (+69/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/ProgramRuleDeletionHandler.java (+69/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariableDeletionHandler.java (+69/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/hibernate/HibernateProgramRuleActionStore.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/hibernate/HibernateProgramRuleStore.java (+71/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/programrule/hibernate/HibernateProgramRuleVariableStore.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java (+329/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/DefaultQueryService.java (+242/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/QueryUtils.java (+129/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java (+101/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java (+132/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java (+77/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java (+81/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipTypeStore.java (+50/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/AbstractPropertyIntrospectorService.java (+301/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java (+229/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java (+289/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/NodePropertyIntrospectorService.java (+279/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java (+397/-122)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUserDetailsService.java (+28/-20)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultUsernameSaltSource.java (+0/-48)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/NoSecurityContextRunnable.java (+51/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/PasswordManager.java (+40/-11)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreOptions.java (+109/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreType.java (+111/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/SecurityContextRunnable.java (+65/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/SecurityService.java (+124/-33)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/UsernameSaltSource.java (+0/-53)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/acl/DefaultAclService.java (+330/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultClientDetailsService.java (+80/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/DefaultOAuth2ClientService.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/OAuth2ClientDeletionHandler.java (+43/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/oauth2/hibernate/HibernateOAuth2ClientStore.java (+48/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/AbstractSpringSecurityCurrentUserService.java (+12/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/spring/SpringSecurityPasswordManager.java (+28/-22)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/vote/AllRequiredRoleVoter.java (+12/-10)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultStyleManager.java (+20/-11)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java (+127/-26)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java (+108/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/hibernate/HibernateSystemSettingStore.java (+47/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DatabaseSupportedInternalMemoryMessageQueue.java (+92/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/DefaultSmsSender.java (+341/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsMessageSender.java (+280/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/SmsPublisher.java (+173/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/DefaultSMSCommandService.java (+126/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSCommand.java (+414/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSCommandDeletionHandler.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSCommandService.java (+65/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/SMSSpecialCharacter.java (+84/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/code/SMSCode.java (+125/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/code/SMSCodesDeletionHandler.java (+62/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/hibernate/HibernateSMSCommandStore.java (+208/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/command/hibernate/SMSCommandStore.java (+65/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/config/AdvanceHttpPostGateWay.java (+146/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/config/DefaultSmsConfigurationManager.java (+133/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/config/GateWayFactory.java (+156/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/config/SimplisticHttpGetGateWay.java (+191/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/hibernate/HibernateIncomingSmsStore.java (+156/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/hibernate/HibernateOutboundSmsStore.java (+144/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/incoming/DefaultIncomingSmsService.java (+206/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/incoming/SMPPInboundNotification.java (+61/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DHISMessageAlertListener.java (+213/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/DataValueSMSListener.java (+753/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/J2MEDataValueSMSListener.java (+587/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/ProgramStageDataEntrySMSListener.java (+215/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/TrackedEntityRegistrationSMSListener.java (+352/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/listener/UnregisteredSMSListener.java (+197/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsService.java (+108/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/outbound/DefaultOutboundSmsTransportService.java (+550/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/sms/task/SendSmsTask.java (+149/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/smscommand/DefaultSMSCommandService.java (+0/-49)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/smscommand/HibernateSMSCommandStore.java (+0/-92)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/ConfigurationPopulator.java (+56/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/ExpressionUpgrader.java (+33/-38)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/FavoriteDataItemUpgrader.java (+121/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/I18nLocalePopulator.java (+77/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java (+218/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/MapViewUpgrader.java (+28/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java (+672/-181)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableCreator.java (+16/-25)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java (+215/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java (+440/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemService.java (+37/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeGroupService.java (+134/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java (+184/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAuditService.java (+87/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java (+312/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceService.java (+746/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java (+123/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAuditDeletionHandler.java (+77/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java (+91/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAttributeStore.java (+76/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAuditStore.java (+64/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java (+556/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityStore.java (+42/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/startup/TableAlteror.java (+620/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java (+136/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueDeletionHandler.java (+96/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java (+120/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentitycomment/DefaultTrackedEntityCommentService.java (+78/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentitydatavalue/DefaultTrackedEntityDataValueService.java (+134/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueDeletionHandler.java (+100/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentitydatavalue/hibernate/HibernateTrackedEntityDataValueStore.java (+132/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/DefaultTranslationService.java (+106/-42)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/TranslationDeletionHandler.java (+29/-9)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/translation/hibernate/HibernateTranslationStore.java (+148/-116)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultCurrentUserService.java (+79/-37)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserGroupAccessService.java (+13/-12)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserGroupService.java (+110/-16)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserService.java (+425/-317)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java (+158/-30)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserAuthorityGroupDeletionHandler.java (+18/-15)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserCredentialsDeletionHandler.java (+0/-73)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserDeletionHandler.java (+38/-42)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserGroupDeletionHandler.java (+30/-21)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/UserSettingDeletionHandler.java (+15/-40)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserAuthorityGroupStore.java (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java (+23/-384)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserSettingStore.java (+130/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserStore.java (+179/-98)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationCriteriaService.java (+20/-13)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java (+548/-286)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/OrganisationUnitExtended.java (+95/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/PeriodTypeExtended.java (+140/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationResultToAlertFilter.java (+41/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRuleDeletionHandler.java (+20/-10)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRuleExtended.java (+73/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRuleGroupDeletionHandler.java (+17/-27)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunContext.java (+494/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunType.java (+38/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java (+151/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java (+654/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/hibernate/HibernateValidationRuleStore.java (+18/-17)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.java (+104/-0)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/version/DefaultVersionService.java (+22/-17)
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/version/hibernate/HibernateVersionStore.java (+20/-15)
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml (+1060/-291)
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml (+34/-12)
dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content.xml (+653/-696)
dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content_pt_.xml (+6424/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/help_content_pt_PT.xml (+4013/-4013)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties (+1034/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar.properties (+728/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_IQ.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ar_SD.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bi.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_bn.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_dz.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_es.properties (+563/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_fr.properties (+585/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_id.properties (+630/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_km.properties (+357/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_lo.properties (+750/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_my.properties (+623/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ne.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt.properties (+645/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_pt_BR.properties (+607/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ru.properties (+712/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_rw.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tet.properties (+830/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_tg.properties (+712/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_ur.properties (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_vi.properties (+958/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global_zh.properties (+527/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message1.vm (+9/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/invite_message2.vm (+9/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/message_email.vm (+12/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/message_email_footer.vm (+1/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/attribute/hibernate/Attribute.hbm.xml (+23/-4)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/attribute/hibernate/AttributeValue.hbm.xml (+5/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/color/hibernate/Color.hbm.xml (+21/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/color/hibernate/ColorSet.hbm.xml (+26/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/common/DataDimensionItem.hbm.xml (+32/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/concept/hibernate/Concept.hbm.xml (+0/-19)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml (+13/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/constant/hibernate/Constant.hbm.xml (+16/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataapproval/hibernate/DataApproval.hbm.xml (+27/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataapproval/hibernate/DataApprovalLevel.hbm.xml (+38/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datadictionary/hibernate/DataDictionary.hbm.xml (+0/-47)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CategoryOptionGroup.hbm.xml (+56/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/CategoryOptionGroupSet.hbm.xml (+46/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml (+37/-21)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategory.hbm.xml (+14/-4)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryCombo.hbm.xml (+14/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOption.hbm.xml (+38/-3)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml (+3/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroupSet.hbm.xml (+3/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementOperand.hbm.xml (+2/-2)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataentryform/hibernate/DataEntryForm.hbm.xml (+9/-2)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/CompleteDataSetRegistration.hbm.xml (+5/-2)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml (+25/-9)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/Section.hbm.xml (+21/-19)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValue.hbm.xml (+14/-11)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/datavalue/hibernate/DataValueAudit.hbm.xml (+31/-18)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml (+196/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml (+199/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/expression/hibernate/Expression.hbm.xml (+7/-8)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/fileresource/hibernate/FileResource.hbm.xml (+41/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/i18n/locale/hibernate/I18nLocale.hbm.xml (+21/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml (+4/-4)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroupSet.hbm.xml (+1/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/Legend.hbm.xml (+5/-12)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/legend/hibernate/LegendSet.hbm.xml (+3/-3)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml (+3/-6)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/MapView.hbm.xml (+62/-30)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/Message.hbm.xml (+1/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/MessageConversation.hbm.xml (+7/-4)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/message/hibernate/UserMessage.hbm.xml (+2/-2)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/metadatafilter/hibernate/MetaDataFilter.hbm.xml (+25/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/option/hibernate/Option.hbm.xml (+25/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/option/hibernate/OptionSet.hbm.xml (+24/-3)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml (+26/-13)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml (+13/-9)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml (+23/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitLevel.hbm.xml (+4/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/Period.hbm.xml (+1/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/PeriodType.hbm.xml (+1/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/period/hibernate/RelativePeriods.hbm.xml (+10/-3)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml (+122/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml (+18/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml (+52/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml (+65/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml (+90/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml (+33/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml (+67/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageSection.hbm.xml (+37/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramTrackedEntityAttribute.hbm.xml (+25/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml (+32/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRule.hbm.xml (+38/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRuleAction.hbm.xml (+43/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/programrule/hibernate/ProgramRuleVariable.hbm.xml (+40/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/relationship/hibernate/Relationship.hbm.xml (+23/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/relationship/hibernate/RelationshipType.hbm.xml (+23/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/security/oauth2/hibernate/OAuth2Client.hbm.xml (+39/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/IncomingSms.hbm.xml (+40/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml (+31/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCode.hbm.xml (+27/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSCommand.hbm.xml (+58/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/SMSSpecialCharacter.hbm.xml (+17/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/smscommand/SMSCode.hbm.xml (+0/-20)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/smscommand/SMSCommand.hbm.xml (+0/-45)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntity.hbm.xml (+29/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttribute.hbm.xml (+90/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeDimension.hbm.xml (+22/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAttributeGroup.hbm.xml (+29/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityAudit.hbm.xml (+22/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityDataElementDimension.hbm.xml (+22/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityInstance.hbm.xml (+37/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentity/hibernate/TrackedEntityInstanceReminder.hbm.xml (+32/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentityattributevalue/hibernate/TrackedEntityAttributeValue.hbm.xml (+19/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitycomment/hibernate/TrackedEntityComment.hbm.xml (+20/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/trackedentitydatavalue/hibernate/TrackedEntityDataValue.hbm.xml (+25/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/translation/hibernate/Translation.hbm.xml (+12/-7)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/User.hbm.xml (+14/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserAuthorityGroup.hbm.xml (+16/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserCredentials.hbm.xml (+27/-10)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml (+15/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroupAccess.hbm.xml (+2/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationCriteria.hbm.xml (+2/-1)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml (+31/-7)
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml (+19/-0)
dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message1.vm (+0/-12)
dhis-2/dhis-services/dhis-service-core/src/main/resources/restore_message2.vm (+0/-12)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/appmanager/DefaultAppManagerServiceTest.java (+23/-69)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeServiceTest.java (+25/-23)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeStoreTest.java (+25/-19)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueServiceTest.java (+26/-26)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueStoreTest.java (+31/-23)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/cofiguration/ConfigurationServiceTest.java (+14/-19)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/common/IdentifiableObjectManagerTest.java (+584/-8)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptServiceTest.java (+0/-215)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/concept/ConceptTest.java (+0/-111)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/constant/ConstantServiceTest.java (+18/-19)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataanalysis/DataAnalysisStoreTest.java (+46/-41)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataanalysis/MinMaxOutlierAnalysisServiceTest.java (+58/-53)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataanalysis/StdDevOutlierAnalysisServiceTest.java (+81/-53)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalLevelServiceTest.java (+676/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceCategoryOptionGroupTest.java (+1817/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java (+1773/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalStoreTest.java (+277/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryServiceTest.java (+0/-184)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryStoreTest.java (+0/-187)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboServiceTest.java (+17/-15)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryComboStoreTest.java (+19/-17)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboServiceTest.java (+23/-23)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionComboStoreTest.java (+76/-25)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionServiceTest.java (+73/-22)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryOptionStoreTest.java (+16/-22)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryServiceTest.java (+110/-41)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementCategoryStoreTest.java (+23/-36)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementGroupSetStoreTest.java (+11/-10)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementGroupStoreTest.java (+16/-32)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementOperandServiceTest.java (+10/-9)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java (+136/-219)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java (+112/-199)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataentryform/DataEntryFormServiceTest.java (+30/-65)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataentryform/DataEntryFormStoreTest.java (+35/-41)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationServiceTest.java (+106/-210)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/CompleteDataSetRegistrationStoreTest.java (+0/-327)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetServiceTest.java (+98/-114)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/DataSetStoreTest.java (+23/-26)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataset/SectionStoreTest.java (+37/-37)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueAuditServiceTest.java (+366/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueDimensionTest.java (+36/-22)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java (+110/-221)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java (+0/-596)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/eventchart/EventChartServiceTest.java (+122/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/eventreport/EventReportServiceTest.java (+122/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionServiceTest.java (+198/-69)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/expression/ExpressionStoreTest.java (+32/-32)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/external/location/LocationManagerTest.java (+351/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/help/HelpManagerTest.java (+12/-15)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/I18nLocaleServiceTest.java (+57/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java (+32/-41)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorGroupSetStoreTest.java (+11/-10)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorGroupStoreTest.java (+15/-23)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java (+22/-95)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java (+29/-47)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java (+176/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java (+240/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/legend/LegendServiceTest.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java (+38/-260)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MessageServiceTest.java (+49/-12)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/message/MockMessageSender.java (+11/-10)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/minmax/MinMaxDataElementStoreTest.java (+53/-58)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/option/OptionServiceTest.java (+37/-42)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSetStoreTest.java (+12/-11)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupStoreTest.java (+11/-10)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java (+361/-209)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitStoreTest.java (+231/-38)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodServiceTest.java (+90/-230)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodStoreTest.java (+73/-351)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java (+146/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java (+234/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramIndicatorServiceTest.java (+630/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java (+446/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java (+296/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java (+236/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java (+179/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java (+177/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java (+478/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java (+330/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java (+175/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java (+142/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java (+153/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java (+97/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java (+114/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java (+279/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java (+148/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleActionServiceTest.java (+177/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleActionStoreTest.java (+93/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleServiceTest.java (+209/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleStoreTest.java (+88/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableServiceTest.java (+168/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableStoreTest.java (+88/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/query/QueryServiceTest.java (+602/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/relationship/RelationshipServiceTest.java (+184/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/relationship/RelationshipStoreTest.java (+137/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/relationship/RelationshipTypeServiceTest.java (+129/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/relationship/RelationshipTypeStoreTest.java (+60/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldCollectionNodePropertyIntrospectorServiceTest.java (+165/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldComplexNodePropertyIntrospectorServiceTest.java (+137/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/schema/FieldSimpleNodePropertyIntrospectorServiceTest.java (+136/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/PasswordManagerTest.java (+63/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/SecurityServiceTest.java (+188/-38)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/oauth2/OAuth2ClientServiceTest.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/security/oauth2/OAuth2ClientStoreTest.java (+94/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingManagerTest.java (+43/-29)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/setting/SystemSettingStoreTest.java (+45/-48)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupServiceTest.java (+153/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeServiceTest.java (+110/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStoreTest.java (+190/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditServiceTest.java (+159/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStoreTest.java (+116/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java (+221/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java (+221/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceStoreTest.java (+144/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java (+249/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java (+203/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentServiceTest.java (+113/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java (+326/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java (+290/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/trackedentityinstance/TrackedEntityInstanceQueryTest.java (+54/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationServiceTest.java (+83/-89)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/translation/TranslationStoreTest.java (+86/-89)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserAuthorityGroupTest.java (+47/-45)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserCredentialsStoreTest.java (+91/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserGroupServiceTest.java (+23/-20)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserServiceTest.java (+692/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserSettingServiceTest.java (+76/-0)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/user/UserStoreTest.java (+81/-191)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationCriteriaServiceTest.java (+23/-24)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationCriteriaStoreTest.java (+24/-27)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleGroupStoreTest.java (+35/-38)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleServiceTest.java (+907/-220)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/validation/ValidationRuleStoreTest.java (+38/-103)
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/version/VersionServiceTest.java (+31/-22)
dhis-2/dhis-services/dhis-service-core/src/test/resources/META-INF/dhis/beans-test.xml (+0/-7)
dhis-2/dhis-services/dhis-service-datamart-default/pom.xml (+0/-56)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/CrossTabDataValue.java (+0/-146)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataElementOperandList.java (+0/-105)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataMartManager.java (+0/-97)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/DataMartScheduler.java (+0/-50)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/JdbcDataMartManager.java (+0/-294)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/OrgUnitOperand.java (+0/-131)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/cache/AggregationCache.java (+0/-53)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/cache/MemoryAggregationCache.java (+0/-213)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageBoolAggregator.java (+0/-186)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageIntAggregator.java (+0/-188)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/AverageIntSingleValueAggregator.java (+0/-137)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/DataElementAggregator.java (+0/-50)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/SumBoolAggregator.java (+0/-128)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/aggregation/dataelement/SumIntAggregator.java (+0/-137)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/CrossTabService.java (+0/-127)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java (+0/-225)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/CrossTabStore.java (+0/-134)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java (+0/-288)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DataElementDataMart.java (+0/-53)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java (+0/-231)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java (+0/-611)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java (+0/-223)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/IndicatorDataMart.java (+0/-49)
dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml (+0/-115)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java (+0/-263)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java (+0/-651)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceOrgUnitTest.java (+0/-526)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java (+0/-564)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java (+0/-184)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/crosstab/CrossTabServiceTest.java (+0/-255)
dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/crosstab/CrossTabStoreTest.java (+0/-62)
dhis-2/dhis-services/dhis-service-dxf2/pom.xml (+24/-30)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXConstants.java (+68/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXDataService.java (+59/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXException.java (+65/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/ADXPeriod.java (+167/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/DefaultADXDataService.java (+451/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/FilterOptions.java (+67/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java (+145/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java (+317/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportSummaryResponseExtractor.java (+65/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportUtils.java (+68/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/JacksonUtils.java (+210/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/Options.java (+268/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrderOptions.java (+138/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrganisationUnitUtils.java (+106/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateParams.java (+72/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/csv/CsvImportService.java (+44/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/csv/DefaultCsvImportService.java (+477/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/DataValue.java (+83/-34)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingCsvDataValue.java (+47/-31)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingDataValue.java (+38/-21)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalue/StreamingJsonDataValue.java (+154/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataExportParams.java (+248/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java (+110/-31)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java (+40/-18)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java (+23/-21)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java (+658/-209)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/PipedImporter.java (+94/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java (+167/-65)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingCsvDataValueSet.java (+14/-10)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingDataValueSet.java (+41/-31)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingJsonDataValueSet.java (+164/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java (+688/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollment.java (+283/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentService.java (+90/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/EnrollmentStatus.java (+62/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/Enrollments.java (+103/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/JacksonEnrollmentService.java (+199/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java (+1192/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Coordinate.java (+99/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DataValue.java (+118/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Event.java (+358/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventSearchParams.java (+301/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java (+107/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java (+46/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Events.java (+136/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventTask.java (+87/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventsTask.java (+65/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java (+195/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java (+490/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/Note.java (+81/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/CsvEventDataValue.java (+316/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/CsvEventService.java (+45/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/csv/DefaultCsvEventService.java (+155/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/AbstractEventRowService.java (+55/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/EventRow.java (+358/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/EventRowService.java (+39/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/EventRows.java (+109/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java (+615/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/Attribute.java (+184/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/JacksonTrackedEntityInstanceService.java (+200/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/Relationship.java (+154/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java (+222/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstanceService.java (+87/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstances.java (+72/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java (+392/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/GmlConversionUtils.java (+137/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/GmlImportService.java (+53/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportConflict.java (+69/-10)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportCount.java (+40/-14)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportStatus.java (+11/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummaries.java (+71/-11)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummary.java (+86/-21)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java (+189/-41)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java (+90/-39)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java (+96/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMetaDataDependencyService.java (+435/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java (+386/-91)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java (+30/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java (+16/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportSummary.java (+21/-14)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportTypeSummary.java (+46/-16)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Importer.java (+13/-11)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MergeService.java (+46/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java (+534/-151)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaDataDependencyService.java (+50/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ObjectBridge.java (+40/-10)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/ObjectHandler.java (+10/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/ObjectHandlerAdapter.java (+57/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/ObjectHandlerUtils.java (+10/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/OrganisationUnitObjectHandler.java (+12/-11)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java (+859/-427)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/tasks/ImportMetaDataTask.java (+22/-19)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/DefaultPdfDataEntryFormService.java (+250/-208)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormService.java (+10/-9)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java (+99/-58)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java (+95/-97)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFormFontSettings.java (+34/-32)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/DefaultRenderService.java (+177/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/render/RenderService.java (+59/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/DefaultSchemaValidator.java (+239/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/SchemaValidator.java (+56/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/ValidationViolation.java (+110/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/schema/ValidationViolations.java (+71/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/AvailabilityStatus.java (+75/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DataSynchronizationTask.java (+72/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java (+322/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/SynchronizationManager.java (+47/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/AbstractWebMessageResponse.java (+68/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/DescriptiveWebMessage.java (+56/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessage.java (+220/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessageException.java (+47/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessageResponse.java (+36/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/WebMessageStatus.java (+37/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/responses/FileResourceWebMessageResponse.java (+57/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/webmessage/responses/ImportCountWebMessageResponse.java (+93/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/META-INF/dhis/beans.xml (+192/-62)
dhis-2/dhis-services/dhis-service-dxf2/src/main/resources/gml/gml2dxf2.xsl (+121/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/adx/ADXPeriodTest.java (+140/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java (+477/-114)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java (+218/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java (+351/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationSingleEventServiceTest.java (+238/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/TrackedEntityInstanceServiceTest.java (+169/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/gml/GmlImportServiceTest.java (+176/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/CsvMetaDataImportTest.java (+117/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java (+140/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java (+58/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java (+110/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/Simple.java (+138/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/SimpleCollection.java (+80/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/adx/adx_data_sample1.xml (+32/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/adx/adx_data_sample2.xml (+26/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetACode.xml (+5/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetB.csv (+13/-13)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetD.xml (+5/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetE.xml (+5/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetF.xml (+6/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetG.xml (+6/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetNonStrict.xml (+5/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/gml/testGmlPayload.gml (+238/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/metadata/dataElements.csv (+3/-0)
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/metadata/optionSets.csv (+13/-0)
dhis-2/dhis-services/dhis-service-eventreporting/pom.xml (+37/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java (+148/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java (+665/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java (+1414/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionSchedulingManager.java (+57/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionTask.java (+129/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultCaseAggregateConditionSchedulingManager.java (+148/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/DefaultProgramSchedulingManager.java (+145/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/ProgramSchedulingManager.java (+53/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/SendScheduledMessageTask.java (+264/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml (+121/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/org/hisp/dhis/caseaggregation/hibernate/CaseAggregationCondition.hbm.xml (+32/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java (+451/-0)
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java (+336/-0)
dhis-2/dhis-services/dhis-service-i18n/pom.xml (+0/-32)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/DefaultI18nManager.java (+0/-122)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/I18nManager.java (+0/-44)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/I18nManagerException.java (+0/-48)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/locale/UserSettingLocaleManager.java (+0/-120)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/DefaultResourceBundleManager.java (+0/-250)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/ResourceBundleManager.java (+0/-50)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/resourcebundle/ResourceBundleManagerException.java (+0/-51)
dhis-2/dhis-services/dhis-service-i18n/src/main/java/org/hisp/dhis/i18n/util/PathUtils.java (+0/-77)
dhis-2/dhis-services/dhis-service-i18n/src/main/resources/META-INF/dhis/beans.xml (+0/-23)
dhis-2/dhis-services/dhis-service-importexport/pom.xml (+2/-6)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/CSVConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DefaultImportService.java (+17/-71)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/DeflatedDataValueDaily.java (+313/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ExportParams.java (+90/-76)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ExportPipeThread.java (+17/-14)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ExportService.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/IbatisConfiguration.java (+0/-193)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/IbatisConfigurationManager.java (+11/-15)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriodService.java (+41/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriodStore.java (+42/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportDataValueService.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportDataValueStore.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportException.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportInternalProcess.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectManager.java (+11/-18)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectService.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportObjectStore.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportParams.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportPreviewInternalProcess.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportService.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ImportType.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/Importer.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/PDFConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/XLSConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/XMLConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/DefaultImportAnalyser.java (+21/-18)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/EntityPropertyValue.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/ImportAnalyser.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/ImportAnalysis.java (+12/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/analysis/IndicatorFormulaIdentifier.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/configuration/DefaultIbatisConfigurationManager.java (+35/-100)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java (+346/-282)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/query/IbatisQueryManager.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/query/QueryManager.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/CaculatedDataElementRowHandler.java (+109/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupMemberRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java (+13/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetDailyCaptureRowHandler.java (+83/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetMemberRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetOrganisationUnitAssociationRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetRowHandler.java (+20/-20)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetMemberRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupMemberRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorTypeRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OnChangePeriodRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupMemberRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/PeriodRowHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataDailyCapturePeriodRowHandler.java (+168/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataDailyCaptureRowHandler.java (+220/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java (+41/-37)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java (+35/-33)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/ValidationRuleRowHandler.java (+77/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/sqlmap/IbatisSqlMapClientProvider.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/sqlmap/Source.java (+28/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/sqlmap/SqlMapClientProvider.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/AggregationOperatorTypeHandler.java (+32/-25)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/BooleanTypeHandler.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/DataElementTypeTypeHandler.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/DateTypeHandler.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/IndicatorTypeTypeHandler.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/typehandler/PeriodTypeTypeHandler.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14CalculatedDataElement.java (+154/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14CalculatedDataElementEntry.java (+28/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14GroupMemberAssociation.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14OrganisationUnitStructure.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14RoutineDataDailyCapture.java (+505/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14RoutineDataValue.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14RoutineValidationExpression.java (+33/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/object/Dhis14SemiPermanentDataValue.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/CsvUtils.java (+149/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14DateUtil.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ExpressionConverter.java (+12/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ObjectMappingUtil.java (+14/-12)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14ParsingUtils.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14PeriodUtil.java (+13/-12)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14TypeHandler.java (+57/-26)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryComboConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryOptionComboConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementCategoryOptionConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java (+133/-39)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementGroupMemberConverter.java (+29/-24)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementIndicatorGroupConverter.java (+18/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataTypeConverter.java (+19/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java (+95/-86)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueDailyConverter.java (+788/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java (+16/-17)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorGroupMemberConverter.java (+13/-10)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorTypeConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java (+99/-39)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitGroupConverter.java (+16/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitGroupMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java (+15/-12)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitStructureConverter.java (+89/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/PeriodConverter.java (+129/-32)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/PeriodTypeConverter.java (+23/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/UserConverter.java (+52/-17)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/UserRoleConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/AbstractXSDConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementGroupMemberXSDConverter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementIndicatorGroupXSDConverter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementXSDConverter.java (+37/-13)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataRootXSDConverter.java (+48/-33)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataTypeXSDConverter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorGroupMemberXSDConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorTypeXSDConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorXSDConverter.java (+13/-10)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/OrganisationUnitGroupMemberXSDConverter.java (+80/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/OrganisationUnitGroupXSDConverter.java (+42/-15)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/OrganisationUnitHierarchyXSDConverter.java (+46/-46)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/OrganisationUnitStructureXSDConverter.java (+88/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/OrganisationUnitXSDConverter.java (+89/-69)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodTypeXSDConverter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodXSDConverter.java (+102/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserRoleXSDConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserXSDConverter.java (+22/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java (+143/-61)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/Dhis14ExportPipeThread.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java (+16/-13)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/AggregatedDataValueConverter.java (+0/-152)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryCategoryOptionAssociationConverter.java (+15/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java (+15/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ChartConverter.java (+0/-230)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CompleteDataSetRegistrationConverter.java (+0/-190)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ConceptConverter.java (+0/-145)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ConstantConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DXFConverter.java (+13/-190)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java (+0/-137)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryDataElementConverter.java (+0/-149)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryIndicatorConverter.java (+0/-150)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryComboConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java (+13/-41)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionComboConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryOptionConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java (+51/-48)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupMemberConverter.java (+13/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupSetConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupSetMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetConverter.java (+14/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetSourceAssociationConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/GroupSetConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/GroupSetMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupSetConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupSetMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorTypeConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java (+62/-68)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitGroupConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitGroupMemberConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitLevelConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitRelationshipConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/PeriodConverter.java (+12/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportConverter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java (+0/-346)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java (+12/-16)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java (+11/-66)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataDailyPeriodStore.java (+66/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java (+17/-10)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportObjectStore.java (+20/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/AbstractImporter.java (+11/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ChartImporter.java (+11/-10)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/CompleteDataSetRegistrationImporter.java (+0/-101)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConceptImporter.java (+0/-90)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConstantImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataDictionaryImporter.java (+0/-108)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupSetImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java (+33/-37)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataEntryFormImporter.java (+0/-106)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataSetImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataValueImporter.java (+14/-13)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupSetImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupSetImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorTypeImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java (+12/-21)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitLevelImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitRelationshipImporter.java (+14/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/PeriodImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ReportImporter.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ReportTableImporter.java (+11/-27)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ValidationRuleImporter.java (+10/-16)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/invoker/ConverterInvoker.java (+10/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/invoker/DefaultConverterInvoker.java (+11/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java (+36/-38)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/GroupMemberAssociationVerifier.java (+12/-11)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java (+56/-77)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/ObjectMappingGenerator.java (+10/-13)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/DataElementConverter.java (+0/-92)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/IndicatorConverter.java (+0/-94)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/OrganisationUnitConverter.java (+0/-95)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/OrganisationUnitHierarchyConverter.java (+0/-125)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/UserConverter.java (+0/-91)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/converter/ValidationRuleConverter.java (+0/-96)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/ITextPDFExportService.java (+0/-158)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/PDFPipeThread.java (+0/-149)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportDataDailyPeriodService.java (+61/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportDataValueService.java (+16/-9)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java (+48/-107)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java (+28/-55)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/synchronous/ExportPivotViewService.java (+0/-265)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/converter/DataElementConverter.java (+0/-96)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/converter/IndicatorConverter.java (+0/-101)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/converter/OrganisationUnitConverter.java (+0/-99)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/converter/OrganisationUnitHierarchyConverter.java (+0/-118)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/exporter/DefaultXLSExportService.java (+0/-143)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xls/exporter/XLSExportPipeThread.java (+0/-130)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/LocManagerXSLTLocator.java (+0/-118)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/Util.java (+0/-98)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XMLPreConverter.java (+0/-173)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/xml/XSLTLocator.java (+0/-50)
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java (+11/-10)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml (+23/-70)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/org/hisp/dhis/importexport/hibernate/ImportDataDailyPeriod.hbm.xml (+20/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlMapConfiguration.xml (+6/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/calculatedDataElement.sqlmap.xml (+48/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataElement.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataSet.sqlmap.xml (+1/-1)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/dataSetDailyCapture.sqlmap.xml (+28/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/groupSet.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicator.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/indicatorType.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnitGroup.sqlmap.xml (+1/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataDailyCapture.sqlmap.xml (+67/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataDailyCapturePeriod.sqlmap.xml (+70/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/routineDataValue.sqlmap.xml (+9/-5)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/validationrule.sqlmap.xml (+42/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/validationruleexpression.sqlmap.xml (+42/-0)
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/transform/gml2dxf.xsl (+1/-2)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/analysis/ImportAnalyserTest.java (+0/-113)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ExpressionConverterTest.java (+0/-82)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ImportServiceTest.java (+0/-72)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java (+0/-48)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/IbatisConfigurationManagerTest.java (+0/-115)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFOrganisationUnitsTest.java (+0/-98)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/GML2DXFTest.java (+0/-103)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportDataValueServiceTest.java (+0/-166)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportDataValueStoreTest.java (+0/-166)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportObjectServiceImportAllTest.java (+0/-971)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportObjectServiceTest.java (+0/-488)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/importobject/ImportObjectStoreTest.java (+0/-355)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/GroupMemberAssociationVerifierTest.java (+0/-122)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/ObjectMappingGeneratorTest.java (+0/-213)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/util/ImportExportUtils.java (+0/-253)
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/util/XsltUtils.java (+0/-84)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/ExportMetaData.xml (+0/-936)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xml (+0/-27)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/changeroot.xsl (+0/-29)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/cross2dxf.xsl (+0/-184)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxf2/base.xml (+0/-178)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxf2/dataValueSet.xml (+0/-9)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxf2/dataValueSet_dim.xml (+0/-11)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml (+0/-597)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml (+0/-1037)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml (+0/-1045)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfD.xml (+0/-283)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfE.xml (+0/-335)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfF.xml (+0/-335)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfG.xml (+0/-335)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfOrganisationUnits.xml (+0/-58)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/formattedCSDS2.xml (+0/-84)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/polygon.gml (+0/-192)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/transforms.xml (+0/-15)
dhis-2/dhis-services/dhis-service-importexport/src/test/resources/xl2dxf.xsl (+0/-149)
dhis-2/dhis-services/dhis-service-integration/pom.xml (+0/-82)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/DefaultIntegrationService.java (+0/-84)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/IntegrationService.java (+0/-52)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2Component.java (+0/-84)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataEndpoint.java (+0/-114)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2DataProducer.java (+0/-70)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataEndpoint.java (+0/-103)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/components/Dxf2MetaDataProducer.java (+0/-68)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/converters/XMLConverterWrappers.java (+0/-51)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/management/DHIS2LifecycleStrategy.java (+0/-194)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/SDMXDataIn.java (+0/-68)
dhis-2/dhis-services/dhis-service-integration/src/main/java/org/hisp/dhis/integration/routes/XMLDataIn.java (+0/-77)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/dhis/beans.xml (+0/-30)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/META-INF/services/org/apache/camel/component/dhis2 (+0/-27)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf.xsl (+0/-215)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/cross2dxf2.xsl (+0/-30)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/gml2dxf.xsl (+0/-62)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/imr2dxf.xsl (+0/-78)
dhis-2/dhis-services/dhis-service-integration/src/main/resources/transform/transforms.xml (+0/-15)
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/RoutesTest.java (+0/-153)
dhis-2/dhis-services/dhis-service-integration/src/test/java/org/hisp/dhis/integration/dxf2/Dxf2ComponentTest.java (+0/-77)
dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/dataValueSetA.xml (+0/-5)
dhis-2/dhis-services/dhis-service-integration/src/test/resources/data/sdmx_test.xml (+0/-27)
dhis-2/dhis-services/dhis-service-integration/src/test/resources/log4j.properties (+0/-12)
dhis-2/dhis-services/dhis-service-integration/src/test/resources/test-context.xml (+0/-24)
dhis-2/dhis-services/dhis-service-mapgeneration/pom.xml (+0/-55)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMap.java (+0/-296)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java (+0/-285)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapObject.java (+0/-170)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsPrimitiveFromJsonFactory.java (+0/-167)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMap.java (+0/-129)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapLayer.java (+0/-235)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/InternalMapObject.java (+0/-261)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Interval.java (+0/-148)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/IntervalSet.java (+0/-262)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Legend.java (+0/-105)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendItem.java (+0/-88)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/LegendSet.java (+0/-207)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/MapUtils.java (+0/-134)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/MapValue.java (+0/-34)
dhis-2/dhis-services/dhis-service-mapgeneration/src/main/resources/META-INF/dhis/beans.xml (+0/-13)
dhis-2/dhis-services/dhis-service-mapgeneration/src/test/java/org/hisp/dhis/mapgenerator/GeoToolsMapLayerTest.java (+0/-178)
dhis-2/dhis-services/dhis-service-mapgeneration/src/test/java/org/hisp/dhis/mapgenerator/GeoToolsMapObjectTest.java (+0/-107)
dhis-2/dhis-services/dhis-service-mapgeneration/src/test/java/org/hisp/dhis/mapgenerator/GeoToolsMapTest.java (+0/-50)
dhis-2/dhis-services/dhis-service-mapgeneration/src/test/java/org/hisp/dhis/mapgenerator/MapGeneratorServiceTest.java (+0/-87)
dhis-2/dhis-services/dhis-service-mobile/pom.xml (+1/-15)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java (+109/-55)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java (+28/-30)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java (+22/-14)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/NotAllowedException.java (+16/-14)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/PatientMobileSettingService.java (+0/-44)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/PatientMobileSettingStore.java (+0/-40)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Activity.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/ActivityPlan.java (+13/-15)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/ActivityValue.java (+11/-10)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Beneficiary.java (+30/-147)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Contact.java (+12/-11)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Conversation.java (+196/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataElement.java (+87/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataSet.java (+12/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataSetList.java (+23/-20)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataSetValue.java (+29/-13)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataSetValueList.java (+98/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataStreamSerializable.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/DataValue.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Interpretation.java (+154/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/InterpretationComment.java (+87/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/LostEvent.java (+166/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/MobileModel.java (+159/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Notification.java (+95/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/OptionSet.java (+15/-11)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Patient.java (+210/-634)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/PatientIdentifierAndAttribute.java (+28/-31)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/PatientList.java (+132/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Program.java (+179/-36)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramInstance.java (+208/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStage.java (+101/-31)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/ProgramStageDataElement.java (+106/-12)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Relationship.java (+16/-10)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/RelationshipType.java (+120/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/LWUITmodel/Section.java (+17/-13)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Message.java (+169/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MessageConversation.java (+114/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileModel.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/MobileOrgUnitLinks.java (+370/-83)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Model.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/ModelList.java (+17/-16)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OptionSet.java (+13/-10)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java (+12/-11)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientAttribute.java (+167/-11)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/PatientIdentifier.java (+0/-127)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Program.java (+15/-15)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/ProgramStage.java (+15/-15)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Recipient.java (+147/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/SMSCode.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/SMSCommand.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Section.java (+17/-17)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/Task.java (+10/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/User.java (+150/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/ActivityComparator.java (+11/-10)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/comparator/TrackedEntityAttributeValueSortOrderComparator.java (+58/-0)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java (+1924/-1112)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultPatientMobileSettingService.java (+0/-79)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java (+245/-31)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java (+136/-59)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/HibernatePatientMobileSettingStore.java (+0/-52)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/LocaleUtil.java (+10/-10)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ModelMapping.java (+58/-57)
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/PeriodUtil.java (+135/-9)
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/META-INF/dhis/beans.xml (+57/-54)
dhis-2/dhis-services/dhis-service-mobile/src/main/resources/org/hisp/dhis/mobile/PatientMobileSetting.hbm.xml (+0/-32)
dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitTest.java (+29/-12)
dhis-2/dhis-services/dhis-service-mobile/src/test/java/org/hisp/dhis/mobile/api/model/OrgUnitsTest.java (+53/-34)
dhis-2/dhis-services/dhis-service-patient/pom.xml (+0/-37)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionDeletionHandler.java (+0/-147)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionManager.java (+0/-113)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java (+0/-449)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java (+0/-68)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/jdbc/JdbcCaseAggregationConditionManager.java (+0/-1099)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeGroupService.java (+0/-103)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeOptionService.java (+0/-86)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAttributeService.java (+0/-137)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAuditService.java (+0/-87)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierService.java (+0/-137)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientIdentifierTypeService.java (+0/-111)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientRegistrationFormService.java (+0/-517)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java (+0/-612)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientAuditDeletionHandler.java (+0/-72)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientDeletionHandler.java (+0/-98)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientIdentifierDeletionHandler.java (+0/-87)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeGroupStore.java (+0/-65)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeOptionStore.java (+0/-58)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAttributeStore.java (+0/-86)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientAuditStore.java (+0/-64)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierStore.java (+0/-124)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientIdentifierTypeStore.java (+0/-52)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientRegistrationFormStore.java (+0/-57)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java (+0/-733)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/CaseAggregateConditionSchedulingManager.java (+0/-56)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/CaseAggregateConditionTask.java (+0/-128)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/DefaultCaseAggregateConditionSchedulingManager.java (+0/-141)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/DefaultProgramSchedulingManager.java (+0/-138)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/ProgramSchedulingManager.java (+0/-52)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/scheduling/SendScheduledMessageTask.java (+0/-253)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/startup/TableAlteror.java (+0/-369)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/util/PatientIdentifierGenerator.java (+0/-124)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java (+0/-222)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueDeletionHandler.java (+0/-102)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java (+0/-160)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientcomment/DefaultPatientCommentService.java (+0/-87)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/DefaultPatientDataValueService.java (+0/-133)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueDeletionHandler.java (+0/-101)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/hibernate/HibernatePatientDataValueStore.java (+0/-122)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientreport/DefaultPatientAggregateReportService.java (+0/-94)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientreport/DefaultPatientTabularReportService.java (+0/-95)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientreport/hibernate/HibernatePatientAggregateReportStore.java (+0/-117)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientreport/hibernate/HibernatePatientTabularReportStore.java (+0/-118)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java (+0/-816)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java (+0/-193)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java (+0/-316)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java (+0/-571)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramService.java (+0/-184)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java (+0/-92)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java (+0/-525)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java (+0/-116)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageService.java (+0/-107)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java (+0/-315)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java (+0/-100)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramDeletionHandler.java (+0/-117)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java (+0/-149)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java (+0/-137)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java (+0/-86)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java (+0/-67)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java (+0/-76)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramIndicatorStore.java (+0/-53)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java (+0/-367)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageDataElementStore.java (+0/-136)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageInstanceStore.java (+0/-2495)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java (+0/-59)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java (+0/-54)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStore.java (+0/-161)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java (+0/-51)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java (+0/-106)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java (+0/-95)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java (+0/-90)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java (+0/-80)
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipTypeStore.java (+0/-48)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml (+0/-649)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/caseaggregation/hibernate/CaseAggregationCondition.hbm.xml (+0/-32)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/Patient.hbm.xml (+0/-59)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttribute.hbm.xml (+0/-43)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttributeGroup.hbm.xml (+0/-29)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAttributeOption.hbm.xml (+0/-19)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientAudit.hbm.xml (+0/-22)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientIdentifier.hbm.xml (+0/-21)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientIdentifierType.hbm.xml (+0/-31)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientRegistrationForm.hbm.xml (+0/-20)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patient/hibernate/PatientReminder.hbm.xml (+0/-24)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientattributevalue/hibernate/PatientAttributeValue.hbm.xml (+0/-22)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientcomment/hibernate/PatientComment.hbm.xml (+0/-20)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientdatavalue/hibernate/PatientDataValue.hbm.xml (+0/-25)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientAggregateReport.hbm.xml (+0/-93)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/patientreport/hibernate/PatientTabularReport.hbm.xml (+0/-70)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/Program.hbm.xml (+0/-106)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramExpression.hbm.xml (+0/-20)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramIndicator.hbm.xml (+0/-31)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramInstance.hbm.xml (+0/-48)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStage.hbm.xml (+0/-61)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageDataElement.hbm.xml (+0/-27)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageInstance.hbm.xml (+0/-48)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramStageSection.hbm.xml (+0/-27)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/program/hibernate/ProgramValidation.hbm.xml (+0/-34)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/relationship/hibernate/Relationship.hbm.xml (+0/-23)
dhis-2/dhis-services/dhis-service-patient/src/main/resources/org/hisp/dhis/relationship/hibernate/RelationshipType.hbm.xml (+0/-23)
dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patient/PatientStoreTest.java (+0/-117)
dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientdatavalue/PatientDataValueStoreTest.java (+0/-101)
dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java (+0/-98)
dhis-2/dhis-services/dhis-service-reporting/pom.xml (+25/-14)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/ChartDeletionHandler.java (+42/-108)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/hibernate/HibernateChartStore.java (+0/-51)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java (+420/-207)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/engine/DefaultDataSetCompletenessEngine.java (+31/-41)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java (+61/-78)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/CompulsoryDataSetCompletenessService.java (+12/-11)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/RegistrationDataSetCompletenessService.java (+14/-13)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java (+28/-16)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardContentDeletionHandler.java (+0/-118)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/DashboardItemDeletionHandler.java (+82/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardContentStore.java (+0/-73)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/hibernate/HibernateDashboardItemStore.java (+91/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/impl/DefaultDashboardService.java (+300/-153)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/manager/DefaultDashboardManager.java (+0/-130)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ContentProvider.java (+0/-39)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/DocumentContentProvider.java (+0/-97)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/MapViewContentProvider.java (+0/-97)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportContentProvider.java (+0/-97)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/ReportTableContentProvider.java (+0/-101)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dashboard/provider/RssContentProvider.java (+0/-132)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dataelementhistory/DataElementHistory.java (+176/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dataelementhistory/DataElementHistoryPoint.java (+78/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dataelementhistory/DefaultHistoryRetriever.java (+255/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/dataelementhistory/HistoryRetriever.java (+47/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/impl/DefaultDataSetReportService.java (+94/-141)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/AnalyticsDataSetReportStore.java (+71/-68)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/datasetreport/jdbc/JdbcDataSetReportStore.java (+0/-216)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/document/impl/DefaultDocumentService.java (+27/-10)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/InterpretationDeletionHandler.java (+87/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/hibernate/HibernateInterpretationStore.java (+66/-13)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/interpretation/impl/DefaultInterpretationService.java (+100/-49)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsMapGenerationService.java (+378/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/GeoToolsPrimitiveFromJsonFactory.java (+168/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/InternalMap.java (+80/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/InternalMapLayer.java (+522/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/InternalMapObject.java (+365/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/Interval.java (+179/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/IntervalSet.java (+119/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/Legend.java (+113/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/LegendItem.java (+95/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/LegendSet.java (+163/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/MapLayerType.java (+34/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/MapUtils.java (+306/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/MapValue.java (+62/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/mapgeneration/comparator/IntervalLowValueAscComparator.java (+48/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/orgunitdistribution/impl/DefaultOrgUnitDistributionService.java (+20/-17)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/ReportDeletionHandler.java (+11/-9)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java (+139/-43)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/ReportTableDeletionHandler.java (+43/-94)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java (+98/-28)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DataMartTask.java (+0/-142)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/DefaultSchedulingManager.java (+39/-11)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/ScheduledTasks.java (+11/-10)
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java (+26/-17)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml (+101/-119)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/html-report.vm (+54/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/jasperreports.properties (+2/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/chart/hibernate/Chart.hbm.xml (+67/-42)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/Dashboard.hbm.xml (+41/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardContent.hbm.xml (+0/-44)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/dashboard/hibernate/DashboardItem.hbm.xml (+56/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/document/hibernate/Document.hbm.xml (+4/-0)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/Interpretation.hbm.xml (+41/-34)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/interpretation/hibernate/InterpretationComment.hbm.xml (+1/-3)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml (+15/-1)
dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/reporttable/hibernate/ReportTable.hbm.xml (+87/-47)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartServiceTest.java (+35/-28)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/chart/ChartStoreTest.java (+37/-28)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java (+104/-86)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java (+133/-141)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardServiceTest.java (+170/-0)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/dashboard/DashboardStoreTest.java (+0/-121)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentServiceTest.java (+20/-16)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java (+16/-15)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/interpretation/InterpretationServiceTest.java (+52/-51)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/mapgeneration/GeoToolsMapLayerTest.java (+212/-0)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/mapgeneration/GeoToolsMapObjectTest.java (+107/-0)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/mapgeneration/MapGeneratorServiceTest.java (+120/-0)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/mapgeneration/MapUtilsTest.java (+68/-0)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/orgunitdistribution/OrgUnitDistributionServiceTest.java (+14/-20)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java (+26/-26)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableGridTest.java (+0/-996)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java (+48/-52)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableTest.java (+45/-44)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/scheduling/SchedulingManagerTest.java (+42/-24)
dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/scheduling/TaskTest.java (+0/-87)
dhis-2/dhis-services/dhis-service-sms/pom.xml (+0/-46)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/SmsConfigurationManagerImpl.java (+0/-135)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/inbound/DefaultInboundSmsService.java (+0/-203)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/inbound/HibernateIncomingSmsStore.java (+0/-136)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsService.java (+0/-72)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/incoming/IncomingSmsStore.java (+0/-56)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/incoming/SMPPInboundNotification.java (+0/-60)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/HibernateOutboundSmsStore.java (+0/-154)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/OutboundSmsServiceImpl.java (+0/-162)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/SmsSender.java (+0/-307)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/outbound/TestOutboundSmsService.java (+0/-165)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DefaultParserManager.java (+0/-1066)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/DhisMessageAlertParser.java (+0/-56)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/IParser.java (+0/-41)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/J2MEDataEntryParser.java (+0/-90)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/SMSConsumer.java (+0/-129)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/parse/SMSParserKeyValue.java (+0/-51)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/queue/DatabaseSupportedInternalMemoryMessageQueue.java (+0/-86)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/queue/MessageQueue.java (+0/-41)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/AdvanceHttpPostGateWay.java (+0/-133)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/GateWayFactory.java (+0/-161)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/SimplisticHttpGetGateWay.java (+0/-180)
dhis-2/dhis-services/dhis-service-sms/src/main/java/org/hisp/dhis/sms/smslib/SmsLibService.java (+0/-575)
dhis-2/dhis-services/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml (+0/-68)
dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/incoming/IncomingSms.hbm.xml (+0/-40)
dhis-2/dhis-services/dhis-service-sms/src/main/resources/org/hisp/dhis/sms/outbound/OutboundSms.hbm.xml (+0/-31)
dhis-2/dhis-services/dhis-service-sms/src/test/java/org/hisp/dhis/sms/AbstractSmsTest.java (+0/-85)
dhis-2/dhis-services/dhis-service-sms/src/test/java/org/hisp/dhis/sms/outbound/OutboundSmsServiceTest.java (+0/-155)
dhis-2/dhis-services/dhis-service-sms/src/test/java/org/hisp/dhis/sms/outbound/OutboundSmsStoreTest.java (+0/-25)
dhis-2/dhis-services/dhis-service-sms/src/test/resources/META-INF/dhis/beans.xml (+0/-7)
dhis-2/dhis-services/pom.xml (+19/-14)
dhis-2/dhis-support/dhis-support-commons/pom.xml (+43/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/AppendingHashMap.java (+58/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CachingMap.java (+72/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/CollectionUtils.java (+267/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/EnumMapWrapper.java (+57/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/ListUtils.java (+321/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/LoggingHashMap.java (+81/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/MimicingHashMap.java (+47/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/PaginatedList.java (+153/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.java (+108/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/comparator/FileLastModifiedComparator.java (+47/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/filter/Filter.java (+44/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/filter/FilterUtils.java (+97/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function0.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function1.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function2.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function3.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function4.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Function5.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/functional/Predicate.java (+39/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/sqlfunc/ConditionalSqlFunction.java (+48/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/sqlfunc/DaysBetweenSqlFunction.java (+44/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/sqlfunc/OneIfZeroOrPositiveSqlFunction.java (+47/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/sqlfunc/SqlFunction.java (+46/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/sqlfunc/ZeroIfNegativeSqlFunction.java (+47/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/SystemTimer.java (+71/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/timer/Timer.java (+55/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/Clock.java (+115/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CodecUtils.java (+142/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/CompositeCounter.java (+69/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/ConcurrentUtils.java (+65/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/Counter.java (+77/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/DebugUtils.java (+152/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/Encoder.java (+103/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/ExceptionUtils.java (+68/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/ExpressionFunctions.java (+107/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/ExpressionUtils.java (+215/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/PageRange.java (+170/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/PathUtils.java (+91/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/SqlHelper.java (+98/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/StreamUtils.java (+277/-0)
dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/util/TextUtils.java (+552/-0)
dhis-2/dhis-support/dhis-support-external/pom.xml (+27/-19)
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/configuration/DefaultConfigurationManager.java (+0/-137)
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManager.java (+34/-9)
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/location/DefaultLocationManagerResolver.java (+11/-9)
dhis-2/dhis-support/dhis-support-external/src/main/resources/META-INF/dhis/beans.xml (+3/-5)
dhis-2/dhis-support/dhis-support-hibernate/pom.xml (+17/-2)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/DefaultHibernateCacheManager.java (+14/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/cache/HibernateCacheManager.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/DbmsUtils.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java (+105/-28)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/ConnectionPropertyFactoryBean.java (+14/-10)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java (+31/-15)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateConfigurationProvider.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java (+361/-652)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java (+13/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java (+13/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernatePropertiesFactoryBean.java (+13/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/dialect/DhisH2Dialect.java (+49/-0)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/exception/CreateAccessDeniedException.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/exception/DeleteAccessDeniedException.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/exception/ReadAccessDeniedException.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/exception/UpdateAccessDeniedException.java (+10/-9)
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml (+26/-2)
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml (+0/-225)
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties (+23/-18)
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/org/hisp/dhis/usertype/UserTypes.hbm.xml (+10/-0)
dhis-2/dhis-support/dhis-support-jdbc-test/pom.xml (+0/-63)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/external/configuration/ConfigurationManagerTest.java (+0/-94)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/external/configuration/DummyConfiguration.java (+0/-149)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/external/location/LocationManagerTest.java (+0/-348)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandlerTest.java (+0/-199)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandlerTest.java (+0/-185)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandlerTest.java (+0/-159)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandlerTest.java (+0/-157)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandlerTest.java (+0/-157)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandlerTest.java (+0/-157)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandlerTest.java (+0/-162)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandlerTest.java (+0/-208)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandlerTest.java (+0/-150)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandlerTest.java (+0/-170)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandlerTest.java (+0/-157)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandlerTest.java (+0/-155)
dhis-2/dhis-support/dhis-support-jdbc-test/src/test/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandlerTest.java (+0/-187)
dhis-2/dhis-support/dhis-support-jdbc/pom.xml (+12/-5)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/StatementBuilder.java (+90/-51)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueBatchHandler.java (+0/-94)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedDataValueTempBatchHandler.java (+0/-45)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueBatchHandler.java (+0/-100)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedIndicatorValueTempBatchHandler.java (+0/-45)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueBatchHandler.java (+0/-97)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitDataValueTempBatchHandler.java (+0/-44)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueBatchHandler.java (+0/-103)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/AggregatedOrgUnitIndicatorValueTempBatchHandler.java (+0/-44)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java (+21/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConceptBatchHandler.java (+0/-100)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryBatchHandler.java (+0/-104)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryDataElementBatchHandler.java (+0/-82)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataDictionaryIndicatorBatchHandler.java (+0/-82)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java (+22/-22)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java (+15/-11)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java (+21/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java (+30/-16)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java (+13/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java (+30/-14)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java (+16/-10)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java (+17/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java (+15/-13)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MapBatchHandler.java (+11/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MinMaxDataElementBatchHandler.java (+10/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java (+15/-15)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java (+15/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/RelativePeriodsBatchHandler.java (+17/-15)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java (+12/-16)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java (+109/-0)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/dialect/StatementDialectFactoryBean.java (+13/-11)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/AbstractStatementBuilder.java (+80/-113)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/H2StatementBuilder.java (+45/-22)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/HsqlStatementBuilder.java (+225/-0)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/MySQLStatementBuilder.java (+42/-22)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/PostgreSQLStatementBuilder.java (+83/-23)
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/statementbuilder/StatementBuilderFactoryBean.java (+17/-9)
dhis-2/dhis-support/dhis-support-jdbc/src/main/resources/META-INF/dhis/beans.xml (+1/-1)
dhis-2/dhis-support/dhis-support-system/pom.xml (+95/-46)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/callable/CategoryOptionComboAclCallable.java (+64/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/callable/IdentifiableObjectCallable.java (+83/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/callable/IdentifiableObjectSearchCallable.java (+66/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/callable/PeriodCallable.java (+64/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/collection/TaskLocalList.java (+67/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/collection/TaskLocalMap.java (+65/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/comparator/FileLastModifiedComparator.java (+0/-44)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/comparator/FileNameComparator.java (+0/-47)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfo.java (+21/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/DatabaseInfoProvider.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/database/HibernateDatabaseInfoProvider.java (+12/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DefaultDeletionManager.java (+24/-16)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java (+230/-120)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionInterceptor.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionManager.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/AggregatableDataElementFilter.java (+26/-25)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/AggregatableTrackedEntityAttributeValueFilter.java (+53/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementGroupWithoutGroupSetFilter.java (+12/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementPeriodTypeAllowAverageFilter.java (+69/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementPeriodTypeFilter.java (+11/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementStringTypeFilter.java (+13/-11)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementTypeFilter.java (+0/-50)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypeFilter.java (+53/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypesFilter.java (+55/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementWithAggregationFilter.java (+0/-44)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataSetTypeFilter.java (+0/-55)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataSetWithOrganisationUnitsFilter.java (+11/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/IndicatorGroupWIthoutGroupSetFilter.java (+12/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/NonCriticalUserAuthorityGroupFilter.java (+11/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitAboveOrEqualToLevelFilter.java (+13/-13)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitGroupWithoutGroupSetFilter.java (+12/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitPolygonCoveringCoordinateFilter.java (+57/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitWithCoordinatesFilter.java (+12/-11)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitWithDataSetsFilter.java (+12/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/OrganisationUnitWithValidCoordinatesFilter.java (+13/-13)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/PastAndCurrentPeriodFilter.java (+11/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/UserAuthorityGroupCanIssueFilter.java (+16/-12)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/UserCredentialsCanUpdateFilter.java (+0/-59)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java (+127/-43)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/ListGrid.java (+213/-50)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/help/HelpContent.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/Log4JLogConfigInitializer.java (+160/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/log/LogConfigInitializer.java (+40/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/math/OneIfZeroOrPositiveFunction.java (+52/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/math/UnaryDoubleFunction.java (+72/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/math/ZeroIfNegativeFunction.java (+52/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java (+16/-15)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notification.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationLevel.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataSetCompletenessRowMapper.java (+0/-62)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedDataValueRowMapper.java (+0/-63)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedIndicatorValueRowMapper.java (+0/-65)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitDataValueRowMapper.java (+0/-58)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/AggregatedOrgUnitIndicatorValueRowMapper.java (+0/-58)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataElementOperandMapper.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DataValueRowMapper.java (+24/-20)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueNameMinMaxRowMapper.java (+13/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/DeflatedDataValueRowMapper.java (+20/-17)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/objectmapper/OrganisationUnitRelationshipRowMapper.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/paging/Paging.java (+14/-13)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/process/AbstractStatementInternalProcess.java (+13/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/process/OpenSessionThread.java (+11/-10)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/process/OutputHolderState.java (+12/-9)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/Scheduler.java (+0/-87)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/SpringScheduler.java (+0/-151)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/AbstractStartupRoutine.java (+0/-79)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/DefaultStartupRoutineExecutor.java (+0/-109)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/StartupListener.java (+0/-93)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/StartupRoutine.java (+0/-69)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/StartupRoutineComparator.java (+0/-45)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/StartupRoutineExecutor.java (+0/-49)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AnnotationUtils.java (+70/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AppendingHashMap.java (+0/-58)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AttributeUtils.java (+15/-13)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Clock.java (+0/-72)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodecUtils.java (+0/-166)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CollectionUtils.java (+0/-85)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CompositeCounter.java (+0/-66)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ConcurrentUtils.java (+0/-62)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ConversionUtils.java (+0/-304)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Counter.java (+0/-74)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CsvUtils.java (+0/-126)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DateUtils.java (+274/-121)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/DebugUtils.java (+0/-146)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Encoder.java (+0/-71)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/EnumMapWrapper.java (+0/-57)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExcelUtils.java (+0/-372)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ExceptionUtils.java (+0/-55)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Filter.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/FilterUtils.java (+0/-57)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/GeoUtils.java (+242/-0)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/JRExportUtils.java (+0/-117)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java (+0/-193)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/LocaleUtils.java (+107/-29)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/LoggingHashMap.java (+0/-81)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MathUtils.java (+228/-41)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/MimicingHashMap.java (+0/-52)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java (+33/-463)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PaginatedList.java (+0/-138)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PredicateUtils.java (+24/-23)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ReflectionUtils.java (+0/-478)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SqlHelper.java (+0/-48)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/StreamUtils.java (+0/-609)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/SystemUtils.java (+0/-64)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/TaskLocalList.java (+0/-66)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/TaskLocalMap.java (+0/-64)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/TextUtils.java (+0/-334)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/Timer.java (+0/-87)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/UUIdUtils.java (+0/-46)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ValidationUtils.java (+206/-50)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/WeightedPaginatedList.java (+0/-114)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function0.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function1.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function2.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function3.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function4.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Function5.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/functional/Predicate.java (+0/-36)
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/velocity/VelocityManager.java (+0/-91)
dhis-2/dhis-support/dhis-support-system/src/main/resources/META-INF/dhis/beans.xml (+5/-1)
dhis-2/dhis-support/dhis-support-system/src/main/resources/grid-html-css.vm (+22/-0)
dhis-2/dhis-support/dhis-support-system/src/main/resources/grid-html.vm (+4/-16)
dhis-2/dhis-support/dhis-support-system/src/main/resources/html-report-template.html (+2/-0)
dhis-2/dhis-support/dhis-support-system/src/main/resources/jasper-report-template.jrxml (+139/-101)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/UniqueArrayListTest.java (+117/-0)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/database/DatabaseInfoProviderTest.java (+12/-15)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/deletion/DummyDeletionHandler.java (+11/-9)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/AggregatableDataElementFilterTest.java (+66/-41)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/filter/DataElementWithAggregationFilterTest.java (+0/-53)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/grid/GridTest.java (+255/-152)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/grid/GridUtilsTest.java (+10/-9)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/grid/MockJRField.java (+19/-9)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/notification/NotifierTest.java (+12/-11)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ConversionUtilsTest.java (+0/-57)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DateUtilsTest.java (+96/-21)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/DebugUtilsTest.java (+13/-12)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ExpressionUtilsTest.java (+184/-0)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/GeoUtilsTest.java (+85/-0)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java (+30/-12)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/LocaleUtilsTest.java (+89/-0)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/MathUtilsTest.java (+145/-13)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PageRangeTest.java (+98/-0)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/PaginatedListTest.java (+20/-18)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ReflectionUtilsTest.java (+30/-36)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/StreamUtilsTest.java (+16/-23)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/TextUtilsTest.java (+80/-24)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ValidationUtilsTest.java (+102/-51)
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/WeightedPaginatedListTest.java (+0/-170)
dhis-2/dhis-support/dhis-support-system/src/test/resources/Export.xml (+0/-3)
dhis-2/dhis-support/dhis-support-test/pom.xml (+9/-1)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java (+949/-331)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisSpringTest.java (+14/-13)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisTest.java (+13/-9)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/GenericDhisSpringTest.java (+10/-9)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockCurrentUserService.java (+66/-10)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockI18n.java (+10/-9)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/MockI18nFormat.java (+10/-9)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java (+124/-0)
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandlerFactory.java (+57/-0)
dhis-2/dhis-support/dhis-support-test/src/main/resources/log4j.properties (+3/-2)
dhis-2/dhis-support/dhis-support-xml/pom.xml (+0/-67)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/factory/XMLFactory.java (+0/-144)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/framework/InputPort.java (+0/-69)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/framework/OutputPort.java (+0/-69)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/framework/XMLPipe.java (+0/-268)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/framework/XPathFilter.java (+0/-176)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLEventReader.java (+0/-366)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/reader/DefaultXMLStreamReader.java (+0/-372)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/reader/XMLReader.java (+0/-171)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/transformer/LoggingErrorListener.java (+0/-67)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/transformer/TransformerTask.java (+0/-178)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/writer/DefaultXMLStreamWriter.java (+0/-278)
dhis-2/dhis-support/dhis-support-xml/src/main/java/org/amplecode/staxwax/writer/XMLWriter.java (+0/-144)
dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/framework/XMLPipeTest.java (+0/-240)
dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/framework/XPathFilterTest.java (+0/-94)
dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/reader/XMLReaderTest.java (+0/-397)
dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/transformer/TransformerTaskTest.java (+0/-105)
dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/writer/XMLWriterTest.java (+0/-307)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/Export.xml (+0/-96044)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/dataA.xml (+0/-63)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/dataB.rng (+0/-26)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/dataB.xml (+0/-28)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/dataC.xml (+0/-10)
dhis-2/dhis-support/dhis-support-xml/src/test/resources/transform.xsl (+0/-27)
dhis-2/dhis-support/pom.xml (+3/-4)
dhis-2/dhis-web/dhis-web-api-fred/pom.xml (+0/-122)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/FredSpringWebTest.java (+0/-176)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/RedirectController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityAdvice.java (+0/-110)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java (+0/-707)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityServiceController.java (+0/-262)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FredController.java (+0/-63)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Facilities.java (+0/-79)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Facility.java (+0/-208)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/Identifier.java (+0/-93)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/domain/MessageResponse.java (+0/-71)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/DuplicateCodeException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/DuplicateUidException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/DuplicateUuidException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/ETagVerificationException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/FacilityNotFoundException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/exception/UuidFormatException.java (+0/-44)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ContextUtils.java (+0/-66)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/FacilityToOrganisationUnitConverter.java (+0/-124)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/FacilityToSimpleFeature.java (+0/-87)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtils.java (+0/-126)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/MessageUtils.java (+0/-69)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ObjectMapperFactoryBean.java (+0/-65)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverter.java (+0/-148)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToSimpleFeature.java (+0/-86)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/utils/ValidationUtils.java (+0/-69)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/validation/constraint/PropertiesValidator.java (+0/-125)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/validation/constraint/annotation/ValidProperties.java (+0/-52)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/validation/group/Create.java (+0/-35)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/validation/group/Standard.java (+0/-54)
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/validation/group/Update.java (+0/-35)
dhis-2/dhis-web/dhis-web-api-fred/src/main/resources/META-INF/dhis/beans.xml (+0/-7)
dhis-2/dhis-web/dhis-web-api-fred/src/main/resources/META-INF/dhis/webapi-fred.xml (+0/-101)
dhis-2/dhis-web/dhis-web-api-fred/src/main/resources/struts.xml (+0/-16)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm (+0/-209)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facility.vm (+0/-187)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/index.vm (+0/-25)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/layout.vm (+0/-71)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/web.xml (+0/-138)
dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/api-fred-resources/js/markerclusterer.min.js (+0/-21)
dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/controller/FacilityControllerTest.java (+0/-523)
dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/utils/GeoUtilsTest.java (+0/-65)
dhis-2/dhis-web/dhis-web-api-fred/src/test/java/org/hisp/dhis/web/webapi/v1/utils/OrganisationUnitToFacilityConverterTest.java (+0/-148)
dhis-2/dhis-web/dhis-web-api-mobile/pom.xml (+2/-12)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/action/UpdateClientAction.java (+0/-81)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/AbstractMobileController.java (+10/-9)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileClientController.java (+58/-11)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/controller/MobileOrganisationUnitController.java (+357/-124)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializableMessageConverter.java (+10/-9)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/DataStreamSerializer.java (+13/-18)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/MediaTypes.java (+10/-9)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/java/org/hisp/dhis/api/mobile/support/MessageConverterAddingPostProcessor.java (+12/-9)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/beans.xml (+1/-3)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/META-INF/dhis/servlet.xml (+2/-13)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/resources/struts.xml (+0/-22)
dhis-2/dhis-web/dhis-web-api-mobile/src/main/webapp/WEB-INF/web.xml (+115/-102)
dhis-2/dhis-web/dhis-web-api-mobile/src/test/java/org/hisp/dhis/api/mobile/DataStreamSerializableMessageConverterTest.java (+10/-9)
dhis-2/dhis-web/dhis-web-api/pom.xml (+22/-18)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java (+0/-411)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java (+0/-396)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AggregatedValueController.java (+0/-208)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AnalyticsController.java (+0/-219)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AttributeTypeController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ChartController.java (+0/-265)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ConceptController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ConstantController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataDictionaryController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataSetController.java (+0/-245)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueController.java (+0/-149)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java (+0/-216)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DimensionController.java (+0/-92)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DocumentController.java (+0/-108)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/IndexController.java (+0/-56)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/InterpretationController.java (+0/-254)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MessageConversationController.java (+0/-233)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java (+0/-314)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/OptionSetController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java (+0/-275)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java (+0/-200)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportTableController.java (+0/-317)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceController.java (+0/-73)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ResourceTableController.java (+0/-91)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SectionController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SharingController.java (+0/-254)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SmsConfigurationController.java (+0/-118)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SqlViewController.java (+0/-156)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/SystemController.java (+0/-136)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/WebMetaData.java (+0/-78)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/WebOptions.java (+0/-74)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/CategoryComboController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/CategoryController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/CategoryOptionComboController.java (+0/-73)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/CategoryOptionController.java (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/DataElementController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/DataElementGroupController.java (+0/-85)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/dataelement/DataElementGroupSetController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java (+0/-99)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/ProgramController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/ProgramStageController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorGroupController.java (+0/-85)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorGroupSetController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/indicator/IndicatorTypeController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java (+0/-278)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapLayerController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapLegendController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapLegendSetController.java (+0/-139)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapViewController.java (+0/-144)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitController.java (+0/-184)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitGroupController.java (+0/-85)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitGroupSetController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/organisationunit/OrganisationUnitLevelController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java (+0/-356)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserAuthorityGroupController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserController.java (+0/-112)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/UserGroupController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/validation/ValidationRuleController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/validation/ValidationRuleGroupController.java (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/ContextUtils.java (+0/-297)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java (+0/-218)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/PdfDataEntryFormImportUtil.java (+0/-371)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java (+0/-161)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/ClassPathUriResolver.java (+0/-88)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/JacksonJsonView.java (+0/-112)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/JacksonXmlView.java (+0/-69)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCache.java (+0/-47)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/TransformCacheImpl.java (+0/-99)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/view/XsltHtmlView.java (+0/-86)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/ChartValue.java (+0/-92)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/DataElementList.java (+0/-61)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/DataValueSets.java (+0/-60)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/FormDataSet.java (+0/-69)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/FormOrganisationUnit.java (+0/-85)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Forms.java (+0/-72)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/IndicatorList.java (+0/-60)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/OrganisationUnitList.java (+0/-61)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resource.java (+0/-121)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java (+0/-103)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Field.java (+0/-105)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Form.java (+0/-108)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/Group.java (+0/-69)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/form/InputType.java (+0/-45)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/Meta.java (+0/-53)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/Sharing.java (+0/-66)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/SharingObject.java (+0/-108)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/SharingUser.java (+0/-66)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/SharingUserGroupAccess.java (+0/-79)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/sharing/SharingUserGroups.java (+0/-56)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/user/Dashboard.java (+0/-73)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/user/Inbox.java (+0/-80)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/user/Recipients.java (+0/-102)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/user/UserAccount.java (+0/-211)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java (+1163/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AccountController.java (+560/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregationQueryController.java (+171/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AnalyticsController.java (+359/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java (+305/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AttributeController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java (+313/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java (+501/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java (+273/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConstantController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CrudControllerAdvice.java (+145/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java (+324/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardItemController.java (+102/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java (+681/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalLevelController.java (+41/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataIntegrityController.java (+85/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java (+289/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueController.java (+750/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java (+169/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java (+188/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DocumentController.java (+105/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EmailController.java (+114/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EventAnalyticsController.java (+496/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ExpressionController.java (+83/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java (+138/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileResourceController.java (+64/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java (+268/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java (+84/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IdentifiableObjectController.java (+92/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/IndexController.java (+114/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/InterpretationController.java (+366/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/LocaleController.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java (+188/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MenuController.java (+75/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java (+614/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataController.java (+413/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataFilterController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/OAuth2ClientController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/OptionController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/OptionSetController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/PdfFormController.java (+201/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportController.java (+229/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java (+310/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ResourceTableController.java (+121/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchedulingController.java (+131/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SchemaController.java (+198/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SectionController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java (+287/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SmsConfigurationController.java (+118/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SqlViewController.java (+253/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SvgConversionController.java (+115/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java (+99/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java (+191/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java (+162/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/TranslationController.java (+71/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/UserSettingController.java (+166/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ValidationCriteriaController.java (+44/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/color/ColorController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/color/ColorSetController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryComboController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java (+76/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionGroupSetController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementController.java (+106/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementGroupController.java (+164/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementGroupSetController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementOperandController.java (+90/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java (+283/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java (+239/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java (+534/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java (+188/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramController.java (+119/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramIndicatorController.java (+102/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramRuleActionController.java (+46/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramRuleController.java (+46/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramRuleVariableController.java (+46/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageController.java (+106/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageDataElementController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageSectionController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramValidationController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/RelationshipTypeController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeController.java (+106/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java (+445/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/exception/FilterTooShortException.java (+40/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/exception/NotAuthenticatedException.java (+40/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/exception/NotFoundException.java (+50/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/indicator/IndicatorController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/indicator/IndicatorGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/indicator/IndicatorGroupSetController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/indicator/IndicatorTypeController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java (+136/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java (+248/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java (+299/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapLayerController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java (+157/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java (+333/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitGroupSetController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLevelController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java (+173/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java (+758/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java (+559/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserRoleController.java (+137/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/validation/ValidationController.java (+115/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/validation/ValidationRuleController.java (+79/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/validation/ValidationRuleGroupController.java (+45/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/CsvMessageConverter.java (+87/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/ExcelMessageConverter.java (+86/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/JsonMessageConverter.java (+86/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/JsonPMessageConverter.java (+112/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/PdfMessageConverter.java (+86/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/RenderServiceMessageConverter.java (+103/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/messageconverter/XmlMessageConverter.java (+87/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/ContextService.java (+78/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultContextService.java (+118/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/DefaultLinkService.java (+281/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/LinkService.java (+78/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/service/WebMessageService.java (+123/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java (+392/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java (+306/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/InputUtils.java (+125/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java (+354/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/WebMessageUtils.java (+248/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/AbstractGridView.java (+135/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/ClassPathUriResolver.java (+89/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/CsvGridView.java (+57/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/CustomPathExtensionContentNegotiationStrategy.java (+102/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/ExcelGridView.java (+54/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonJsonView.java (+158/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonXmlView.java (+104/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/PdfGridView.java (+54/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormDataSet.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormOrganisationUnit.java (+125/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/FormProgram.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/Forms.java (+104/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/GeoFeature.java (+243/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/MessageConversation.java (+153/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/SchedulingStrategy.java (+120/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebMetaData.java (+79/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebOptions.java (+90/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/approval/Approval.java (+71/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/approval/Approvals.java (+88/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/form/Field.java (+144/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/form/Form.java (+117/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/form/Group.java (+124/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/Meta.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/Sharing.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingObject.java (+122/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUser.java (+67/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUserGroupAccess.java (+87/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/SharingUserGroups.java (+57/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/sharing/comparator/SharingUserGroupAccessNameComparator.java (+46/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/user/Dashboard.java (+74/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/user/Inbox.java (+81/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/user/Recipients.java (+103/-0)
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/user/UserAccount.java (+241/-0)
dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/beans.xml (+4/-3)
dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml (+96/-34)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/attributeType.xsl (+0/-57)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/category.xsl (+0/-41)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryCombo.xsl (+0/-50)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOption.xsl (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/categoryOptionCombo.xsl (+0/-52)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/chart.xsl (+0/-126)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/config/sms.xsl (+0/-54)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/constant.xsl (+0/-37)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElement.xsl (+0/-66)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroup.xsl (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataElementGroupSet.xsl (+0/-34)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataSet.xsl (+0/-66)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl (+0/-41)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/document.xsl (+0/-47)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/html-wrapper.xsl (+0/-38)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl (+0/-15)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicator.xsl (+0/-73)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroup.xsl (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorGroupSet.xsl (+0/-45)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/indicatorType.xsl (+0/-42)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/interpretation.xsl (+0/-59)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl (+0/-81)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/map.xsl (+0/-31)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLayer.xsl (+0/-66)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegend.xsl (+0/-55)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapLegendSet.xsl (+0/-44)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/mapView.xsl (+0/-92)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversation.xsl (+0/-58)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/messageConversations.xsl (+0/-54)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/model2html.xsl (+0/-65)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/optionSets.xsl (+0/-39)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnit.xsl (+0/-94)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroup.xsl (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitGroupSet.xsl (+0/-42)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/organisationUnitLevel.xsl (+0/-32)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/program.xsl (+0/-111)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/programStage.xsl (+0/-113)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/relativePeriods.xsl (+0/-81)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/report.xsl (+0/-61)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/reportTable.xsl (+0/-95)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/resource.xsl (+0/-16)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/sqlView.xsl (+0/-41)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/user.xsl (+0/-59)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userAuthorityGroup.xsl (+0/-56)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userCredentials.xsl (+0/-20)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/userGroup.xsl (+0/-43)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRule.xsl (+0/-84)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/validationRuleGroup.xsl (+0/-48)
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/metadata2dsd.xsl (+71/-71)
dhis-2/dhis-web/dhis-web-api/src/main/webapp/WEB-INF/web.xml (+66/-66)
dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppStoreAction.java (+0/-69)
dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/ajax/jsonSystemAuthorities.vm (+0/-15)
dhis-2/dhis-web/dhis-web-appmanager/src/main/webapp/dhis-web-appmanager/getApps.vm (+0/-34)
dhis-2/dhis-web/dhis-web-apps/pom.xml (+67/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/resources/struts.xml (+73/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/classes/velocity.properties (+3/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/WEB-INF/web.xml (+123/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-apps/index.html (+17/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app.properties (+25/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app_ar.properties (+11/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/i18n/i18n_app_fr.properties (+3/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/index.html (+115/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/app.js (+26/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/controllers.js (+105/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/directives.js (+5/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/filters.js (+5/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/scripts/services.js (+100/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/styles/style.css (+157/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-cache-cleaner/views/modal.html (+10/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/event-capture.appcache (+149/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app.properties (+152/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app_ar.properties (+114/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/i18n/i18n_app_fr.properties (+70/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html (+108/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/app.js (+38/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js (+998/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/directives.js (+5/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/event-capture.js (+639/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/filters.js (+5/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/notes-controller.js (+12/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/services.js (+558/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/styles/style.css (+373/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/buttons-section.html (+12/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/column-modal.html (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/comments-section.html (+24/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/defaultForm.html (+523/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/dialog.html (+10/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/ec-custom-form.html (+61/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/eventList.html (+362/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/home.html (+121/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/indicators.html (+19/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/modal.html (+10/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/notes.html (+20/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/views/warnings.html (+14/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties (+213/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app_ar.properties (+176/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/index.html (+38/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/plugin.html (+37/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js (+8624/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/core.js (+3652/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/eventreport.js (+4493/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/styles/style.css (+1223/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties (+236/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app_ar.properties (+200/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/index.html (+44/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/plugin.html (+42/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js (+8316/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/core.js (+4710/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/eventchart.js (+5447/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/styles/style.css (+1189/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties (+434/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties (+391/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties (+363/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties (+406/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_id.properties (+361/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties (+59/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties (+1/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties (+392/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties (+300/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties (+370/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties (+370/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties (+430/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties (+301/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/index.html (+27/-29)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/plugin.html (+59/-49)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js (+7487/-2689)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/core.js (+3698/-1706)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/custom.js (+424/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/map.js (+7466/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat.js (+6/-1)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/Facility.js (+2/-2)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/mapfish/core/GeoStat/all.js (+813/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/styles/style.css (+697/-117)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties (+208/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ar.properties (+134/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_es.properties (+126/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_fr.properties (+155/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_lo.properties (+155/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_pt.properties (+135/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ru.properties (+132/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_tet.properties (+178/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_tg.properties (+132/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_vi.properties (+195/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/index.html (+21/-15)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/plugin.html (+56/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js (+6884/-3266)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/core.js (+2571/-1773)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/table.js (+3739/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/styles/style.css (+325/-132)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs-controller.js (+22/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/activeprograms/active-programs.html (+24/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js (+425/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-widgets-controller.js (+9/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-widgets.html (+20/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard.html (+74/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js (+1188/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry.html (+223/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/default-form.html (+443/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/event-paging.html (+43/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/new-event.html (+55/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/table-entry-form.html (+274/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment-controller.js (+206/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/enrollment/enrollment.html (+137/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes-controller.js (+88/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html (+60/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile-controller.js (+68/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html (+23/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/default-registration-form.html (+111/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/enrollment-dates-form.html (+43/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js (+374/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration.html (+78/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/add-relationship.html (+120/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship-controller.js (+565/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/relationship.html (+47/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/relationship/search.html (+115/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/event-details.html (+74/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events-controller.js (+281/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/overdue-events.html (+198/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-details.html (+130/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics-controller.js (+145/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-statistics.html (+56/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary-controller.js (+130/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/program-summary.html (+96/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/reportForm.html (+77/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report-controller.js (+183/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/tei-report.html (+27/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events-controller.js (+279/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/report/upcoming-events.html (+223/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound-controller.js (+59/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/rulebound/rulebound.html (+29/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected-controller.js (+19/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/selected/selected.html (+22/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app.properties (+364/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/i18n/i18n_app_ar.properties (+265/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/index.html (+146/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/app.js (+64/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/controllers.js (+437/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/directives.js (+30/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/filters.js (+5/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/leftbar-menu-controller.js (+12/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/ng-csv.js (+236/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/report-types-controller.js (+20/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/services.js (+1760/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/scripts/tracker-capture.js (+738/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/print.css (+7/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/screen.css (+11/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css (+1166/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/tracker-capture.appcache (+96/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/advanced-search.html (+109/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/column-modal.html (+18/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/dialog.html (+10/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/home.html (+167/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/modal.html (+10/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/report-types.html (+29/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/search-ou-tree.html (+22/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/tei.html (+56/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/warnings.html (+14/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties (+286/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ar.properties (+205/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_es.properties (+195/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_fr.properties (+220/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_id.properties (+141/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_lo.properties (+89/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_my.properties (+111/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt.properties (+209/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt_BR.properties (+147/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ru.properties (+203/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_tet.properties (+252/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_tg.properties (+203/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_vi.properties (+278/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_zh.properties (+157/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/index.html (+19/-15)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/manifest.webapp (+21/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/plugin.html (+52/-156)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js (+7036/-3581)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/chart.js (+4624/-0)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/core.js (+3889/-2052)
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/styles/style.css (+320/-225)
dhis-2/dhis-web/dhis-web-caseentry/pom.xml (+0/-59)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetOptionSetAction.java (+0/-89)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetProgramMetaDataAction.java (+0/-150)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/GetUsernamesAction.java (+0/-76)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/NoAction.java (+0/-43)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationFormAction.java (+0/-91)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultAction.java (+0/-231)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/CaseAggregationResultDetailsAction.java (+0/-136)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/SaveAggregateDataValueAction.java (+0/-175)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseaggregation/ValidationCaseAggregationAction.java (+0/-99)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CompleteDataEntryAction.java (+0/-173)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/CreateAnonymousEncounterAction.java (+0/-159)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/DataRecordingSelectAction.java (+0/-121)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetAllProgramsAction.java (+0/-97)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetDataRecordsAction.java (+0/-271)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetOptionsByDataElementAction.java (+0/-125)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetProgramStageDataElementsAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetProgramStageInstanceAction.java (+0/-168)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetProgramsByOrgunitAction.java (+0/-106)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetSingleEventProgramListAction.java (+0/-94)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/GetUsernameListAction.java (+0/-90)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadAnonymousProgramsAction.java (+0/-124)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadDataEntryAction.java (+0/-353)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/LoadProgramStageInstancesAction.java (+0/-171)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MarkForFollowupAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/MultiDataEntrySelectAction.java (+0/-127)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ProgramStageInstanceCompletenessAction.java (+0/-136)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RegisterIrregularEncounterAction.java (+0/-131)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveCurrentEncounterAction.java (+0/-110)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveEmptyEventsAction.java (+0/-102)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveProgramInstanceAction.java (+0/-78)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveCoordinatesEventAction.java (+0/-115)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveExecutionDateAction.java (+0/-263)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProgramInstanceCommentAction.java (+0/-106)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveProvidingFacilityAction.java (+0/-119)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValueAction.java (+0/-186)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/SaveValuesAction.java (+0/-217)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ShowEventWithRegistrationFormAction.java (+0/-284)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/UncompleteDataEntryAction.java (+0/-126)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/UploadAnonymousEventAction.java (+0/-323)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateProgramInstanceAction.java (+0/-116)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/ValidateSearchAction.java (+0/-124)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddPatientAction.java (+0/-482)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRelationshipPatientAction.java (+0/-446)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/AddRepresentativeAction.java (+0/-300)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPartnerAction.java (+0/-168)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientAction.java (+0/-448)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientHistoryAction.java (+0/-131)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetPatientLocationAction.java (+0/-116)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetProgramAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetProgramInstanceAction.java (+0/-83)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/GetProgramInstanceHistoryAction.java (+0/-109)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/PatientDashboardAction.java (+0/-310)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentAction.java (+0/-261)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ProgramEnrollmentSelectAction.java (+0/-134)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RegisterPatientLocationAction.java (+0/-92)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemovePatientAction.java (+0/-107)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemoveRelationshipAction.java (+0/-77)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/RemoveRepresentativeAction.java (+0/-78)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveDueDateAction.java (+0/-135)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveIdentifierAndAttributeAction.java (+0/-300)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveProgramEnrollmentAction.java (+0/-253)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveRelationshipAction.java (+0/-161)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SaveRepresentativeAction.java (+0/-119)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPatientAction.java (+0/-212)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchPersonAction.java (+0/-141)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SearchRelationshipPatientAction.java (+0/-190)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SelectAction.java (+0/-129)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/SetProgramInstanceStatusAction.java (+0/-171)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddPatientFormAction.java (+0/-258)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipFormAction.java (+0/-156)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRelationshipPatientAction.java (+0/-264)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowAddRepresentativeAction.java (+0/-134)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ShowRelationshipListAction.java (+0/-120)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/UpdatePatientAction.java (+0/-480)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateAddRelationshipPatientAction.java (+0/-378)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientAction.java (+0/-413)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidatePatientProgramEnrollmentAction.java (+0/-123)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/patient/ValidateSearchRelationshipAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/AddPatientCommentAction.java (+0/-109)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/GetProgramTrackingListAction.java (+0/-148)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/RemovePatientCommentAction.java (+0/-100)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsAction.java (+0/-178)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SendSmsToListAction.java (+0/-186)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/reminder/SetEventStatusAction.java (+0/-113)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/DeleteAggregateReportAction.java (+0/-80)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/DeleteTabularReportAction.java (+0/-80)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateAggregateReportAction.java (+0/-456)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateReportAction.java (+0/-214)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateStatisticalProgramReportAction.java (+0/-199)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GenerateTabularReportAction.java (+0/-605)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetAggregateReportAction.java (+0/-133)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetAggregateReportListAction.java (+0/-140)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetOrganisationUnitChildrenAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetOrganisationUnitsAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetOrganisationUnitsByGroupAction.java (+0/-91)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetProgramStageSectionsAction.java (+0/-89)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularReportAction.java (+0/-216)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/GetTabularReportsAction.java (+0/-138)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadDataElementsAction.java (+0/-110)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadPatientPropertiesAction.java (+0/-129)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/LoadProgramStagesAction.java (+0/-86)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ReportSelectAction.java (+0/-95)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveAggregateReportAction.java (+0/-298)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/SaveTabularReportAction.java (+0/-247)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/TabularInitializeAction.java (+0/-121)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateAggregateReportNameAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/UpdateTabularReportNameAction.java (+0/-89)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ValidateTabularReportAction.java (+0/-103)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/report/ViewRecordsAction.java (+0/-127)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java (+0/-255)
dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java (+0/-104)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml (+0/-1176)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_es_ES.properties (+0/-601)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fa_AF.properties (+0/-453)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_fr_FR.properties (+0/-650)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_id_ID.properties (+0/-623)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_my_MM.properties (+0/-283)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_BR.properties (+0/-641)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_pt_PT.properties (+0/-641)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_vi_VN.properties (+0/-271)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module_zh_CN.properties (+0/-739)
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml (+0/-1186)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/WEB-INF/classes/velocity.properties (+0/-3)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/WEB-INF/web.xml (+0/-102)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanRecords.vm (+0/-115)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/activityPlanSelect.vm (+0/-210)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addCaseAggregation.vm (+0/-116)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addPatientForm.vm (+0/-70)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipForm.vm (+0/-92)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRelationshipPatientForm.vm (+0/-81)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addRepresentativeSuccess.vm (+0/-1)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/addSingleEventRegistration.vm (+0/-95)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js (+0/-6665)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/css/style.css (+0/-903)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/index.html (+0/-41)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/cacheManifest.vm (+0/-100)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregation.vm (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationForm.vm (+0/-85)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationMenu.vm (+0/-5)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResult.vm (+0/-83)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/caseAggregationResultDetails.vm (+0/-1)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/colorHelp.vm (+0/-49)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/customDataEntryForm.vm (+0/-8)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryForm.vm (+0/-109)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataEntryMenu.vm (+0/-25)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataRecordingSelect.vm (+0/-41)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/dataentryRecords.vm (+0/-113)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/detailsPartner.vm (+0/-79)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/eventMessage.vm (+0/-54)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/htmlGrid.vm (+0/-49)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm (+0/-199)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/identifierAndAttributeForm.vm (+0/-39)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/activityPlan.js (+0/-247)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseAggregationForm.js (+0/-19)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/caseagg.js (+0/-149)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/commons.js (+0/-2113)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/form.js (+0/-198)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/multiDataEntry.js (+0/-166)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/patient.js (+0/-352)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/programStageCompleteness.js (+0/-38)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/relationshipPatient.js (+0/-311)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/report.js (+0/-63)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/singleEvent.js (+0/-311)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/smsReminder.js (+0/-305)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/statisticalReport.js (+0/-46)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/tooltip.js (+0/-54)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/javascript/underage.js (+0/-207)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReport.vm (+0/-36)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonAggregateReportResult.vm (+0/-23)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptionSet.vm (+0/-6)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonOptions.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonPatientProperties.vm (+0/-66)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramEnrollment.vm (+0/-7)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramInstances.vm (+0/-11)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm (+0/-33)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageDataElements.vm (+0/-19)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstance.vm (+0/-55)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageInstances.vm (+0/-13)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStageSections.vm (+0/-10)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramStages.vm (+0/-10)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonResponseProgramCompleted.vm (+0/-4)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonSingleEventPrograms.vm (+0/-15)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReport.vm (+0/-111)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularAggregateReportResult.vm (+0/-23)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularInitialize.vm (+0/-44)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReport.vm (+0/-106)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportList.vm (+0/-26)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm (+0/-35)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonUsernames.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonUsers.vm (+0/-1)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonminOrganisationUnitChildren.vm (+0/-1)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonminOrganisationUnitPaths.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/listPatient.vm (+0/-147)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/menu.vm (+0/-58)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/multiDataEntrySelect.vm (+0/-87)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientDashboard.vm (+0/-285)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm (+0/-271)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientHistory.vm (+0/-42)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientLocation.vm (+0/-57)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientRegistrationList.vm (+0/-213)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentForm.vm (+0/-186)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programEnrollmentSelectForm.vm (+0/-78)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programInstanceHistory.vm (+0/-38)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageCompleteness.vm (+0/-47)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageCompletenessSelect.vm (+0/-73)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programStageInstanceFlow.vm (+0/-130)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingList.vm (+0/-212)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingRecords.vm (+0/-118)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/programTrackingSelect.vm (+0/-184)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/records.vm (+0/-88)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/registrationMenu.vm (+0/-18)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipList.vm (+0/-152)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/relationshipPatients.vm (+0/-100)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/report.vm (+0/-78)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportDataEntryForm.vm (+0/-98)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportSelect.vm (+0/-86)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/reportsMenu.vm (+0/-19)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDataElements.vm (+0/-17)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseDuplicate.vm (+0/-38)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseError.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseIdentifierTypes.vm (+0/-29)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseInput.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseOrgUnit.vm (+0/-5)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatient.vm (+0/-28)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatientDetails.vm (+0/-28)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePatients.vm (+0/-39)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responsePeriods.vm (+0/-12)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseProgramInstance.vm (+0/-7)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRelationshipPatients.vm (+0/-9)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseRepresentative.vm (+0/-14)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/responseSuccess.vm (+0/-2)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/searchPatientCriteria.vm (+0/-176)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/sectionDataEntryForm.vm (+0/-108)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm (+0/-139)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleDataEntryForm.vm (+0/-242)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/singleEventSelect.vm (+0/-153)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReport.vm (+0/-35)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/statisticalProgramReportSelect.vm (+0/-85)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/status.vm (+0/-9)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/style/style.css (+0/-543)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/underAgeForm.vm (+0/-158)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm (+0/-143)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/validationResult.vm (+0/-53)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/visitSchedule.vm (+0/-255)
dhis-2/dhis-web/dhis-web-commons-resources/pom.xml (+14/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/WEB-INF/classes/log4j.properties (+15/-27)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm (+87/-35)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm (+26/-18)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm (+5/-18)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menu.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/menuDashboard.vm (+0/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm (+19/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/software.vm (+0/-19)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/htmlNotifications.vm (+0/-13)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCaseAggregation.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryCombo.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionCombo.vm (+8/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroup.vm (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroupSet.vm (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroups.vm (+18/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonConcept.vm (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm (+20/-20)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm (+18/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroup.vm (+2/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementOperands.vm (+4/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElements.vm (+3/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSet.vm (+2/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonHelpPageLinkModule.vm (+3/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIdentifiableObjects.vm (+17/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicator.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroup.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorGroupSet.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonIndicatorType.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonModules.vm (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOption.vm (+8/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnit.vm (+21/-15)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroup.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitGroupSet.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTree.vm (+3/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonOrganisationUnitTreePartial.vm (+6/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPatientIdentifierType.vm (+0/-11)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgram.vm (+9/-12)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramIndicator.vm (+6/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramRule.vm (+8/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStage.vm (+13/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSection.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStageSections.vm (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramStages.vm (+4/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonProgramValidation.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonPrograms.vm (+2/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonRelationshipType.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonSection.vm (+3/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntity.vm (+8/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttribute.vm (+14/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributeGroup.vm (+6/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributeGroups.vm (+3/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityAttributes.vm (+5/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonTrackedEntityInstanceReminder.vm (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUser.vm (+3/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserGroup.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonUserRole.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonValidationCriteria.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElement.vm (+2/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlDataElements.vm (+2/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/custom-form.html (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/error-messages.html (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/map.html (+15/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/angular-forms/serverside-pagination.html (+52/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap-datepicker.css (+301/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap-responsive.min.css (+0/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap-theme.min.css (+369/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap.min.css (+5170/-8)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/fonts/glyphicons-halflings-regular.svg (+229/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/js/bootstrap-datepicker.js (+1046/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/js/bootstrap.min.js (+8/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/.htaccess (+0/-24)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/LICENSE.html (+0/-1327)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/LICENSE.md (+1264/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/adapters/jquery.js (+10/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/ckeditor.js (+1001/-149)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/config.js (+22/-25)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/contents.css (+115/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/_languages.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/_translationstatus.txt (+0/-61)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/af.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ar.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/bg.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/bn.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/bs.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ca.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/cs.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/cy.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/da.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/de.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/el.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/en-au.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/en-ca.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/en-gb.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/en.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/eo.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/es.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/et.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/eu.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/fa.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/fi.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/fo.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/fr-ca.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/fr.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/gl.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/gu.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/he.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/hi.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/hr.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/hu.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/id.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/is.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/it.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ja.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ka.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/km.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ko.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ku.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/lt.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/lv.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/mk.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/mn.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ms.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/nb.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/nl.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/no.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/pl.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/pt-br.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/pt.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ro.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ru.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/si.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sk.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sl.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sq.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sr-latn.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sr.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/sv.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/th.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/tr.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/tt.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/ug.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/uk.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/vi.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/zh-cn.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/lang/zh.js (+3/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js (+10/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt (+25/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/da.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/de.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/el.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/en.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/es.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/et.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/he.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/id.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/it.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/km.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/no.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/si.js (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/th.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/lang/en.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/a11yhelp/lang/he.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/about/dialogs/about.js (+7/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/adobeair/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/ajax/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/autogrow/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/bbcode/plugin.js (+0/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/clipboard/dialogs/paste.js (+11/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/colordialog/dialogs/colordialog.js (+13/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/devtools/lang/en.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/devtools/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/dialog/dialogDefinition.js (+4/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/div/dialogs/div.js (+9/-8)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/docprops/dialogs/docprops.js (+0/-10)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/docprops/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/find/dialogs/find.js (+24/-10)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/flash/dialogs/flash.js (+24/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/button.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/checkbox.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/form.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/hiddenfield.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/radio.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/select.js (+20/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/textarea.js (+8/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/forms/dialogs/textfield.js (+10/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/iframe/dialogs/iframe.js (+10/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/iframedialog/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/image/dialogs/image.js (+43/-13)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/link/dialogs/anchor.js (+7/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/link/dialogs/link.js (+26/-12)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/liststyle/dialogs/liststyle.js (+10/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/pastefromword/filter/default.js (+31/-11)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/pastetext/dialogs/pastetext.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/placeholder/dialogs/placeholder.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/placeholder/lang/en.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/placeholder/lang/he.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/placeholder/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/preview/preview.html (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/scayt/LICENSE.md (+28/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/scayt/README.md (+25/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/scayt/dialogs/options.js (+17/-8)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/scayt/dialogs/toolbar.css (+70/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/smiley/dialogs/smiley.js (+10/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt (+20/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ar.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/bg.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ca.js (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/cs.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/cy.js (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/de.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/el.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/en.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/eo.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/es.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/et.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/fa.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/fi.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/fr.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/gl.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/he.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/hr.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/hu.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/id.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/it.js (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ja.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/km.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ku.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/lv.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/nb.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/nl.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/no.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/pl.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/pt.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ru.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/si.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/sk.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/sl.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/sq.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/sv.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/th.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/tr.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/tt.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/ug.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/uk.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/vi.js (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/lang/zh.js (+12/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/dialogs/specialchar.js (+14/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/specialchar/lang/en.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/styles/styles/default.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/stylesheetparser/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/table/dialogs/table.js (+21/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/tableresize/plugin.js (+0/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/tabletools/dialogs/tableCell.js (+17/-8)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/templates/dialogs/templates.css (+84/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/templates/dialogs/templates.js (+10/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/templates/templates/default.js (+6/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/dialogs/uicolor.js (+0/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/lang/en.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/lang/he.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/yui/assets/yui.css (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/uicolor/yui/yui.js (+0/-76)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/LICENSE.md (+28/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/README.md (+25/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/dialogs/ciframe.html (+18/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/dialogs/tmpFrameset.html (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/dialogs/wsc.css (+78/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/dialogs/wsc.js (+74/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/wsc/dialogs/wsc_ie.js (+11/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/plugins/xml/plugin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/kama/dialog.css (+0/-10)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/kama/editor.css (+0/-13)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/kama/skin.js (+0/-7)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/kama/templates.css (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/dialog.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/dialog_ie.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/dialog_ie7.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/dialog_ie8.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/dialog_iequirks.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor_gecko.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor_ie.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor_ie7.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor_ie8.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/editor_iequirks.css (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/moono/readme.md (+51/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/office2003/dialog.css (+0/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/office2003/editor.css (+0/-14)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/office2003/skin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/office2003/templates.css (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/v2/dialog.css (+0/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/v2/editor.css (+0/-13)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/v2/skin.js (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/skins/v2/templates.css (+0/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/styles.js (+111/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ckeditor/themes/default/theme.js (+0/-8)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/account.css (+27/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css (+203/-182)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css (+199/-183)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css (+209/-189)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css (+60/-34)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css (+581/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/myanmar/myanmar.css (+483/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/print.css (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css (+204/-184)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/widgets.css (+262/-101)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/font-awesome/css/font-awesome.min.css (+4/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/font-awesome/fonts/fontawesome-webfont.svg (+520/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/fonts/padauk-bold-webfont.svg (+134/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/fonts/padauk-webfont.svg (+134/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-animate.js (+32/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-cookies.js (+7/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-messages.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-resource.js (+13/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-route.js (+15/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular-sanitize.js (+15/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/angular.js (+251/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/angular-translate.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/angularLocalStorage.js (+159/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/angularjs-nvd3-directives.min.js (+3/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/ng-infinite-scroll.js (+61/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/select.css (+262/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/select.js (+1825/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/select2.css (+626/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/plugins/select2.js (+212/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/angular/ui-bootstrap.js (+4861/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js (+151/-105)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/d3/d3.min.js (+5/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.controllers.js (+53/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.directives.js (+632/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.filters.js (+139/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js (+1573/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.validations.js (+134/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.appcache.js (+60/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.array.js (+10/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js (+90/-101)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.comparator.js (+35/-35)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.contextmenu.js (+194/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.map.contextmenu.js (+138/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.map.textoverlay.js (+103/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js (+515/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.manager.js (+196/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js (+1245/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.period.js (+992/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.select.js (+10/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.selected.js (+258/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.sharing.js (+200/-161)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.idb.js (+131/-104)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.js (+41/-35)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ls.js (+10/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.memory.js (+11/-13)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.storage.ss.js (+10/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.translate.js (+148/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.trigger.js (+37/-39)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js (+201/-88)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.validation.js (+206/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/es5-sham.min.js (+4/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/es5-shim.min.js (+4/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext-ux/carousel/css/carousel.css (+2/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/ext/ext-all.js (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/css/jquery.calendars.picker.css (+215/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/css/ui-redmond.calendars.picker.css (+18/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/css/ui.calendars.picker.css (+107/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.coptic.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.ethiopian.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.islamic.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.julian.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.nepali.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.ext.js (+253/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.picker.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.plus.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/calendars/jquery.calendars.thai.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisAjaxSelect.js (+15/-12)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisCheckboxMenu.js (+182/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js (+10/-9)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.plugin.min.js (+4/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.utils.js (+19/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js (+8/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/placeholders.jquery.min.js (+2/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui.css (+927/-210)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/ui/jquery-ui.min.js (+4/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/moment/moment-with-langs.min.js (+9/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/nvd3/nv.d3.css (+769/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/nvd3/nv.d3.min.js (+6/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/OpenLayers.js (+1384/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/script/OpenStreetMap.js (+125/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/google.css (+17/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/google.tidy.css (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/ie6-style.css (+10/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/ie6-style.tidy.css (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/style.css (+484/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/style.mobile.css (+63/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/style.mobile.tidy.css (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/openlayers/theme/default/style.tidy.css (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodType.js (+32/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/periodTypeNoDep.js (+42/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js (+4624/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventchart.js (+5447/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/eventreport.js (+4489/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/map.js (+7466/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/plugin.js (+0/-1307)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js (+3739/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/underscore.min.js (+5/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/account.js (+123/-82)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/expired.js (+78/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js (+45/-25)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/restore.js (+45/-47)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/updateUserAccountForm.js (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/validationRules.js (+297/-151)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/loader/loader.vm (+1/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/oust.js (+70/-67)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTree.vm (+1/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm (+26/-18)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js (+6/-6)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSingleSelect.vm (+6/-4)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/orgunittreesearch.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/ouwt.js (+642/-460)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseCollapse.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseError.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseExpand.vm (+2/-2)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseSelect.vm (+2/-3)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseSuccess.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/responseTree.vm (+5/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ouwt/userCount.vm (+3/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm (+1/-1)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js (+57/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm (+78/-51)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginStrings.vm (+14/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm (+19/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.css (+440/-305)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/select2/select2.min.js (+17/-77)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/settings/userGeneralSettings.vm (+15/-5)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/account.vm (+42/-18)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/accountStrings.vm (+15/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/expired.vm (+62/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm (+6/-12)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recoveryStrings.vm (+7/-0)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm (+191/-45)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js (+97/-151)
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm (+118/-112)
dhis-2/dhis-web/dhis-web-commons/pom.xml (+3/-15)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java (+29/-204)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/HelpAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/RedirectAction.java (+46/-24)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/AppCacheAction.java (+81/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifestAction.java (+199/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/AbstractRelativePeriodsAction.java (+20/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetAttributesAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetAvailablePeriodsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetCategoryOptionCombosAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetCategoryOptionGroupsAction.java (+78/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetCategoryOptionsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetConstantsAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementCategoriesAction.java (+43/-15)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupSetsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementGroupsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementNameAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementOperandsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsAction.java (+39/-23)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataElementsNotInGroupAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetDataSetsAction.java (+20/-31)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetExpressionTextAction.java (+0/-102)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupSetAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupSetsAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorGroupsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetIndicatorsAction.java (+25/-18)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetNotificationsAction.java (+0/-102)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java (+37/-22)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitChildrenAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitGroupSetsAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitGroupsAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitGroupsByGroupSetAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitLevelsAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java (+133/-93)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodTypesAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodsAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPingAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetProgramsAction.java (+109/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionDataElementsAction.java (+14/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetSectionIndicatorsAction.java (+100/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserGroupsAction.java (+13/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUserRolesAction.java (+16/-25)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetUsersAction.java (+13/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetValidationRulesAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/encoding/velocity/EncoderVelocityContext.java (+11/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpContentAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/help/action/GetHelpItemsAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java (+105/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java (+19/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/I18nAction.java (+26/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/TranslateAction.java (+26/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/AbstractPreResultListener.java (+14/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/CacheInterceptor.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ContextInterceptor.java (+24/-22)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/ExceptionInterceptor.java (+16/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/I18nInterceptor.java (+14/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java (+60/-26)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/UserSettingInterceptor.java (+14/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/AddSelectedOrganisationUnitAction.java (+17/-16)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ClearSelectedOrganisationUnitsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/ExpandSubtreeAction.java (+19/-18)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/GetExpandedTreeAction.java (+16/-15)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/GetUserCountAction.java (+74/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/RemoveSelectedOrganisationUnitAction.java (+19/-22)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/SelectAllOrganisationUnitAction.java (+12/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/action/SetSelectedOrganisationUnitAction.java (+23/-17)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/DefaultSelectionTreeManager.java (+50/-64)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/oust/manager/SelectionTreeManager.java (+12/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/AddSelectedOrganisationUnitAction.java (+30/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/ClearSelectedOrganisationUnitsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/CollapseSubtreeAction.java (+15/-15)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/ExpandSubtreeAction.java (+20/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/GetExpandedTreeAction.java (+20/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/GetOrganisationUnitsByNameAction.java (+31/-17)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/GetSelectedOrganisationUnitsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/RemoveSelectedOrganisationUnitAction.java (+15/-14)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/action/SetSelectedOrganisationUnitAction.java (+29/-25)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/OrganisationUnitTreeInterceptor.java (+17/-15)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/interceptor/TreeNode.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultOrganisationUnitSelectionManager.java (+27/-18)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/DefaultTreeStateManager.java (+17/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManager.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/ouwt/manager/TreeStateManager.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java (+12/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/ChartResult.java (+30/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridCsvResult.java (+13/-16)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java (+12/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJrxmlResult.java (+25/-24)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfInlineResult.java (+42/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridPdfResult.java (+20/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridXlsResult.java (+12/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/OutputStreamResult.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/PlainTextErrorResult.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityCacheManifestResult.java (+28/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityJavascriptResult.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityJsonResult.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/VelocityXMLResult.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AbstractAutomaticAccessProvider.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/ActionAccessResolver.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/AutomaticAccessProvider.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/CustomExceptionMappingAuthenticationFailureHandler.java (+51/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DatabaseAutomaticAccessProvider.java (+15/-24)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/DefaultAuthenticationSuccessHandler.java (+39/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/GhostAutomaticAccessProvider.java (+16/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/MappedRedirectStrategy.java (+41/-19)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/SpringSecurityActionAccessResolver.java (+15/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/StrutsAuthorityUtils.java (+12/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java (+30/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/RestrictOrganisationUnitsAction.java (+27/-23)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/AppsSystemAuthoritiesProvider.java (+63/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/CachingSystemAuthoritiesProvider.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/CompositeSystemAuthoritiesProvider.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DefaultRequiredAuthoritiesProvider.java (+16/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/DetectingSystemAuthoritiesProvider.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/ModuleSystemAuthoritiesProvider.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/RequiredAuthoritiesProvider.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/SimpleSystemAuthoritiesProvider.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/authority/SystemAuthoritiesProvider.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/AutomaticAccessFilter.java (+14/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/BasicAuthenticationRequiredFilter.java (+0/-50)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CorsFilter.java (+163/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/CustomAuthenticationFilter.java (+22/-12)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/RequiredLoginFilter.java (+13/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/filter/UserAuditLogoutFilter.java (+0/-72)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/HttpMethodInterceptor.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/LoginInterceptor.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/SingleSecurityMetadataSource.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/intercept/XWorkSecurityInterceptor.java (+15/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/listener/AuthenticationListener.java (+0/-95)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/AbstractPrefixedAccessDecisionVoter.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ActionAccessVoter.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ExternalAccessVoter.java (+143/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/LogicalOrAccessDecisionManager.java (+17/-13)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/ModuleAccessVoter.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/vote/SimpleAccessVoter.java (+12/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/servlet/filter/AppCacheFilter.java (+124/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/servlet/filter/HttpMaxCacheFilter.java (+119/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/servlet/filter/HttpRedirectFilter.java (+25/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/GetGeneralSettingsAction.java (+29/-56)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/settings/user/action/SetGeneralSettingsAction.java (+26/-51)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/ExpiredAccountAction.java (+84/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/GetCurrentUserAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsAccountRecoveryAllowedAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsInviteTokenValidAction.java (+143/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsRestoreTokenValidAction.java (+26/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/IsSelfRegistrationAllowedAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserAccountAction.java (+19/-33)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/useraccount/action/UpdateUserProfileAction.java (+21/-20)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/CollectionUtils.java (+0/-133)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/ContextUtils.java (+12/-30)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/InternalProcessUtil.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/SessionUtils.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/StreamActionSupport.java (+13/-11)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/DataElementIdComparator.java (+0/-45)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/util/comparator/PeriodStartDateComparator.java (+0/-45)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalMenuInterceptor.java (+20/-22)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalModuleInterceptor.java (+21/-25)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java (+55/-24)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalUserInterceptor.java (+19/-21)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuState.java (+12/-42)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/MenuStateManager.java (+10/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/SessionMenuStateManager.java (+12/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/GetModulesAction.java (+92/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuHiddenAction.java (+0/-63)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuStateAction.java (+70/-0)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/menu/action/SetMenuVisibleAction.java (+0/-63)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ConfigurableModuleComparator.java (+12/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/CurrentModuleDetectorFilter.java (+13/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java (+86/-85)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/Module.java (+114/-9)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/ModuleManager.java (+13/-16)
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/StartableModuleFilter.java (+11/-10)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml (+65/-58)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml (+158/-29)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml (+77/-40)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties (+0/-722)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_am_ET.properties (+0/-6)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_bi_VU.properties (+0/-601)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es_ES.properties (+0/-607)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fa_AF.properties (+0/-1)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr_FR.properties (+0/-612)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_id_ID.properties (+0/-630)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_my_MM.properties (+0/-391)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_ps_AF.properties (+0/-1)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt_BR.properties (+0/-607)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt_PT.properties (+0/-607)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_rw_RW.properties (+0/-4)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties (+0/-499)
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_zh_CN.properties (+0/-527)
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/OrganisationUnitSelectionManagerTest.java (+0/-188)
dhis-2/dhis-web/dhis-web-commons/src/test/java/org/hisp/dhis/ouwt/manager/SessionReplacerOUSManager.java (+0/-46)
dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml (+21/-18)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ClearAreaAction.java (+0/-78)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/InitAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/ProvideContentAction.java (+0/-171)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveDocumentAction.java (+0/-104)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveMapViewAction.java (+0/-103)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveReportAction.java (+0/-103)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/RemoveReportTableAction.java (+0/-103)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/SearchAction.java (+0/-95)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/action/SetAreaItemAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/interpretation/action/GetInterpretationsAction.java (+19/-41)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessageOptionsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessageRecipientsAction.java (+17/-16)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/GetMessagesAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/ReadMessageAction.java (+23/-12)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/RemoveMessageAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendFeedbackAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendMessageAction.java (+24/-12)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/SendReplyAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/ToggleFollowUpAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/UnreadMessageAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/message/action/UserCountAction.java (+138/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/java/org/hisp/dhis/dashboard/profile/action/GetUserAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/META-INF/dhis/beans.xml (+16/-103)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties (+41/-17)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ar.properties (+131/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es.properties (+104/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_es_ES.properties (+0/-98)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr.properties (+124/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_fr_FR.properties (+0/-111)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_id.properties (+105/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_id_ID.properties (+0/-105)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_lo.properties (+124/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_my.properties (+32/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_my_MM.properties (+0/-37)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_pt.properties (+126/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_pt_PT.properties (+0/-107)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_ru.properties (+124/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_tet.properties (+131/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_tg.properties (+124/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_vi.properties (+119/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_vi_VN.properties (+0/-51)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_zh.properties (+65/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module_zh_CN.properties (+0/-65)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/struts.xml (+141/-231)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm (+109/-24)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm (+0/-27)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/hits.vm (+0/-23)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretation.vm (+3/-5)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/interpretationFeed.vm (+89/-51)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js (+1211/-97)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js (+253/-85)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/message.js (+198/-57)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/jsonUserCount.vm (+3/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm (+0/-22)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm (+63/-33)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/chart.js (+4624/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventchart.js (+5447/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/eventreport.js (+4489/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/map.js (+7466/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/plugin/table.js (+3739/-0)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/profile.vm (+2/-12)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm (+15/-5)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm (+0/-22)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm (+0/-22)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/rss_diseases.vm (+0/-7)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/rss_health.vm (+0/-7)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/sendMessage.vm (+42/-37)
dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css (+379/-134)
dhis-2/dhis-web/dhis-web-dataentry/pom.xml (+12/-8)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataSetAssociationsAction.java (+115/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetDataValuesForDataSetAction.java (+105/-68)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetHistoryAction.java (+61/-38)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetHistoryChartAction.java (+0/-164)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMetaDataAction.java (+153/-57)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/GetMultiOrgSettingAction.java (+0/-72)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java (+103/-94)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/MarkForFollowupAction.java (+0/-152)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/PageInitAction.java (+11/-23)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RegisterCompleteDataSetAction.java (+0/-222)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveCommentAction.java (+0/-189)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveValueAction.java (+0/-269)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/UndoCompleteDataSetAction.java (+0/-196)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/ValidationAction.java (+118/-134)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/history/DataElementHistory.java (+0/-175)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/history/DataElementHistoryPoint.java (+0/-77)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/history/DefaultHistoryRetriever.java (+0/-254)
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/history/HistoryRetriever.java (+0/-46)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml (+30/-94)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties (+27/-16)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ar.properties (+119/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_es.properties (+105/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_es_ES.properties (+0/-110)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_fr.properties (+115/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_fr_FR.properties (+0/-113)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_id.properties (+106/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_id_ID.properties (+0/-106)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_km.properties (+96/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_lo.properties (+122/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_my.properties (+119/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_my_MM.properties (+0/-97)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt.properties (+117/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_BR.properties (+1/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_pt_PT.properties (+0/-112)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_ru.properties (+107/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_tet.properties (+123/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_tg.properties (+107/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi.properties (+120/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_vi_VN.properties (+0/-102)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_zh.properties (+166/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module_zh_CN.properties (+0/-166)
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml (+12/-36)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/customForm.vm (+0/-7)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm (+74/-33)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js (+198/-154)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js (+1781/-1129)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/history.js (+87/-64)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/menu.vm (+4/-15)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/multiOrgSectionForm.vm (+144/-11)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSetAssociations.vm (+19/-0)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSets.vm (+0/-10)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataValues.vm (+5/-4)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseLockStatus.vm (+0/-1)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseMetaData.vm (+40/-29)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responsePeriods.vm (+0/-9)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/sectionForm.vm (+69/-21)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/select.vm (+42/-42)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css (+205/-20)
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/validationResult.vm (+46/-20)
dhis-2/dhis-web/dhis-web-importexport/pom.xml (+22/-22)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/GetImportSummaryAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java (+67/-35)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java (+40/-29)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/GetDhis14ConfigurationAction.java (+12/-65)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/SetDhis14ConfigurationAction.java (+12/-18)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dhis14/ValidateDhis14ConfigurationAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterExportFormAction.java (+134/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/FilterListAction.java (+111/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetFilterListSortOrderAction.java (+82/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/GetImportSummaryAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataExportFormAction.java (+26/-14)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java (+101/-20)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/SaveFilterListSortOrderAction.java (+85/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/ShowUpdateFilterExportFormAction.java (+85/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ExportEventAction.java (+60/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/GetImportEventSummariesAction.java (+75/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java (+153/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/DataExportAction.java (+250/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/DetailedMetaDataExportAction.java (+22/-30)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDataElementListAction.java (+16/-57)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetDetailedExportOptionsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/GetIndicatorListAction.java (+15/-43)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java (+11/-21)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/ValidateAggregatedExportAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetCompareOptionsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportAnalysisAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportOptionsAction.java (+11/-39)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetImportStatusAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java (+11/-22)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java (+12/-27)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/ImportAction.java (+13/-36)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/SetImportTypeAction.java (+12/-50)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/AddRouteAction.java (+0/-117)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/DisplayRoutesAction.java (+0/-86)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/RouteOperationAction.java (+0/-128)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/integration/ShowAddRouteFormAction.java (+0/-52)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardAllObjectsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectAction.java (+11/-30)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/DiscardObjectsOfTypeAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/ImportAllObjectsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/object/MatchObjectAction.java (+11/-30)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ClassMapUtil.java (+11/-13)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportDataValueTask.java (+39/-28)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportExportInternalProcessUtil.java (+10/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataCsvTask.java (+102/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java (+84/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataTask.java (+33/-26)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml (+104/-79)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties (+168/-28)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ar.properties (+391/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es.properties (+303/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_es_ES.properties (+0/-301)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr.properties (+429/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_fr_FR.properties (+0/-303)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_id.properties (+307/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_id_ID.properties (+0/-315)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_km.properties (+4/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_lo.properties (+415/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_my.properties (+17/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_my_MM.properties (+0/-271)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt.properties (+323/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt_BR.properties (+105/-112)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_pt_PT.properties (+0/-304)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_ru.properties (+333/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_tet.properties (+443/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_tg.properties (+333/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi.properties (+298/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_vi_VN.properties (+0/-273)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_zh.properties (+493/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module_zh_CN.properties (+0/-500)
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml (+130/-50)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/compareToExistingForm.vm (+0/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/displayRoutes.vm (+0/-34)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2FilteredMetaDataExport.vm (+109/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataExport.vm (+33/-152)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm (+34/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm (+181/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm (+74/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataForm.vm (+84/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportDataValueForm.vm (+54/-24)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/exportMetaDataForm.vm (+0/-4)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalExportMenu.vm (+1/-1)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/externalImportMenu.vm (+1/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/filterExportForm.vm (+360/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/gmlImport.vm (+35/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm (+34/-6)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importEvents.vm (+78/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm (+1/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm (+5/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm (+9/-9)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm (+25/-14)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/detailedExport.js (+0/-4)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/dxf2MetaDataExport.js (+108/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/eventData.js (+36/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/export.js (+42/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js (+84/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filteredMetaDataExport.js (+530/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importMetaData.js (+17/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/routes.js (+0/-7)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/utils.js (+147/-0)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm (+26/-12)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/matchToExistingForm.vm (+0/-8)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/previewForm.vm (+0/-1)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/showAddRouteForm.vm (+0/-23)
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/sortFilterForm.vm (+35/-0)
dhis-2/dhis-web/dhis-web-light/pom.xml (+4/-10)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java (+16/-15)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/NoAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/anonymous/action/GetAllAnonymousProgramAction.java (+0/-124)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/anonymous/action/SaveAnonymousProgramAction.java (+0/-365)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/anonymous/action/SearchOrgUnitAction.java (+0/-87)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/anonymous/action/ShowAnonymousFormAction.java (+0/-156)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiaryEnrollmentOrganisationUnitAction.java (+0/-79)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetBeneficiarySearchingFormAction.java (+0/-58)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetEnrollmentProgramListAction.java (+0/-175)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/GetProgramEnrollmentFormAction.java (+0/-173)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SaveMobileProgramEnrollmentAction.java (+0/-513)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryenrollment/action/SearchBeneficiaryAction.java (+0/-98)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/GetBeneficiaryRegistrationOrganisationUnitAction.java (+0/-101)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/RegisterBeneficiaryAction.java (+0/-188)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/beneficiaryregistration/action/SaveBeneficiaryAction.java (+0/-561)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetChartAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetDashboardChartAction.java (+66/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetReportAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/GetReportParamsAction.java (+21/-11)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java (+38/-39)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetOverviewAction.java (+37/-25)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetDataSetsAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetOrganisationUnitsAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetPeriodsAction.java (+36/-22)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/GetSectionFormAction.java (+34/-29)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/MarkComplete.java (+34/-21)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/SaveSectionFormAction.java (+71/-70)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dataentry/action/UndoCompleteAction.java (+47/-7)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/interpretation/action/GetInterpretation.java (+93/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/interpretation/action/GetInterpretations.java (+125/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/interpretation/action/PostInterpretation.java (+103/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/interpretation/action/PostInterpretationComment.java (+94/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/message/action/AddRecipientAction.java (+125/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/message/action/GetMessageAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/message/action/GetMessagesAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/message/action/SendFeedbackAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/message/action/SendReplyAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/messaging/action/FindUserAction.java (+98/-3)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/messaging/action/GetMessageRecipientsAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/messaging/action/SendMessagesAction.java (+77/-21)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/AddNewRalationshipAction.java (+0/-161)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/DeleteRelationshipAction.java (+0/-107)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java (+0/-160)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetActivityListAction.java (+0/-154)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetAddNewRelationshipFormAction.java (+0/-153)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryDetailAction.java (+0/-119)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryListAction.java (+0/-174)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java (+0/-156)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetNamebasedOrganisationUnitsAction.java (+0/-102)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientLocationFormAction.java (+0/-147)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java (+0/-359)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageFormAction.java (+0/-348)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageListAction.java (+0/-227)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageSectionAction.java (+0/-281)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRelationshipFormAction.java (+0/-42)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRepeatableEventRegistrationFormAction.java (+0/-164)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/MarkCompleteProgramStageAction.java (+0/-86)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/RegisterPatientLocationAction.java (+0/-101)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java (+0/-617)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveRepeatableEventAction.java (+0/-188)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/ShowActivityTypeAction.java (+0/-71)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java (+20/-29)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/SaveSettingsFormAction.java (+16/-23)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/FindSingleEventOptionSetAction.java (+0/-176)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventAction.java (+0/-117)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventBeneficiaryAction.java (+0/-172)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/GetSingleEventFormAction.java (+0/-305)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/singleevent/action/SaveSingleEventAction.java (+0/-550)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtils.java (+59/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/FormUtilsImpl.java (+51/-141)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtils.java (+51/-0)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/NamebasedUtilsImpl.java (+56/-50)
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/utils/ValueUtils.java (+117/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml (+82/-434)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties (+20/-1)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ar.properties (+134/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_es.properties (+132/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_es_ES.properties (+0/-132)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr.properties (+137/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties (+0/-134)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_id.properties (+132/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_id_ID.properties (+0/-132)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_km.properties (+109/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_lo.properties (+153/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_my.properties (+1/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_my_MM.properties (+0/-1)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt.properties (+135/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_BR.properties (+1/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_pt_PT.properties (+0/-134)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_ru.properties (+133/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_tg.properties (+133/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_vi.properties (+45/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_vi_VN.properties (+0/-42)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_zh.properties (+155/-0)
dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_zh_CN.properties (+0/-155)
dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml (+292/-531)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/WEB-INF/web.xml (+16/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/anonymousProgramForm.vm (+0/-94)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/anonymousProgramSelection.vm (+0/-20)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/anonymous/selectAnonymousOrgUnit.vm (+0/-26)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/beneficiaryList.vm (+0/-23)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_chart.vm (+24/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm (+1/-1)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntryOverview.vm (+3/-4)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dataEntrySection.vm (+17/-13)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchResult.vm (+0/-24)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm (+0/-38)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/enrollmentProgramList.vm (+0/-36)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/programEnrollmentForm.vm (+0/-71)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/selectEnrollmentOrganisationUnits.vm (+0/-15)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/interpretation/interpretation.vm (+54/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/interpretation/interpretations.vm (+31/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/main.vm (+15/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm (+3/-24)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm (+42/-27)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/addNewRelationshipForm.vm (+0/-34)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryDetail.vm (+0/-23)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryList.vm (+0/-17)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramList.vm (+0/-171)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/beneficiaryProgramStageList.vm (+0/-54)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/completedProgramStageForm.vm (+0/-130)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm (+0/-47)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findRelatedPatientForm.vm (+0/-50)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/patientLocationForm.vm (+0/-33)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/programStageForm.vm (+0/-146)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/relatedPatientList.vm (+0/-24)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/repeatableEventRegistrationForm.vm (+0/-35)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivity.vm (+0/-25)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectActivityType.vm (+0/-15)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectNamebasedOrganisationUnits.vm (+0/-15)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/selectProgramStageSection.vm (+0/-53)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm (+0/-153)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/selectRegistrationOrganisationUnits.vm (+0/-15)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/selectPeriod.vm (+4/-2)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/sendMessageOnMobile2.vm (+79/-0)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEvent.vm (+0/-19)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/selectSingleEventBeneficiary.vm (+0/-23)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventForm.vm (+0/-87)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/singleevent/singleEventOptionSetFindForm.vm (+0/-20)
dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm (+0/-37)
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/GetDataSetsActionTest.java (+0/-105)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/pom.xml (+13/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AddAppAction.java (+59/-104)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppListAction.java (+42/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/AppSettingsAction.java (+42/-99)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java (+30/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/java/org/hisp/dhis/appmanager/action/NoAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/META-INF/dhis/beans.xml (+6/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module.properties (+10/-6)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_ar.properties (+21/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_es.properties (+19/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_fr.properties (+20/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_my.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_pt.properties (+22/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_ru.properties (+19/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_tg.properties (+19/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/org/hisp/dhis/appmanager/i18n_module_vi.properties (+7/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/resources/struts.xml (+10/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/classes/velocity.properties (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/WEB-INF/web.xml (+17/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/appSettings.vm (+20/-60)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/index.vm (+102/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/deleteApp.js (+27/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/javascript/uploadApp.js (+16/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-appmanager/src/main/webapp/dhis-web-maintenance-appmanager/menu.vm (+2/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml (+7/-5)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/AddAttributeAction.java (+114/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java (+18/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java (+13/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/RemoveAttributeAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/SaveAttributeSortOrderAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/ShowAddUpdateAttributeAction.java (+98/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/UpdateAttributeAction.java (+115/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/ValidateAttributeAction.java (+32/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ClearCacheAction.java (+18/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/cache/ShowCacheAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/AddConstantAction.java (+38/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/RemoveConstantAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/UpdateConstantAction.java (+37/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/ValidateConstantAction.java (+50/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/ActionSupport.java (+0/-456)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/DataBrowserAction.java (+469/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/ExportResultAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/GetPeriodTypesAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityAction.java (+0/-276)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/dataintegrity/GetDataIntegrityReportAction.java (+82/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/duplicatedataelimination/EliminateDuplicateDataAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/AddLocaleAction.java (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleAction.java (+86/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleListAction.java (+129/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/RemoveLocaleAction.java (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/ShowAddLocaleFormAction.java (+82/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/ValidateLocaleAction.java (+116/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/AddLockExceptionAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/BatchRemoveLockExceptionsAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetDataSetsAction.java (+15/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionFormAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetPeriodsAction.java (+0/-129)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/PrepareBatchRemovalAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/RemoveLockExceptionAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/maintenance/PerformMaintenanceAction.java (+141/-127)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GenerateMinMaxValuesAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/minmaxvalidation/GetMinMaxValidationParamsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/AddOptionAction.java (+106/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/AddOptionSetAction.java (+38/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionAction.java (+102/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionListAction.java (+115/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetAction.java (+17/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java (+19/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/RemoveOptionAction.java (+92/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/RemoveOptionSetAction.java (+17/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/SortOptionsAction.java (+103/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/UpdateOptionAction.java (+100/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/UpdateOptionSetAction.java (+30/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ValidateOptionAction.java (+139/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/ValidateOptionSetAction.java (+35/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/organisationunitmerge/MergeOrganisationUnitsAction.java (+23/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/resourcetable/GenerateResourceTableAction.java (+0/-211)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/scheduling/ScheduleTasksAction.java (+156/-128)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/AddSqlViewAction.java (+45/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/CheckViewTableExistenceAction.java (+23/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExecuteSqlViewQueryAction.java (+19/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExportSqlViewResultAction.java (+14/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java (+44/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewObjectAction.java (+13/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/RemoveSqlViewAction.java (+19/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/UpdateSqlViewAction.java (+31/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ValidateAddUpdateSqlViewAction.java (+43/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/statistics/GetStatisticsAction.java (+66/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/OpenDataElementsZeroIsSignificantManagerAction.java (+0/-80)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/zerovaluestorage/UpdateZeroIsSignificantForDataElementsAction.java (+0/-77)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/META-INF/dhis/beans.xml (+175/-146)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties (+80/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ar.properties (+334/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_es.properties (+319/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_es_ES.properties (+0/-310)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_fr.properties (+346/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_fr_FR.properties (+0/-324)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_id.properties (+321/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_id_ID.properties (+0/-321)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_km.properties (+8/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_lo.properties (+350/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_my.properties (+56/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_my_MM.properties (+0/-295)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_pt.properties (+340/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_pt_PT.properties (+0/-323)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_ru.properties (+324/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_tg.properties (+324/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi.properties (+319/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties (+0/-317)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_zh.properties (+415/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_zh_CN.properties (+0/-415)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml (+219/-150)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addAttributeForm.vm (+35/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addConstantForm.vm (+14/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addLocaleForm.vm (+60/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addLockExceptionForm.vm (+5/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addOptionForm.vm (+55/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addOptionSetForm.vm (+29/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/addSqlViewForm.vm (+36/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/attribute.vm (+22/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/constant.vm (+72/-57)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserGrid.vm (+51/-31)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm (+12/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrity.vm (+36/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm (+0/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm (+7/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/attribute.js (+32/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/constant.js (+16/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowser.js (+51/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataBrowserForm.js (+1/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js (+129/-62)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js (+0/-108)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/locale.js (+30/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/localeForm.js (+19/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/lockException.js (+56/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/maintenance.js (+40/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/option.js (+60/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/optionSet.js (+40/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/resourceTable.js (+16/-62)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/scheduling.js (+7/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js (+93/-89)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/statistics.js (+6/-7)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonAttribute.vm (+9/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonConstant.vm (+3/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonDataSets.vm (+3/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonLocale.vm (+8/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonLockException.vm (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonOptionSet.vm (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonPeriods.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/jsonSqlView.vm (+2/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/localeList.vm (+73/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/lockException.vm (+40/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/maintenanceForm.vm (+25/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/menu.vm (+14/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/minMaxValidation.vm (+12/-5)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/option.vm (+95/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/optionSet.vm (+37/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/organisationUnitMergeForm.vm (+1/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm (+59/-54)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/resourceTableForm.vm (+34/-55)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseDataIntegrity.vm (+0/-61)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm (+142/-66)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/showDataSqlViewForm.vm (+7/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sortOptionsForm.vm (+39/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/sqlView.vm (+40/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateAttributeForm.vm (+40/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateConstantForm.vm (+14/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateOptionForm.vm (+49/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateOptionSetForm.vm (+25/-37)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/updateSqlViewForm.vm (+50/-37)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/viewScheduledTasks.vm (+45/-45)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/zeroValueStorageManagement.vm (+0/-73)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml (+10/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryAction.java (+37/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/AddDataElementCategoryOptionAction.java (+84/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboAction.java (+84/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java (+88/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryAction.java (+11/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionAction.java (+61/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java (+26/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/RemoveDataElementCategoryAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/RemoveDataElementCategoryOptionAction.java (+25/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ShowAddDataElementCategoryOptionAction.java (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateCategoryOptionComboAction.java (+97/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryAction.java (+35/-42)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/UpdateDataElementCategoryOptionAction.java (+97/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateCategoryOptionComboAction.java (+114/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/ValidateDataElementCategoryOptionAction.java (+30/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/AddDataElementCategoryComboAction.java (+50/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryComboListAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/GetDataElementCategoryListAction.java (+12/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/RemoveDataElementCategoryComboAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/UpdateDataElementCategoryComboAction.java (+38/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categorycombo/ValidateDataElementCategoryComboAction.java (+14/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/AddCategoryOptionGroupAction.java (+136/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupAction.java (+98/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java (+113/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/RemoveCategoryOptionGroupAction.java (+116/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/ShowAddCategoryOptionGroupAction.java (+75/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/ShowUpdateCategoryOptionGroupAction.java (+123/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/UpdateCategoryOptionGroupAction.java (+136/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/ValidateCategoryOptionGroupAction.java (+149/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/AddCategoryOptionGroupSetAction.java (+124/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetAction.java (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/GetCategoryOptionGroupSetListAction.java (+109/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/RemoveCategoryOptionGroupSetAction.java (+109/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/ShowAddCategoryOptionGroupSetAction.java (+81/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/ShowUpdateCategoryOptionGroupSetAction.java (+95/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/UpdateCategoryOptionGroupSetAction.java (+116/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroupset/ValidateCategoryOptionGroupSetAction.java (+108/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/AddConceptAction.java (+0/-76)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/GetConceptListAction.java (+0/-115)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/RemoveConceptAction.java (+0/-109)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/UpdateConceptAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/concept/ValidateAddUpdateConceptAction.java (+0/-117)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/AddDataDictionaryAction.java (+0/-163)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryAction.java (+0/-81)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java (+0/-106)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryMembersAction.java (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/RemoveDataDictionaryAction.java (+0/-79)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/SetCurrentDataDictionaryAction.java (+0/-73)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/UpdateDataDictionaryAction.java (+0/-170)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java (+56/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementGroupMembersAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListAction.java (+45/-63)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/GetDataElementListSortOrderAction.java (+0/-81)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/RemoveDataElementAction.java (+13/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/SaveDataElementSortOrderAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java (+0/-199)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java (+248/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java (+0/-242)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java (+62/-136)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ValidateDataElementAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AddDataElementGroupAction.java (+25/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/AssignGroupsForDataElementAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetAssignedGroupsByDataElementAction.java (+15/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupListAction.java (+15/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetDataElementGroupMembersAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/RemoveDataElementGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/RenameDEGroupNameEditorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowAddDataElementGroupForm.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java (+21/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/UpdateDataElementGroupAction.java (+30/-32)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ValidateDataElementGroupAction.java (+11/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java (+46/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/DeleteDataElementGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/GetDataElementGroupSetAction.java (+21/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ListDataElementGroupSetAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/OpenUpdateDataElementGroupSetAction.java (+23/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/UpdateDataElementGroupSetAction.java (+42/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/ValidateDataElementGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java (+36/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListAction.java (+14/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/GetIndicatorListSortOrderAction.java (+0/-81)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/RemoveIndicatorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/SaveIndicatorSortOrderAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java (+27/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java (+28/-26)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java (+37/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ValidateIndicatorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AddIndicatorGroupAction.java (+29/-26)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/AssignGroupsForIndicatorAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetAssignedIndicatorGroupsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/RemoveIndicatorGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/RenameIndicatorGroupNameEditorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowAddIndicatorGroupForm.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowIndicatorGroupEditorAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java (+21/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java (+28/-29)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java (+28/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/DeleteIndicatorGroupSetAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/GetIndicatorGroupSetAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/ListIndicatorGroupSetAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/OpenUpdateIndicatorGroupSetAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/UpdateIndicatorGroupSetAction.java (+26/-28)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/AddIndicatorTypeAction.java (+17/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java (+18/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/RemoveIndicatorTypeAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/UpdateIndicatorTypeAction.java (+13/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/ValidateIndicatorTypeAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/pdf/ExportToPdfAction.java (+0/-244)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml (+115/-174)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties (+52/-29)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_ar.properties (+23/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_es.properties (+188/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_es_ES.properties (+0/-206)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_fr.properties (+234/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_fr_FR.properties (+0/-208)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_id.properties (+206/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_id_ID.properties (+0/-206)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_km.properties (+7/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_lo.properties (+231/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_my.properties (+166/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_my_MM.properties (+0/-195)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt.properties (+210/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_BR.properties (+3/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_pt_PT.properties (+0/-207)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_ru.properties (+209/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_tg.properties (+209/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_vi.properties (+182/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_vi_VN.properties (+0/-204)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_zh.properties (+394/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module_zh_CN.properties (+0/-394)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml (+274/-350)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addCategoryOptionGroupForm.vm (+71/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addCategoryOptionGroupSetForm.vm (+71/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataDictionaryForm.vm (+0/-141)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm (+0/-235)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm (+15/-43)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupSet.vm (+30/-49)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm (+21/-7)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm (+13/-44)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupSet.vm (+12/-46)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorTypeForm.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroup.vm (+79/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/categoryOptionGroupSet.vm (+76/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataDictionary.vm (+0/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm (+51/-46)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementForm.vm (+260/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroup.vm (+25/-47)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm (+24/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupSet.vm (+30/-53)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm (+15/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicator.vm (+37/-66)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorExpressionBuilderForm.vm (+62/-174)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroup.vm (+31/-50)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupSet.vm (+28/-47)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorType.vm (+45/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addCategoryOptionGroupSet.js (+53/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataDictionaryForm.js (+0/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addDataElementGroupSet.js (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addIndicatorGroupSet.js (+8/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/category.js (+3/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryCombo.js (+18/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOption.js (+35/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOptionCombo.js (+53/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOptionGroup.js (+35/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/categoryOptionGroupSet.js (+34/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/concept.js (+24/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataDictionary.js (+0/-41)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js (+142/-141)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroup.js (+33/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js (+204/-123)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupSet.js (+31/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/expressionBuilder.js (+147/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js (+19/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroup.js (+21/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupSet.js (+21/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataDictionaryForm.js (+0/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateDataElementGroupSet.js (+4/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/updateIndicatorGroupSet.js (+2/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonCategoryOptionGroupSet.vm (+9/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/jsonDataDictionary.vm (+0/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/menu.vm (+15/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addConceptForm.vm (+0/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryComboForm.vm (+38/-69)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryForm.vm (+29/-71)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/addDataElementCategoryOptionForm.vm (+85/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/category.vm (+63/-47)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryCombo.vm (+43/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOption.vm (+52/-53)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/categoryOptionCombo.vm (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/concept.vm (+0/-67)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateCategoryOptionCombo.vm (+49/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateConceptForm.vm (+0/-37)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryComboForm.vm (+37/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryForm.vm (+31/-80)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/multidimensional/updateDataElementCategoryOptionForm.vm (+88/-41)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortDataElementForm.vm (+0/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/sortIndicatorForm.vm (+0/-32)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupForm.vm (+85/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateCategoryOptionGroupSetForm.vm (+80/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataDictionaryForm.vm (+0/-150)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm (+0/-251)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm (+14/-47)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupSet.vm (+29/-54)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm (+20/-6)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm (+14/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupSet.vm (+13/-54)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorTypeForm.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml (+19/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/AddDataSetAction.java (+171/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java (+14/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DefineDataSetAssociationsAction.java (+15/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DelDataSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/EditDataSetFormAction.java (+86/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/GetDataSetListSortOrderAction.java (+0/-81)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/SaveDataSetSortOrderAction.java (+0/-87)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/UpdateDataSetAction.java (+172/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/ValidateDataSetAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/SaveCompulsoryDataElementsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/AutoSaveDataEntryFormAction.java (+14/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/DelDataEntryFormAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/GetSelectedDataElementsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SaveDataEntryFormAction.java (+19/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/SetAutoSaveSettingAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ValidateDataEntryFormAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/DefinedAssociationEditorAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/DefinedMultiAssociationsEditorAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/editor/ShowedAssociationsEditorAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/AddSectionAction.java (+75/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/EditSectionAction.java (+12/-53)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionAction.java (+23/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionListSortOrderAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GetSectionOptionsAction.java (+19/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/GreySectionAction.java (+19/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/RemoveSectionAction.java (+14/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionGreyStatusAction.java (+16/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SaveSectionSortOrderAction.java (+18/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/SectionListAction.java (+35/-44)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java (+75/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/ValidateSectionAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml (+13/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module.properties (+19/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_ar.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_es.properties (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_es_ES.properties (+0/-167)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_fr.properties (+116/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_fr_FR.properties (+0/-114)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_id.properties (+110/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_id_ID.properties (+0/-111)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_lo.properties (+115/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_my.properties (+19/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_my_MM.properties (+0/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt.properties (+118/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_BR.properties (+1/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_pt_PT.properties (+0/-114)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_ru.properties (+111/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_tg.properties (+111/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi.properties (+81/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_vi_VN.properties (+0/-92)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_zh.properties (+178/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/org/hisp/dhis/dataset/i18n_module_zh_CN.properties (+0/-180)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml (+21/-41)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm (+155/-143)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addSection.vm (+98/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/dataSetList.vm (+50/-84)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm (+159/-149)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editSection.vm (+83/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/greySection.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/index.vm (+2/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addDataSet.js (+0/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/addSection.js (+2/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataEntryForm.js (+1/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js (+41/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editDataSet.js (+0/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/editSection.js (+2/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js (+13/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/viewDataEntryForm.js (+12/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/menu.vm (+2/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sectionList.vm (+31/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortDataSetForm.vm (+0/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/sortSectionForm.vm (+18/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewDataEntryForm.vm (+10/-31)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/viewEditorForm.vm (+2/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml (+14/-6)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/DeleteSentSMSAction.java (+21/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/GetSmsConfigurationAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/J2meClientUpdateAction.java (+48/-68)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/MobileDataSetListAction.java (+0/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ReloadStartStopServiceAction.java (+17/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/RemoveGatewayConfigAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/SaveSmsConfigurationAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/SendSMSAction.java (+24/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowMobileSettingFormAction.java (+0/-167)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/ShowSentSMSAction.java (+103/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateBulkGateWayConfigAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateClickatellGateWayConfigAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateDefaultGatewayAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateGenericHTTPGateWayConfigAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileDataSetAction.java (+0/-96)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateMobileSettingAction.java (+0/-205)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateModemGateWayConfigAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/UpdateSMPPGateWayConfigAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/DeleteReceiveSMSAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ProcessingSendQuickSMSAction.java (+290/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReceivingSMSAction.java (+112/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/ReimportSMSAction.java (+55/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/incoming/UpdateReceiveSMSAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/CreateSMSCommandForm.java (+44/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/DeleteSMSCommandAction.java (+37/-32)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/EditSMSCommandForm.java (+198/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/SMSCommandAction.java (+110/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/action/smscommand/ValidateSMSCommandAction.java (+109/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/caseentry/state/DefaultSelectedStateManager.java (+40/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/java/org/hisp/dhis/mobile/caseentry/state/SelectedStateManager.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/META-INF/dhis/beans.xml (+58/-100)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module.properties (+37/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_ar.properties (+3/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_es.properties (+114/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_fr.properties (+145/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_fr_FR.properties (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_id.properties (+118/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_id_ID.properties (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_lo.properties (+146/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_my.properties (+39/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_my_MM.properties (+0/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_pt.properties (+131/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_pt_PT.properties (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_ru.properties (+129/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_tg.properties (+129/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_vi.properties (+63/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_vi_VN.properties (+0/-67)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_zh.properties (+157/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/org/hisp/dhis/mobile/i18n_module_zh_CN.properties (+0/-157)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/resources/struts.xml (+80/-75)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/index.vm (+6/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/command.js (+83/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/menu.vm (+1/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/mobileDatasetList.vm (+0/-74)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/patientSettings.vm (+0/-86)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/receiveSMSPage.vm (+112/-28)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/showSentSMSPage.vm (+59/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/edit-sms-command.vm (+306/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/new-sms-command.vm (+43/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smscommand/sms-commands.vm (+31/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/style/dhis-web-maintenance-mobile.css (+9/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml (+18/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/GetSelectedOrganisationUnitAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/MoveOrganisationUnitAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateNewParentOrganisationUnitAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/hierarchy/ValidateOrganisationUnitToMoveAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java (+49/-86)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AssignOrganisationUnitToGroupsAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetCompulsoryGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitAction.java (+61/-43)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/GetOrganisationUnitListAction.java (+20/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/RemoveOrganisationUnitAction.java (+14/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ShowAddOrganisationUnitFormAction.java (+30/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/UpdateOrganisationUnitAction.java (+61/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/ValidateOrganisationUnitAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/AddOrganisationUnitGroupAction.java (+19/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupAction.java (+22/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupMembersAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/RemoveOrganisationUnitGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ShowAddOrganisationUnitGroupFormAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/UpdateOrganisationUnitGroupAction.java (+22/-52)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/ValidateOrganisationUnitGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/AddGroupSetAction.java (+68/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/RemoveGroupSetAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowAddOrganisationUnitGroupSetFormAction.java (+77/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ShowUpdateGroupSetFormAction.java (+45/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/UpdateGroupSetAction.java (+74/-33)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/ValidateGroupSetAction.java (+22/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/GetOrganisationUnitLevelsAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitlevel/SaveOrganisationUnitLevelsAction.java (+23/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/pdf/ExportToPdfAction.java (+0/-200)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/search/GetOrganisationUnitDetailsAction.java (+30/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/search/SearchOrganisationUnitsAction.java (+38/-50)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/META-INF/dhis/beans.xml (+11/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties (+6/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_ar.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_es.properties (+106/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_es_ES.properties (+0/-103)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_fr.properties (+109/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_fr_FR.properties (+0/-107)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_id.properties (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_id_ID.properties (+0/-107)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_lo.properties (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_my.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_my_MM.properties (+0/-98)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_pt.properties (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_pt_PT.properties (+0/-106)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_ru.properties (+108/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_tg.properties (+108/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi.properties (+99/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_vi_VN.properties (+0/-100)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_zh.properties (+149/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module_zh_CN.properties (+0/-149)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/struts.xml (+12/-23)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm (+47/-43)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupForm.vm (+4/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitGroupSetForm.vm (+48/-50)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/index.vm (+5/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/addOrganisationUnitGroupSetForm.js (+0/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/hierarchyOperations.js (+14/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js (+19/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroup.js (+18/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitGroupSet.js (+15/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnitSearch.js (+0/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/updateOrganisationUnitGroupSetForm.js (+0/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/menu.vm (+6/-6)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm (+89/-79)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroup.vm (+41/-29)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitGroupSet.vm (+45/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnitSearch.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/saveOrganisationUnitLevelForm.vm (+25/-6)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm (+30/-45)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupForm.vm (+2/-53)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitGroupSetForm.vm (+44/-53)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/GetPatientExcelItemplateFileAction.java (+0/-76)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/configuration/SetPatientExcelItemplateFileAction.java (+0/-75)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/DelRegistrationFormAction.java (+0/-98)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/GetPatientRegistrationFormListAction.java (+0/-112)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/RemovePatientAttributeOptionAction.java (+0/-121)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/ShowUpdatePatientAttributeAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/AddPatientIdentifierTypeAction.java (+0/-128)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeAction.java (+0/-91)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/GetPatientIdentifierTypeListAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/RemovePatientIdentifierTypeAction.java (+0/-125)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/ShowUpdatePatientIdentifierTypeForm.java (+0/-114)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/UpdatePatientIdentifierTypeAction.java (+0/-137)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientidentifiertype/ValidatePatientIdentifierTypeAction.java (+0/-111)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/DefineProgramUserroleAction.java (+0/-108)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/program/ShowProgramUserroleFormAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/GetProgramStageListAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programstage/SaveProgramStageSortOrderAction.java (+0/-100)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/programtindicator/GetProgramIndicatorDescripttionAction.java (+0/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/DefineProgramListForValidationCriteriaAction.java (+0/-126)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/validation/GetProgramListForValidationCriteriaAction.java (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/DefaultSelectedStateManager.java (+0/-255)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/state/SelectedStateManager.java (+0/-103)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_es_ES.properties (+0/-420)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_fr_FR.properties (+0/-440)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_id_ID.properties (+0/-377)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_my_MM.properties (+0/-255)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_pt_PT.properties (+0/-422)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_vi_VN.properties (+0/-286)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module_zh_CN.properties (+0/-649)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientIdentifierTypeForm.vm (+0/-72)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addCaseAggregationForm.js (+0/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addPatientAttributeForm.js (+0/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/addPatientIdentifierTypeForm.js (+0/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/commons.js (+0/-101)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patientIdentifierType.js (+0/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updatePatientAttributeForm.js (+0/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/updatePatientIdentifierTypeForm.js (+0/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientIdentifierType.vm (+0/-66)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientRegistrationForm.vm (+0/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programUserrole.vm (+0/-44)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/programsForValidationCriteriaAssociations.vm (+0/-56)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/updatePatientIdentifierType.vm (+0/-74)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/pom.xml (+15/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/NoAction.java (+13/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/AddCaseAggregationConditionAction.java (+20/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggConditionDescriptionAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAggPSDataElementsAction.java (+24/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetAllCaseAggregationConditionAction.java (+29/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetCaseAggregationConditionAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetDataElementsByDataSetAction.java (+15/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetOptionsAction.java (+115/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetParamsByProgramAction.java (+25/-23)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java (+36/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/RemoveCaseAggregationConditionAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowAddCaseAggregationConditionFormAction.java (+24/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ShowUpdateCaseAggregationConditionFormAction.java (+25/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/TestCaseAggregationConditionAction.java (+19/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/UpdateCaseAggregationConditionAction.java (+16/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/ValidateCaseAggregationConditionAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/GetSelectedDataElementsAction.java (+13/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveDataEntryFormAction.java (+20/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/RemoveProgramEntryFormAction.java (+100/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SaveDataEntryFormAction.java (+30/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SaveProgramEntryFormAction.java (+26/-50)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SelectDataElementAction.java (+15/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SelectProgramStageDataElementAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SetAutoSaveDataEntrySettingAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/SetAutoSaveProgramEntryFormSettingAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ShowDataEntryFormAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ShowProgramEntryFormAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ValidateDataEntryFormAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ViewDataEntryFormAction.java (+16/-23)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/dataentryform/ViewProgramEntryFormAction.java (+37/-81)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/AddProgramAction.java (+215/-200)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/DefineProgramAssociationsAction.java (+16/-82)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/GetProgramAction.java (+61/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/GetProgramListAction.java (+42/-63)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/GetUnAnonymousProgramAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/RemoveProgramAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowAddProgramFormAction.java (+137/-54)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ShowUpdateProgramFormAction.java (+140/-49)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/UpdateProgramAction.java (+217/-163)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/program/ValidateProgramAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/AddProgramIndicatorAction.java (+53/-46)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorAction.java (+96/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/GetProgramIndicatorListAction.java (+15/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/RemoveProgramIndicatorAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/UpdateProgramIndicatorAction.java (+62/-59)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programindicator/ValidateProgramIndicatorAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/GetProgramRuleAction.java (+112/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/GetProgramRuleListAction.java (+118/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/ShowAddProgramRuleFormAction.java (+102/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programrule/ValidateProgramRuleAction.java (+124/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageAction.java (+217/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/AddProgramStageSectionAction.java (+43/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageAction.java (+88/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageSectionAction.java (+45/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/GetProgramStageSectionListAction.java (+15/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/RemoveProgramStageAction.java (+24/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/RemoveProgramStageSectionAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SaveProgramStageSectionSortOrderAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/ShowAddProgramStageAction.java (+181/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/ShowAddProgramStageFormAction.java (+155/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/ShowAddProgramStageSectionAction.java (+40/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/SortProgramStagesAction.java (+98/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageAction.java (+223/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/UpdateProgramStageSectionAction.java (+42/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/ValidateProgramStageAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/programstage/ValidateProgramStageSectionAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/AddRelationshipTypeAction.java (+18/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/GetRelationshipTypeAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/GetRelationshipTypeListAction.java (+48/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/RemoveRelationshipTypeAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/UpdateRelationshipTypeAction.java (+17/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/relationship/ValidateRelationshipTypeAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java (+13/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleCaseAggregateConditionAction.java (+16/-45)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/AddTrackedEntityAction.java (+107/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/GetTrackedEntityAction.java (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/GetTrackedEntityListAction.java (+108/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/RemoveTrackedEntityAction.java (+110/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/ShowAddUpdateTrackedEntityAction.java (+110/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/UpdateTrackedEntityAction.java (+116/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentity/ValidateTrackedEntityAction.java (+108/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java (+183/-73)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/GetAttributeAction.java (+23/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/GetAttributeListAction.java (+54/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/GetAttributesWithoutGroupAction.java (+24/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/GetOptionalAttributesWithoutGroupAction.java (+22/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/RemoveAttributeAction.java (+24/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/SaveAttributeInListNoProgramAction.java (+103/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/SaveAttributeVisitScheduleAction.java (+36/-31)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java (+184/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAttributeInListNoProgramAction.java (+86/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAttributeVisitScheduleFormAction.java (+31/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/UpdateAttributeAction.java (+179/-109)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ValidateAttributeAction.java (+67/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/AddAttributeGroupAction.java (+44/-41)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/GetAttributeGroupAction.java (+45/-44)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/GetAttributeGroupListAction.java (+60/-38)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/RemoveAttributeGroupAction.java (+21/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/SaveAttributeGroupSortOrderAction.java (+32/-30)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/UpdateAttributeGroupAction.java (+44/-43)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattributegroup/ValidateAttributeGroupAction.java (+20/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/AddProgramReminderAction.java (+169/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/AddProgramStageReminderAction.java (+170/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/GetInstanceReminderAction.java (+140/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/GetProgramStageReminderAction.java (+141/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/RemoveProgramReminderAction.java (+99/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/RemoveProgramStageReminderAction.java (+98/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/ShowAddProgramReminderAction.java (+111/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/ShowAddProgramStageReminderAction.java (+111/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/UpdateProgramReminderAction.java (+186/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/UpdateProgramStageReminderAction.java (+186/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityinstancereminder/ValidateProgramReminderAction.java (+112/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddProgramValidationAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/AddValidationCriteriaAction.java (+38/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramExpressionDescriptionAction.java (+28/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetProgramValidationListAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetValidationCriteriaAction.java (+50/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/GetValidationCriteriaListAction.java (+13/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveProgramValidationAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/RemoveValidationCriteriaAction.java (+12/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateProgramValidationAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/UpdateValidationCriteriaAction.java (+32/-35)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/validation/ValidateValidationCriteriaAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/META-INF/dhis/beans.xml (+1151/-1153)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties (+249/-113)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_ar.properties (+4/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_es.properties (+223/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_fr.properties (+188/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_id.properties (+377/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_km.properties (+5/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_lo.properties (+492/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_my.properties (+54/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_pt.properties (+544/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_ru.properties (+482/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_tg.properties (+482/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_vi.properties (+168/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module_zh.properties (+649/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/struts.xml (+1286/-1183)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm (+138/-48)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeGroupForm.vm (+18/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addCaseAggregation.vm (+15/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramForm.vm (+226/-218)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramIndicator.vm (+67/-61)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramReminder.vm (+145/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramRule.vm (+259/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageForm.vm (+234/-59)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageReminder.vm (+134/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addProgramStageSectionForm.vm (+67/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addRelationshipTypeForm.vm (+15/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addSingleProgramValidationForm.vm (+10/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addTrackedEntity.vm (+53/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addValidationCriteria.vm (+40/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attribute.vm (+53/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeGroup.vm (+49/-46)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeInListNoProgram.vm (+76/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/attributeVisitSchedule.vm (+27/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregation.vm (+44/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationForm.vm (+71/-42)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/caseAggregationList.vm (+8/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/expressionBuilderForm.vm (+3/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/index.vm (+9/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addAttributeGroupForm.js (+25/-29)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addCaseAggregationForm.js (+13/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addProgramStageForm.js (+21/-90)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addRelationshipTypeForm.js (+7/-3)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/addValidationCriteria.js (+7/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attribute.js (+121/-133)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/attributeGroup.js (+30/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/caseaggregation.js (+575/-512)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/program.js (+296/-306)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programEntryForm.js (+16/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js (+163/-111)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programReminder.js (+192/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programRule.js (+542/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStage.js (+223/-66)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageReminder.js (+191/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programStageSection.js (+16/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programValidation.js (+167/-180)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/relationship.js (+61/-61)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/trackedEntity.js (+33/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateAttributeGroupForm.js (+24/-28)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateCaseAggregationForm.js (+5/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateProgramStageForm.js (+10/-74)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateRelationshipTypeForm.js (+10/-7)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/updateValidationCriteria.js (+9/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/validationcriteria.js (+91/-57)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewDataEntryForm.js (+20/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/viewProgramEntryForm.js (+90/-77)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonOptions.vm (+2/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm (+19/-36)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonTrackedEntityDataElements.vm (+5/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/menu.vm (+10/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programAssociations.vm (+9/-57)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicator.vm (+28/-21)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programIndicatorForm.vm (+311/-80)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programList.vm (+64/-84)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programReminder.vm (+92/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programRule.vm (+79/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStage.vm (+37/-32)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageReminder.vm (+91/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageSection.vm (+17/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programStageSectionSortOder.vm (+2/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/programValidationList.vm (+42/-39)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/relationshipType.vm (+53/-43)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseSelDataElementList.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/responseValidationCriteria.vm (+0/-5)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/sortAttributeGroupForm.vm (+8/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/sortProgramStagesForm.vm (+27/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/style/basic.css (+13/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/trackedEntity.vm (+64/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm (+124/-50)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteGroupForm.vm (+23/-51)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateCaseAggregation.vm (+19/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramForm.vm (+244/-278)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramIndicator.vm (+68/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramReminder.vm (+180/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramRule.vm (+308/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageForm.vm (+246/-120)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageReminder.vm (+141/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateProgramStageSectionForm.vm (+71/-23)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateRelationshipTypeForm.vm (+9/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateSingleProgramValidationForm.vm (+17/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateTrackedEntity.vm (+54/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateValidationCriteria.vm (+34/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/validationCriteria.vm (+27/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewDataEntryForm.vm (+34/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewProgramEntryForm.vm (+53/-103)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/viewScheduledCaseAggTasks.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml (+13/-8)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/AddApprovalLevelAction.java (+104/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAccessSettingsAction.java (+28/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAddApprovalLevelFormParameters.java (+94/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java (+53/-34)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsStringAction.java (+88/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetApprovalSettingsAction.java (+103/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetCalendarSettingsAction.java (+75/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetGeneralSettingsAction.java (+55/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetOAuth2ClientAction.java (+86/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetOAuth2ClientsAction.java (+73/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetSMTPSettingsAction.java (+29/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetSynchronizationSettingsAction.java (+83/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/MoveApprovalLevelDownAction.java (+78/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/MoveApprovalLevelUpAction.java (+77/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/RemoveApprovalLevelAction.java (+110/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAccessSettingsAction.java (+97/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java (+61/-22)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetApprovalSettingsAction.java (+97/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetCalendarSettingsAction.java (+84/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java (+115/-27)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSMTPSettingsAction.java (+32/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetSynchronizationSettingsAction.java (+117/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/ValidateApprovalLevelAction.java (+110/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/META-INF/dhis/beans.xml (+96/-24)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties (+95/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_ar.properties (+9/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es.properties (+53/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_es_ES.properties (+0/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr.properties (+98/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_fr_FR.properties (+0/-104)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_id.properties (+60/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_id_ID.properties (+0/-60)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_lo.properties (+113/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_my.properties (+2/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_my_MM.properties (+0/-61)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_pt.properties (+147/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_pt_PT.properties (+0/-144)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_ru.properties (+64/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_tg.properties (+64/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi.properties (+32/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_vi_VN.properties (+0/-118)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_zh.properties (+103/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module_zh_CN.properties (+0/-103)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/struts.xml (+138/-23)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/WEB-INF/web.xml (+114/-100)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/addApprovalLevel.vm (+38/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/index.vm (+11/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/addApprovalLevel.js (+25/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/oauth2Clients.js (+99/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemAppearanceSettings.js (+11/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemApprovalSettings.js (+24/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/javascripts/systemSynchronizationSettings.js (+7/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/oAuth2Client.vm (+105/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/settingsMenu.vm (+12/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAccessSettings.vm (+101/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm (+51/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettingsString.vm (+7/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemApprovalSettings.vm (+96/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemCalendarSettings.vm (+38/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm (+33/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm (+119/-40)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemOAuth2Clients.vm (+52/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemSynchronizationSettings.vm (+37/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml (+23/-15)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddRoleAction.java (+39/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/AddUserAction.java (+263/-73)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DeleteCurrentUserAction.java (+30/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/DisableUserAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetOrgunitUserListAction.java (+29/-64)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleAction.java (+49/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetSystemAuthoritiesAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserAction.java (+18/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetUserListAction.java (+53/-83)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/RemoveRoleAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/RemoveUserAction.java (+14/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupRoleAction.java (+0/-109)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/SetupTreeAction.java (+159/-57)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateRoleAction.java (+39/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/UpdateUserAction.java (+247/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateInviteAction.java (+126/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateRoleAction.java (+11/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/ValidateUserAction.java (+53/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/pdf/ExportToPdfAction.java (+0/-205)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/AddUserGroupAction.java (+34/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/AddUserGroupFormAction.java (+20/-17)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/EditUserGroupFormAction.java (+37/-18)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/GetUserGroupAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/GetUserGroupListAction.java (+69/-14)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/RemoveUserGroupAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/UpdateUserGroupAction.java (+51/-31)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/ValidateUserGroupAction.java (+24/-16)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/META-INF/dhis/beans.xml (+56/-25)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties (+194/-133)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ar.properties (+5/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties (+221/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties (+0/-347)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties (+330/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties (+0/-345)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties (+276/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id_ID.properties (+0/-311)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_km.properties (+4/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties (+333/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties (+168/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties (+0/-252)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties (+343/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties (+7/-42)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties (+0/-359)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties (+297/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties (+297/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties (+223/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties (+0/-281)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties (+266/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties (+0/-300)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml (+80/-42)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addRoleForm.vm (+35/-2)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserForm.vm (+172/-78)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/addUserGroupForm.vm (+51/-68)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allRole.vm (+30/-20)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm (+83/-56)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/index.vm (+4/-11)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/allRole.js (+13/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/allUser.js (+9/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/role.js (+12/-13)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/updateRoleForm.js (+1/-0)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js (+231/-102)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user_tmpl.js (+17/-9)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/usergroup.js (+60/-19)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/menu.vm (+5/-5)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/responseUsers.vm (+1/-1)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateRoleForm.vm (+40/-4)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm (+157/-86)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserGroupForm.vm (+53/-72)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/user.vm (+21/-26)
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/userGroupList.vm (+82/-55)
dhis-2/dhis-web/dhis-web-maintenance/pom.xml (+3/-2)
dhis-2/dhis-web/dhis-web-mapping/pom.xml (+0/-83)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java (+0/-101)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java (+0/-155)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetAllPeriodTypesAction.java (+0/-78)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonAction.java (+0/-174)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFacilitiesAction.java (+0/-208)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFilesAction.java (+0/-84)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetGeoJsonFromFileAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetInfrastructuralDataElementMapValuesAction.java (+0/-143)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitChildrenAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitGroupsByGroupSetAction.java (+0/-99)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetOrganisationUnitInfoFacilityAction.java (+0/-101)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetPeriodsByPeriodTypeAction.java (+0/-116)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/InitializeAction.java (+0/-156)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/NoAction.java (+0/-43)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/RenameMapAction.java (+0/-59)
dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/UpdateOrganisationUnitCoordinatesAction.java (+0/-85)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml (+0/-116)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module.properties (+0/-370)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_es_ES.properties (+0/-304)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_fr_FR.properties (+0/-363)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_id_ID.properties (+0/-361)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_pt_BR.properties (+0/-300)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_pt_PT.properties (+0/-300)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_vi_VN.properties (+0/-304)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/org/hisp/dhis/mapping/i18n_module_zh_CN.properties (+0/-301)
dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml (+0/-126)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/classes/velocity.properties (+0/-3)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/WEB-INF/web.xml (+0/-102)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/app/scripts/plugin.js (+0/-295)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonFacilities.vm (+0/-6)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonmin.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/geojsonminValues.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm (+0/-395)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonAggregatedMapValues.vm (+0/-15)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonBaseCoordinate.vm (+0/-7)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonDataElementGroupSets.vm (+0/-2)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonDataElementGroups.vm (+0/-2)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonGeoJsonFiles.vm (+0/-8)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonIndicatorGroups.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonInfrastructuralAggregatedMapValues.vm (+0/-3)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonInitialize.vm (+0/-47)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMap.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLayers.vm (+0/-16)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSet.vm (+0/-11)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegendSets.vm (+0/-12)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapLegends.vm (+0/-14)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelation.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapOrganisationUnitRelations.vm (+0/-12)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapView.vm (+0/-33)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonMapViews.vm (+0/-36)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitChildren.vm (+0/-13)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnitLevels.vm (+0/-10)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOrganisationUnits.vm (+0/-19)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonOutputFile.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriodTypes.vm (+0/-10)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonPeriods.vm (+0/-11)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonUserSettings.vm (+0/-3)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminAggregatedMapValues.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminDataElements.vm (+0/-2)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminFacilityInfo.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminIndicators.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapLegendSets.vm (+0/-9)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapOrganisationUnitRelations.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMapViews.vm (+0/-11)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminMaps.vm (+0/-12)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnitGroups.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/jsonminOrganisationUnits.vm (+0/-1)
dhis-2/dhis-web/dhis-web-mobile/pom.xml (+13/-25)
dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java (+12/-11)
dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/interceptors/I18nInterceptor.java (+10/-9)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/beans.xml (+1/-1)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/META-INF/dhis/mobile.xml (+3/-3)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache (+1/-2)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module.properties (+2/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_ar.properties (+1/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_fr.properties (+13/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_fr_FR.properties (+0/-13)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_lo.properties (+14/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_pt.properties (+13/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_ru.properties (+1/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/resources/org/hisp/dhis/web/mobile/i18n_module_tg.properties (+1/-0)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/data-entry.vm (+326/-267)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm (+37/-5)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/layout.vm (+19/-4)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/user-account.vm (+2/-2)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/web.xml (+136/-120)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/css/jquery.mobile.min.css (+11/-2)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/dhis2.storage.js (+34/-10)
dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/js/jquery.mobile.min.js (+9/-7)
dhis-2/dhis-web/dhis-web-ohie/pom.xml (+106/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/adx/webapi/ADXController.java (+79/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Body.java (+88/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Code.java (+79/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Envelope.java (+80/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Fault.java (+72/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Header.java (+117/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Reason.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Subcode.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Text.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/Value.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/soap/package-info.java (+40/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/Action.java (+73/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/Address.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/MessageID.java (+67/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/RelatesTo.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/ReplyTo.java (+59/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/To.java (+73/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/domain/wsa/package-info.java (+40/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/common/exception/SoapException.java (+58/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Address.java (+80/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/AddressLine.java (+73/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/CodedType.java (+93/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/CommonName.java (+78/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Contact.java (+59/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/ContactPoint.java (+98/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Csd.java (+98/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Facility.java (+207/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/FacilityDirectory.java (+60/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Geocode.java (+98/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/GetModificationsRequest.java (+60/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/GetModificationsResponse.java (+64/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Language.java (+86/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Name.java (+134/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/OperatingHours.java (+112/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Organization.java (+158/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/OrganizationDirectory.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/OtherID.java (+78/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Person.java (+87/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/ProviderDirectory.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Record.java (+99/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/Service.java (+101/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/ServiceDirectory.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/domain/package-info.java (+40/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/exception/MissingGetDirectoryModificationsRequestException.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/exception/MissingGetModificationsRequestException.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/exception/MissingLastModifiedException.java (+42/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/csd/webapi/CsdController.java (+428/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/FredSpringWebTest.java (+175/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/RedirectController.java (+48/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/controller/FacilityAdvice.java (+250/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/controller/FacilityController.java (+810/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/controller/FredController.java (+53/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/domain/Facilities.java (+80/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/domain/Facility.java (+209/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/domain/Identifier.java (+94/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/domain/MessageResponse.java (+72/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/DuplicateCodeException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/DuplicateUidException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/DuplicateUuidException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/ETagVerificationException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/FacilityNotFoundException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/exception/UuidFormatException.java (+45/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/ContextUtils.java (+67/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/FacilityToOrganisationUnitConverter.java (+133/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/FacilityToSimpleFeature.java (+88/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/GeoUtils.java (+127/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/MessageUtils.java (+81/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/ObjectMapperFactoryBean.java (+67/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/OrganisationUnitToFacilityConverter.java (+142/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/OrganisationUnitToSimpleFeature.java (+86/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/ValidationUtils.java (+72/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/validation/constraint/PropertiesValidator.java (+139/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/validation/constraint/annotation/ValidProperties.java (+53/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/validation/group/Create.java (+36/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/validation/group/Standard.java (+55/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/java/org/hisp/dhis/web/ohie/fred/webapi/v1/validation/group/Update.java (+36/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/beans.xml (+7/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/resources/META-INF/dhis/webapi-ohie.xml (+106/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/resources/struts.xml (+19/-0)
dhis-2/dhis-web/dhis-web-ohie/src/main/webapp/WEB-INF/web.xml (+150/-0)
dhis-2/dhis-web/dhis-web-ohie/src/test/java/org/hisp/dhis/web/ohie/fred/webapi/v1/controller/FacilityControllerTest.java (+526/-0)
dhis-2/dhis-web/dhis-web-ohie/src/test/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/GeoUtilsTest.java (+67/-0)
dhis-2/dhis-web/dhis-web-ohie/src/test/java/org/hisp/dhis/web/ohie/fred/webapi/v1/utils/OrganisationUnitToFacilityConverterTest.java (+138/-0)
dhis-2/dhis-web/dhis-web-ohie/src/test/resources/getModificationsRequest-test.xml (+19/-0)
dhis-2/dhis-web/dhis-web-pivot/pom.xml (+0/-64)
dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/GetOrganisationUnitChildrenAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/InitializeAction.java (+0/-271)
dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/NoAction.java (+0/-43)
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/META-INF/dhis/beans.xml (+0/-31)
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties (+0/-129)
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr_FR.properties (+0/-124)
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_pt_PT.properties (+0/-109)
dhis-2/dhis-web/dhis-web-pivot/src/main/resources/struts.xml (+0/-38)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/classes/velocity.properties (+0/-3)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/WEB-INF/web.xml (+0/-102)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js (+0/-154)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm (+0/-131)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/jsonInitialize.vm (+0/-10)
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/jsonminOrganisationUnitChildren.vm (+0/-1)
dhis-2/dhis-web/dhis-web-portal/india-pom.xml (+0/-228)
dhis-2/dhis-web/dhis-web-portal/pom.xml (+24/-28)
dhis-2/dhis-web/dhis-web-portal/src/main/resources/META-INF/dhis/beans.xml (+1/-1)
dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml (+61/-32)
dhis-2/dhis-web/dhis-web-reporting/pom.xml (+13/-10)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessAction.java (+21/-18)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/completeness/action/GetDataCompletenessOptionsAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataapproval/action/GetDataApprovalOptionsAction.java (+102/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java (+18/-111)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GenerateDataSetReportAction.java (+60/-88)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/GetDataSetReportOptionsAction.java (+61/-22)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/AddDocumentToDashboardAction.java (+0/-112)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/GetAllDocumentsAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/GetDocumentAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/RemoveDocumentAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/document/action/SaveDocumentAction.java (+24/-11)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/ExportDataMartAction.java (+0/-262)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/exp/MetaDataExportAction.java (+0/-135)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/orgunitdistribution/action/GetOrgUnitDistributionAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/orgunitdistribution/action/GetOrgUnitDistributionChartAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/orgunitdistribution/action/GetOrgUnitDistributionOptionsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/AddReportAction.java (+47/-15)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/AddReportToDashboardAction.java (+0/-112)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetAllReportsAction.java (+16/-14)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportAndParamsAction.java (+26/-80)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportOptionsAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/GetReportTemplateAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/RemoveReportAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/AddReportTableToDashboardAction.java (+0/-113)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java (+14/-13)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetAllTablesAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetReportParamsAction.java (+71/-40)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/RemoveTableAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml (+13/-38)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties (+34/-8)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_ar.properties (+87/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_es.properties (+240/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_es_ES.properties (+0/-248)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_fr.properties (+265/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_fr_FR.properties (+0/-249)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_id.properties (+246/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_id_ID.properties (+0/-247)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_km.properties (+84/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_lo.properties (+274/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_my.properties (+99/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_my_MM.properties (+0/-205)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_pt.properties (+239/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_pt_PT.properties (+0/-239)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_ru.properties (+246/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_tg.properties (+246/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi.properties (+272/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_vi_VN.properties (+0/-231)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_zh.properties (+430/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module_zh_CN.properties (+0/-431)
dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml (+19/-80)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addDocumentForm.vm (+4/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/addReportForm.vm (+75/-55)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataApprovalForm.vm (+121/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm (+50/-61)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/index.vm (+1/-7)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm (+2/-3)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataApproval.js (+339/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataCompleteness.js (+33/-5)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataMart.js (+4/-23)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js (+197/-71)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/document.js (+35/-35)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js (+59/-69)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/table.js (+7/-15)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/jsonReport.vm (+1/-0)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/menu.vm (+3/-2)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDataSetReportHeader.vm (+2/-2)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderDefaultDataSetReportForm.vm (+0/-6)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderHtmlReport.vm (+2/-53)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/renderSectionDataSetReportForm.vm (+7/-1)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/style/dhis-web-reporting.css (+39/-1)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataCompletenessForm.vm (+7/-8)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDataMartForm.vm (+4/-38)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewDocumentForm.vm (+65/-74)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewOrgUnitDistribution.vm (+3/-4)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewReportForm.vm (+58/-65)
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewTableForm.vm (+28/-30)
dhis-2/dhis-web/dhis-web-sms/pom.xml (+9/-12)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/MenuAction.java (+14/-14)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/action/NoAction.java (+10/-9)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInput.java (+0/-157)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/input/SMSInputAction.java (+159/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ProcessingSendSMSAction.java (+81/-127)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/SearchPatientAction.java (+0/-193)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSBeneficiaryFormAction.java (+19/-17)
dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/outcoming/ShowSendSMSFormAction.java (+13/-14)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml (+9/-11)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module.properties (+2/-1)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ar.properties (+1/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es.properties (+118/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_es_ES.properties (+0/-65)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr.properties (+120/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_fr_FR.properties (+0/-118)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_id.properties (+119/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_id_ID.properties (+0/-119)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_km.properties (+1/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_lo.properties (+117/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my.properties (+1/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_my_MM.properties (+0/-1)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt.properties (+118/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_pt_PT.properties (+0/-118)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_ru.properties (+120/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_tg.properties (+120/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi.properties (+86/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_vi_VN.properties (+0/-90)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_zh.properties (+67/-0)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/org/hisp/dhis/sms/i18n_module_zh_CN.properties (+0/-67)
dhis-2/dhis-web/dhis-web-sms/src/main/resources/struts.xml (+8/-10)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiaryDetail.vm (+1/-1)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/beneficiarySearchResult.vm (+1/-2)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/dataEntrySection.vm (+12/-10)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/inputReportParamsForm.vm (+0/-56)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/sendSMS.js (+2/-9)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/patientRegistrationList.vm (+2/-1)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/programStageForm.vm (+10/-10)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm (+3/-3)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm (+2/-6)
dhis-2/dhis-web/dhis-web-uaa/pom.xml (+62/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/java/org/hisp/dhis/web/uaa/oauth2/ConfirmAccessController.java (+52/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/beans.xml (+7/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/resources/META-INF/dhis/webapi-uaa.xml (+38/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/resources/struts.xml (+11/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/webapp/WEB-INF/classes/velocity.properties (+3/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/webapp/WEB-INF/dhis-web-uaa/confirm_access.vm (+44/-0)
dhis-2/dhis-web/dhis-web-uaa/src/main/webapp/WEB-INF/web.xml (+106/-0)
dhis-2/dhis-web/dhis-web-validationrule/pom.xml (+16/-18)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/AddValidationRuleAction.java (+117/-49)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ExportValidationResultAction.java (+35/-28)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetFilteredDataElementsAction.java (+29/-29)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetPeriodTypesAction.java (+31/-13)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetTextualExpressionAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationResultDetailsAction.java (+15/-13)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/GetValidationRuleListAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/NoAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RemoveValidationRuleAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/RunValidationAction.java (+81/-45)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/SetupTreeAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowRunValidationFormAction.java (+17/-15)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ShowUpdateValidationRuleFormAction.java (+36/-11)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/UpdateValidationRuleAction.java (+96/-28)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateRunValidationAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/ValidateValidationRuleAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/EditDataValueAction.java (+0/-201)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ExportAnalysisResultAction.java (+137/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetAnalysisAction.java (+53/-42)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/GetFollowupAction.java (+112/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/MarkForFollowupAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ValidationRunAnalysisAction.java (+13/-11)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ViewAnalysisFormAction.java (+12/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/pdf/ExportToPdfAction.java (+0/-180)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/AddValidationRuleGroupAction.java (+51/-15)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/GetValidationRuleGroupAction.java (+11/-18)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/GetValidationRuleGroupListAction.java (+14/-12)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/RemoveValidationRuleGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/ShowUpdateValidationRuleGroupFormAction.java (+60/-28)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/UpdateValidationRuleGroupAction.java (+51/-14)
dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/validationrulegroup/ValidateValidationRuleGroupAction.java (+11/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/META-INF/dhis/beans.xml (+15/-18)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module.properties (+41/-8)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_ar.properties (+30/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_es.properties (+124/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_es_ES.properties (+0/-145)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_fr.properties (+154/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_fr_FR.properties (+0/-126)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_id.properties (+129/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_id_ID.properties (+0/-129)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_km.properties (+31/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_lo.properties (+152/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_my.properties (+32/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_my_MM.properties (+0/-124)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_pt.properties (+149/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_pt_PT.properties (+0/-126)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_ru.properties (+132/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_tet.properties (+159/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_tg.properties (+132/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_vi.properties (+120/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_vi_VN.properties (+0/-132)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_zh.properties (+154/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/org/hisp/dhis/validationrule/i18n_module_zh_CN.properties (+0/-154)
dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml (+53/-50)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/WEB-INF/web.xml (+113/-97)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleForm.vm (+67/-16)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/addValidationRuleGroupForm.vm (+67/-13)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/dataAnalysisForm.vm (+1/-3)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/expressionBuilderForm.vm (+36/-24)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/followUpAnalysisForm.vm (+0/-12)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/followupAnalysisForm.vm (+55/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/followupResult.vm (+96/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/index.vm (+3/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/addValidationRuleGroupForm.js (+1/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/dataAnalysis.js (+62/-18)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/editDataValue.js (+0/-142)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expression.js (+0/-187)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/expressionBuilder.js (+60/-52)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/general.js (+88/-10)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/runValidation.js (+30/-9)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleForm.js (+2/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/updateValidationRuleGroupForm.js (+2/-1)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRule.js (+27/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/javascript/validationRuleGroup.js (+162/-97)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRule.vm (+9/-0)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/jsonValidationRuleGroup.vm (+4/-1)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/menu.vm (+3/-3)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/responseDataElementList.vm (+1/-2)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/runValidationForm.vm (+11/-8)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/searchResult.vm (+12/-11)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleForm.vm (+77/-26)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/updateValidationRuleGroupForm.vm (+63/-8)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm (+76/-39)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRuleGroup.vm (+54/-42)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultDetailsForm.vm (+10/-6)
dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/viewValidationResultForm.vm (+51/-23)
dhis-2/dhis-web/dhis-web-visualizer/pom.xml (+0/-79)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/AddOrUpdateChartAction.java (+0/-508)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/DeleteChartsAction.java (+0/-79)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/ExportImageAction.java (+0/-157)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitChildrenAction.java (+0/-105)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitsAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitsByGroupAction.java (+0/-91)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/GetOrganisationUnitsByLevelAction.java (+0/-91)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/InitializeAction.java (+0/-261)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/NoAction.java (+0/-43)
dhis-2/dhis-web/dhis-web-visualizer/src/main/java/org/hisp/dhis/visualizer/action/UpdateChartNameAction.java (+0/-88)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/META-INF/dhis/beans.xml (+0/-85)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties (+0/-201)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_es_ES.proper (+0/-126)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_es_ES.properties (+0/-141)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties (+0/-182)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_id_ID.properties (+0/-141)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_my_MM.properties (+0/-121)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_pt_BR.properties (+0/-147)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_pt_PT.properties (+0/-123)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_vi_VN.properties (+0/-125)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_zh_CN.properties (+0/-157)
dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/struts.xml (+0/-102)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/classes/velocity.properties (+0/-3)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/WEB-INF/web.xml (+0/-102)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/i18n.vm (+0/-201)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonInitialize.vm (+0/-9)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminAggregatedValues.vm (+0/-1)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminCharts.vm (+0/-1)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminOrganisationUnitChildren.vm (+0/-1)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/jsonminOrganisationUnitPaths.vm (+0/-2)
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/stringChartId.vm (+0/-1)
dhis-2/dhis-web/pom.xml (+31/-15)
dhis-2/pom-full.xml (+26/-0)
dhis-2/pom.xml (+414/-322)
dhis-live/pom.xml (+0/-170)
dhis-live/readme.txt (+0/-61)
dhis-live/src/main/java/org/hisp/dhis/TrayApp.java (+0/-297)
dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java (+0/-139)
dhis-live/src/main/resources/log4j.properties (+0/-28)
dhis-live/util/config/dhislive-config.xml (+0/-29)
dhis-live/util/config/launch4j-dhis2-conf.xml (+0/-32)
dhis-live/util/div/hibernate.properties (+0/-6)
dhis-live/util/script/startup.sh (+0/-29)
dhis-mobile/dhis-service-sms/pom.xml (+0/-55)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/gateway/DhisClickatellGateway.java (+0/-38)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/DefaultSmsImportService.java (+0/-326)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/DefaultSmsInboundStoreService.java (+0/-99)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/HibernateSmsInboundStore.java (+0/-101)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/SmsService.java (+0/-627)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/ReceiveSMS.java (+0/-90)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/ReceiveSMSService.java (+0/-22)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/ReceiveSMSStore.java (+0/-22)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SendSMS.java (+0/-91)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SendSMSService.java (+0/-25)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SendSMSStore.java (+0/-24)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SmsFormat.java (+0/-109)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SmsImportService.java (+0/-37)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SmsInbound.java (+0/-247)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SmsInboundStore.java (+0/-49)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/api/SmsInboundStoreService.java (+0/-55)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/utils/Compressor.java (+0/-337)
dhis-mobile/dhis-service-sms/src/main/java/org/hisp/dhis/mobile/sms/utils/XMLFilter.java (+0/-12)
dhis-mobile/dhis-service-sms/src/main/resources/META-INF/dhis/beans.xml (+0/-34)
dhis-mobile/dhis-service-sms/src/main/resources/org/hisp/dhis/mobile/sms/hibernate/Sms.hbm.xml (+0/-33)
dhis-mobile/dhis-service-sms/src/test/java/org/hisp/dhis/mobile/sms/DefaultSmsInboundStoreServiceTest.java (+0/-140)
dhis-mobile/dhis-service-sms/src/test/java/org/hisp/dhis/mobile/sms/utils/CompressorTest.java (+0/-61)
dhis-mobile/dhis-web-sms/log4j.properties (+0/-29)
dhis-mobile/dhis-web-sms/pom.xml (+0/-54)
dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileHomePageAction.java (+0/-63)
dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/MobileSettingsAction.java (+0/-380)
dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/ReceiveImportPageAction.java (+0/-144)
dhis-mobile/dhis-web-sms/src/main/java/org/hisp/dhis/mobile/action/SendSMSAction.java (+0/-107)
dhis-mobile/dhis-web-sms/src/main/resources/META-INF/dhis/beans.xml (+0/-24)
dhis-mobile/dhis-web-sms/src/main/resources/struts.xml (+0/-40)
dhis-mobile/dhis-web-sms/src/main/webapp/META-INF/context.xml (+0/-2)
dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/classes/log4j.properties (+0/-29)
dhis-mobile/dhis-web-sms/src/main/webapp/WEB-INF/web.xml (+0/-60)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/StylesForTags.css (+0/-56)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/receiveImportPage.css (+0/-27)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/css/stylesForReports.css (+0/-74)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/user.js (+0/-54)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/menu.vm (+0/-6)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileImportingResult.vm (+0/-4)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/mobileSettingsPage.vm (+0/-39)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/receiveImportPage.vm (+0/-69)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/sendSMSPage.vm (+0/-32)
dhis-mobile/dhis-web-sms/src/main/webapp/dhis-web-sms/welcome.vm (+0/-2)
dhis-mobile/pom.xml (+0/-31)
installers/.bzrignore (+0/-12)
installers/INSTALLER-README.txt (+0/-132)
installers/LICENSE.txt (+0/-24)
installers/build.bat (+0/-52)
installers/build.sh (+0/-64)
installers/pom.xml (+0/-37)
installers/resources/conf/generic_hibernate.properties (+0/-27)
installers/resources/conf/hibernate.properties (+0/-27)
installers/resources/conf/importexport/ibatisConfiguration.xml (+0/-6)
installers/resources/conf/jetty.port (+0/-1)
installers/resources/conf/reports/reportConfiguration.xml (+0/-4)
installers/resources/files/Licence.txt (+0/-27)
installers/resources/files/README.html (+0/-79)
installers/resources/files/Readme.txt (+0/-19)
installers/resources/files/Readme_generic.txt (+0/-13)
installers/resources/postgres/restore_db.bat (+0/-5)
installers/resources/postgres/restore_db_psql.bat (+0/-13)
installers/resources/scripts/linux/startup.sh (+0/-28)
installers/src/bitrock/DHIS2.xml (+0/-333)
installers/src/bitrock/DHIS2_demo_birt.xml (+0/-319)
installers/src/bitrock/DHIS2_live.xml (+0/-245)
installers/src/bitrock/DHIS2_live_embedded_en.xml (+0/-319)
installers/src/bitrock/DHIS2_live_embedded_fr.xml (+0/-296)
installers/src/bitrock/DHIS2_pg.xml (+0/-419)
installers/src/bitrock/DHIS2_pginstaller.xml (+0/-460)
installers/src/bitrock/DHIS2_pginstaller_generic.xml (+0/-807)
installers/src/izpack/ProcessPanel.Spec.xml (+0/-34)
installers/src/izpack/install.xml (+0/-81)
installers/src/izpack/shortcutSpec.xml (+0/-57)
installers/src/nsis/dhis.nsi (+0/-327)
local/in/dhis-in-api/pom.xml (+1/-1)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/aggregation/CCEIAggregationService.java (+34/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/Catalog.java (+0/-202)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataEntryService.java (+0/-29)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValue.java (+0/-107)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueService.java (+0/-23)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogDataValueStore.java (+0/-23)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogService.java (+0/-51)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogStore.java (+0/-37)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogType.java (+0/-134)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttribute.java (+0/-160)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOption.java (+0/-102)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionService.java (+0/-25)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeOptionStore.java (+0/-25)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeService.java (+0/-33)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeAttributeStore.java (+0/-24)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeService.java (+0/-30)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/CatalogTypeStore.java (+0/-27)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogComparator.java (+0/-13)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeComparator.java (+0/-14)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeAttributeOptionComparator.java (+0/-18)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/catalog/comparator/CatalogTypeComparator.java (+0/-14)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/Equipment.java (+160/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentAttributeValue.java (+118/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentAttributeValueService.java (+25/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentAttributeValueStore.java (+21/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentDataValue.java (+147/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentDataValueService.java (+28/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentDataValueStore.java (+27/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentService.java (+57/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatus.java (+185/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatusService.java (+21/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStatusStore.java (+22/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentStore.java (+55/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentType.java (+196/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttribute.java (+255/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeGroup.java (+174/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeGroupService.java (+49/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeGroupStore.java (+40/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeOption.java (+100/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeOptionService.java (+22/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeOptionStore.java (+22/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeService.java (+38/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeAttributeStore.java (+30/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeService.java (+34/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentTypeStore.java (+26/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentType_Attribute.java (+135/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentType_AttributeService.java (+41/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/EquipmentType_AttributeStore.java (+33/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/comparator/EquipmentTypeAttributeComparator.java (+14/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/comparator/EquipmentTypeAttributeMandatoryComparator.java (+28/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/comparator/EquipmentTypeAttributeOptionComparator.java (+19/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/equipment/comparator/EquipmentTypeComparator.java (+13/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/Equipment.java (+0/-110)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDataValue.java (+0/-142)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDataValueService.java (+0/-26)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentDataValueStore.java (+0/-25)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstance.java (+0/-143)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceService.java (+0/-37)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentInstanceStore.java (+0/-31)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentService.java (+0/-25)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatus.java (+0/-153)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusService.java (+0/-19)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStatusStore.java (+0/-20)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/EquipmentStore.java (+0/-21)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType.java (+0/-196)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttribute.java (+0/-186)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOption.java (+0/-94)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionService.java (+0/-22)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeOptionStore.java (+0/-22)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeService.java (+0/-36)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeAttributeStore.java (+0/-28)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeService.java (+0/-34)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryTypeStore.java (+0/-26)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType_Attribute.java (+0/-135)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType_AttributeService.java (+0/-33)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/InventoryType_AttributeStore.java (+0/-35)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeComparator.java (+0/-14)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeMandatoryComparator.java (+0/-28)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeAttributeOptionComparator.java (+0/-19)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/inventory/comparator/InventoryTypeComparator.java (+0/-13)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/Model.java (+205/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelAttributeValue.java (+111/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelAttributeValueService.java (+25/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelAttributeValueStore.java (+25/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelDataEntryService.java (+29/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelService.java (+57/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelStore.java (+42/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelType.java (+156/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttribute.java (+187/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeGroup.java (+170/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeGroupService.java (+46/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeGroupStore.java (+39/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeOption.java (+102/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeOptionService.java (+25/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeOptionStore.java (+25/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeService.java (+35/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeAttributeStore.java (+26/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeService.java (+39/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/ModelTypeStore.java (+34/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/comparator/ModelComparator.java (+13/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/comparator/ModelTypeAttributeComparator.java (+14/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/comparator/ModelTypeAttributeGroupOrderComparator.java (+29/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/comparator/ModelTypeAttributeOptionComparator.java (+18/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/model/comparator/ModelTypeComparator.java (+14/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/reports/CCEMReport.java (+64/-11)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/coldchain/reports/CCEMReportManager.java (+63/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/Lookup.java (+114/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupService.java (+27/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/lookup/LookupStore.java (+16/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportModel.java (+7/-4)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportOrgSpecificDataService.java (+5/-6)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportService.java (+2/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportStore.java (+2/-0)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/ReportType.java (+8/-1)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/reports/StateDistrictFeedbackReportService.java (+6/-6)
local/in/dhis-in-api/src/main/java/org/hisp/dhis/surveydatavalue/SurveyDataValue.java (+6/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/pom.xml (+6/-2)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/aggregation/DefaultCCEIAggregationService.java (+576/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogDataEntryService.java (+0/-1316)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogDataValueService.java (+0/-74)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogService.java (+0/-198)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeOptionService.java (+0/-79)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeAttributeService.java (+0/-125)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/DefaultCatalogTypeService.java (+0/-139)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogDataValueStore.java (+0/-103)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogStore.java (+0/-89)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeOptionStore.java (+0/-113)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeAttributeStore.java (+0/-100)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/hibernate/HibernateCatalogTypeStore.java (+0/-136)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentAttributeValueService.java (+141/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentDataValueService.java (+65/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentService.java (+196/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentStatusService.java (+59/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentTypeAttributeOptionService.java (+65/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentTypeAttributeService.java (+147/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentTypeService.java (+163/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/DefaultEquipmentType_AttributeService.java (+240/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentAttributeValueStore.java (+89/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentDataValueStore.java (+115/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStatusStore.java (+92/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentStore.java (+370/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentTypeAttributeOptionStore.java (+91/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentTypeAttributeStore.java (+115/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentTypeStore.java (+108/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/hibernate/HibernateEquipmentType_AttributeStore.java (+165/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentDataValueService.java (+0/-57)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentInstanceService.java (+0/-133)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentService.java (+0/-136)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultEquipmentStatusService.java (+0/-50)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeOptionService.java (+0/-61)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeAttributeService.java (+0/-138)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryTypeService.java (+0/-158)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/DefaultInventoryType_AttributeService.java (+0/-94)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentDataValueStore.java (+0/-108)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentInstanceStore.java (+0/-157)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStatusStore.java (+0/-73)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateEquipmentStore.java (+0/-87)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeOptionStore.java (+0/-89)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeAttributeStore.java (+0/-110)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryTypeStore.java (+0/-108)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/hibernate/HibernateInventoryType_AttributeStore.java (+0/-155)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelAttributeValueService.java (+87/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelDataEntryService.java (+1317/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelService.java (+219/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelTypeAttributeGroupService.java (+129/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelTypeAttributeOptionService.java (+83/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelTypeAttributeService.java (+134/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/DefaultModelTypeService.java (+174/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelAttributeValueStore.java (+114/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelStore.java (+160/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelTypeAttributeGroupStore.java (+80/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelTypeAttributeOptionStore.java (+114/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelTypeAttributeStore.java (+107/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/model/hibernate/HibernateModelTypeStore.java (+164/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/DefaultCCEMReportManager.java (+1404/-275)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/META-INF/dhis/beans.xml (+184/-155)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Catalog.hbm.xml (+0/-29)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogDataValue.hbm.xml (+0/-22)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogType.hbm.xml (+0/-37)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttribute.hbm.xml (+0/-28)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/CatalogTypeAttributeOption.hbm.xml (+0/-19)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Equipment.hbm.xml (+32/-22)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentAttributeValue.hbm.xml (+22/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentDataValue.hbm.xml (+2/-2)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentInstance.hbm.xml (+0/-30)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentStatus.hbm.xml (+3/-3)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentType.hbm.xml (+55/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentTypeAttribute.hbm.xml (+39/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/EquipmentType_Attribute.hbm.xml (+21/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType.hbm.xml (+0/-55)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttribute.hbm.xml (+0/-30)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryTypeAttributeOption.hbm.xml (+0/-19)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/InventoryType_Attribute.hbm.xml (+0/-21)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/Model.hbm.xml (+29/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelAttributeValue.hbm.xml (+22/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelType.hbm.xml (+44/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttribute.hbm.xml (+35/-0)
local/in/dhis-in-services/dhis-in-service-coldchain/src/main/resources/org/hisp/dhis/coldchain/hibernate/ModelTypeAttributeGroup.hbm.xml (+30/-0)
local/in/dhis-in-services/dhis-in-service-configuration/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-dataentrystatus/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-dbmanager/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-ihrissyncmanager/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-linelisting/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-lookup/pom.xml (+50/-0)
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/DefaultLookupService.java (+68/-0)
local/in/dhis-in-services/dhis-in-service-lookup/src/main/java/org/hisp/dhis/lookup/hibernate/HibernateLookupStore.java (+25/-0)
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/META-INF/dhis/beans.xml (+18/-0)
local/in/dhis-in-services/dhis-in-service-lookup/src/main/resources/org/hisp/dhis/lookup/hibernate/Lookup.hbm.xml (+28/-0)
local/in/dhis-in-services/dhis-in-service-reports/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/DefaultReportService.java (+20/-13)
local/in/dhis-in-services/dhis-in-service-reports/src/main/java/org/hisp/dhis/reports/hibernate/HibernateReportStore.java (+17/-0)
local/in/dhis-in-services/dhis-in-service-scheduler/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-in-service-survey/pom.xml (+1/-1)
local/in/dhis-in-services/dhis-service-aggregationengine/pom.xml (+4/-4)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/DefaultAggregationService.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/cache/AggregationCache.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/cache/MemoryAggregationCache.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AbstractDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AverageBoolDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AverageIntDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/AverageIntSingleValueDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/SumBoolDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/dataelement/SumIntDataElementAggregation.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/impl/indicator/IndicatorAggregation.java (+23/-16)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregationStore.java (+10/-9)
local/in/dhis-in-services/dhis-service-aggregationengine/src/main/resources/META-INF/dhis/beans.xml (+1/-1)
local/in/dhis-in-services/dhis-service-aggregationengine/src/test/java/org/hisp/dhis/aggregation/AggregationServiceTest.java (+15/-14)
local/in/dhis-in-services/dhis-service-aggregationengine/src/test/java/org/hisp/dhis/aggregation/AggregationStoreTest.java (+10/-9)
local/in/dhis-in-services/pom.xml (+12/-5)
local/in/dhis-mobile/dhis-service-mobile/pom.xml (+1/-1)
local/in/dhis-mobile/dhis-web-mobile/pom.xml (+1/-1)
local/in/dhis-mobile/pom.xml (+1/-1)
local/in/dhis-mobile/smsclient/pom.xml (+1/-1)
local/in/dhis-web-alert/pom.xml (+1/-1)
local/in/dhis-web-birtreports/pom.xml (+71/-0)
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportOptionsStack.java (+40/-0)
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/BirtReportTypeObject.java (+29/-0)
local/in/dhis-web-birtreports/src/main/java/org/hisp/dhis/birtreports/action/ReportsHomePageAction.java (+83/-0)
local/in/dhis-web-birtreports/src/main/resources/META-INF/dhis/beans.xml (+14/-0)
local/in/dhis-web-birtreports/src/main/resources/org/hisp/dhis/birtreports/i18n_module.properties (+347/-0)
local/in/dhis-web-birtreports/src/main/resources/struts.xml (+22/-0)
local/in/dhis-web-birtreports/src/main/webapp/WEB-INF/web.xml (+59/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/StylesForTags.css (+56/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/document.js (+75/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/report.js (+128/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportConfiguration.js (+22/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/reportParams.js (+96/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/style.css (+244/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/css/stylesForReports.css (+74/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menu.vm (+1/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/menuWithTree.vm (+17/-0)
local/in/dhis-web-birtreports/src/main/webapp/dhis-web-birtreports/selectReport.vm (+195/-0)
local/in/dhis-web-coldchain/pom.xml (+3/-1)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/action/GetOrganisationUnitAction.java (+21/-1)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/action/GetOrganisationUnitGroupsAction.java (+72/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogAction.java (+0/-190)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogFormAction.java (+0/-50)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAction.java (+0/-90)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeAttributeAction.java (+0/-111)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddCatalogTypeFormAction.java (+0/-32)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/AddColdChainCatalogTypeAttributeForm.java (+0/-30)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogListAction.java (+0/-170)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogSelectAction.java (+0/-55)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/CatalogTypeListAction.java (+0/-88)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogDetailsAction.java (+0/-130)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogListAction.java (+0/-165)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogTypeAttributeDetailsAction.java (+0/-50)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogTypeAttributeListAction.java (+0/-64)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogTypeAttributesAction.java (+0/-137)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetCatalogTypeDetailsAction.java (+0/-70)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/GetColdChainCatalogTypeAttributeListAction.java (+0/-85)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/RemoveCatalogAction.java (+0/-99)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/RemoveCatalogTypeAction.java (+0/-84)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/RemoveCatalogTypeAttributeAction.java (+0/-81)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/RemoveCatalogTypeAttributeOptionAction.java (+0/-88)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowAddCatalogFormAction.java (+0/-191)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowCatalogTypeImageAction.java (+0/-109)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowImageAction.java (+0/-131)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowUpdateCatalogTypeAttributeFormAction.java (+0/-52)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowUploadCatalogImageFormAction.java (+0/-51)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ShowUploadCatalogTypeImageFormAction.java (+0/-56)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogAction.java (+0/-220)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogFormAction.java (+0/-317)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeAction.java (+0/-105)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeAttributeAction.java (+0/-154)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UpdateCatalogTypeFormAction.java (+0/-78)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UploadCatalogImageAction.java (+0/-353)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/UploadCatalogTypeImageAction.java (+0/-121)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ValidateCatalogAction.java (+0/-82)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ValidateCatalogTypeAction.java (+0/-81)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/action/ValidateCatalogTypeAttributeAction.java (+0/-78)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/DeleteCatalogDataEntryFormAction.java (+0/-87)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/SaveCatalogDataEntryFormAction.java (+0/-119)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/ValidateCatalogDataEntryFormAction.java (+0/-83)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/catalog/dataentryform/action/ViewCatalogDataEntryFormAction.java (+0/-113)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddEquipmentAction.java (+147/-89)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/AddUpdateEquipmentIcePacksAction.java (+475/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/EquipmentSelectAction.java (+10/-10)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentDataAction.java (+335/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceDataAction.java (+0/-167)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentInstanceListAction.java (+0/-273)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/GetEquipmentListAction.java (+572/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadDataEntryFormAction.java (+52/-24)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadEquipmentIcePacksDataAction.java (+216/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/LoadPeriodsAction.java (+5/-2)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentAction.java (+66/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/RemoveEquipmentInstanceAction.java (+0/-66)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/SaveEquipmentDataValueAction.java (+33/-28)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentFormAction.java (+144/-90)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowAddEquipmentIcePacksFormAction.java (+183/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentDataEntryFormAction.java (+101/-128)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusFormAction.java (+75/-12)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/ShowEquipmentStatusHistoryFormAction.java (+26/-14)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentAction.java (+202/-89)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/action/UpdateEquipmentStatusAction.java (+96/-19)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ClinicEquipmentsAction.java (+81/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/EquipmentModelsAction.java (+71/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetFullOrganisationUnitDetailsAction.java (+452/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/GetOrganisationUnitDetailsAction.java (+741/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/LoadFacilityDataEntryFormAction.java (+198/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/SaveFacilityDataValueAction.java (+235/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ShowUpdateFacilityDataEntryFormAction.java (+100/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ShowUpdateOrganisationUnitFormAction.java (+159/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/UpdateOrganisationUnitAction.java (+353/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/VaccinesModelsAction.java (+68/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipment/manager/action/ValidateOrganisationUnitCodeAction.java (+90/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/AddEquipmentTypeAction.java (+160/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/AddEquipmentTypeAttributeAction.java (+119/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetDataSetListAction.java (+59/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeAction.java (+47/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeAttributeAction.java (+51/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeAttributeListAction.java (+170/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeAttributeListForDisplayAction.java (+111/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeAttributesAction.java (+58/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/GetEquipmentTypeListAction.java (+81/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/RemoveEquipmentTypeAction.java (+69/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/RemoveEquipmentTypeAttributeAction.java (+71/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/RemoveEquipmentTypeAttributeOptionAction.java (+79/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ShowAddEquipmentTypeAction.java (+61/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java (+60/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ShowUpdateEquipmentTypeAction.java (+116/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ShowUpdateEquipmentTypeAttributeAction.java (+47/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/UpdateEquipmentTypeAction.java (+185/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java (+153/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/UpdateEquipmentTypeDataSetAction.java (+100/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ValidateEquipmentTypeAction.java (+74/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/equipmenttype/action/ValidateEquipmentTypeAttributeAction.java (+76/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAction.java (+0/-160)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/AddInventoryTypeAttributeAction.java (+0/-121)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetDataSetListAction.java (+0/-59)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAction.java (+0/-47)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeAction.java (+0/-51)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributeListAction.java (+0/-123)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeAttributesAction.java (+0/-57)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/GetInventoryTypeListAction.java (+0/-81)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/RemoveInventoryTypeAction.java (+0/-69)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/RemoveInventoryTypeAttributeAction.java (+0/-71)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/RemoveInventoryTypeAttributeOptionAction.java (+0/-79)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowAddInventoryTypeAction.java (+0/-61)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowInventoryTypeDataSetFormAction.java (+0/-60)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowUpdateInventoryTypeAction.java (+0/-116)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ShowUpdateInventoryTypeAttributeAction.java (+0/-47)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAction.java (+0/-185)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeAttributeAction.java (+0/-153)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/UpdateInventoryTypeDataSetAction.java (+0/-100)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ValidateInventoryTypeAction.java (+0/-74)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/inventory/action/ValidateInventoryTypeAttributeAction.java (+0/-76)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddColdChainModelTypeAttributeForm.java (+30/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelAction.java (+206/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelFormAction.java (+50/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelTypeAction.java (+90/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelTypeAttributeAction.java (+118/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/AddModelTypeFormAction.java (+32/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetColdChainModelTypeAttributeListAction.java (+84/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelDetailsAction.java (+145/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelListAction.java (+260/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelTypeAttributeDetailsAction.java (+50/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelTypeAttributeListAction.java (+68/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelTypeAttributeOptionListAction.java (+70/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelTypeAttributesAction.java (+137/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/GetModelTypeDetailsAction.java (+70/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ModelListAction.java (+170/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ModelSelectAction.java (+71/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ModelTypeListAction.java (+88/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/RemoveModelAction.java (+99/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/RemoveModelTypeAction.java (+84/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/RemoveModelTypeAttributeAction.java (+81/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/RemoveModelTypeAttributeOptionAction.java (+88/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowAddModelFormAction.java (+225/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowImageAction.java (+131/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowModelTypeImageAction.java (+107/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowUpdateModelTypeAttributeFormAction.java (+52/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowUploadModelImageFormAction.java (+51/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ShowUploadModelTypeImageFormAction.java (+56/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelAction.java (+249/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelFormAction.java (+358/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelTypeAction.java (+105/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelTypeAttributeAction.java (+162/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UpdateModelTypeFormAction.java (+78/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UploadModelImageAction.java (+354/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/UploadModelTypeImageAction.java (+121/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ValidateModelAction.java (+82/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ValidateModelTypeAction.java (+81/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/action/ValidateModelTypeAttributeAction.java (+78/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/dataentryform/action/DeleteModelDataEntryFormAction.java (+87/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/dataentryform/action/SaveModelDataEntryFormAction.java (+119/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/dataentryform/action/ValidateModelDataEntryFormAction.java (+83/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/model/dataentryform/action/ViewModelDataEntryFormAction.java (+113/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/action/CCEIReportPageAction.java (+296/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/action/CCEMReportPageAction.java (+0/-158)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/action/GenerateCCEIReportAction.java (+5744/-0)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/action/GenerateCCEMReportAction.java (+391/-352)
local/in/dhis-web-coldchain/src/main/java/org/hisp/dhis/coldchain/reports/action/GenerateJRXMLReportAction.java (+0/-1213)
local/in/dhis-web-coldchain/src/main/resources/META-INF/dhis/beans.xml (+572/-365)
local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module.properties (+94/-61)
local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module_pt_PT.properties (+2/-0)
local/in/dhis-web-coldchain/src/main/resources/org/hisp/dhis/coldchain/i18n_module_vi_VN.properties (+53/-53)
local/in/dhis-web-coldchain/src/main/resources/struts.xml (+426/-252)
local/in/dhis-web-coldchain/src/main/webapp/WEB-INF/web.xml (+3/-4)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addCatalogForm.vm (+0/-47)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addCatalogTypeForm.vm (+0/-73)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addColdChainCatalogTypeAttributeForm.vm (+0/-81)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addColdChainModelTypeAttributeForm.vm (+90/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentForm.vm (+73/-44)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentIcePacksForm.vm (+67/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentTypeAttributeForm.vm (+92/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addEquipmentTypeForm.vm (+138/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeAttributeForm.vm (+0/-92)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addInventoryTypeForm.vm (+0/-138)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addModelForm.vm (+47/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/addModelTypeForm.vm (+73/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogDataEntryForm.vm (+0/-74)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogDetails.vm (+0/-55)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogList.vm (+0/-97)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalogTypeList.vm (+0/-81)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/catalog_List.vm (+0/-88)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/cceiReportForm.vm (+7/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/cceiReportMenu.vm (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/cceiReportsPage.vm (+407/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportMenu.vm (+1/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/ccemReportsPage.vm (+4/-4)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicEquipments.vm (+81/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicEquipmentsAndOrgUnitDetails.vm (+180/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/clinicEquipmentsMenu.vm (+9/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainCatalogTypeAttribute.vm (+0/-89)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/coldChainModelTypeAttribute.vm (+89/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/css/basic.css (+5/-5)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/css/facilityDataentry.css (+39/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/css/style.css (+3/-3)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentDataEntry.vm (+20/-54)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentInstanceList.vm (+0/-123)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentList.vm (+63/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentModels.vm (+61/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentModelsMenu.vm (+7/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentStatusForm.vm (+50/-25)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentTypeAttributeList.vm (+90/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentTypeDataSetForm.vm (+80/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/equipmentTypeList.vm (+95/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/facilityDataEntry.vm (+94/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/fullOrganisationUnitDetail.vm (+182/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeAttributeList.vm (+0/-90)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeDataSetForm.vm (+0/-80)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/inventoryTypeList.vm (+0/-95)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addCatalogTypeAttributeForm.js (+0/-21)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addCatalogTypeForm.js (+0/-30)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addEquipmentTypeAttributeForm.js (+21/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addEquipmentTypeForm.js (+69/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addInventoryTypeAttributeForm.js (+0/-21)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addInventoryTypeForm.js (+0/-69)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addModelTypeAttributeForm.js (+21/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/addModelTypeForm.js (+30/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalog.js (+0/-626)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalogType.js (+0/-102)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/catalogTypeAttribute.js (+0/-97)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/ccemReports.js (+108/-15)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/clinicEquipments.js (+1313/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipment.js (+79/-73)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentDataEntry.js (+141/-7)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentModels.js (+600/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentType.js (+199/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/equipmentTypeAttribute.js (+95/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/ext-all.js (+1/-1)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/facilityDataEntry.js (+114/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/highcharts.js (+1/-1)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryType.js (+0/-199)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/inventoryTypeAttribute.js (+0/-95)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/model.js (+690/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/modelType.js (+102/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/modelTypeAttribute.js (+97/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateCatalogForm.js (+0/-10)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateCatalogTypeAttributeForm.js (+0/-19)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateCatalogTypeForm.js (+0/-37)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateEquipmentTypeAttributeForm.js (+19/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateEquipmentTypeDataSetForm.js (+27/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateEquipmentTypeForm.js (+81/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateInventoryTypeAttributeForm.js (+0/-19)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateInventoryTypeDataSetForm.js (+0/-27)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateInventoryTypeForm.js (+0/-81)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateModelForm.js (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateModelTypeAttributeForm.js (+19/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/updateModelTypeForm.js (+37/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/uploadCatalogImageForm.js (+0/-36)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/uploadCatalogTypeImageForm.js (+0/-11)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/uploadModelImageForm.js (+36/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/uploadModelTypeImageForm.js (+11/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/viewCatalogTypeDataEntryForm.js (+0/-126)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/javascript/viewModelTypeDataEntryForm.js (+126/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jrxmlReportsPage.vm (+0/-107)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonCatalog.vm (+0/-18)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonCatalogType.vm (+0/-19)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonCatalogTypeAttribute.vm (+0/-9)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonCatalogTypeAttributes.vm (+0/-13)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonEquipmentType.vm (+9/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonEquipmentTypeAttribute.vm (+9/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonEquipmentTypeAttributes.vm (+12/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryType.vm (+0/-9)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryTypeAttribute.vm (+0/-9)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonInventoryTypeAttributes.vm (+0/-12)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonModel.vm (+18/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonModelType.vm (+19/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonModelTypeAttribute.vm (+9/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonModelTypeAttributes.vm (+13/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/jsonPeriods.vm (+2/-1)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadDataEntryForm.vm (+88/-20)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadEquipmentIcePacksDataForm.vm (+57/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/loadFacilityDataEntryForm.vm (+132/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/menu.vm (+24/-9)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/modelDataEntryForm.vm (+74/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/modelDetails.vm (+83/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/modelList.vm (+97/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/modelTypeList.vm (+81/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/model_List.vm (+63/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseCatalogTypeAttributes.vm (+0/-10)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseEquipmentTypeAttributeListDisplay.vm (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseEquipmentTypeAttributes.vm (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseInventoryTypeAttributes.vm (+0/-10)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseModelTypeAttributeOption.vm (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseModelTypeAttributes.vm (+10/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseOrganisationUnitGroups.vm (+5/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodCatalogTypeImageStatus.vm (+0/-5)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodImageStatus.vm (+3/-3)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/responseUplodModelTypeImageStatus.vm (+5/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectCatalog.vm (+0/-64)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectEquipment.vm (+23/-22)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/selectModel.vm (+71/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddCatalogForm.vm (+0/-140)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showAddModelForm.vm (+160/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentData.vm (+6/-6)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentDetails.vm (+90/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/showEquipmentStatusHistory.vm (+33/-13)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogForm.vm (+0/-141)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogTypeAttibuteForm.vm (+0/-96)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateCatalogTypeForm.vm (+0/-95)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentForm.vm (+55/-56)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentTypeAttibuteForm.vm (+110/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateEquipmentTypeForm.vm (+148/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeAttibuteForm.vm (+0/-110)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateInventoryTypeForm.vm (+0/-148)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelForm.vm (+182/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelTypeAttibuteForm.vm (+105/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateModelTypeForm.vm (+95/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/updateOrganisationUnitForm.vm (+137/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/uploadCatalogImageForm.vm (+0/-80)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/uploadCatalogTypeImageForm.vm (+0/-38)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/uploadModelImageForm.vm (+80/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/uploadModelTypeImageForm.vm (+75/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/vaccinesModels.vm (+59/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/vaccinesModelsMenu.vm (+7/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/viewCatalogDataEntryForm.vm (+0/-165)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/viewModelDataEntryForm.vm (+165/-0)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/xmlCatalogTypeAttributes.vm (+0/-12)
local/in/dhis-web-coldchain/src/main/webapp/dhis-web-coldchain/xmlModelTypeAttributes.vm (+12/-0)
local/in/dhis-web-dashboard/pom.xml (+1/-1)
local/in/dhis-web-dataentry-ccem/pom.xml (+89/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetEquipmentAndDataSetListAction.java (+133/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/GetOrganisationUnitAction.java (+88/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadDataEntryFormAction.java (+158/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadNextPrePeriodsAction.java (+121/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/LoadPeriodsAction.java (+100/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/PageInitAction.java (+98/-0)
local/in/dhis-web-dataentry-ccem/src/main/java/org/hisp/dhis/dataentry/action/SaveEquipmentDataValueAction.java (+223/-0)
local/in/dhis-web-dataentry-ccem/src/main/resources/META-INF/dhis/beans.xml (+57/-0)
local/in/dhis-web-dataentry-ccem/src/main/resources/org/hisp/dhis/dataentry/i18n_module.properties (+16/-0)
local/in/dhis-web-dataentry-ccem/src/main/resources/struts.xml (+61/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/WEB-INF/web.xml (+59/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/dataEntrySelection.vm (+106/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/javascript/ccemDataEntry.js (+359/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/jsonPeriods.vm (+13/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/loadDataEntryForm.vm (+128/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/menu.vm (+9/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/responseEquipmentAndDataSets.vm (+16/-0)
local/in/dhis-web-dataentry-ccem/src/main/webapp/dhis-web-dataentry-ccem/style/dhis-web-dataentry-ccem.css (+102/-0)
local/in/dhis-web-dataentry-linelisting/pom.xml (+1/-1)
local/in/dhis-web-excelimport/pom.xml (+1/-1)
local/in/dhis-web-ihrissyncmanager/pom.xml (+1/-1)
local/in/dhis-web-leprosy/pom.xml (+1/-1)
local/in/dhis-web-linelisting-in/pom.xml (+1/-1)
local/in/dhis-web-maintenance-ccem/pom.xml (+110/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/ExportToExcelAction.java (+83/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/GetOrganisationUnitAction.java (+51/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/action/NoAction.java (+11/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryAction.java (+234/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AddAggregationQueryFormAction.java (+61/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/AggregationQueryListAction.java (+45/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/GetAggregationParameterAction.java (+185/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/aggregation/action/RunAggregationQueryAction.java (+161/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/csv/action/UploadCSVFileDataAction.java (+68/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/AddEquipmentAction.java (+232/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/EquipmentSelectAction.java (+95/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/GetEquipmentDataAction.java (+196/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/GetEquipmentListAction.java (+387/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadDataEntryFormAction.java (+161/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadNextPrePeriodsAction.java (+117/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/LoadPeriodsAction.java (+101/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/RemoveEquipmentAction.java (+66/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/SaveEquipmentDataValueAction.java (+206/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowAddEquipmentFormAction.java (+157/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentDataEntryFormAction.java (+263/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentStatusFormAction.java (+34/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/ShowEquipmentStatusHistoryFormAction.java (+63/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/UpdateEquipmentAction.java (+323/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipment/action/UpdateEquipmentStatusAction.java (+198/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAction.java (+160/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/AddEquipmentTypeAttributeAction.java (+147/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetDataSetListAction.java (+59/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetEquipmentTypeAction.java (+47/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetEquipmentTypeAttributeAction.java (+51/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetEquipmentTypeAttributeListAction.java (+123/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetEquipmentTypeAttributesAction.java (+57/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/GetEquipmentTypeListAction.java (+81/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/RemoveEquipmentTypeAction.java (+108/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/RemoveEquipmentTypeAttributeAction.java (+71/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/RemoveEquipmentTypeAttributeOptionAction.java (+79/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowAddEquipmentTypeAction.java (+61/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowEquipmentTypeDataSetFormAction.java (+78/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowUpdateEquipmentTypeAction.java (+116/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ShowUpdateEquipmentTypeAttributeAction.java (+69/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAction.java (+185/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeAttributeAction.java (+184/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/UpdateEquipmentTypeDataSetAction.java (+100/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ValidateEquipmentTypeAction.java (+74/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/equipmenttype/action/ValidateEquipmentTypeAttributeAction.java (+76/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/importexport/action/CSVImportAction.java (+1116/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddColdChainModelTypeAttributeForm.java (+50/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelAction.java (+190/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelFormAction.java (+50/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAction.java (+90/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeAction.java (+145/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeGroupAction.java (+124/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeAttributeGroupFormAction.java (+61/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/AddModelTypeFormAction.java (+32/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetColdChainModelTypeAttributeListAction.java (+84/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelDetailsAction.java (+130/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelListAction.java (+259/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeAttributeDetailsAction.java (+50/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeAttributeGroupListSortOrderAction.java (+70/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeAttributeListAction.java (+64/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeAttributeOptionListAction.java (+70/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeAttributesAction.java (+194/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/GetModelTypeDetailsAction.java (+70/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ModelListAction.java (+170/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ModelSelectAction.java (+55/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ModelTypeAttributeGroupListAction.java (+123/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ModelTypeListAction.java (+88/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/RemoveModelAction.java (+99/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/RemoveModelTypeAction.java (+94/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/RemoveModelTypeAttributeAction.java (+81/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/RemoveModelTypeAttributeOptionAction.java (+88/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/SaveModelTypeAttributeGroupSortOrderAction.java (+76/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowAddModelFormAction.java (+191/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowImageAction.java (+131/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowModelTypeImageAction.java (+107/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUpdateModelTypeAttributeFormAction.java (+76/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUploadModelImageFormAction.java (+51/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ShowUploadModelTypeImageFormAction.java (+56/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelAction.java (+220/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelFormAction.java (+316/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAction.java (+105/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeAttributeAction.java (+190/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UpdateModelTypeFormAction.java (+78/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UploadModelImageAction.java (+354/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/UploadModelTypeImageAction.java (+121/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ValidateModelAction.java (+82/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ValidateModelTypeAction.java (+81/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ValidateModelTypeAttributeAction.java (+78/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/action/ValidateModelTypeAttributeGroupAction.java (+86/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/dataentryform/action/DeleteModelDataEntryFormAction.java (+87/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/dataentryform/action/SaveModelDataEntryFormAction.java (+119/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/dataentryform/action/ValidateModelDataEntryFormAction.java (+83/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/model/dataentryform/action/ViewModelDataEntryFormAction.java (+113/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataFormAction.java (+79/-0)
local/in/dhis-web-maintenance-ccem/src/main/java/org/hisp/dhis/ccem/transferfacilitydata/action/TraferFacilityDataResultAction.java (+316/-0)
local/in/dhis-web-maintenance-ccem/src/main/resources/META-INF/dhis/beans.xml (+781/-0)
local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module.properties (+174/-0)
local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module_pt_PT.properties (+2/-0)
local/in/dhis-web-maintenance-ccem/src/main/resources/org/hisp/dhis/ccem/i18n_module_vi_VN.properties (+128/-0)
local/in/dhis-web-maintenance-ccem/src/main/resources/struts.xml (+705/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/WEB-INF/web.xml (+59/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationParam.vm (+16/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addAggregationQuery.vm (+64/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addColdChainModelTypeAttributeForm.vm (+103/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentForm.vm (+117/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeAttributeForm.vm (+105/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addEquipmentTypeForm.vm (+138/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addModelForm.vm (+47/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addModelTypeAttributeGroupForm.vm (+74/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/addModelTypeForm.vm (+73/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/aggregationQueryList.vm (+67/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportMenu.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportOutput.vm (+134/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/ccemReportsPage.vm (+93/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/coldChainModelTypeAttribute.vm (+104/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/StylesForTags.css (+100/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/basic.css (+118/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/equipmentDataentry.css (+39/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/example.css (+85/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/ext-all.css (+1/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/css/style.css (+101/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/csvImportResult.vm (+14/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/customForm.vm (+1/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/defaultForm.vm (+60/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentDataEntry.vm (+118/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentList.vm (+125/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentMenu.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentStatusForm.vm (+69/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentTypeAttributeList.vm (+105/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentTypeDataSetForm.vm (+80/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/equipmentTypeList.vm (+114/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/importDataForm.vm (+47/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addEquipmentTypeAttributeForm.js (+23/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addEquipmentTypeForm.js (+69/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeAttributeForm.js (+22/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeAttributeGroupForm.js (+33/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/addModelTypeForm.js (+30/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/aggregationEngine.js (+7/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/ccemReports.js (+257/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipment.js (+535/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentDataEntry.js (+258/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentType.js (+199/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/equipmentTypeAttribute.js (+96/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/exporting.js (+23/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/ext-all.js (+15/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/highcharts.js (+239/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/importData.js (+5/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/model.js (+690/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelType.js (+102/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttribute.js (+107/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/modelTypeAttributeGroup.js (+87/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/transferFacilityData.js (+30/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeAttributeForm.js (+21/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeDataSetForm.js (+27/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateEquipmentTypeForm.js (+81/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelForm.js (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelTypeAttributeForm.js (+21/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/updateModelTypeForm.js (+37/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/uploadModelImageForm.js (+36/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/uploadModelTypeImageForm.js (+11/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/javascript/viewModelTypeDataEntryForm.js (+126/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jrxmlReportMenu.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jrxmlReportsPage.vm (+107/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonDataSetList.vm (+12/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonEquipmentType.vm (+9/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonEquipmentTypeAttribute.vm (+9/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonEquipmentTypeAttributes.vm (+12/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonModel.vm (+18/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonModelType.vm (+19/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonModelTypeAttribute.vm (+9/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonModelTypeAttributes.vm (+13/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/jsonPeriods.vm (+12/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/loadDataEntryForm.vm (+40/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/menu.vm (+45/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/modelDataEntryForm.vm (+74/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/modelDetails.vm (+55/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/modelList.vm (+97/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/modelTypeAttributeGroupList.vm (+72/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/modelTypeList.vm (+84/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/model_List.vm (+99/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseEquipmentTypeAttributes.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseMetaData.vm (+48/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseModelTypeAttributeOption.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseModelTypeAttributes.vm (+10/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseUplodImageStatus.vm (+8/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/responseUplodModelTypeImageStatus.vm (+5/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/runAggregationQueryForm.vm (+18/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/runAggregationQueryResult.vm (+2/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/selectEquipment.vm (+177/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/selectModel.vm (+70/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showAddModelForm.vm (+140/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showEquipmentData.vm (+28/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/showEquipmentStatusHistory.vm (+44/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/sortModelTypeAttributeGroupForm.vm (+33/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataForm.vm (+19/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/transferFacilityDataResult.vm (+4/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentForm.vm (+119/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentTypeAttibuteForm.vm (+124/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateEquipmentTypeForm.vm (+148/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelForm.vm (+141/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelTypeAttibuteForm.vm (+119/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/updateModelTypeForm.vm (+95/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/uploadModelImageForm.vm (+80/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/uploadModelTypeImageForm.vm (+75/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/viewModelDataEntryForm.vm (+165/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/welcome.vm (+2/-0)
local/in/dhis-web-maintenance-ccem/src/main/webapp/dhis-web-maintenance-ccem/xmlModelTypeAttributes.vm (+12/-0)
local/in/dhis-web-maintenance-in/pom.xml (+1/-1)
local/in/dhis-web-maintenance-pbf/pom.xml (+66/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddBankDataAction.java (+122/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/AddTariffDataAction.java (+184/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteBankDataAction.java (+73/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/DeleteTariffDataAction.java (+113/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/GetDataElementforTariffAction.java (+125/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadBankDetailsAction.java (+124/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/LoadTariffDetailsAction.java (+170/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/NoAction.java (+11/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/action/ValidateTariffDataAction.java (+157/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/AddAggregationQueryAction.java (+256/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/AddAggregationQueryFormAction.java (+84/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/AggregationQueryListAction.java (+45/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/GetAggregationParameterAction.java (+86/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/GetAggregationQueryAction.java (+64/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/RemoveAggregationQueryAction.java (+51/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/RunAggregationQueryAction.java (+304/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/RunAggregationQueryFormAction.java (+71/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/ShowUpdateAggregationQueryFormAction.java (+107/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/aggregation/action/UpdateAggregationQueryAction.java (+125/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/BankDetails.java (+142/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/BankDetailsService.java (+23/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/BankDetailsStore.java (+24/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/Lookup.java (+101/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/LookupService.java (+31/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/LookupStore.java (+30/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/PBFDataValue.java (+196/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/PBFDataValueService.java (+28/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/PBFDataValueStore.java (+26/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/QualityMaxValue.java (+183/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/QualityMaxValueService.java (+28/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/QualityMaxValueStore.java (+28/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValue.java (+207/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueService.java (+31/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/api/TariffDataValueStore.java (+33/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/GetOrganisationUnitAction.java (+125/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/LoadDataEntryFormAction.java (+368/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/LoadNextPrePeriodsAction.java (+140/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/LoadPeriodsAction.java (+100/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/PageInitAction.java (+136/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/dataentry/SaveValueAction.java (+375/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultBankDetailsService.java (+66/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultLookupService.java (+91/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultPBFAggregationService.java (+368/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultPBFDataValueService.java (+72/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultQualityMaxValueService.java (+77/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/DefaultTariffDataValueService.java (+80/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateBankDetailsStore.java (+88/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateLookupStore.java (+118/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernatePBFDataValueStore.java (+152/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateQualityMaxValueStore.java (+119/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/impl/HibernateTariffDataValueStore.java (+153/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/AddLookupAction.java (+83/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/AddLookupFormAction.java (+17/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/DelLookup.java (+83/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/EditLookupFormAction.java (+90/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/GetAllLookupsAction.java (+81/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/GetLookupAction.java (+59/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/UpdateLookupAction.java (+86/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/lookup/action/ValidateLookupAction.java (+91/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/GetOrganisationUnitForPaymentAction.java (+157/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/GetPaymentAdjustmentDetailsAction.java (+158/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/LoadPaymentAdjustmentAction.java (+257/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/LoadPaymentAdjustmentDetailsAction.java (+331/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/LoadPaymentNextPrePeriodsAction.java (+114/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/payment/action/LoadPaymentPeriodsAction.java (+91/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/GetOrganisationUnitForMaxAction.java (+117/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/GetOrganisationUnitForScoreAction.java (+127/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityMaxDetailsAction.java (+174/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/LoadQualityScoreDetailsAction.java (+239/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/QualityMaxInitAction.java (+168/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/QualityScoreInitAction.java (+150/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/SaveDataValueAction.java (+242/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/SaveQualityValueAction.java (+273/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/quality/dataentry/ValidateQualityMaxDataAction.java (+160/-0)
local/in/dhis-web-maintenance-pbf/src/main/java/org/hisp/dhis/pbf/report/action/PBFInvoiceReportFormAction.java (+101/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/META-INF/dhis/beans.xml (+418/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/hibernate/BankDetails.hbm.xml (+23/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/hibernate/Lookup.hbm.xml (+28/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/hibernate/PBFDataValue.hbm.xml (+29/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/hibernate/QuantityMaxValue.hbm.xml (+26/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/hibernate/TariffDataValue.hbm.xml (+30/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/org/hisp/dhis/pbf/i18n_module.properties (+69/-0)
local/in/dhis-web-maintenance-pbf/src/main/resources/struts.xml (+337/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/WEB-INF/web.xml (+59/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/PBFInvoiceReportForm.vm (+111/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/addAggregationParam.vm (+33/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/addAggregationQuery.vm (+99/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/addLookupForm.vm (+70/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/aggregationQueryList.vm (+79/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/dataentry.css (+102/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/css/ext-all-neptune-debug.css (+1/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/dataEntrySelection.vm (+87/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/editLookup.vm (+72/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getAllLookups.vm (+87/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getBankDetails.vm (+302/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/getPaymentAdjustmentList.vm (+176/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/TransformGrid.js (+99/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/addLookup.js (+13/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/aggregationEngine.js (+46/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/editLookup.js (+11/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/lookup.js (+39/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/pagingmemory.js (+165/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/paymentAdjustment.js (+324/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/pbfDataEntry.js (+309/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/prevNextPeriods.js (+24/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityMaxDataEntry.js (+226/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/javascript/qualityScoreDataEntry.js (+308/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/jsonAggregationQuery.vm (+8/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/jsonLookup.vm (+11/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/jsonPeriods.vm (+15/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/jsonResponseInput.vm (+4/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/jsonResponseSuccess.vm (+14/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadBankData.vm (+32/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataElementsforTariff.vm (+161/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadDataEntryForm.vm (+182/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadPaymentAdjustment.vm (+108/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityMaxEntryForm.vm (+53/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadQualityScoreEntryForm.vm (+129/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/loadTariffData.vm (+377/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menu.vm (+31/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuDataEntry.vm (+9/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuMaxEntry.vm (+9/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuPayment.vm (+9/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/menuScoreEntry.vm (+9/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityMaxEntrySelection.vm (+91/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/qualityScoreEntrySelection.vm (+80/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/runAggregationQueryForm.vm (+65/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/runAggregationQueryResult.vm (+2/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/status.vm (+3/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/tariffMenu.vm (+2/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/tariffStatus.vm (+6/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/updateAggregationQueryForm.vm (+123/-0)
local/in/dhis-web-maintenance-pbf/src/main/webapp/dhis-web-maintenance-pbf/welcome.vm (+2/-0)
local/in/dhis-web-maintenance-rbf/pom.xml (+113/-0)
local/in/dhis-web-maintenance-rbf/src/main/META-INF/application.xml (+7/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/AddBankDataAction.java (+139/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/AddTariffDataAction.java (+201/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/DeleteBankDataAction.java (+95/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/DeleteTariffDataAction.java (+131/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/GetDataElementforTariffAction.java (+205/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/LoadBankDetailsAction.java (+190/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/LoadTariffDetailsAction.java (+241/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/NoAction.java (+11/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/ShowAddTariffDetailsFormAction.java (+119/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/ShowUpdateTariffDetailsFormAction.java (+183/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/action/ValidateTariffDataAction.java (+229/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/AddAggregationQueryAction.java (+264/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/AddAggregationQueryFormAction.java (+114/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/AggregationQueryListAction.java (+45/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/GetAggregationParameterAction.java (+86/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/GetAggregationQueryAction.java (+64/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/RemoveAggregationQueryAction.java (+51/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/RunAggregationQueryAction.java (+325/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/RunAggregationQueryFormAction.java (+71/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/ShowUpdateAggregationQueryFormAction.java (+105/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/aggregation/action/UpdateAggregationQueryAction.java (+125/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/BankDetails.java (+174/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/BankDetailsService.java (+24/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/BankDetailsStore.java (+26/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Lookup.java (+110/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/LookupService.java (+31/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/LookupStore.java (+30/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PBFDataValue.java (+228/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PBFDataValueService.java (+28/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PBFDataValueStore.java (+26/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/Partner.java (+190/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerService.java (+43/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/PartnerStore.java (+43/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityMaxValue.java (+211/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityMaxValueService.java (+49/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityMaxValueStore.java (+56/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityScorePayment.java (+106/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityScorePaymentService.java (+23/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/QualityScorePaymentStore.java (+22/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/TariffDataValue.java (+268/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/TariffDataValueService.java (+56/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/TariffDataValueStore.java (+56/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/UtilizationRate.java (+159/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/UtilizationRateService.java (+31/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/api/UtilizationRateStore.java (+31/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/GetOrganisationUnitAction.java (+126/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadDataEntryFormAction.java (+738/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadNextPrePeriodsAction.java (+141/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/LoadPeriodsAction.java (+100/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/PageInitAction.java (+160/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/SaveValueAction.java (+459/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/dataentry/SaveValueInDataValueAction.java (+291/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultBankDetailsService.java (+73/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultLookupService.java (+92/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFAggregationService.java (+658/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPBFDataValueService.java (+72/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultPartnerService.java (+102/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityMaxValueService.java (+128/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultQualityScorePaymentService.java (+60/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultTariffDataValueService.java (+140/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/DefaultUtilizationRateService.java (+78/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateBankDetailsStore.java (+107/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateLookupStore.java (+118/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernatePBFDataValueStore.java (+152/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernatePartnerStore.java (+367/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityMaxValueStore.java (+391/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateQualityScorePaymentStore.java (+80/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateTariffDataValueStore.java (+442/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/impl/HibernateUtilizationRateStore.java (+166/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/AddLookupAction.java (+83/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/AddLookupFormAction.java (+17/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/DelLookup.java (+82/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/EditLookupFormAction.java (+90/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/GetAllLookupsAction.java (+81/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/GetLookupAction.java (+59/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/UpdateLookupAction.java (+86/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/lookup/action/ValidateLookupAction.java (+90/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/GetDataElementAndPeriodListAction.java (+125/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/GetPartnerDateListAction.java (+103/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerDataListAction.java (+43/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerFormAction.java (+126/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/PartnerFundManagement.java (+97/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/RemovePartnerAction.java (+188/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/SavePartnerDetailsResultAction.java (+277/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/UpdatePartnerFormAction.java (+143/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/partner/action/ValidatePartnerAction.java (+179/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/GetOrganisationUnitForPaymentAction.java (+163/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/GetPaymentAdjustmentDetailsAction.java (+175/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/LoadPaymentAdjustmentAction.java (+260/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/LoadPaymentAdjustmentDetailsAction.java (+334/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/LoadPaymentNextPrePeriodsAction.java (+111/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/payment/action/LoadPaymentPeriodsAction.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/GetOrganisationUnitForMaxAction.java (+155/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/GetOrganisationUnitForScoreAction.java (+127/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/LoadQualityMaxDetailsAction.java (+223/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/LoadQualityMaxScoreAction.java (+136/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/LoadQualityScoreDetailsAction.java (+497/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/QualityMaxInitAction.java (+190/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/QualityScoreInitAction.java (+153/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/SaveDataValueAction.java (+374/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/SaveQualityValueAction.java (+290/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/quality/dataentry/ValidateQualityMaxDataAction.java (+217/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentAction.java (+67/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/AddQualityScorePaymentFormAction.java (+21/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/DeleteQualityScorePaymentAction.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentAction.java (+65/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/GetQualityScorePaymentList.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/UpdateQualityScorePaymentAction.java (+79/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/qualityscorepayment/action/UpdateQualityScorePaymentFormAction.java (+67/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/report/action/PBFInvoiceReportFormAction.java (+102/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/report/action/PBFReportFormAction.java (+243/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/AddReportAction.java (+149/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/AddReportFormAction.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/DefineReportAssociationsAction.java (+104/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/DelReportAction.java (+43/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/GetPBFReportPeriodsAction.java (+86/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/GetPBFReportsAction.java (+133/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/GetReportAction.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/PBFReportFormAction.java (+39/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/ReportsHomePageAction.java (+29/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/ReportsListAction.java (+46/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/SetupAssociationsTreeAction.java (+68/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/UpdateReportAction.java (+148/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/UpdateReportForm.java (+114/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/reportmanagement/action/ValidateReportAction.java (+121/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/scheduler/AggregationJobScheduler.java (+251/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/scheduler/RunAggregationQueryActionByScheduler.java (+336/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/AddUtilizationRateAction.java (+138/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/GetUtilizationRateListAction.java (+80/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/GetUtilizationRuleDataElementListAction.java (+76/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/RemoveUtilizationRateAction.java (+107/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/ShowAddUtilizationRateFormAction.java (+59/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/ShowUpdateUtilizationRateFormAction.java (+89/-0)
local/in/dhis-web-maintenance-rbf/src/main/java/org/hisp/dhis/rbf/utilizationRuleManagement/action/UpdateUtilizationRateAction.java (+116/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/META-INF/dhis/beans.xml (+877/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/BankDetails.hbm.xml (+24/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/Lookup.hbm.xml (+28/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/PBFDataValue.hbm.xml (+33/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/Partner.hbm.xml (+24/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/QualityScorePayment.hbm.xml (+22/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/QuantityMaxValue.hbm.xml (+27/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/TariffDataValue.hbm.xml (+32/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/hibernate/UtilizationRate.hbm.xml (+22/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/org/hisp/dhis/rbf/i18n_module.properties (+146/-0)
local/in/dhis-web-maintenance-rbf/src/main/resources/struts.xml (+735/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/WEB-INF/web.xml (+66/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/PBFInvoiceReportForm.vm (+111/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addAggregationParam.vm (+33/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addAggregationQuery.vm (+99/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addLookupForm.vm (+70/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addReportForm.vm (+99/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addUtilizationRateForm.vm (+78/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/addqualityScorePaymentForm.vm (+60/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/aggregationQueryList.vm (+79/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/css/dataentry.css (+102/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/css/ext-all-neptune-debug.css (+1/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dataEntrySelection.vm (+159/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/jstree.js (+7073/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/jstree.min.js (+5/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/themes/default-dark/style.css (+1094/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/themes/default-dark/style.min.css (+1/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/themes/default/style.css (+1050/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/dist/themes/default/style.min.css (+1/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/editLookup.vm (+72/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/editReportForm.vm (+101/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/getAllLookups.vm (+87/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/getBankDetails.vm (+302/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/getBankDetails_old.vm (+302/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/getPaymentAdjustmentList.vm (+176/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/TransformGrid.js (+99/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addLookup.js (+13/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/addQualityScorePayment.js (+12/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/aggregationEngine.js (+46/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/editLookup.js (+11/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/filterTable.js (+23/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/lookup.js (+39/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/pagingmemory.js (+165/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/partner.js (+463/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/paymentAdjustment.js (+324/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/pbfDataEntry.js (+604/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/prevNextPeriods.js (+24/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityMaxDataEntry.js (+293/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScoreDataEntry.js (+348/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/qualityScorePayment.js (+38/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/reportManagement.js (+464/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/reportManagementAssociations.js (+64/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/updateQualityScorePayment.js (+12/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/javascript/utilizationRule.js (+187/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonAggregationQuery.vm (+8/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonLookup.vm (+11/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonPeriods.vm (+15/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonQualityScorePaymentDetails.vm (+8/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonResponseInput.vm (+4/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/jsonResponseSuccess.vm (+14/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadBankData.vm (+32/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadBankData_old.vm (+32/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataElementsforTariff.vm (+211/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataElementsforTariff_old.vm (+201/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm.vm (+444/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadDataEntryForm_03_11_2014.vm (+423/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadPaymentAdjustment.vm (+108/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadQualityMaxEntryForm.vm (+55/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadQualityMaxScore.vm (+100/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadQualityScoreEntryForm.vm (+208/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadTariffAddDetailsForm.vm (+108/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadTariffData.vm (+338/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadTariffData_old.vm (+391/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/loadTariffUpdateDetailsForm.vm (+93/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menu.vm (+114/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menuDataEntry.vm (+9/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menuMaxEntry.vm (+9/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menuPayment.vm (+9/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menuScoreEntry.vm (+9/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/menuWithTree.vm (+22/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerDataList.vm (+53/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerDateList.vm (+64/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerForm.vm (+179/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement.vm (+74/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/partnerFundManagement_old.vm (+136/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportForm.vm (+175/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportForm_old.vm (+316/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/pbfReportMenu.vm (+26/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityMaxEntrySelection.vm (+103/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScoreEntrySelection.vm (+81/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/qualityScorePaymentList.vm (+87/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/reportAssociations.vm (+24/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/reportHomePage.vm (+1/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/reportsList.vm (+80/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm (+16/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responsePBFReports.vm (+17/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseReportManagementInput.vm (+2/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseReportManagementObject.vm (+12/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseReportManagementSuccess.vm (+2/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseTariffStatusInput.vm (+4/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/runAggregationQueryForm.vm (+65/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/runAggregationQueryResult.vm (+2/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/status.vm (+3/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/tariffMenu.vm (+2/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/tariffStatus.vm (+6/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/updateAggregationQueryForm.vm (+123/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/updatePartnerForm.vm (+87/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/updateQualityScorePaymentForm.vm (+62/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/updateUtilizationRateForm.vm (+78/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/utilizationRateList.vm (+53/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/utilizationRuleDataElements.vm (+57/-0)
local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/welcome.vm (+57/-0)
local/in/dhis-web-reports-in/pom.xml (+1/-1)
local/in/dhis-web-reports-national/pom.xml (+1/-1)
local/in/dhis-web-sandbox/pom.xml (+1/-1)
local/in/dhis-web-sandboxbk/pom.xml (+1/-1)
local/in/dhis-web-survey/pom.xml (+1/-1)
local/in/dhis-web-validationrule-in/pom.xml (+1/-1)
local/in/pom.xml (+20/-10)
local/ke/mfl2dxf2/pom.xml (+0/-111)
local/ke/mfl2dxf2/src/main/java/org/hisp/dhis/integration/routes/MFLTransformRoute.java (+0/-50)
local/ke/mfl2dxf2/src/main/resources/log4j.properties (+0/-40)
local/ke/mfl2dxf2/src/main/resources/routes/mfl2dxf2.xml (+0/-16)
local/ke/mfl2dxf2/src/main/resources/transform/mfl2dxf2.xsl (+0/-90)
local/vn/dhis-web-spreadsheet-reporting/src/main/resources/org/hisp/dhis/reportsheet/i18n_module_pt_PT.properties (+8/-8)
resources/backup/pg_backup.cron (+0/-1)
resources/backup/pg_backup.sh (+0/-32)
resources/backup/readme.txt (+0/-20)
resources/html/carousel.html (+0/-99)
resources/html/flag-resizer.html (+0/-5)
resources/html/index.html (+0/-90)
resources/html/plugin.html (+0/-128)
resources/jrxml/data_analysis_usage_stats.jrxml (+0/-246)
resources/logo/svg/favicon.svg (+0/-106)
resources/logo/svg/logo_banner.svg (+0/-88)
resources/logo/svg/logo_front.svg (+0/-88)
resources/logo/svg/logo_promo1.svg (+0/-88)
resources/logo/svg/logo_promo2.svg (+0/-99)
resources/routes/xml/ou_updater.xml (+0/-21)
resources/sql/copydata.sql (+0/-28)
resources/sql/create_eav_dataset.sql (+0/-148)
resources/sql/ct_source_period_from_deid.sql (+0/-71)
resources/sql/div.sql (+0/-181)
resources/sql/integritychecks.sql (+0/-146)
resources/sql/mysql-dhis-upgrade-2.3.sql (+0/-230)
resources/sql/pltcl.sql (+0/-34)
resources/sql/recreate_datamart_indexes.sql (+0/-11)
resources/sql/remove_in_tables.sql (+0/-26)
resources/sql/remove_invalid_coordinates.sql (+0/-164)
resources/util/clean_cde.sh (+0/-57)
resources/util/clean_translations.sh (+0/-83)
resources/util/compile_help_content.sh (+0/-31)
resources/util/dhis2_create_ubuntu_instance.sh (+0/-79)
resources/util/dhis2_serveropt.sh (+0/-139)
resources/util/dhis2version (+0/-42)
resources/util/dxfgen.sh (+0/-30)
resources/util/live (+0/-10)
resources/util/putdesign.sh (+0/-23)
resources/util/refreshSQLViews.R (+0/-19)
resources/util/refresh_resource_tables.sh (+0/-16)
resources/util/remove_unused_keys.sh (+0/-51)
resources/util/report_stats.sh (+0/-40)
resources/util/style.css (+0/-32)
resources/util/tomcat (+0/-36)
resources/xsl/gml2dxf.xsl (+0/-51)
resources/xsl/gmltest-point.gml (+0/-13624)
resources/xsl/gmltest-polygon.gml (+0/-192)
resources/xsl/transforms.xml (+0/-7)
tools/dhis-adhoc/pom.xml (+0/-46)
tools/dhis-adhoc/src/main/java/org/hisp/dhis/adhoc/Command.java (+0/-7)
tools/dhis-adhoc/src/main/java/org/hisp/dhis/adhoc/RunMe.java (+0/-70)
tools/dhis-adhoc/src/main/java/org/hisp/dhis/adhoc/command/ExampleCommand.java (+0/-16)
tools/dhis-adhoc/src/main/resources/META-INF/dhis/beans.xml (+0/-7)
tools/dhis-adhoc/src/main/resources/log4j.properties (+0/-30)
tools/dhis-i18n-resourceeditor/pom.xml (+0/-48)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/exception/I18nInvalidLocaleException.java (+0/-43)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/exception/I18nResourceException.java (+0/-43)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/gui/DirFileFilter.java (+0/-44)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/gui/I18nLoggingSwing.java (+0/-74)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/gui/I18nResourceEditorGUI.java (+0/-1205)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/gui/ResourceTreeSelectionModel.java (+0/-116)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/gui/UnicodeTransferHandler.java (+0/-136)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/persistence/FileUtils.java (+0/-184)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/persistence/ResourceManager.java (+0/-322)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/service/ConfigurationManager.java (+0/-82)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/service/I18nLogging.java (+0/-40)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/tree/KeyNode.java (+0/-95)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/tree/ModuleNode.java (+0/-289)
tools/dhis-i18n-resourceeditor/src/main/java/org/hisp/dhis/i18nresourceeditor/tree/ResourceNode.java (+0/-51)
tools/dhis-i18n-resourceeditor/src/main/resources/config.properties (+0/-4)
tools/dhis-i18n-resourceeditor/util/launch4j/dhis-i18n-resourceeditor.xml (+0/-22)
tools/dhis-i18n-resourceeditor/util/script/startup.sh (+0/-4)
tools/dhis2-tools-deb/.bzrignore (+0/-2)
tools/dhis2-tools-deb/Makefile (+0/-17)
tools/dhis2-tools-deb/assemble.sh (+0/-26)
tools/dhis2-tools-deb/docs/Makefile (+0/-8)
tools/dhis2-tools-deb/docs/manual.xml (+0/-257)
tools/dhis2-tools-deb/install.sh (+0/-15)
tools/dhis2-tools-deb/pkg/DEBIAN/conffiles (+0/-1)
tools/dhis2-tools-deb/pkg/DEBIAN/control (+0/-14)
tools/dhis2-tools-deb/pkg/DEBIAN/postinst (+0/-12)
tools/dhis2-tools-deb/pkg/DEBIAN/postrm (+0/-7)
tools/dhis2-tools-deb/pkg/DEBIAN/preinst (+0/-6)
tools/dhis2-tools-deb/pkg/etc/sudoers.d/dhis2 (+0/-10)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-backup (+0/-73)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-create-admin (+0/-26)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-deploy-war (+0/-59)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-instance-create (+0/-167)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-logview (+0/-17)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-nginx (+0/-25)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-restoredb (+0/-48)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-shutdown (+0/-18)
tools/dhis2-tools-deb/pkg/usr/bin/dhis2-startup (+0/-25)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/doc/copyright (+0/-24)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/samples/apache2/dhis2-ssl (+0/-78)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/samples/apache2/http-redirect (+0/-5)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/samples/nginx/dhis2 (+0/-38)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/bin/setenv.sh (+0/-32)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/catalina.properties (+0/-81)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/context.xml (+0/-38)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/logging.properties (+0/-41)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/logrotate.conf (+0/-10)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/server.xml (+0/-25)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/tomcat-users.xml (+0/-26)
tools/dhis2-tools-deb/pkg/usr/share/dhis2-tools/skel/conf/web.xml (+0/-1275)
tools/dhis2-tools-deb/pkg/usr/share/doc/dhis2-tools/copyright (+0/-135)
tools/dhis2deb/Makefile (+0/-19)
tools/dhis2deb/Readme.txt (+0/-38)
tools/dhis2deb/debian-binary (+0/-1)
tools/dhis2deb/dhis2/DEBIAN/changelog (+0/-4)
tools/dhis2deb/dhis2/DEBIAN/control (+0/-11)
tools/dhis2deb/dhis2/DEBIAN/copyright (+0/-3)
tools/dhis2deb/dhis2/DEBIAN/postinst (+0/-66)
tools/dhis2deb/dhis2/DEBIAN/postrm (+0/-12)
tools/dhis2deb/dhis2/DEBIAN/rules (+0/-92)
tools/dhis2deb/dhis2/WEB-INF/classes/log4j.properties (+0/-19)
tools/dhis2deb/dhis2/dhis2_home/hibernate.properties (+0/-29)
tools/dhis2deb/dhis2/dhis2_home/importexport/ibatisConfiguration.xml (+0/-6)
tools/dhis2deb/dhis2/dhis2_home/reports/reportConfiguration.xml (+0/-4)
tools/dhis2deb/dhis2/dhis2_home/rt/design/jrxml/STIServicesMD.jrxml (+0/-674)
tools/dhis2deb/dhis2/dhis2_home/rt/design/xml/STIServicesMD.xml (+0/-7)

Low

Fix Committed

Link a bug report

Related blueprints

Animation of startup process (Medium)

Easy-access help-system (Undefined)

Orgnisationunit Wise Data Locking (Undefined)

Create an SMS that can be sent to mobile to download application (High)

Branch information

Owner:: DHIS 2 core developers

Project:: DHIS

Status:: Development

Recent revisions

23766. By Halvdan Hoem Grelland on 2016-08-29: Various fixes: codestyle, added missing Jackson XML-annotations, replace mutable state + external logic with inlined logic for BatchResponseStatus.isOk(), removed auto-generated comments, removed auto-generated unused constructors, replaced repeated construction logic with explicit constructors.
23765. By Halvdan Hoem Grelland on 2016-08-29: Merge Zubair's feature branch in anticipation of The Great VCS Move of 2016
23764. By Abyot Asalefew Gizaw on 2016-08-29: centralized map directive
23763. By Stian Sandvold on 2016-08-29: PushAnalysis; crud + render + "run"; No scheduling
23762. By Lars Helge Øverland on 2016-08-29: Renamed conf property for cache replication
23761. By Lars Helge Øverland on 2016-08-29: Added interpretation support for event chart and event report.
23760. By Stian Sandvold on 2016-08-29: Added method for getting ReportTableGrid with specified user for ReportTableService
23759. By Morten Olav Hansen on 2016-08-29: reuse current user for DELETE
23758. By Morten Olav Hansen on 2016-08-29: reuse current user for POST/PUT
23757. By Morten Olav Hansen on 2016-08-29: removed custom post/put logic for chart/report-table controllers, will now use the importer directly