dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37482
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19166: minor
------------------------------------------------------------
revno: 19166
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-05-19 09:46:07 +0200
message:
minor
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/AbstractEventRowService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/AbstractEventRowService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/AbstractEventRowService.java 2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/report/AbstractEventRowService.java 2015-05-19 07:46:07 +0000
@@ -56,35 +56,7 @@
@Override
public EventRows getEventRows( EventSearchParams params )
- {
- /*List<EventRow> eventRowList = new ArrayList<EventRow>();
- EventRows eventRows = new EventRows();
-
- Events events = eventService.getEvents( params );
-
- for ( Event event : events.getEvents() )
- {
- if ( event.getTrackedEntityInstance() != null )
- {
- TrackedEntityInstance tei = trackedEntityInstanceService.getTrackedEntityInstance( event.getTrackedEntityInstance() );
-
- EventRow eventRow = new EventRow();
- eventRow.setTrackedEntityInstance( event.getTrackedEntityInstance() );
- eventRow.setAttributes( tei.getAttributes() );
- eventRow.setEvent( event.getEvent() );
- eventRow.setProgram( params.getProgram().getUid() );
- eventRow.setProgramStage( event.getProgramStage() );
- eventRow.setRegistrationOrgUnit( tei.getOrgUnit() );
- eventRow.setRegistrationDate( tei.getCreated() );
- eventRow.setEventOrgUnitName( event.getOrgUnitName() );
- eventRow.setDueDate( event.getDueDate() );
- eventRow.setFollowup( event.getFollowup() );
- eventRowList.add( eventRow );
- }
- }
-
- eventRows.setEventRows( eventRowList );*/
-
+ {
EventRows eventRows = eventService.getEventRows( params );
return eventRows;