dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3119
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-22 11:30:57 +0100
message:
  API change in r3114 broke the indian module
modified:
  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/SelectAction.java
  local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java


--
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/SectionFormAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java	2010-11-12 11:12:37 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java	2011-03-22 10:30:57 +0000
@@ -259,10 +259,10 @@
 
         calculatedValueMap = new HashMap<CalculatedDataElement, Integer>();
 
-        Map<DataElement, Integer> factorMap;
+        Map<DataElement, Double> factorMap;
 
         DataValue dataValue;
-        int factor;
+        Double factor;
         int value = 0;
 
         for ( DataElement dataElement : dataElements )

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java	2010-09-08 12:56:29 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java	2011-03-22 10:30:57 +0000
@@ -230,9 +230,9 @@
         return calculatedDataElementIds;
     }
 
-    private Map<CalculatedDataElement, Map<DataElement, Integer>> calculatedDataElementMap;
+    private HashMap<CalculatedDataElement, Map<DataElement, Double>> calculatedDataElementMap;
 
-    public Map<CalculatedDataElement, Map<DataElement, Integer>> getCalculatedDataElementMap()
+    public Map<CalculatedDataElement, Map<DataElement, Double>> getCalculatedDataElementMap()
     {
         return calculatedDataElementMap;
     }
@@ -405,7 +405,7 @@
         // ---------------------------------------------------------------------
 
         calculatedDataElementIds = new HashSet<Integer>();
-        calculatedDataElementMap = new HashMap<CalculatedDataElement, Map<DataElement, Integer>>();
+        calculatedDataElementMap = new HashMap<CalculatedDataElement, Map<DataElement, Double>>();
         CalculatedDataElement cde;
 
         for ( DataElement dataElement : selectedDataSet.getDataElements() )

=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java'
--- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java	2010-06-04 11:50:05 +0000
+++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java	2011-03-22 10:30:57 +0000
@@ -165,9 +165,9 @@
         return calculatedDataElementIds;
     }
 
-    private Map<CalculatedDataElement, Map<DataElement, Integer>> calculatedDataElementMap;
+    private Map<CalculatedDataElement, Map<DataElement, Double>> calculatedDataElementMap;
 
-    public Map<CalculatedDataElement, Map<DataElement, Integer>> getCalculatedDataElementMap()
+    public Map<CalculatedDataElement, Map<DataElement, Double>> getCalculatedDataElementMap()
     {
         return calculatedDataElementMap;
     }
@@ -320,7 +320,7 @@
         // ---------------------------------------------------------------------
 
         calculatedDataElementIds = new HashSet<Integer>();
-        calculatedDataElementMap = new HashMap<CalculatedDataElement, Map<DataElement, Integer>>();
+        calculatedDataElementMap = new HashMap<CalculatedDataElement, Map<DataElement, Double>>();
         CalculatedDataElement cde;
 
         for ( DataElement dataElement : selectedDataSet.getDataElements() )