dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08496
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2048: Removed DataElementSortOrderManager references from indian linelisting module
------------------------------------------------------------
revno: 2048
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2010-11-12 12:12:37 +0100
message:
Removed DataElementSortOrderManager references from indian linelisting module
removed:
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/GetDataElementOrderAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementDownAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementUpAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByCodeAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByEntryAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByNameAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/ResetDataElementOrderAction.java
modified:
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/MinMaxGeneratingAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveCommentAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java
local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml
local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml
local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.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 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2010-09-01 09:05:14 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/FormAction.java 2010-11-12 11:12:37 +0000
@@ -42,7 +42,6 @@
import org.hisp.dhis.dataelement.DataElementCategoryService;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dataentryform.DataEntryForm;
-import org.hisp.dhis.dataentryform.DataEntryFormService;
import org.hisp.dhis.datalock.DataSetLockService;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.datavalue.DataValue;
@@ -54,7 +53,6 @@
import org.hisp.dhis.i18n.I18n;
import org.hisp.dhis.minmax.MinMaxDataElement;
import org.hisp.dhis.minmax.MinMaxDataElementService;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
@@ -72,13 +70,6 @@
// Dependencies
// -------------------------------------------------------------------------
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
private LLDataValueService dataValueService;
public void setDataValueService( LLDataValueService dataValueService )
@@ -100,13 +91,6 @@
{
this.dataElementCategoryService = dataElementCategoryService;
}
-
- private DataEntryFormService dataEntryFormService;
-
- public void setDataEntryFormService( DataEntryFormService dataEntryFormService )
- {
- this.dataEntryFormService = dataEntryFormService;
- }
private StandardCommentsManager standardCommentsManager;
@@ -419,11 +403,6 @@
// Order the DataElements
// ---------------------------------------------------------------------
- //orderedDataElements = dataElementOrderManager.getOrderedDataElements( dataSet );
-
-
- orderedDataElements = dataElementOrderManager.getOrderedDataElements(dataSet);
-
// ---------------------------------------------------------------------
// Get the DataValues and create a map
// ---------------------------------------------------------------------
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/MinMaxGeneratingAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/MinMaxGeneratingAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/MinMaxGeneratingAction.java 2010-11-12 11:12:37 +0000
@@ -37,13 +37,10 @@
import org.hisp.dhis.den.state.SelectedStateManager;
import org.hisp.dhis.minmax.MinMaxDataElement;
import org.hisp.dhis.minmax.MinMaxDataElementService;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
/**
* @author Margrethe Store
@@ -73,13 +70,6 @@
this.minMaxDataElementService = minMaxDataElementService;
}
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
private SelectedStateManager selectedStateManager;
public void setSelectedStateManager( SelectedStateManager selectedStateManager )
@@ -114,8 +104,7 @@
DataSet dataSet = selectedStateManager.getSelectedDataSet();
// get a list of dataelements
- List<DataElement> dataElements = new ArrayList<DataElement>( dataElementOrderManager
- .getOrderedDataElements( dataSet ) );
+ List<DataElement> dataElements = new ArrayList<DataElement>( dataSet.getDataElements() );
// set min/max values for each dataelement
for ( DataElement dataelement : dataElements )
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveCommentAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveCommentAction.java 2010-06-15 11:26:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveCommentAction.java 2010-11-12 11:12:37 +0000
@@ -29,19 +29,9 @@
import java.util.Date;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.datavalue.DataValue;
-import org.hisp.dhis.datavalue.DataValueService;
-import org.hisp.dhis.den.state.SelectedStateManager;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.period.Period;
import org.hisp.dhis.user.CurrentUserService;
import com.opensymphony.xwork2.Action;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
/**
* @author Torgeir Lorange Ostby
@@ -51,8 +41,6 @@
public class SaveCommentAction
implements Action
{
- private static final Log LOG = LogFactory.getLog( SaveCommentAction.class );
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
@@ -64,27 +52,6 @@
this.currentUserService = currentUserService;
}
- private DataElementService dataElementService;
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- private DataValueService dataValueService;
-
- public void setDataValueService( DataValueService dataValueService )
- {
- this.dataValueService = dataValueService;
- }
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
// -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -135,12 +102,6 @@
public String execute()
{
- OrganisationUnit organisationUnit = selectedStateManager.getSelectedOrganisationUnit();
-
- Period period = selectedStateManager.getSelectedPeriod();
-
- DataElement dataElement = dataElementService.getDataElement( dataElementId );
-
storedBy = currentUserService.getCurrentUsername();
if ( storedBy == null )
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java 2010-07-13 09:28:43 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java 2010-11-12 11:12:37 +0000
@@ -67,13 +67,13 @@
private SectionService sectionService;
- private DataValueService dataValueService;
-
public void setSectionService( SectionService sectionService )
{
this.sectionService = sectionService;
}
+ private DataValueService dataValueService;
+
public void setDataValueService( DataValueService dataValueService )
{
this.dataValueService = dataValueService;
=== removed directory 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order'
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/GetDataElementOrderAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/GetDataElementOrderAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/GetDataElementOrderAction.java 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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.List;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: GetDataElementOrderAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class GetDataElementOrderAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- // -------------------------------------------------------------------------
- // Input/output
- // -------------------------------------------------------------------------
-
- private List<DataElement> dataElements;
-
- public List<DataElement> getDataElements()
- {
- return dataElements;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElements = dataElementOrderManager.getOrderedDataElements( dataSet );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementDownAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementDownAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementDownAction.java 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: MoveDataElementDownAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class MoveDataElementDownAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer dataElementId;
-
- public void setDataElementId( Integer dataElementId )
- {
- this.dataElementId = dataElementId;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.moveDataElementDown( dataSet, dataElementId );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementUpAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementUpAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/MoveDataElementUpAction.java 1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: MoveDataElementUpAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class MoveDataElementUpAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Input
- // -------------------------------------------------------------------------
-
- private Integer dataElementId;
-
- public void setDataElementId( Integer dataElementId )
- {
- this.dataElementId = dataElementId;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.moveDataElementUp( dataSet, dataElementId );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByCodeAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByCodeAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByCodeAction.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataelement.comparator.DataElementCodeComparator;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: OrderDataElementsByCodeAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class OrderDataElementsByCodeAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.setDataElementOrder( dataSet, new DataElementCodeComparator() );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByEntryAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByEntryAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByEntryAction.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-import org.hisp.dhis.util.comparator.DataElementIdComparator;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: OrderDataElementsByEntryAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class OrderDataElementsByEntryAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.setDataElementOrder( dataSet, new DataElementIdComparator() );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByNameAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByNameAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/OrderDataElementsByNameAction.java 1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataelement.comparator.DataElementNameComparator;
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: OrderDataElementsByNameAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class OrderDataElementsByNameAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.setDataElementOrder( dataSet, new DataElementNameComparator() );
-
- return SUCCESS;
- }
-}
=== removed file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/ResetDataElementOrderAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/ResetDataElementOrderAction.java 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/order/ResetDataElementOrderAction.java 1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-package org.hisp.dhis.den.action.order;
-
-/*
- * Copyright (c) 2004-2007, 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 org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
-import org.hisp.dhis.den.state.SelectedStateManager;
-
-import com.opensymphony.xwork2.Action;
-
-/**
- * @author Torgeir Lorange Ostby
- * @version $Id: ResetDataElementOrderAction.java 4089 2007-11-24 13:30:44Z larshelg $
- */
-
-public class ResetDataElementOrderAction
- implements Action
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private SelectedStateManager selectedStateManager;
-
- public void setSelectedStateManager( SelectedStateManager selectedStateManager )
- {
- this.selectedStateManager = selectedStateManager;
- }
-
- private DataElementOrderManager dataElementOrderManager;
-
- public void setDataElementOrderManager( DataElementOrderManager dataElementOrderManager )
- {
- this.dataElementOrderManager = dataElementOrderManager;
- }
-
- // -------------------------------------------------------------------------
- // Action implementation
- // -------------------------------------------------------------------------
-
- public String execute()
- throws Exception
- {
- DataSet dataSet = selectedStateManager.getSelectedDataSet();
-
- dataElementOrderManager.resetDataElementOrder( dataSet );
-
- return SUCCESS;
- }
-}
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2010-06-17 07:51:57 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/impl/HibernateLLDataValueStore.java 2010-11-12 11:12:37 +0000
@@ -2198,7 +2198,6 @@
return deValueMap;
}
- @SuppressWarnings( "deprecation" )
public Map<String, String> processLineListMaternalDeaths( OrganisationUnit organisationUnit, Period periodL )
{
Map<String, String> deValueMap = new HashMap<String, String>();
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-08-31 07:51:06 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/META-INF/dhis/beans.xml 2010-11-12 11:12:37 +0000
@@ -92,14 +92,10 @@
<bean id="org.hisp.dhis.den.action.FormAction"
class="org.hisp.dhis.den.action.FormAction" scope="prototype">
- <property name="dataElementOrderManager"
- ref="org.hisp.dhis.order.manager.DataElementOrderManager"/>
<property name="dataValueService"
ref="org.hisp.dhis.den.api.LLDataValueService"/>
<property name="dataElementService"
ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="dataEntryFormService"
- ref="org.hisp.dhis.dataentryform.DataEntryFormService"/>
<property name="standardCommentsManager"
ref="org.hisp.dhis.den.comments.StandardCommentsManager"/>
<property name="minMaxDataElementService"
@@ -114,8 +110,6 @@
<bean id="org.hisp.dhis.den.action.multidimensional.FormAction"
class="org.hisp.dhis.den.action.multidimensional.FormAction" scope="prototype">
- <property name="dataElementOrderManager"
- ref="org.hisp.dhis.order.manager.DataElementOrderManager"/>
<property name="dataValueService"
ref="org.hisp.dhis.den.api.LLDataValueService"/>
<property name="dataElementService"
@@ -209,12 +203,6 @@
class="org.hisp.dhis.den.action.SaveCommentAction" scope="prototype">
<property name="currentUserService"
ref="org.hisp.dhis.user.CurrentUserService"/>
- <property name="dataElementService"
- ref="org.hisp.dhis.dataelement.DataElementService"/>
- <property name="dataValueService"
- ref="org.hisp.dhis.datavalue.DataValueService"/>
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
</bean>
<bean id="org.hisp.dhis.den.action.SaveMinMaxLimitsAction"
@@ -254,77 +242,7 @@
<property name="dataElementCategoryComboService"
ref="org.hisp.dhis.dataelement.DataElementCategoryComboService"/>
</bean>
-
- <bean id="org.hisp.dhis.den.action.order.GetDataElementOrderAction"
- class="org.hisp.dhis.den.action.order.GetDataElementOrderAction"
- scope="prototype">
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.MoveDataElementUpAction"
- class="org.hisp.dhis.den.action.order.MoveDataElementUpAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.MoveDataElementDownAction"
- class="org.hisp.dhis.den.action.order.MoveDataElementDownAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.ResetDataElementOrderAction"
- class="org.hisp.dhis.den.action.order.ResetDataElementOrderAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.OrderDataElementsByEntryAction"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByEntryAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.OrderDataElementsByNameAction"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByNameAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
- <bean id="org.hisp.dhis.den.action.order.OrderDataElementsByCodeAction"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByCodeAction"
- scope="prototype">
- <property name="selectedStateManager"
- ref="org.hisp.dhis.den.state.SelectedStateManager"/>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
- </bean>
-
+
<bean id="org.hisp.dhis.den.action.HistoryAction"
class="org.hisp.dhis.den.action.HistoryAction" scope="prototype">
<property name="historyRetriever">
@@ -346,9 +264,6 @@
<property name="historyRetriever">
<ref local="org.hisp.dhis.den.history.HistoryRetriever"/>
</property>
- <property name="dataElementOrderManager">
- <ref bean="org.hisp.dhis.order.manager.DataElementOrderManager"/>
- </property>
<property name="minMaxDataElementService">
<ref bean="org.hisp.dhis.minmax.MinMaxDataElementService"/>
</property>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml'
--- local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/resources/struts.xml 2010-11-12 11:12:37 +0000
@@ -126,57 +126,7 @@
<param name="onExceptionReturn">plainTextError</param>
<param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
</action>
-
- <action name="getDataElementOrder"
- class="org.hisp.dhis.den.action.order.GetDataElementOrderAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="velocity">/popup.vm</result>
- <param name="page">/dhis-web-dataentry-national/order.vm</param>
- <param name="javascripts">javascript/order.js</param>
- </action>
-
- <action name="moveDataElementUp"
- class="org.hisp.dhis.den.action.order.MoveDataElementUpAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
- <action name="moveDataElementDown"
- class="org.hisp.dhis.den.action.order.MoveDataElementDownAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
- <action name="orderDataElementsByCode"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByCodeAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
- <action name="orderDataElementsByEntry"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByEntryAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
- <action name="orderDataElementsByName"
- class="org.hisp.dhis.den.action.order.OrderDataElementsByNameAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
- <action name="resetDataElementOrder"
- class="org.hisp.dhis.den.action.order.ResetDataElementOrderAction">
- <!--<interceptor-ref name="transactionStack"/>-->
- <result name="success" type="chain">getDataElementOrder</result>
- <param name="requiredAuthorities">F_DATASET_ORDER_CHANGE</param>
- </action>
-
+
<action name="viewHistory" class="org.hisp.dhis.den.action.HistoryAction">
<!--<interceptor-ref name="transactionStack"/>-->
<result name="success" type="velocity">/popup.vm</result>
=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm'
--- local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm 2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/webapp/dhis-web-dataentry-national/select.vm 2010-11-12 11:12:37 +0000
@@ -34,7 +34,6 @@
<form id="selectForm" name="selectForm" method="post" action="select.action">
<!--
<div id="actions" style="width:200px text-align:right">
- <input type="button" value="$i18n.getString( "change_order" )" onclick="changeOrder()" style="width:100% text-align:right" #if( !$selectedDataSetId || !$auth.hasAccess( "dhis-web-dataentry-national", "getDataElementOrder" ) ) disabled="disabled" #end>
<input type="button" value="$i18n.getString( "generate_min_max" )" onclick="javascript:generateMinMaxValues();" style="width:100% text-align:right" #if( !$selectedPeriodIndex || !$auth.hasAccess( "dhis-web-dataentry-national", "minMaxGeneration" )) disabled="disabled" #end >
<input type="button" value="$i18n.getString( "run_validation" )" onclick="javascript:validate();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
<input type="button" id="calculateCDEs" value="$i18n.getString( "save_calculated" )" name="calculateCDEs" onclick="calculateAndSaveCDEs();" style="width:100% text-align:right" #if( !$selectedPeriodIndex ) disabled="disabled" #end>
