dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43451
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22033: minor, replace test metadata in dxf2 object bundle test
------------------------------------------------------------
revno: 22033
committer: Morten Olav Hansen <morten@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-02-24 11:40:54 +0700
message:
minor, replace test metadata in dxf2 object bundle test
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java 2016-02-24 04:32:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/fieldfilter/DefaultFieldFilterService.java 2016-02-24 04:40:54 +0000
@@ -433,14 +433,6 @@
private FieldMap getFullFieldMap( Schema schema )
{
FieldMap fieldMap = new FieldMap();
-
- /*
- for ( String mapKey : schema.getPropertyMap().keySet() )
- {
- fieldMap.put( mapKey, new FieldMap() );
- }
- */
-
fieldMap.put( ":owner", new FieldMap() );
return fieldMap;
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json 2016-02-23 06:02:53 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/dxf2/simple_metadata1.json 2016-02-24 04:40:54 +0000
@@ -1,231 +1,148 @@
{
+ "organisationUnitLevels": [
+ {
+ "name": "Country",
+ "created": "2016-02-17T06:17:12.379+0000",
+ "lastUpdated": "2016-02-17T06:19:09.255+0000",
+ "level": 1,
+ "id": "e1DcQuAONBm"
+ }
+ ],
+ "categoryCombos": [
+ {
+ "lastUpdated": "2016-02-17T06:13:29.135+0000",
+ "name": "default",
+ "skipTotal": false,
+ "categories": [
+ {
+ "id": "XSypGD15atv"
+ }
+ ],
+ "id": "zU1OZFVxnw7",
+ "created": "2016-02-17T06:13:29.133+0000",
+ "dataDimensionType": "DISAGGREGATION",
+ "publicAccess": "--------",
+ "userGroupAccesses": []
+ }
+ ],
"users": [
{
+ "firstName": "admin",
+ "created": "2016-02-17T06:14:12.250+0000",
"organisationUnits": [
{
"id": "PdWlltZnVZe"
}
],
"surname": "admin",
- "created": "2016-02-17T06:14:12.250+0000",
"userCredentials": {
- "disabled": false,
- "cogsDimensionConstraints": [],
"lastLogin": "2016-02-17T06:14:12.274+0000",
- "username": "admin",
- "externalAccess": false,
- "userInfo": {
- "id": "ueKaFVdR8Fz"
- },
- "catDimensionConstraints": [],
- "externalAuth": false,
- "name": "admin",
- "invitation": false,
- "displayName": "admin",
- "selfRegistered": false,
- "passwordLastUpdated": "2016-02-17T06:14:12.274+0000",
- "attributeValues": [],
"created": "2016-02-17T06:14:12.362+0000",
- "code": "admin",
- "userGroupAccesses": [],
"userRoles": [
{
"id": "rKLtmQLRMU8"
}
- ]
+ ],
+ "invitation": false,
+ "disabled": false,
+ "externalAuth": false,
+ "cogsDimensionConstraints": [],
+ "userInfo": {
+ "id": "ueKaFVdR8Fz"
+ },
+ "passwordLastUpdated": "2016-02-17T06:14:12.274+0000",
+ "catDimensionConstraints": [],
+ "username": "admin",
+ "selfRegistered": false
},
+ "attributeValues": [],
"dataViewOrganisationUnits": [],
- "id": "ueKaFVdR8Fz",
- "firstName": "admin",
- "attributeValues": [],
- "lastUpdated": "2016-02-17T06:14:12.250+0000"
- }
- ],
- "organisationUnitLevels": [
- {
- "id": "e1DcQuAONBm",
- "name": "Country",
- "level": 1,
- "created": "2016-02-17T06:17:12.379+0000",
- "lastUpdated": "2016-02-17T06:19:09.255+0000"
- }
- ],
- "dataElements": [
- {
- "domainType": "AGGREGATE",
- "code": "DataElementCodeA",
- "created": "2016-02-17T06:15:06.079+0000",
- "userGroupAccesses": [],
- "shortName": "DataElementShortA",
- "name": "DataElementA",
- "id": "SG4HuKlNEFH",
- "publicAccess": "rw------",
- "attributeValues": [],
- "user": {
- "id": "ueKaFVdR8Fz"
- },
- "valueType": "TEXT",
- "zeroIsSignificant": false,
- "categoryCombo": {
- "id": "zU1OZFVxnw7"
- },
- "lastUpdated": "2016-02-17T06:15:59.378+0000",
- "aggregationType": "SUM",
- "aggregationLevels": []
- },
- {
- "attributeValues": [],
- "publicAccess": "rw------",
- "name": "DataElementB",
- "id": "CCwk5Yx440o",
- "shortName": "DataElementShortB",
- "userGroupAccesses": [],
- "domainType": "AGGREGATE",
- "created": "2016-02-17T06:15:49.487+0000",
- "code": "DataElementCodeB",
- "aggregationLevels": [],
- "aggregationType": "SUM",
- "lastUpdated": "2016-02-17T06:16:08.180+0000",
- "categoryCombo": {
- "id": "zU1OZFVxnw7"
- },
- "zeroIsSignificant": false,
- "user": {
- "id": "ueKaFVdR8Fz"
- },
- "valueType": "TEXT"
+ "lastUpdated": "2016-02-17T06:14:12.250+0000",
+ "id": "ueKaFVdR8Fz"
+ }
+ ],
+ "organisationUnits": [
+ {
+ "shortName": "OrgUnitShortA",
+ "created": "2016-02-17T06:17:01.218+0000",
+ "featureType": "NONE",
+ "openingDate": "2016-02-17",
+ "code": "OrgUnitCodeA",
+ "attributeValues": [],
+ "path": "/PdWlltZnVZe",
+ "user": {
+ "id": "ueKaFVdR8Fz"
+ },
+ "lastUpdated": "2016-02-17T06:17:01.228+0000",
+ "name": "OrgUnitA",
+ "description": "",
+ "id": "PdWlltZnVZe",
+ "uuid": "6ea86a20-1eb1-4bbd-87ea-948ee1e01f20"
}
],
"dataSets": [
{
- "renderAsTabs": false,
- "validCompleteOnly": false,
- "lastUpdated": "2016-02-17T06:19:18.986+0000",
- "version": 1,
- "categoryCombo": {
- "id": "zU1OZFVxnw7"
- },
- "indicators": [],
+ "dataElements": [
+ {
+ "id": "CCwk5Yx440o"
+ },
+ {
+ "id": "SG4HuKlNEFH"
+ }
+ ],
"periodType": "Monthly",
+ "dataElementDecoration": false,
+ "noValueRequiresComment": false,
+ "openFuturePeriods": 0,
+ "name": "DataSetA",
+ "skipOffline": false,
+ "notifyCompletingUser": false,
+ "code": "DataSetCodeA",
+ "publicAccess": "rw------",
"fieldCombinationRequired": false,
+ "organisationUnits": [
+ {
+ "id": "PdWlltZnVZe"
+ }
+ ],
"mobile": false,
- "noValueRequiresComment": false,
+ "id": "DSaKQTwN4qg",
"compulsoryDataElementOperands": [],
- "notifyCompletingUser": false,
+ "expiryDays": 0,
+ "version": 1,
+ "indicators": [],
"user": {
"id": "ueKaFVdR8Fz"
},
- "skipOffline": false,
- "attributeValues": [],
- "publicAccess": "rw------",
+ "lastUpdated": "2016-02-17T06:19:18.986+0000",
"renderHorizontally": false,
+ "userGroupAccesses": [],
+ "validCompleteOnly": false,
+ "attributeValues": [],
"timelyDays": 15,
- "id": "DSaKQTwN4qg",
- "name": "DataSetA",
- "dataElementDecoration": false,
- "dataElements": [
- {
- "id": "CCwk5Yx440o"
- },
- {
- "id": "SG4HuKlNEFH"
- }
- ],
- "openFuturePeriods": 0,
- "shortName": "DataSetShortA",
- "expiryDays": 0,
- "organisationUnits": [
- {
- "id": "PdWlltZnVZe"
- }
- ],
- "userGroupAccesses": [],
+ "categoryCombo": {
+ "id": "zU1OZFVxnw7"
+ },
+ "renderAsTabs": false,
"created": "2016-02-17T06:16:40.204+0000",
- "code": "DataSetCodeA"
- }
- ],
- "categories": [
- {
- "dataDimensionType": "DISAGGREGATION",
- "publicAccess": "--------",
- "lastUpdated": "2016-02-23T04:45:41.246+0000",
- "id": "XSypGD15atv",
- "name": "default",
- "dataDimension": true,
- "userGroupAccesses": [],
- "created": "2016-02-17T06:13:29.131+0000",
- "categoryOptions": [
- {
- "id": "SMHi6P8WZ1H"
- }
- ]
- }
- ],
- "categoryCombos": [
- {
- "userGroupAccesses": [],
- "created": "2016-02-17T06:13:29.133+0000",
- "dataDimensionType": "DISAGGREGATION",
- "skipTotal": false,
- "categories": [
- {
- "id": "XSypGD15atv"
- }
- ],
- "publicAccess": "--------",
- "lastUpdated": "2016-02-17T06:13:29.135+0000",
- "name": "default",
- "id": "zU1OZFVxnw7"
- }
- ],
- "date": "2016-02-23T04:46:54.176+0000",
- "organisationUnits": [
- {
- "name": "OrgUnitA",
- "id": "PdWlltZnVZe",
- "attributeValues": [],
- "openingDate": "2016-02-17",
- "lastUpdated": "2016-02-17T06:17:01.228+0000",
- "user": {
- "id": "ueKaFVdR8Fz"
- },
- "featureType": "NONE",
- "description": "",
- "code": "OrgUnitCodeA",
- "path": "/PdWlltZnVZe",
- "created": "2016-02-17T06:17:01.218+0000",
- "shortName": "OrgUnitShortA",
- "uuid": "6ea86a20-1eb1-4bbd-87ea-948ee1e01f20"
+ "shortName": "DataSetShortA"
}
],
"categoryOptionCombos": [
{
+ "name": "default",
"lastUpdated": "2016-02-17T06:13:29.134+0000",
"categoryOptions": [
{
"id": "SMHi6P8WZ1H"
}
],
+ "created": "2016-02-17T06:13:29.133+0000",
"ignoreApproval": false,
- "created": "2016-02-17T06:13:29.133+0000",
- "id": "gOeVvNgprQ8",
"categoryCombo": {
"id": "zU1OZFVxnw7"
},
- "name": "default"
- }
- ],
- "categoryOptions": [
- {
- "shortName": "default",
- "created": "2016-02-17T06:13:29.120+0000",
- "organisationUnits": [],
- "userGroupAccesses": [],
- "publicAccess": "--------",
- "lastUpdated": "2016-02-17T06:13:29.137+0000",
- "attributeValues": [],
- "id": "SMHi6P8WZ1H",
- "name": "default"
+ "id": "gOeVvNgprQ8"
}
],
"userRoles": [
@@ -265,24 +182,101 @@
"F_APPROVE_DATA_LOWER_LEVELS",
"F_TRACKED_ENTITY_DATAVALUE_DELETE"
],
+ "id": "rKLtmQLRMU8",
+ "lastUpdated": "2016-02-17T06:14:12.260+0000",
"name": "Superuser",
- "id": "rKLtmQLRMU8",
+ "userGroupAccesses": [],
"dataSets": [],
- "publicAccess": "--------",
- "lastUpdated": "2016-02-17T06:14:12.260+0000",
- "userGroupAccesses": [],
+ "programs": [],
"created": "2016-02-17T06:14:12.260+0000",
- "programs": []
+ "publicAccess": "--------"
}
],
"trackedEntities": [
{
+ "id": "NdUUIOhQPcu",
"attributeValues": [],
- "lastUpdated": "2016-02-17T06:25:08.000+0000",
"description": "Person",
- "id": "NdUUIOhQPcu",
"name": "Person",
- "created": "2016-02-17T06:25:08.000+0000"
- }
- ]
+ "created": "2016-02-17T06:25:08.000+0000",
+ "lastUpdated": "2016-02-17T06:25:08.000+0000"
+ }
+ ],
+ "dataElements": [
+ {
+ "attributeValues": [],
+ "userGroupAccesses": [],
+ "valueType": "TEXT",
+ "aggregationType": "SUM",
+ "created": "2016-02-17T06:15:06.079+0000",
+ "shortName": "DataElementShortA",
+ "categoryCombo": {
+ "id": "zU1OZFVxnw7"
+ },
+ "aggregationLevels": [],
+ "id": "SG4HuKlNEFH",
+ "domainType": "AGGREGATE",
+ "lastUpdated": "2016-02-17T06:15:59.378+0000",
+ "user": {
+ "id": "ueKaFVdR8Fz"
+ },
+ "zeroIsSignificant": false,
+ "publicAccess": "rw------",
+ "code": "DataElementCodeA",
+ "name": "DataElementA"
+ },
+ {
+ "code": "DataElementCodeB",
+ "publicAccess": "rw------",
+ "name": "DataElementB",
+ "attributeValues": [],
+ "userGroupAccesses": [],
+ "valueType": "TEXT",
+ "aggregationType": "SUM",
+ "shortName": "DataElementShortB",
+ "created": "2016-02-17T06:15:49.487+0000",
+ "categoryCombo": {
+ "id": "zU1OZFVxnw7"
+ },
+ "id": "CCwk5Yx440o",
+ "aggregationLevels": [],
+ "domainType": "AGGREGATE",
+ "user": {
+ "id": "ueKaFVdR8Fz"
+ },
+ "lastUpdated": "2016-02-17T06:16:08.180+0000",
+ "zeroIsSignificant": false
+ }
+ ],
+ "categories": [
+ {
+ "lastUpdated": "2016-02-24T04:31:52.533+0000",
+ "categoryOptions": [
+ {
+ "id": "SMHi6P8WZ1H"
+ }
+ ],
+ "name": "default",
+ "id": "XSypGD15atv",
+ "created": "2016-02-17T06:13:29.131+0000",
+ "publicAccess": "--------",
+ "dataDimensionType": "DISAGGREGATION",
+ "userGroupAccesses": [],
+ "dataDimension": true
+ }
+ ],
+ "categoryOptions": [
+ {
+ "id": "SMHi6P8WZ1H",
+ "name": "default",
+ "lastUpdated": "2016-02-17T06:13:29.137+0000",
+ "userGroupAccesses": [],
+ "attributeValues": [],
+ "shortName": "default",
+ "organisationUnits": [],
+ "created": "2016-02-17T06:13:29.120+0000",
+ "publicAccess": "--------"
+ }
+ ],
+ "date": "2016-02-24T04:32:01.229+0000"
}
