dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20018
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-09-07 10:51:58 +0200
message:
  Fixed problem with constructor
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypesFilter.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.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 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java	2015-09-04 07:11:50 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataElementConverter.java	2015-09-07 08:51:58 +0000
@@ -73,7 +73,7 @@
 
     private static final String FIELD_META = "MetaDataElement";
 
-    private static final String FIELD_DATA_TYPE = "DataTypeID";
+    //private static final String FIELD_DATA_TYPE = "DataTypeID";
 
     private static final String FIELD_PERIOD_TYPE = "DataPeriodTypeID";
 

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypesFilter.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypesFilter.java	2015-09-04 09:29:23 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/filter/DataElementValueTypesFilter.java	2015-09-07 08:51:58 +0000
@@ -42,7 +42,7 @@
 {
     private List<ValueType> valueTypes;
 
-    public DataElementValueTypesFilter( List<ValueType> valueType )
+    public DataElementValueTypesFilter( List<ValueType> valueTypes )
     {
         this.valueTypes = valueTypes;
     }

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java	2015-09-04 09:29:23 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/PDFUtils.java	2015-09-07 08:51:58 +0000
@@ -691,17 +691,6 @@
         return map;
     }
 
-    private static Map<String, String> getType()
-    {
-        Map<String, String> map = new HashMap<>();
-        map.put( DataElement.VALUE_TYPE_STRING, "text" );
-        map.put( DataElement.VALUE_TYPE_INT, "number" );
-        map.put( DataElement.VALUE_TYPE_BOOL, "yes_no" );
-        map.put( DataElement.VALUE_TYPE_DATE, "date" );
-        map.put( DataElement.VALUE_TYPE_DATETIME, "date_time" );
-        return map;
-    }
-
     private static Map<String, String> getAggregationOperator()
     {
         Map<String, String> map = new HashMap<>();