sectionList = new ArrayList

(); ds.setSections( sectionList ); if ( sections == null || sections.size() == 0 ) { - // Collection dataElements = - // new ArrayList(); List dataElements = new ArrayList( dataSet.getDataElements() ); @@ -138,83 +138,22 @@ // Fake Section to store Data Elements Section section = new Section(); - - sectionList.add( section ); section.setId( 0 ); section.setName( "" ); - List dataElementList = new ArrayList(); - section.setDataElements( dataElementList ); - - for ( org.hisp.dhis.dataelement.DataElement dataElement : dataElements ) - { - // Server DataElement - dataElement = i18n( i18nService, locale, dataElement ); - Set deCatOptCombs = dataElement.getCategoryCombo().getOptionCombos(); - // Client DataElement - ModelList deCateOptCombo = new ModelList(); - List listCateOptCombo = new ArrayList(); - deCateOptCombo.setModels( listCateOptCombo ); - - for ( DataElementCategoryOptionCombo oneCatOptCombo : deCatOptCombs ) - { - Model oneCateOptCombo = new Model(); - oneCateOptCombo.setId( oneCatOptCombo.getId() ); - oneCateOptCombo.setName( oneCatOptCombo.getName() ); - listCateOptCombo.add( oneCateOptCombo ); - } - - DataElement de = new DataElement(); - de.setId( dataElement.getId() ); - de.setName( dataElement.getName() ); - de.setType( dataElement.getType() ); - - //For facility Reporting, all data element are mandetory - de.setCompulsory( true ); - de.setCategoryOptionCombos( deCateOptCombo ); - dataElementList.add( de ); - } + section.setDataElements( getDataElements( locale, dataElements ) ); + sectionList.add( section ); } else { - for ( org.hisp.dhis.dataset.Section each : sections ) + for ( org.hisp.dhis.dataset.Section s : sections ) { - List dataElements = each.getDataElements(); - Section section = new Section(); - section.setId( each.getId() ); - section.setName( each.getName() ); - // Mobile - List dataElementList = new ArrayList(); + section.setId( s.getId() ); + section.setName( s.getName() ); + + List dataElementList = getDataElements( locale, s.getDataElements() ); section.setDataElements( dataElementList ); - - for ( org.hisp.dhis.dataelement.DataElement dataElement : dataElements ) - { - // Server DataElement - dataElement = i18n( i18nService, locale, dataElement ); - Set deCatOptCombs = dataElement.getCategoryCombo() - .getOptionCombos(); - - // Client DataElement - ModelList deCateOptCombo = new ModelList(); - List listCateOptCombo = new ArrayList(); - deCateOptCombo.setModels( listCateOptCombo ); - - for ( DataElementCategoryOptionCombo oneCatOptCombo : deCatOptCombs ) - { - Model oneCateOptCombo = new Model(); - oneCateOptCombo.setId( oneCatOptCombo.getId() ); - oneCateOptCombo.setName( oneCatOptCombo.getName() ); - listCateOptCombo.add( oneCateOptCombo ); - } - - DataElement de = new DataElement(); - de.setId( dataElement.getId() ); - de.setName( dataElement.getName() ); - de.setType( dataElement.getType() ); - de.setCategoryOptionCombos( deCateOptCombo ); - dataElementList.add( de ); - } sectionList.add( section ); } } @@ -222,6 +161,24 @@ return ds; } + private List getDataElements( Locale locale, List dataElements ) + { + List dataElementList = new ArrayList(); + + for ( org.hisp.dhis.dataelement.DataElement dataElement : dataElements ) + { + dataElement = i18n( i18nService, locale, dataElement ); + + DataElement de = Mapping.getDataElement( dataElement ); + + // For facility Reporting, no data elements are mandetory + de.setCompulsory( false ); + + dataElementList.add( de ); + } + return dataElementList; + } + @Override public String saveDataSetValues( OrganisationUnit unit, DataSetValue dataSetValue ) { @@ -248,17 +205,13 @@ dataElementIds.add( dv.getId() ); } - // if ( dataElements.size() != dataElementIds.size() ) - // { - // return "INVALID_DATASET"; - // } - Map dataElementMap = new HashMap(); for ( org.hisp.dhis.dataelement.DataElement dataElement : dataElements ) { if ( !dataElementIds.contains( dataElement.getId() ) ) { - return "INVALID_DATASET"; + log.info( "Dataset '" + dataSet.getName() + "' for org unit '" + unit.getName() + + "' missing data element '" + dataElement.getName() + "'" ); } dataElementMap.put( dataElement.getId(), dataElement ); } === added file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/Mapping.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/Mapping.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/service/Mapping.java 2010-11-27 04:15:31 +0000 @@ -0,0 +1,78 @@ +package org.hisp.dhis.web.api.service; + +/* + * Copyright (c) 2004-2010, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.hisp.dhis.web.api.model.DataElement; +import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; +import org.hisp.dhis.web.api.model.Model; +import org.hisp.dhis.web.api.model.ModelList; + +public class Mapping +{ + + public static DataElement getDataElement( org.hisp.dhis.dataelement.DataElement dataElement ) + { + DataElement de = new DataElement(); + de.setId( dataElement.getId() ); + de.setName( dataElement.getName() ); + de.setType( dataElement.getType() ); + + de.setCategoryOptionCombos( getCategoryOptionCombos( dataElement ) ); + return de; + } + + public static ModelList getCategoryOptionCombos( org.hisp.dhis.dataelement.DataElement dataElement ) + { + Set deCatOptCombs = dataElement.getCategoryCombo().getOptionCombos(); + +// if ( deCatOptCombs.size() < 2 ) +// { +// return null; +// } + + // Client DataElement + ModelList deCateOptCombo = new ModelList(); + List listCateOptCombo = new ArrayList(); + deCateOptCombo.setModels( listCateOptCombo ); + + for ( DataElementCategoryOptionCombo oneCatOptCombo : deCatOptCombs ) + { + Model oneCateOptCombo = new Model(); + oneCateOptCombo.setId( oneCatOptCombo.getId() ); + oneCateOptCombo.setName( oneCatOptCombo.getName() ); + listCateOptCombo.add( oneCateOptCombo ); + } + return deCateOptCombo; + } + + +}