------------------------------------------------------------
revno: 30
committer: Lars Helge Oeverland [email protected]
branch nick: trunk
timestamp: Tue 2009-03-10 08:56:24 +0100
message:
Temporarily fixing compile errors in indian linelisting module.
modified:
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/RemoveMinMaxLimitsAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveMinMaxLimitsAction.java
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/history/DefaultHistoryRetriever.java
=== 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
2009-03-10 06:15:33 +0000
+++
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/MinMaxGeneratingAction.java
2009-03-10 07:56:24 +0000
@@ -32,12 +32,12 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.order.manager.DataElementOrderManager;
import org.hisp.dhis.den.history.DataElementHistory;
import org.hisp.dhis.den.history.HistoryRetriever;
import org.hisp.dhis.den.state.SelectedStateManager;
import org.hisp.dhis.minmax.MinMaxDataElement;
import org.hisp.dhis.minmax.MinMaxDataElementStore;
+import org.hisp.dhis.order.manager.DataElementOrderManager;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
@@ -69,7 +69,7 @@
{
this.minMaxDataElementStore = minMaxDataElementStore;
}
-
+
private DataElementOrderManager dataElementOrderManager;
public void setDataElementOrderManager( DataElementOrderManager
dataElementOrderManager )
@@ -83,7 +83,7 @@
{
this.selectedStateManager = selectedStateManager;
}
-
+
//
-------------------------------------------------------------------------
// Output
//
-------------------------------------------------------------------------
@@ -145,7 +145,7 @@
throws Exception
{
MinMaxDataElement minMaxDataElement =
minMaxDataElementStore.getMinMaxDataElement( organisationUnit,
- dataelement );
+ dataelement, null );
if ( minMaxDataElement != null )
{
@@ -182,7 +182,7 @@
// create a new MinMaxDataElement if it doesn't exist
if ( minMaxDataElement == null )
{
- minMaxDataElement = new MinMaxDataElement( organisationUnit,
dataelement, (int) minLimit,
+ minMaxDataElement = new MinMaxDataElement( organisationUnit,
dataelement, null, (int) minLimit,
(int) maxLimit, true );
minMaxDataElementStore.addMinMaxDataElement( minMaxDataElement
);
}
=== modified file
'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/RemoveMinMaxLimitsAction.java'
---
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/RemoveMinMaxLimitsAction.java
2009-03-10 06:15:33 +0000
+++
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/RemoveMinMaxLimitsAction.java
2009-03-10 07:56:24 +0000
@@ -98,7 +98,7 @@
DataElement dataElement = dataElementService.getDataElement(
dataElementId );
MinMaxDataElement minMaxDataElement =
minMaxDataElementStore.getMinMaxDataElement( organisationUnit,
- dataElement );
+ dataElement, null );
if ( minMaxDataElement != null )
{
=== modified file
'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveMinMaxLimitsAction.java'
---
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveMinMaxLimitsAction.java
2009-03-10 06:15:33 +0000
+++
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SaveMinMaxLimitsAction.java
2009-03-10 07:56:24 +0000
@@ -112,11 +112,11 @@
DataElement dataElement = dataElementService.getDataElement(
dataElementId );
MinMaxDataElement minMaxDataElement =
minMaxDataElementStore.getMinMaxDataElement( organisationUnit,
- dataElement );
+ dataElement, null );
if ( minMaxDataElement == null )
{
- minMaxDataElement = new MinMaxDataElement( organisationUnit,
dataElement, minLimit, maxLimit, false );
+ minMaxDataElement = new MinMaxDataElement( organisationUnit,
dataElement, null, minLimit, maxLimit, false );
minMaxDataElementStore.addMinMaxDataElement( minMaxDataElement );
}
=== modified file
'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/history/DefaultHistoryRetriever.java'
---
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/history/DefaultHistoryRetriever.java
2009-03-10 06:15:33 +0000
+++
local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/history/DefaultHistoryRetriever.java
2009-03-10 07:56:24 +0000
@@ -229,7 +229,7 @@
private void addMinMaxLimits( OrganisationUnit organisationUnit,
DataElement dataElement, DataElementHistory history )
{
MinMaxDataElement minMaxDataElement =
minMaxDataElementStore.getMinMaxDataElement( organisationUnit,
- dataElement );
+ dataElement, null );
if ( minMaxDataElement != null )
{
--
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
