dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9735
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-05 16:59:52 +0200
message:
  Data entry, suing uids for mark-for-followup function
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/MarkForFollowupAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.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/MarkForFollowupAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/MarkForFollowupAction.java	2012-02-16 19:58:55 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/MarkForFollowupAction.java	2013-02-05 14:59:52 +0000
@@ -85,13 +85,20 @@
     // Input
     // -------------------------------------------------------------------------
 
-    private Integer dataElementId;
+    private String dataElementId;
 
-    public void setDataElementId( Integer dataElementId )
+    public void setDataElementId( String dataElementId )
     {
         this.dataElementId = dataElementId;
     }
 
+    private String categoryOptionComboId;
+
+    public void setCategoryOptionComboId( String categoryOptionComboId )
+    {
+        this.categoryOptionComboId = categoryOptionComboId;
+    }
+
     private String periodId;
 
     public void setPeriodId( String periodId )
@@ -106,13 +113,6 @@
         this.organisationUnitId = organisationUnitId;
     }
 
-    private Integer categoryOptionComboId;
-
-    public void setCategoryOptionComboId( Integer categoryOptionComboId )
-    {
-        this.categoryOptionComboId = categoryOptionComboId;
-    }
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------
@@ -131,9 +131,9 @@
     public String execute()
     {
         DataElement dataElement = dataElementService.getDataElement( dataElementId );
+        DataElementCategoryOptionCombo categoryOptionCombo = categoryService.getDataElementCategoryOptionCombo( categoryOptionComboId );
         Period period = PeriodType.createPeriodExternalId( periodId );
         OrganisationUnit source = organisationUnitService.getOrganisationUnit( organisationUnitId );
-        DataElementCategoryOptionCombo categoryOptionCombo = categoryService.getDataElementCategoryOptionCombo( categoryOptionComboId );
 
         DataValue dataValue = dataValueService.getDataValue( source, dataElement, period, categoryOptionCombo );
 

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java	2012-02-16 19:58:55 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/RemoveMinMaxLimitsAction.java	2013-02-05 14:59:52 +0000
@@ -86,16 +86,16 @@
         this.organisationUnitId = organisationUnitId;
     }
 
-    private Integer dataElementId;
+    private String dataElementId;
 
-    public void setDataElementId( Integer dataElementId )
+    public void setDataElementId( String dataElementId )
     {
         this.dataElementId = dataElementId;
     }
 
-    private Integer categoryOptionComboId;
+    private String categoryOptionComboId;
 
-    public void setCategoryOptionComboId( Integer categoryOptionComboId )
+    public void setCategoryOptionComboId( String categoryOptionComboId )
     {
         this.categoryOptionComboId = categoryOptionComboId;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java	2012-02-16 19:58:55 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SaveMinMaxLimitsAction.java	2013-02-05 14:59:52 +0000
@@ -86,16 +86,16 @@
         this.organisationUnitId = organisationUnitId;
     }
 
-    private Integer dataElementId;
+    private String dataElementId;
 
-    public void setDataElementId( Integer dataElementId )
+    public void setDataElementId( String dataElementId )
     {
         this.dataElementId = dataElementId;
     }
 
-    private Integer categoryOptionComboId;
+    private String categoryOptionComboId;
 
-    public void setCategoryOptionComboId( Integer categoryOptionComboId )
+    public void setCategoryOptionComboId( String categoryOptionComboId )
     {
         this.categoryOptionComboId = categoryOptionComboId;
     }