------------------------------------------------------------
revno: 14035
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Sat 2014-02-15 11:00:45 +0700
message:
support filtering only on person uid
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.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-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java 2013-11-25 14:54:19 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java 2014-02-15 04:00:45 +0000
@@ -115,7 +115,7 @@
@RequestParam( value = "program", required = false ) String programUid,
@RequestParam( value = "programStage", required = false ) String programStageUid,
@RequestParam( value = "person", required = false ) String personUid,
- @RequestParam( value = "orgUnit" ) String orgUnitUid,
+ @RequestParam( value = "orgUnit", required = false ) String orgUnitUid,
@RequestParam( value = "includeChildren", required = false, defaultValue = "false" ) boolean includeChildren,
@RequestParam( value = "includeDescendants", required = false, defaultValue = "false" ) boolean includeDescendants,
@RequestParam( required = false ) @DateTimeFormat( pattern = "yyyy-MM-dd" ) Date startDate,
@@ -152,6 +152,16 @@
}
}
+ if ( rootOrganisationUnit == null && person != null )
+ {
+ Events events = eventService.getEvents( Arrays.asList( program ), Arrays.asList( programStage ), null, person, startDate, endDate );
+
+ model.addAttribute( "model", events );
+ model.addAttribute( "viewClass", options.getViewClass( "detailed" ) );
+
+ return "events";
+ }
+
if ( rootOrganisationUnit == null )
{
throw new NotFoundException( "OrganisationUnit", programUid );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
