dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13690
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4462: Removed unused code
Merge authors:
Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 4462 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-08-27 01:05:45 +0200
message:
Removed unused code
removed:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataElementListFilteredByGroup.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/IndicatorListFilteredByGroup.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/DataElementListFilteredByGroupForSection.java
modified:
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js
--
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
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataElementListFilteredByGroup.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataElementListFilteredByGroup.java 2010-07-01 10:08:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataElementListFilteredByGroup.java 1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-package org.hisp.dhis.dataset.action;
-
-/*
- * 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.Iterator;
-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.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Kristian
- * @version $Id: DataElementListFilteredByGroup.java 6256 2008-11-10 17:10:30Z
- * larshelg $
- */
-public class DataElementListFilteredByGroup
- implements Action
-{
- private String dataElementGroupId;
-
- private String selectedDataElements[];
-
- private List<DataElement> dataElements;
-
- private Integer dataSetId;
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
- // Getters & Setters
- // -------------------------------------------------------------------------
-
- public void setDataElementGroupId( String dataElementGroupId )
- {
- this.dataElementGroupId = dataElementGroupId;
- }
-
- public void setSelectedDataElements( String[] selectedDataElements )
- {
- this.selectedDataElements = selectedDataElements;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public String getDataElementGroupId()
- {
- return dataElementGroupId;
- }
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- if ( dataElementGroupId == null || dataElementGroupId.equals( "ALL" ) )
- {
- dataElements = new ArrayList<DataElement>( dataElementService.getAllActiveDataElements() );
- }
- else
- {
- DataElementGroup dataElementGroup = dataElementService.getDataElementGroup( Integer
- .parseInt( dataElementGroupId ) );
-
- dataElements = new ArrayList<DataElement>( dataElementGroup.getMembers() );
- }
-
- if ( selectedDataElements != null && selectedDataElements.length > 0 )
- {
- Iterator<DataElement> iter = dataElements.iterator();
-
- while ( iter.hasNext() )
- {
- DataElement dataElement = iter.next();
-
- for ( int i = 0; i < selectedDataElements.length; i++ )
- {
- if ( dataElement.getId() == Integer.parseInt( selectedDataElements[i] ) )
- {
- iter.remove();
- }
- }
- }
- }
-
- if ( dataSetId != null )
- {
- DataSet dataSet = dataSetService.getDataSet( dataSetId );
-
- dataElements.removeAll( dataSet.getDataElements() );
- }
-
- Collections.sort( dataElements, dataElementComparator );
-
- displayPropertyHandler.handle( dataElements );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/IndicatorListFilteredByGroup.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/IndicatorListFilteredByGroup.java 2011-05-09 10:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/IndicatorListFilteredByGroup.java 1970-01-01 00:00:00 +0000
@@ -1,169 +0,0 @@
-package org.hisp.dhis.dataset.action;
-
-/*
- * 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.Iterator;
-import java.util.List;
-
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-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 mortenoh
- */
-public class IndicatorListFilteredByGroup
- implements Action
-{
- private String indicatorGroupId;
-
- private String selectedIndicators[];
-
- private List<Indicator> indicators;
-
- private Integer dataSetId;
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private Comparator<Indicator> indicatorComparator;
-
- public void setIndicatorComparator( Comparator<Indicator> indicatorComparator )
- {
- this.indicatorComparator = indicatorComparator;
- }
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
- // Getters & Setters
- // -------------------------------------------------------------------------
-
- public void setIndicatorGroupId( String indicatorGroupId )
- {
- this.indicatorGroupId = indicatorGroupId;
- }
-
- public void setSelectedIndicators( String[] selectedIndicators )
- {
- this.selectedIndicators = selectedIndicators;
- }
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public String getIndicatorGroupId()
- {
- return indicatorGroupId;
- }
-
- public List<Indicator> getIndicators()
- {
- return indicators;
- }
-
- // -------------------------------------------------------------------------
- // Action
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- if ( indicatorGroupId == null || indicatorGroupId.equals( "ALL" ) )
- {
- indicators = new ArrayList<Indicator>( indicatorService.getAllIndicators() );
- }
- else
- {
- IndicatorGroup indicatorGroup = indicatorService.getIndicatorGroup( Integer.parseInt( indicatorGroupId ) );
-
- indicators = new ArrayList<Indicator>( indicatorGroup.getMembers() );
- }
-
- if ( selectedIndicators != null && selectedIndicators.length > 0 )
- {
- Iterator<Indicator> iter = indicators.iterator();
-
- while ( iter.hasNext() )
- {
- Indicator indicator = iter.next();
-
- for ( int i = 0; i < selectedIndicators.length; i++ )
- {
- if ( indicator.getId() == Integer.parseInt( selectedIndicators[i] ) )
- {
- iter.remove();
- }
- }
- }
- }
-
- if ( dataSetId != null )
- {
- DataSet dataSet = dataSetService.getDataSet( dataSetId );
-
- indicators.removeAll( dataSet.getIndicators() );
- }
-
- Collections.sort( indicators, indicatorComparator );
-
- displayPropertyHandler.handle( indicators );
-
- return SUCCESS;
- }
-}
=== removed file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/DataElementListFilteredByGroupForSection.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/DataElementListFilteredByGroupForSection.java 2010-09-08 11:00:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/DataElementListFilteredByGroupForSection.java 1970-01-01 00:00:00 +0000
@@ -1,220 +0,0 @@
-package org.hisp.dhis.dataset.action.section;
-
-/*
- * 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.Iterator;
-import java.util.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementGroup;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.dataset.DataSetService;
-import org.hisp.dhis.dataset.Section;
-import org.hisp.dhis.options.displayproperty.DisplayPropertyHandler;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Dang Duy Hieu
- * @version $Id$
- */
-public class DataElementListFilteredByGroupForSection
- implements Action
-{
- private static final String ALL = "ALL";
-
- // -------------------------------------------------------------------------
- // Variables
- // -------------------------------------------------------------------------
-
- private Integer dataSetId;
-
- private Integer categoryComboId;
-
- private String dataElementGroupId;
-
- private String[] selectedList;
-
- private List<DataElement> dataElements;
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataSetService dataSetService;
-
- public void setDataSetService( DataSetService dataSetService )
- {
- this.dataSetService = dataSetService;
- }
-
- private DataElementCategoryService dataElementCategoryService;
-
- public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
- {
- this.dataElementCategoryService = dataElementCategoryService;
- }
-
- private Comparator<DataElement> dataElementComparator;
-
- public void setDataElementComparator( Comparator<DataElement> dataElementComparator )
- {
- this.dataElementComparator = dataElementComparator;
- }
-
- private DisplayPropertyHandler displayPropertyHandler;
-
- public void setDisplayPropertyHandler( DisplayPropertyHandler displayPropertyHandler )
- {
- this.displayPropertyHandler = displayPropertyHandler;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- public void setDataSetId( Integer dataSetId )
- {
- this.dataSetId = dataSetId;
- }
-
- public void setCategoryComboId( Integer categoryComboId )
- {
- this.categoryComboId = categoryComboId;
- }
-
- public void setDataElementGroupId( String dataElementGroupId )
- {
- this.dataElementGroupId = dataElementGroupId;
- }
-
- public void setSelectedList( String[] selectedList )
- {
- this.selectedList = selectedList;
- }
-
- // -------------------------------------------------------------------------
- // Output
- // -------------------------------------------------------------------------
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- // dataSetId
- if ( dataSetId != null )
- {
- DataSet dataSet = dataSetService.getDataSet( dataSetId );
-
- dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
-
- for ( Section section : dataSet.getSections() )
- {
- dataElements.removeAll( section.getDataElements() );
- }
- }
-
- // categoryComboId
- if ( categoryComboId != null )
- {
- DataElementCategoryCombo categoryCombo = dataElementCategoryService
- .getDataElementCategoryCombo( categoryComboId.intValue() );
-
- Iterator<DataElement> dataElementIterator = dataElements.iterator();
-
- while ( dataElementIterator.hasNext() )
- {
- DataElement de = dataElementIterator.next();
-
- if ( !de.getCategoryCombo().getName().equalsIgnoreCase( categoryCombo.getName() ) )
- {
- dataElementIterator.remove();
- }
- }
- }
-
- // dataElementGroupId
- if ( dataElementGroupId == null || dataElementGroupId.equals( ALL ) )
- {
- dataElements.retainAll( dataElementService.getAllActiveDataElements() );
- }
- else
- {
- DataElementGroup dataElementGroup = dataElementService.getDataElementGroup( Integer
- .parseInt( dataElementGroupId ) );
-
- dataElements.retainAll( dataElementGroup.getMembers() );
- }
-
- // selectedList
- if ( selectedList != null && selectedList.length > 0 )
- {
- Iterator<DataElement> iter = dataElements.iterator();
-
- while ( iter.hasNext() )
- {
- DataElement dataElement = iter.next();
-
- for ( int i = 0; i < selectedList.length; i++ )
- {
- if ( dataElement.getId() == Integer.parseInt( selectedList[i] ) )
- {
- iter.remove();
- }
- }
- }
- }
-
- Collections.sort( dataElements, dataElementComparator );
-
- displayPropertyHandler.handle( dataElements );
-
- return SUCCESS;
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-06-20 09:28:07 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/META-INF/dhis/beans.xml 2011-08-26 22:00:50 +0000
@@ -188,26 +188,6 @@
</property>
</bean>
- <bean id="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup" class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup"
- scope="prototype">
- <property name="dataElementService">
- <ref bean="org.hisp.dhis.dataelement.DataElementService" />
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService" />
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup" class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup"
- scope="prototype">
- <property name="indicatorService">
- <ref bean="org.hisp.dhis.indicator.IndicatorService" />
- </property>
- <property name="dataSetService">
- <ref bean="org.hisp.dhis.dataset.DataSetService" />
- </property>
- </bean>
-
<bean id="org.hisp.dhis.dataset.action.DataElementGroupListAction" class="org.hisp.dhis.dataset.action.DataElementGroupListAction"
scope="prototype">
<property name="dataElementService">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2011-06-20 10:02:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml 2011-08-26 22:00:50 +0000
@@ -164,23 +164,6 @@
<param name="requiredAuthorities">F_DATASET_DELETE</param>
</action>
- <!-- Filter -->
-
- <action name="filterAvailableDataElementsByDataElementGroup" class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="filterAvailableIndicatorsByIndicatorGroup" class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseIndicatorGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
- <action name="filterDataElementsByDataElementGroupForSection" class="org.hisp.dhis.dataset.action.section.DataElementListFilteredByGroupForSection">
- <result name="success" type="velocity-xml">/dhis-web-maintenance-dataset/responseDataElementGroup.vm</result>
- <param name="onExceptionReturn">plainTextError</param>
- </action>
-
<!-- DataSet association -->
<action name="defineDataSetAssociationsForm" class="org.hisp.dhis.dataset.action.GetDataSetAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2011-05-23 13:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js 2011-08-26 22:00:50 +0000
@@ -42,93 +42,3 @@
{
window.location.href = 'viewDataEntryForm.action?dataSetId=' + dataSetId;
}
-
-// ----------------------------------------------------------------------
-// Filter by DataElementGroup and PeriodType
-// ----------------------------------------------------------------------
-
-function filterByDataElementGroup( selectedDataElementGroup )
-{
- var request = new Request();
-
- var requestString = 'filterAvailableDataElementsByDataElementGroup.action';
-
- var params = 'dataElementGroupId=' + selectedDataElementGroup;
-
- var selectedList = document.getElementById( 'selectedList' );
-
- for ( var i = 0; i < selectedList.options.length; ++i)
- {
- params += '&selectedDataElements=' + selectedList.options[i].value;
- }
-
- // Clear the list
- var availableList = document.getElementById( 'availableList' );
-
- availableList.options.length = 0;
-
- request.setResponseTypeXML( 'dataElementGroup' );
- request.setCallbackSuccess( filterByDataElementGroupCompleted );
- request.sendAsPost( params );
- request.send( requestString );
-}
-
-function filterByDataElementGroupCompleted( dataElementGroup )
-{
- var dataElements = dataElementGroup.getElementsByTagName( 'dataElements' )[0];
- var dataElementList = dataElements.getElementsByTagName( 'dataElement' );
-
- var availableList = document.getElementById( 'availableList' );
-
- for ( var i = 0; i < dataElementList.length; i++ )
- {
- var dataElement = dataElementList[i];
- var name = dataElement.firstChild.nodeValue;
- var id = dataElement.getAttribute( 'id' );
-
- availableList.add( new Option( name, id ), null );
- }
-}
-
-function filterByIndicatorGroup( selectedIndicatorGroup )
-{
- var request = new Request();
-
- var requestString = 'filterAvailableIndicatorsByIndicatorGroup.action';
-
- var params = 'indicatorGroupId=' + selectedIndicatorGroup;
-
- var selectedList = document.getElementById( 'indicatorSelectedList' );
-
- for ( var i = 0; i < selectedList.options.length; ++i)
- {
- params += '&selectedIndicators=' + selectedList.options[i].value;
- }
-
- // Clear the list
- var availableList = document.getElementById( 'indicatorAvailableList' );
-
- availableList.options.length = 0;
-
- request.setResponseTypeXML( 'indicatorGroup' );
- request.setCallbackSuccess( filterByIndicatorGroupCompleted );
- request.sendAsPost( params );
- request.send( requestString );
-}
-
-function filterByIndicatorGroupCompleted( indicatorGroup )
-{
- var indicators = indicatorGroup.getElementsByTagName( 'indicators' )[0];
- var indicatorList = indicators.getElementsByTagName( 'indicator' );
-
- var availableList = document.getElementById( 'indicatorAvailableList' );
-
- for ( var i = 0; i < indicatorList.length; i++ )
- {
- var indicator = indicatorList[i];
- var name = indicator.firstChild.nodeValue;
- var id = indicator.getAttribute( 'id' );
-
- availableList.add( new Option( name, id ), null );
- }
-}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2011-08-19 21:33:57 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js 2011-08-26 22:00:50 +0000
@@ -55,29 +55,6 @@
}
}
-function getDataElementByDataSet(dataSetId) {
- var request = new Request();
-
- var requestString = 'filterAvailableDataElementsByDataSet.action';
-
- var params = 'dataSetId=' + dataSetId;
-
- var selectedList = document.getElementById('selectedList');
-
- for ( var i = 0; i < selectedList.options.length; ++i) {
- params += '&selectedDataElements=' + selectedList.options[i].value;
- // process list.options[i].value / list.options[i].text
- }
-
- var availableList = document.getElementById('availableList');
- availableList.options.length = 0;
-
- request.setResponseTypeXML('dataElementGroup');
- request.setCallbackSuccess(filterByDataElementGroupCompleted);
- request.sendAsPost(params);
- request.send(requestString);
-}
-
function toggle(dataElementId, optionComboId) {
var elementId = '[' + dataElementId;
@@ -153,48 +130,3 @@
function markValue(color) {
}
-
-// ----------------------------------------------------------------------
-// Filter by DataElementGroup
-// ----------------------------------------------------------------------
-
-function filterByDataElementGroupForSection( groupId )
-{
- var aSelectedList = new Array();
- var selectedList = byId( 'selectedList' );
-
- for ( var i = 0; i < selectedList.options.length; ++i)
- {
- aSelectedList.push( selectedList.options[i].value );
- }
-
- $.post("filterDataElementsByDataElementGroupForSection.action",
- {
- selectedList: aSelectedList,
- dataElementGroupId: groupId,
- dataSetId: getFieldValue( 'dataSetId' ),
- categoryComboId: getFieldValue( 'categoryComboId' )
- },
- function (data)
- {
- filterByDataElementGroupForSectionCompleted( data );
- }, 'xml');
-}
-
-function filterByDataElementGroupForSectionCompleted( dataElementGroup )
-{
- var dataElements = dataElementGroup.getElementsByTagName( 'dataElements' )[0];
- var dataElementList = dataElements.getElementsByTagName( 'dataElement' );
-
- var availableList = byId( 'availableList' );
- availableList.options.length = 0;
-
- for ( var i = 0; i < dataElementList.length; i++ )
- {
- var dataElement = dataElementList[i];
- var name = dataElement.firstChild.nodeValue;
- var id = dataElement.getAttribute( 'id' );
-
- availableList.add( new Option( name, id ), null );
- }
-}
\ No newline at end of file
