dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12358
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3786: Removed type="chain" into dhis-web-maintenance-datadictionary module.
------------------------------------------------------------
revno: 3786
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-05-30 15:58:59 +0700
message:
Removed type="chain" into dhis-web-maintenance-datadictionary module.
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java
added:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.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/indicatorgroup/ShowIndicatorGroupEditorAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java
modified:
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/struts.xml
--
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
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowDataElementGroupEditorAction.java 2011-05-30 08:58:59 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+package org.hisp.dhis.dd.action.dataelementgroup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementGroup;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $ ShowDataElementGroupEditorAction.java May 30, 2011 2:05:49 PM $
+ *
+ */
+public class ShowDataElementGroupEditorAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private DataElementService dataElementService;
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Comparator
+ // -------------------------------------------------------------------------
+
+ private Comparator<DataElement> dataElementComparator;
+
+ public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
+ {
+ this.dataElementComparator = dataElementComparator;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & output
+ // -------------------------------------------------------------------------
+
+ private List<DataElementGroup> dataElementGroups;
+
+ public List<DataElementGroup> getDataElementGroups()
+ {
+ return dataElementGroups;
+ }
+
+ private List<DataElement> dataElements;
+
+ public List<DataElement> getDataElements()
+ {
+ return dataElements;
+ }
+
+ // -------------------------------------------------------------------------
+ // DisplayPropertyHandler
+ // -------------------------------------------------------------------------
+
+ private DisplayPropertyHandler displayPropertyHandler;
+
+ public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
+ {
+ this.displayPropertyHandler = displayPropertyHandler;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ throws Exception
+ {
+ dataElementGroups = new ArrayList<DataElementGroup>( dataElementService.getAllDataElementGroups() );
+
+ dataElements = new ArrayList<DataElement>( dataElementService.getAllDataElements() );
+ Collections.sort( dataElements, dataElementComparator );
+ displayPropertyHandler.handle( dataElements );
+
+ return SUCCESS;
+ }
+
+}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/ShowUpdateDataElementGroupFormAction.java 2011-05-30 08:58:59 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+package org.hisp.dhis.dd.action.dataelementgroup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementGroup;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $ ShowUpdateDataElementGroupAction.java May 30, 2011 2:26:15 PM $
+ *
+ */
+public class ShowUpdateDataElementGroupFormAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private DataElementService dataElementService;
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Comparator
+ // -------------------------------------------------------------------------
+
+ private Comparator<DataElement> dataElementComparator;
+
+ public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
+ {
+ this.dataElementComparator = dataElementComparator;
+ }
+
+ // -------------------------------------------------------------------------
+ // DisplayPropertyHandler
+ // -------------------------------------------------------------------------
+
+ private DisplayPropertyHandler displayPropertyHandler;
+
+ public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
+ {
+ this.displayPropertyHandler = displayPropertyHandler;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input
+ // -------------------------------------------------------------------------
+
+ private Integer id;
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ // -------------------------------------------------------------------------
+ // Output
+ // -------------------------------------------------------------------------
+
+ private DataElementGroup dataElementGroup;
+
+ public DataElementGroup getDataElementGroup()
+ {
+ return dataElementGroup;
+ }
+
+ private List<DataElement> groupMembers = new ArrayList<DataElement>();
+
+ public List<DataElement> getGroupMembers()
+ {
+ return groupMembers;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ // ---------------------------------------------------------------------
+ // Get group members
+ // ---------------------------------------------------------------------
+
+ dataElementGroup = dataElementService.getDataElementGroup( id );
+
+ groupMembers = new ArrayList<DataElement>( dataElementGroup.getMembers() );
+
+ Collections.sort( groupMembers, dataElementComparator );
+
+ displayPropertyHandler.handle( groupMembers );
+
+ return SUCCESS;
+ }
+}
=== added 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 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicator/ShowUpdateIndicatorFormAction.java 2011-05-30 08:58:59 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+package org.hisp.dhis.dd.action.indicator;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.hisp.dhis.indicator.Indicator;
+import org.hisp.dhis.indicator.IndicatorService;
+import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.indicator.comparator.IndicatorTypeNameComparator;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $ ShowUpdateIndicatorFormAction.java May 30, 2011 2:34:10 PM $
+ *
+ */
+public class ShowUpdateIndicatorFormAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private IndicatorService indicatorService;
+
+ public void setIndicatorService( IndicatorService indicatorService )
+ {
+ this.indicatorService = indicatorService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/output
+ // -------------------------------------------------------------------------
+
+ private Integer id;
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ private Indicator indicator;
+
+ public Indicator getIndicator()
+ {
+ return indicator;
+ }
+
+ private int selectedIndicatorType;
+
+ public int getSelectedIndicatorType()
+ {
+ return selectedIndicatorType;
+ }
+
+ private String indicatorTypeName;
+
+ public String getIndicatorTypeName()
+ {
+ return indicatorTypeName;
+ }
+
+ private List<IndicatorType> indicatorTypes;
+
+ public List<IndicatorType> getIndicatorTypes()
+ {
+ return indicatorTypes;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ indicator = indicatorService.getIndicator( id );
+
+ if ( indicator.getIndicatorType() != null )
+ {
+ selectedIndicatorType = indicator.getIndicatorType().getId();
+
+ indicatorTypeName = indicator.getIndicatorType().getName();
+ }
+
+ indicatorTypes = new ArrayList<IndicatorType>( indicatorService.getAllIndicatorTypes() );
+
+ Collections.sort( indicatorTypes, new IndicatorTypeNameComparator() );
+
+ return SUCCESS;
+ }
+
+}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 2011-05-27 10:24:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/GetIndicatorGroupMembersAction.java 1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-package org.hisp.dhis.dd.action.indicatorgroup;
-
-/*
- * 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.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorGroup;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- */
-public class GetIndicatorGroupMembersAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- // -------------------------------------------------------------------------
- // Comparator
- // -------------------------------------------------------------------------
-
- private Comparator<Indicator> indicatorComparator;
-
- public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
- {
- this.indicatorComparator = indicatorComparator;
- }
-
- // -------------------------------------------------------------------------
- // DisplayPropertyHandler
- // -------------------------------------------------------------------------
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer id;
-
- public void setId( Integer id )
- {
- this.id = id;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- private List<Indicator> groupMembers = new ArrayList<Indicator>();
-
- public List<Indicator> getGroupMembers()
- {
- return groupMembers;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- {
- // ---------------------------------------------------------------------
- // Get group members
- // ---------------------------------------------------------------------
-
- if ( id != null )
- {
- IndicatorGroup group = indicatorService.getIndicatorGroup( id.intValue() );
-
- groupMembers = new ArrayList<Indicator>( group.getMembers() );
-
- Collections.sort( groupMembers, indicatorComparator );
-
- displayPropertyHandler.handle( groupMembers );
- }
-
- return SUCCESS;
- }
-}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowIndicatorGroupEditorAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowIndicatorGroupEditorAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowIndicatorGroupEditorAction.java 2011-05-30 08:58:59 +0000
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+package org.hisp.dhis.dd.action.indicatorgroup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.hisp.dhis.indicator.Indicator;
+import org.hisp.dhis.indicator.IndicatorGroup;
+import org.hisp.dhis.indicator.IndicatorService;
+import org.hisp.dhis.indicator.comparator.IndicatorGroupNameComparator;
+import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $ ShowIndicatorGroupEditorAction.java May 30, 2011 2:44:20 PM $
+ *
+ */
+public class ShowIndicatorGroupEditorAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private IndicatorService indicatorService;
+
+ public void setIndicatorService( IndicatorService indicatorService )
+ {
+ this.indicatorService = indicatorService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Comparator
+ // -------------------------------------------------------------------------
+
+ private Comparator<Indicator> indicatorComparator;
+
+ public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
+ {
+ this.indicatorComparator = indicatorComparator;
+ }
+
+ // -------------------------------------------------------------------------
+ // DisplayPropertyHandler
+ // -------------------------------------------------------------------------
+
+ private DisplayPropertyHandler displayPropertyHandler;
+
+ public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
+ {
+ this.displayPropertyHandler = displayPropertyHandler;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input & Output
+ // -------------------------------------------------------------------------
+
+ private List<IndicatorGroup> indicatorGroups;
+
+ public List<IndicatorGroup> getIndicatorGroups()
+ {
+ return indicatorGroups;
+ }
+
+ private List<Indicator> indicators;
+
+ public List<Indicator> getIndicators()
+ {
+ return indicators;
+ }
+
+ // -------------------------------------------------------------------------
+
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ indicatorGroups = new ArrayList<IndicatorGroup>( indicatorService.getAllIndicatorGroups() );
+
+ Collections.sort( indicatorGroups, new IndicatorGroupNameComparator() );
+
+
+ indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
+
+ Collections.sort( indicators, indicatorComparator );
+
+ displayPropertyHandler.handle( indicators );
+
+ return SUCCESS;
+ }
+}
=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/ShowUpdateIndicatorGroupFormAction.java 2011-05-30 08:58:59 +0000
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2004-2009, 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.
+ */
+
+package org.hisp.dhis.dd.action.indicatorgroup;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.hisp.dhis.indicator.Indicator;
+import org.hisp.dhis.indicator.IndicatorGroup;
+import org.hisp.dhis.indicator.IndicatorService;
+import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
+
+import com.opensymphony.xwork2.Action;
+
+/**
+ * @author Chau Thu Tran
+ * @version $ ShowUpdateIndicatorGroupFormAction.java May 30, 2011 3:01:41 PM $
+ *
+ */
+public class ShowUpdateIndicatorGroupFormAction
+ implements Action
+{
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ private IndicatorService indicatorService;
+
+ public void setIndicatorService( IndicatorService indicatorService )
+ {
+ this.indicatorService = indicatorService;
+ }
+
+ // -------------------------------------------------------------------------
+ // Comparator
+ // -------------------------------------------------------------------------
+
+ private Comparator<Indicator> indicatorComparator;
+
+ public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
+ {
+ this.indicatorComparator = indicatorComparator;
+ }
+
+ // -------------------------------------------------------------------------
+ // DisplayPropertyHandler
+ // -------------------------------------------------------------------------
+
+ private DisplayPropertyHandler displayPropertyHandler;
+
+ public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
+ {
+ this.displayPropertyHandler = displayPropertyHandler;
+ }
+
+ // -------------------------------------------------------------------------
+ // Input/output
+ // -------------------------------------------------------------------------
+
+ private Integer id;
+
+ public void setId( Integer id )
+ {
+ this.id = id;
+ }
+
+ private IndicatorGroup indicatorGroup;
+
+ public IndicatorGroup getIndicatorGroup()
+ {
+ return indicatorGroup;
+ }
+
+ private List<Indicator> groupMembers = new ArrayList<Indicator>();
+
+ public List<Indicator> getGroupMembers()
+ {
+ return groupMembers;
+ }
+
+ // -------------------------------------------------------------------------
+ // Action implementation
+ // -------------------------------------------------------------------------
+
+ public String execute()
+ {
+ indicatorGroup = indicatorService.getIndicatorGroup( id );
+
+ groupMembers = new ArrayList<Indicator>( indicatorGroup.getMembers() );
+
+ Collections.sort( groupMembers, indicatorComparator );
+
+ displayPropertyHandler.handle( groupMembers );
+
+ return SUCCESS;
+ }
+}
\ No newline at end of file
=== 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 2011-05-27 10:24:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/META-INF/dhis/beans.xml 2011-05-30 08:58:59 +0000
@@ -39,6 +39,15 @@
</bean>
<bean
+ id="org.hisp.dhis.dd.action.dataelementgroup.ShowUpdateDataElementGroupFormAction"
+ class="org.hisp.dhis.dd.action.dataelementgroup.ShowUpdateDataElementGroupFormAction"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean
id="org.hisp.dhis.dd.action.dataelement.GetDataElementGroupMembersAction"
class="org.hisp.dhis.dd.action.dataelement.GetDataElementGroupMembersAction"
scope="prototype">
@@ -125,12 +134,21 @@
scope="prototype">
<property name="dataElementService">
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
+ </property>
</bean>
-
+
<!-- Data Element Group -->
<bean
+ id="org.hisp.dhis.dd.action.dataelementgroup.ShowDataElementGroupEditorAction"
+ class="org.hisp.dhis.dd.action.dataelementgroup.ShowDataElementGroupEditorAction"
+ scope="prototype">
+ <property name="dataElementService">
+ <ref bean="org.hisp.dhis.dataelement.DataElementService" />
+ </property>
+ </bean>
+
+ <bean
id="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupListAction"
class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupListAction"
scope="prototype">
@@ -138,7 +156,7 @@
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.dataelementgroup.GetAssignedGroupsByDataElementAction"
class="org.hisp.dhis.dd.action.dataelementgroup.GetAssignedGroupsByDataElementAction"
@@ -147,7 +165,7 @@
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.dataelementgroup.AssignGroupsForDataElementAction"
class="org.hisp.dhis.dd.action.dataelementgroup.AssignGroupsForDataElementAction"
@@ -230,7 +248,7 @@
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.dataelementgroupset.OpenUpdateDataElementGroupSetAction"
class="org.hisp.dhis.dd.action.dataelementgroupset.OpenUpdateDataElementGroupSetAction"
@@ -266,7 +284,7 @@
<ref bean="org.hisp.dhis.dataelement.DataElementService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.dataelementgroupset.GetDataElementGroupSetAction"
class="org.hisp.dhis.dd.action.dataelementgroupset.GetDataElementGroupSetAction"
@@ -280,6 +298,15 @@
<!-- Indicator Group -->
<bean
+ id="org.hisp.dhis.dd.action.indicatorgroup.ShowIndicatorGroupEditorAction"
+ class="org.hisp.dhis.dd.action.indicatorgroup.ShowIndicatorGroupEditorAction"
+ scope="prototype">
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ </bean>
+
+ <bean
id="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupListAction"
class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupListAction"
scope="prototype">
@@ -314,6 +341,15 @@
</bean>
<bean
+ id="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction"
+ class="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction"
+ scope="prototype">
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ </bean>
+
+ <bean
id="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction"
class="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction"
scope="prototype">
@@ -332,15 +368,6 @@
</bean>
<bean
- id="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupMembersAction"
- class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupMembersAction"
- scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService" />
- </property>
- </bean>
-
- <bean
id="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction"
class="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction"
scope="prototype">
@@ -348,7 +375,7 @@
<ref bean="org.hisp.dhis.indicator.IndicatorService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction"
class="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction"
@@ -386,7 +413,7 @@
<ref bean="org.hisp.dhis.indicator.IndicatorService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.indicatorgroupset.ListIndicatorGroupSetAction"
class="org.hisp.dhis.dd.action.indicatorgroupset.ListIndicatorGroupSetAction"
@@ -413,7 +440,7 @@
<ref bean="org.hisp.dhis.indicator.IndicatorService" />
</property>
</bean>
-
+
<bean
id="org.hisp.dhis.dd.action.indicatorgroupset.GetIndicatorGroupSetAction"
class="org.hisp.dhis.dd.action.indicatorgroupset.GetIndicatorGroupSetAction"
@@ -529,6 +556,14 @@
</property>
</bean>
+ <bean id="org.hisp.dhis.dd.action.indicator.ShowUpdateIndicatorFormAction"
+ class="org.hisp.dhis.dd.action.indicator.ShowUpdateIndicatorFormAction"
+ scope="prototype">
+ <property name="indicatorService">
+ <ref bean="org.hisp.dhis.indicator.IndicatorService" />
+ </property>
+ </bean>
+
<bean id="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction"
class="org.hisp.dhis.dd.action.indicator.UpdateIndicatorAction" scope="prototype">
<property name="indicatorService">
@@ -542,7 +577,7 @@
<property name="indicatorService">
<ref bean="org.hisp.dhis.indicator.IndicatorService" />
</property>
- </bean>
+ </bean>
<!-- DataDictionary -->
@@ -711,7 +746,7 @@
<ref bean="org.hisp.dhis.dataset.DataSetService" />
</property>
</bean>
-
+
<!-- CategoryCombo -->
<bean
@@ -779,8 +814,7 @@
<!-- PDF -->
- <bean id="org.hisp.dhis.dd.action.pdf.ExportToPdfAction"
- class="org.hisp.dhis.dd.action.pdf.ExportToPdfAction"
+ <bean id="org.hisp.dhis.dd.action.pdf.ExportToPdfAction" class="org.hisp.dhis.dd.action.pdf.ExportToPdfAction"
scope="prototype">
<property name="serviceProvider">
<ref bean="exportServiceProvider" />
@@ -791,59 +825,49 @@
<bean id="org.hisp.dhis.dd.action.NoAction" class="org.hisp.dhis.dd.action.NoAction" />
-
+
<!-- Validate CategoryOption -->
-
- <bean id="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryOptionAction"
+
+ <bean
+ id="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryOptionAction"
class="org.hisp.dhis.dd.action.category.ValidateDataElementCategoryOptionAction"
scope="prototype">
<property name="dataElementCategoryService">
<ref bean="org.hisp.dhis.dataelement.DataElementCategoryService" />
</property>
</bean>
-
+
<!-- Concept Name -->
-
- <bean id="org.hisp.dhis.dd.action.concept.AddConceptAction"
- class="org.hisp.dhis.dd.action.concept.AddConceptAction"
+
+ <bean id="org.hisp.dhis.dd.action.concept.AddConceptAction" class="org.hisp.dhis.dd.action.concept.AddConceptAction"
scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
-
+
<bean id="org.hisp.dhis.dd.action.concept.UpdateConceptAction"
- class="org.hisp.dhis.dd.action.concept.UpdateConceptAction"
- scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
+ class="org.hisp.dhis.dd.action.concept.UpdateConceptAction" scope="prototype">
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
-
+
<bean id="org.hisp.dhis.dd.action.concept.RemoveConceptAction"
- class="org.hisp.dhis.dd.action.concept.RemoveConceptAction"
- scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
- <bean id="org.hisp.dhis.dd.action.concept.GetConceptAction"
- class="org.hisp.dhis.dd.action.concept.GetConceptAction"
- scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
- </bean>
-
+ class="org.hisp.dhis.dd.action.concept.RemoveConceptAction" scope="prototype">
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
+ </bean>
+
+ <bean id="org.hisp.dhis.dd.action.concept.GetConceptAction" class="org.hisp.dhis.dd.action.concept.GetConceptAction"
+ scope="prototype">
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
+ </bean>
+
<bean id="org.hisp.dhis.dd.action.concept.GetConceptListAction"
- class="org.hisp.dhis.dd.action.concept.GetConceptListAction"
- scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
+ class="org.hisp.dhis.dd.action.concept.GetConceptListAction" scope="prototype">
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
-
+
<bean id="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction"
class="org.hisp.dhis.dd.action.concept.ValidateAddUpdateConceptAction"
scope="prototype">
- <property name="conceptService"
- ref="org.hisp.dhis.concept.ConceptService" />
+ <property name="conceptService" ref="org.hisp.dhis.concept.ConceptService" />
</bean>
-
+
</beans>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-05-27 10:24:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2011-05-30 08:58:59 +0000
@@ -97,17 +97,7 @@
<!-- DataElementGroup Editor -->
<action name="dataElementGroupEditor"
- class="org.hisp.dhis.commons.action.GetDataElementsAction">
- <result name="success" type="chain">dataElementGroupEditorChain1</result>
- </action>
-
- <action name="dataElementGroupEditorChain1"
- class="org.hisp.dhis.commons.action.GetDataElementGroupsAction">
- <result name="success" type="chain">dataElementGroupEditorChain2</result>
- </action>
-
- <action name="dataElementGroupEditorChain2"
- class="org.hisp.dhis.dd.action.NoAction">
+ class="org.hisp.dhis.dd.action.dataelementgroup.ShowDataElementGroupEditorAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
@@ -185,14 +175,7 @@
</action>
<action name="showUpdateDataElementGroupForm"
- class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupAction">
- <result name="success" type="chain">
- getGroupMembersAndAvailableElements</result>
- <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
- </action>
-
- <action name="getGroupMembersAndAvailableElements"
- class="org.hisp.dhis.dd.action.dataelementgroup.GetDataElementGroupMembersAction">
+ class="org.hisp.dhis.dd.action.dataelementgroup.ShowUpdateDataElementGroupFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm</param>
<param name="javascripts">javascript/dataElementGroup.js</param>
@@ -326,13 +309,7 @@
</action>
<action name="showUpdateIndicatorForm"
- class="org.hisp.dhis.dd.action.indicator.GetIndicatorAction">
- <result name="success" type="chain">getIndicatorTypeList</result>
- <param name="requiredAuthorities">F_INDICATOR_UPDATE</param>
- </action>
-
- <action name="getIndicatorTypeList"
- class="org.hisp.dhis.dd.action.indicatortype.GetIndicatorTypeListAction">
+ class="org.hisp.dhis.dd.action.indicator.ShowUpdateIndicatorFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorForm.vm</param>
<param name="javascripts">javascript/shortName.js,javascript/indicator.js,javascript/denum.js</param>
@@ -358,17 +335,7 @@
<!-- Indicator Group Editor -->
<action name="indicatorGroupEditor"
- class="org.hisp.dhis.commons.action.GetIndicatorGroupsAction">
- <result name="success" type="chain">indicatorGroupEditorChain1</result>
- </action>
-
- <action name="indicatorGroupEditorChain1"
- class="org.hisp.dhis.commons.action.GetIndicatorsAction">
- <result name="success" type="chain">indicatorGroupEditorChain2</result>
- </action>
-
- <action name="indicatorGroupEditorChain2"
- class="org.hisp.dhis.dd.action.NoAction">
+ class="org.hisp.dhis.dd.action.indicatorgroup.ShowIndicatorGroupEditorAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
@@ -446,14 +413,7 @@
</action>
<action name="showUpdateIndicatorGroupForm"
- class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupAction">
- <result name="success" type="chain">
- getGroupMembersAndAvailableIndicators</result>
- <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
- </action>
-
- <action name="getGroupMembersAndAvailableIndicators"
- class="org.hisp.dhis.dd.action.indicatorgroup.GetIndicatorGroupMembersAction">
+ class="org.hisp.dhis.dd.action.indicatorgroup.ShowUpdateIndicatorGroupFormAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm</param>
<param name="javascripts">javascript/indicatorGroup.js</param>
