dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19739
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-08-07 08:05:01 +0200
message:
  Program indicator ui, fixed bug
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js


--
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-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java	2015-08-06 21:31:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/caseaggregation/GetTrackedEntityDataElementsAction.java	2015-08-07 06:05:01 +0000
@@ -78,12 +78,19 @@
         this.programId = programId;
     }
 
-    private String programStageId;
+    private Integer programStageId;
 
-    public void setProgramStageId( String programStageId )
+    public void setProgramStageId( Integer programStageId )
     {
         this.programStageId = programStageId;
     }
+    
+    private Integer programStageUid;
+
+    public void setProgramStageUid( Integer programStageUid )
+    {
+        this.programStageUid = programStageUid;
+    }
 
     private List<DataElement> dataElements;
 
@@ -99,18 +106,24 @@
     @Override
     public String execute()
     {
-        if ( programStageId == null )
+        if ( programStageId != null )
+        {
+            ProgramStage stage = programStageService.getProgramStage( programStageId );
+            
+            dataElements = new ArrayList<>( stage.getAllDataElements() );
+        }
+        else if ( programStageUid != null )
+        {
+            ProgramStage stage = programStageService.getProgramStage( programStageUid );
+            
+            dataElements = new ArrayList<>( stage.getAllDataElements() );
+        }
+        else
         {
             Program program = programService.getProgram( programId );
             
             dataElements = new ArrayList<>( program.getAllDataElements() );
         }
-        else
-        {
-            ProgramStage stage = programStageService.getProgramStage( programStageId );
-            
-            dataElements = new ArrayList<>( stage.getAllDataElements() );
-        }
         
         Collections.sort( dataElements, IdentifiableObjectNameComparator.INSTANCE );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-08-06 21:31:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/javascript/programIndicator.js	2015-08-07 06:05:01 +0000
@@ -68,7 +68,7 @@
   jQuery.getJSON('getTrackedEntityDataElements.action',
     {
       programId: getFieldValue('programId'),
-      programStageId: programStageId
+      programStageUid: programStageId
     }, function( json ) {
       var dataElements = jQuery('#' + fieldId);
       for( i in json.dataElements ) {