dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19913
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8888: Impl add/update UI for legend set association with data element and indicator
------------------------------------------------------------
revno: 8888
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-11-05 21:32:08 +0300
message:
Impl add/update UI for legend set association with data element and indicator
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm
--
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/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2012-11-02 11:03:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2012-11-05 18:32:08 +0000
@@ -514,8 +514,13 @@
{
for ( MapView mapView : mapViews )
{
- mapView.getParentOrganisationUnit().setLevel(
- organisationUnitService.getLevelOfOrganisationUnit( mapView.getParentOrganisationUnit().getId() ) );
+ //TODO poor performance, fix
+
+ if ( mapView.getParentOrganisationUnit() != null )
+ {
+ mapView.getParentOrganisationUnit().setLevel(
+ organisationUnitService.getLevelOfOrganisationUnit( mapView.getParentOrganisationUnit().getId() ) );
+ }
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/AddDataElementAction.java 2012-11-05 18:32:08 +0000
@@ -38,6 +38,8 @@
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.system.util.AttributeUtils;
@@ -82,6 +84,13 @@
{
this.optionService = optionService;
}
+
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
// -------------------------------------------------------------------------
// Input
@@ -212,6 +221,13 @@
{
this.selectedOptionSetId = selectedOptionSetId;
}
+
+ private Integer selectedLegendSetId;
+
+ public void setSelectedLegendSetId( Integer selectedLegendSetId )
+ {
+ this.selectedLegendSetId = selectedLegendSetId;
+ }
// -------------------------------------------------------------------------
// Action implementation
@@ -248,6 +264,7 @@
.getDataElementCategoryCombo( selectedCategoryComboId );
OptionSet optionSet = optionService.getOptionSet( selectedOptionSetId );
+ MapLegendSet legendSet = mappingService.getMapLegendSet( selectedLegendSetId );
dataElement.setName( name );
dataElement.setShortName( shortName );
@@ -257,6 +274,7 @@
dataElement.setActive( true );
dataElement.setDomainType( domainType );
dataElement.setType( valueType );
+
if ( DataElement.VALUE_TYPE_STRING.equalsIgnoreCase( valueType ) )
{
dataElement.setTextType( textType );
@@ -265,13 +283,14 @@
{
dataElement.setNumberType( numberType );
}
+
dataElement.setAggregationOperator( aggregationOperator );
dataElement.setUrl( url );
dataElement.setZeroIsSignificant( zeroIsSignificant );
dataElement.setCategoryCombo( categoryCombo );
- dataElement.setAggregationLevels( new ArrayList<Integer>( ConversionUtils
- .getIntegerCollection( aggregationLevels ) ) );
+ dataElement.setAggregationLevels( new ArrayList<Integer>( ConversionUtils.getIntegerCollection( aggregationLevels ) ) );
dataElement.setOptionSet( optionSet );
+ dataElement.setLegendSet( legendSet );
if ( jsonAttributeValues != null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java 2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowAddDataElementForm.java 2012-11-05 18:32:08 +0000
@@ -41,6 +41,8 @@
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
@@ -94,6 +96,13 @@
this.optionService = optionService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -140,13 +149,20 @@
return attributes;
}
- private Collection<OptionSet> optionSets;
+ private List<OptionSet> optionSets;
- public Collection<OptionSet> getOptionSets()
+ public List<OptionSet> getOptionSets()
{
return optionSets;
}
+ private List<MapLegendSet> legendSets;
+
+ public List<MapLegendSet> getLegendSets()
+ {
+ return legendSets;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -168,12 +184,16 @@
attributes = new ArrayList<Attribute>( attributeService.getDataElementAttributes() );
+ optionSets = new ArrayList<OptionSet>( optionService.getAllOptionSets() );
+
+ legendSets = new ArrayList<MapLegendSet>( mappingService.getAllMapLegendSets() );
+
Collections.sort( dataElementCategoryCombos, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( attributes, new AttributeSortOrderComparator() );
-
- optionSets = optionService.getAllOptionSets();
-
+ Collections.sort( optionSets, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java 2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowUpdateDataElementFormAction.java 2012-11-05 18:32:08 +0000
@@ -44,6 +44,8 @@
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementGroupSet;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
@@ -98,6 +100,13 @@
this.optionService = optionService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -172,13 +181,20 @@
return attributeValues;
}
- private Collection<OptionSet> optionSets;
+ private List<OptionSet> optionSets;
- public Collection<OptionSet> getOptionSets()
+ public List<OptionSet> getOptionSets()
{
return optionSets;
}
+ private List<MapLegendSet> legendSets;
+
+ public List<MapLegendSet> getLegendSets()
+ {
+ return legendSets;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -211,11 +227,15 @@
attributeValues = AttributeUtils.getAttributeValueMap( dataElement.getAttributeValues() );
+ optionSets = new ArrayList<OptionSet>( optionService.getAllOptionSets() );
+
+ legendSets = new ArrayList<MapLegendSet>( mappingService.getAllMapLegendSets() );
+
Collections.sort( dataElementCategoryCombos, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( attributes, new AttributeSortOrderComparator() );
-
- optionSets = optionService.getAllOptionSets();
+ Collections.sort( optionSets, IdentifiableObjectNameComparator.INSTANCE );
+ Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/UpdateDataElementAction.java 2012-11-05 18:32:08 +0000
@@ -32,6 +32,8 @@
import org.hisp.dhis.dataelement.*;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.option.OptionService;
import org.hisp.dhis.option.OptionSet;
import org.hisp.dhis.system.util.AttributeUtils;
@@ -87,6 +89,13 @@
this.optionService = optionService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -238,6 +247,13 @@
this.selectedOptionSetId = selectedOptionSetId;
}
+ private Integer selectedLegendSetId;
+
+ public void setSelectedLegendSetId( Integer selectedLegendSetId )
+ {
+ this.selectedLegendSetId = selectedLegendSetId;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -278,6 +294,7 @@
.getDataElementCategoryCombo( selectedCategoryComboId );
OptionSet optionSet = optionService.getOptionSet( selectedOptionSetId );
+ MapLegendSet legendSet = mappingService.getMapLegendSet( selectedLegendSetId );
dataElement.setName( name );
dataElement.setShortName( shortName );
@@ -287,6 +304,7 @@
dataElement.setActive( active );
dataElement.setDomainType( domainType );
dataElement.setType( valueType );
+
if ( DataElement.VALUE_TYPE_STRING.equalsIgnoreCase( valueType ) )
{
dataElement.setTextType( textType );
@@ -297,6 +315,7 @@
dataElement.setNumberType( numberType );
dataElement.setTextType( null );
}
+
dataElement.setAggregationOperator( aggregationOperator );
dataElement.setUrl( url );
dataElement.setZeroIsSignificant( zeroIsSignificant );
@@ -304,6 +323,7 @@
dataElement.setAggregationLevels( new ArrayList<Integer>( ConversionUtils
.getIntegerCollection( aggregationLevels ) ) );
dataElement.setOptionSet( optionSet );
+ dataElement.setLegendSet( legendSet );
Set<DataSet> dataSets = dataElement.getDataSets();
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/AddIndicatorAction.java 2012-11-05 18:32:08 +0000
@@ -36,6 +36,8 @@
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.system.util.AttributeUtils;
import com.opensymphony.xwork2.Action;
@@ -64,6 +66,13 @@
this.attributeService = attributeService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -110,6 +119,13 @@
this.indicatorTypeId = indicatorTypeId;
}
+ private Integer selectedLegendSetId;
+
+ public void setSelectedLegendSetId( Integer selectedLegendSetId )
+ {
+ this.selectedLegendSetId = selectedLegendSetId;
+ }
+
private String url;
public void setUrl( String url )
@@ -177,6 +193,8 @@
description = null;
}
+ MapLegendSet legendSet = mappingService.getMapLegendSet( selectedLegendSetId );
+
Indicator indicator = new Indicator();
indicator.setName( name );
@@ -185,6 +203,7 @@
indicator.setDescription( description );
indicator.setAnnualized( annualized );
indicator.setIndicatorType( indicatorType );
+ indicator.setLegendSet( legendSet );
indicator.setUrl( url );
indicator.setNumerator( numerator );
indicator.setNumeratorDescription( numeratorDescription );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java 2012-06-09 21:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowAddIndicatorForm.java 2012-11-05 18:32:08 +0000
@@ -34,6 +34,8 @@
import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import java.util.ArrayList;
import java.util.Collections;
@@ -63,6 +65,13 @@
this.attributeService = attributeService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -81,6 +90,13 @@
return attributes;
}
+ private List<MapLegendSet> legendSets;
+
+ public List<MapLegendSet> getLegendSets()
+ {
+ return legendSets;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -88,11 +104,15 @@
public String execute()
{
indicatorTypes = new ArrayList<IndicatorType>( indicatorService.getAllIndicatorTypes() );
+
+ attributes = new ArrayList<Attribute>( attributeService.getIndicatorAttributes() );
+
+ legendSets = new ArrayList<MapLegendSet>( mappingService.getAllMapLegendSets() );
+
Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
-
- attributes = new ArrayList<Attribute>( attributeService.getIndicatorAttributes() );
Collections.sort( attributes, new AttributeSortOrderComparator() );
-
+ Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2012-11-05 18:32:08 +0000
@@ -41,6 +41,8 @@
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.system.util.AttributeUtils;
import com.opensymphony.xwork2.Action;
@@ -71,6 +73,13 @@
this.attributeService = attributeService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -131,6 +140,13 @@
return attributeValues;
}
+ private List<MapLegendSet> legendSets;
+
+ public List<MapLegendSet> getLegendSets()
+ {
+ return legendSets;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -154,9 +170,12 @@
attributeValues = AttributeUtils.getAttributeValueMap( indicator.getAttributeValues() );
+ legendSets = new ArrayList<MapLegendSet>( mappingService.getAllMapLegendSets() );
+
Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
Collections.sort( attributes, new AttributeSortOrderComparator() );
+ Collections.sort( legendSets, IdentifiableObjectNameComparator.INSTANCE );
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/UpdateIndicatorAction.java 2012-11-05 18:32:08 +0000
@@ -36,6 +36,8 @@
import org.hisp.dhis.indicator.IndicatorGroupSet;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.mapping.MapLegendSet;
+import org.hisp.dhis.mapping.MappingService;
import org.hisp.dhis.system.util.AttributeUtils;
import com.opensymphony.xwork2.Action;
@@ -64,6 +66,13 @@
this.attributeService = attributeService;
}
+ private MappingService mappingService;
+
+ public void setMappingService( MappingService mappingService )
+ {
+ this.mappingService = mappingService;
+ }
+
// -------------------------------------------------------------------------
// Input
// -------------------------------------------------------------------------
@@ -117,6 +126,13 @@
this.indicatorTypeId = indicatorTypeId;
}
+ private Integer selectedLegendSetId;
+
+ public void setSelectedLegendSetId( Integer selectedLegendSetId )
+ {
+ this.selectedLegendSetId = selectedLegendSetId;
+ }
+
private String url;
public void setUrl( String url )
@@ -183,6 +199,8 @@
IndicatorType indicatorType = indicatorService.getIndicatorType( indicatorTypeId );
+ MapLegendSet legendSet = mappingService.getMapLegendSet( selectedLegendSetId );
+
if ( code != null && code.trim().length() == 0 )
{
code = null;
@@ -199,6 +217,7 @@
indicator.setDescription( description );
indicator.setAnnualized( annualized );
indicator.setIndicatorType( indicatorType );
+ indicator.setLegendSet( legendSet );
indicator.setUrl( url );
indicator.setNumerator( numerator );
indicator.setNumeratorDescription( numeratorDescription );
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2012-06-09 21:41:33 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2012-11-05 18:32:08 +0000
@@ -60,6 +60,7 @@
</property>
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
<property name="optionService" ref="org.hisp.dhis.option.OptionService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.dataelement.GetDataElementAction" class="org.hisp.dhis.dd.action.dataelement.GetDataElementAction"
@@ -89,6 +90,7 @@
</property>
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
<property name="optionService" ref="org.hisp.dhis.option.OptionService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.dataelement.UpdateDataElementAction" class="org.hisp.dhis.dd.action.dataelement.UpdateDataElementAction"
@@ -104,6 +106,7 @@
</property>
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
<property name="optionService" ref="org.hisp.dhis.option.OptionService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.dataelement.ShowUpdateDataElementFormAction" class="org.hisp.dhis.dd.action.dataelement.ShowUpdateDataElementFormAction"
@@ -119,6 +122,7 @@
</property>
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
<property name="optionService" ref="org.hisp.dhis.option.OptionService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.dataelement.ValidateDataElementAction" class="org.hisp.dhis.dd.action.dataelement.ValidateDataElementAction"
@@ -444,6 +448,7 @@
<ref bean="org.hisp.dhis.indicator.IndicatorService" />
</property>
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction" class="org.hisp.dhis.dd.action.indicator.GetIndicatorListAction"
@@ -489,18 +494,21 @@
scope="prototype">
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.indicator.ShowUpdateIndicatorFormAction" class="org.hisp.dhis.dd.action.indicator.ShowUpdateIndicatorFormAction"
scope="prototype">
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction" class="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction"
scope="prototype">
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="attributeService" ref="org.hisp.dhis.attribute.AttributeService" />
+ <property name="mappingService" ref="org.hisp.dhis.mapping.MappingService" />
</bean>
<bean id="org.hisp.dhis.dd.action.indicator.ValidateIndicatorAction" class="org.hisp.dhis.dd.action.indicator.ValidateIndicatorAction"
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties 2012-11-05 18:32:08 +0000
@@ -194,4 +194,5 @@
please_select=Please select
formula=Formula
long_text = Long text
-text_type = Text type
\ No newline at end of file
+text_type = Text type
+legend_set=Legend set
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementForm.vm 2012-11-05 18:32:08 +0000
@@ -138,11 +138,22 @@
<select id="selectedOptionSetId" name="selectedOptionSetId">
<option value="0">[$i18n.getString('please_select')]</option>
#foreach ( $optionSet in $optionSets )
- <option value="$optionSet.id">$optionSet.name</option>
+ <option value="$optionSet.id">$encoder.htmlEncode( $optionSet.name )</option>
#end
</select>
</td>
</tr>
+ <tr>
+ <td>$i18n.getString( 'legend_set' )</td>
+ <td>
+ <select id="selectedLegendSetId" name="selectedLegendSetId">
+ <option value="0">[$i18n.getString('please_select')]</option>
+ #foreach ( $legendSet in $legendSets )
+ <option value="$legendSet.id">$encoder.htmlEncode( $legendSet.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
</table>
<div id="aggregationLevelsContainer" style="border:1px solid #808080; padding:10px; width:465px; display:none;">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorForm.vm 2012-11-05 18:32:08 +0000
@@ -67,6 +67,17 @@
</td>
</tr>
<tr>
+ <td>$i18n.getString( 'legend_set' )</td>
+ <td>
+ <select id="selectedLegendSetId" name="selectedLegendSetId">
+ <option value="0">[$i18n.getString('please_select')]</option>
+ #foreach ( $legendSet in $legendSets )
+ <option value="$legendSet.id">$encoder.htmlEncode( $legendSet.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
<td><input type="text" id="url" name="url" /></td>
</tr>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm 2012-11-05 18:32:08 +0000
@@ -157,11 +157,22 @@
<select id="selectedOptionSetId" name="selectedOptionSetId">
<option value="0">[$i18n.getString('please_select')]</option>
#foreach ( $optionSet in $optionSets )
- <option value="$optionSet.id" #if( $dataElement.optionSet.id == "$optionSet.id" ) selected #end >$optionSet.name</option>
+ <option value="$optionSet.id" #if( $dataElement.optionSet && $dataElement.optionSet.id == "$optionSet.id" ) selected #end>$encoder.htmlEncode( $optionSet.name )</option>
#end
</select>
</td>
</tr>
+ <tr>
+ <td>$i18n.getString( 'legend_set' )</td>
+ <td>
+ <select id="selectedLegendSetId" name="selectedLegendSetId">
+ <option value="0">[$i18n.getString('please_select')]</option>
+ #foreach ( $legendSet in $legendSets )
+ <option value="$legendSet.id" #if( $dataElement.legendSet && $dataElement.legendSet.id == "$legendSet.id" ) selected #end>$encoder.htmlEncode( $legendSet.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
</table>
<div id="aggregationLevelsContainer" style="border:1px solid #808080;padding:10px;width:465px;#if( !$dataElement.hasAggregationLevels() ) display:none;#else display:block;#end">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2012-10-18 13:04:28 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm 2012-11-05 18:32:08 +0000
@@ -65,6 +65,17 @@
</td>
</tr>
<tr>
+ <td>$i18n.getString( 'legend_set' )</td>
+ <td>
+ <select id="selectedLegendSetId" name="selectedLegendSetId">
+ <option value="0">[$i18n.getString('please_select')]</option>
+ #foreach ( $legendSet in $legendSets )
+ <option value="$legendSet.id" #if( $indicator.legendSet && $indicator.legendSet.id == "$legendSet.id" ) selected #end>$encoder.htmlEncode( $legendSet.name )</option>
+ #end
+ </select>
+ </td>
+ </tr>
+ <tr>
<td><label for="url">$i18n.getString( "url" )</label></td>
<td><input type="text" id="url" name="url" value="$!encoder.htmlEncode( $indicator.url )"></td>
</tr>
