Merge authors:
Jim Grace (jimgrace)
···
------------------------------------------------------------
revno: 17231 [merge]
committer: jimgrace@gmail.com
branch nick: dhis2
timestamp: Thu 2014-10-23 04:46:08 -0400
message:
New data approvals code -- work in progress
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalBaseState.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPermissions.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalPeriodAggregator.java
added:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalAndPermissions.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStatusAndPermissions.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataApprovalException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeAcceptedException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeApprovedException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnacceptedException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataMayNotBeUnapprovedException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/DataSetNotMarkedForApprovalException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/NoAttributeOptionsFoundInGroupsException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/PeriodShorterThanDataSetPeriodException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotAccessApprovalLevelException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserCannotApproveAttributeComboException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotAcceptDataException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotApproveDataException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnacceptDataException.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/exceptions/UserMayNotUnapproveDataException.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalAggregator.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApproval.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevel.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalLevelStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalState.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalStore.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DataApprovalSelection.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalLevelService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/DefaultDataApprovalService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalLevelStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataapproval/hibernate/HibernateDataApprovalStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataapproval/hibernate/DataApproval.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalStoreTest.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CollectionUtils.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java
The size of the diff (8680 lines) is larger than your specified limit of 5000 lines
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress