dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 857
committer: abyot <abyota@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-10-14 08:36:36 +0200
message:
  bug (450957) fix in dataentry
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.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-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java	2009-10-13 14:08:04 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/FormAction.java	2009-10-14 06:36:36 +0000
@@ -155,11 +155,11 @@
         this.dataSetLockService = dataSetLockService;
     }
 
-    private DataElementCategoryOptionComboService categoryOptionComboService;
+    private DataElementCategoryOptionComboService dataElementCategoryOptionComboService;
 
-    public void setCategoryOptionComboService( DataElementCategoryOptionComboService categoryOptionComboService )
+    public void setDataElementCategoryOptionComboService( DataElementCategoryOptionComboService dataElementCategoryOptionComboService )
     {
-        this.categoryOptionComboService = categoryOptionComboService;
+        this.dataElementCategoryOptionComboService = dataElementCategoryOptionComboService;
     }
 
     // -------------------------------------------------------------------------
@@ -324,7 +324,7 @@
             return SUCCESS;
         }
 
-        DataElementCategoryOptionCombo defaultOptionCombo = categoryOptionComboService.getDefaultDataElementCategoryOptionCombo();
+        DataElementCategoryOptionCombo defaultOptionCombo = dataElementCategoryOptionComboService.getDefaultDataElementCategoryOptionCombo();
         
         optionComboId = defaultOptionCombo.getId();
 
@@ -371,6 +371,7 @@
         // ---------------------------------------------------------------------
 
         dataElementTypeMap = new HashMap<String, String>();
+        dataElementTypeMap.put( DataElement.TYPE_DATE, i18n.getString( "date" ) );
         dataElementTypeMap.put( DataElement.TYPE_BOOL, i18n.getString( "yes_no" ) );
         dataElementTypeMap.put( DataElement.TYPE_INT, i18n.getString( "number" ) );
         dataElementTypeMap.put( DataElement.TYPE_STRING, i18n.getString( "text" ) );

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java	2009-10-13 20:08:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/multidimensional/FormAction.java	2009-10-14 06:36:36 +0000
@@ -486,6 +486,7 @@
         // ---------------------------------------------------------------------
 
         dataElementTypeMap = new HashMap<String, String>();
+        dataElementTypeMap.put( DataElement.TYPE_DATE, i18n.getString( "date" ) );
         dataElementTypeMap.put( DataElement.TYPE_BOOL, i18n.getString( "yes_no" ) );
         dataElementTypeMap.put( DataElement.TYPE_INT, i18n.getString( "number" ) );
         dataElementTypeMap.put( DataElement.TYPE_STRING, i18n.getString( "text" ) );