------------------------------------------------------------ revno: 12795 committer: Lars Helge Ă˜verland <larshe...@gmail.com> branch nick: dhis2 timestamp: Tue 2013-10-22 16:32:09 +0200 message: Sql script modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java resources/sql/div.sql
-- 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-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2013-10-22 14:28:10 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2013-10-22 14:32:09 +0000 @@ -274,7 +274,6 @@ boolean skipExistingCheck = importOptions.isSkipExistingCheck(); Map<String, DataElement> dataElementMap = identifiableObjectManager.getIdMap( DataElement.class, dataElementIdScheme ); - Map<String, OrganisationUnit> orgUnitMap = orgUnitIdScheme == UUID ? getUuidOrgUnitMap() : identifiableObjectManager.getIdMap( OrganisationUnit.class, orgUnitIdScheme ); Map<String, DataElementCategoryOptionCombo> categoryOptionComboMap = identifiableObjectManager.getIdMap( DataElementCategoryOptionCombo.class, IdentifiableProperty.UID ); Map<String, Period> periodMap = new HashMap<String, Period>(); === modified file 'resources/sql/div.sql' --- resources/sql/div.sql 2013-06-18 17:50:40 +0000 +++ resources/sql/div.sql 2013-10-22 14:32:09 +0000 @@ -148,6 +148,13 @@ join categoryoptioncombo coc using(categoryoptioncomboid) join _categoryoptioncomboname con using(categoryoptioncomboid); +-- Display category option combo identifier and name + +select cc.categoryoptioncomboid as id, uid, categoryoptioncomboname as name, code +from categoryoptioncombo cc +join _categoryoptioncomboname cn +on (cc.categoryoptioncomboid=cn.categoryoptioncomboid); + -- Populate dashboards for all users (7666 is userinfoid for target dashboard, replace with preferred id) insert into usersetting (userinfoid, name, value)
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp