dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26177
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12966: filter events by person, wip
------------------------------------------------------------
revno: 12966
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-11-19 11:02:44 +0100
message:
filter events by person, wip
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java
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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2013-11-14 13:00:50 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2013-11-19 10:02:44 +0000
@@ -34,6 +34,7 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementService;
import org.hisp.dhis.dxf2.InputValidationService;
+import org.hisp.dhis.dxf2.events.person.Person;
import org.hisp.dhis.dxf2.importsummary.ImportConflict;
import org.hisp.dhis.dxf2.importsummary.ImportStatus;
import org.hisp.dhis.dxf2.importsummary.ImportSummary;
@@ -313,6 +314,16 @@
}
@Override
+ public Events getEvents( Program program, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ List<Event> eventList = eventStore.getAll( program, organisationUnit, person, startDate, endDate );
+ Events events = new Events();
+ events.setEvents( eventList );
+
+ return events;
+ }
+
+ @Override
public Events getEvents( ProgramStage programStage, OrganisationUnit organisationUnit )
{
List<Event> eventList = eventStore.getAll( programStage, organisationUnit );
@@ -333,6 +344,16 @@
}
@Override
+ public Events getEvents( ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ List<Event> eventList = eventStore.getAll( programStage, organisationUnit, person, startDate, endDate );
+ Events events = new Events();
+ events.setEvents( eventList );
+
+ return events;
+ }
+
+ @Override
public Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit )
{
List<Event> eventList = eventStore.getAll( program, programStage, organisationUnit );
@@ -343,6 +364,16 @@
}
@Override
+ public Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person )
+ {
+ List<Event> eventList = eventStore.getAll( program, programStage, organisationUnit, person );
+ Events events = new Events();
+ events.setEvents( eventList );
+
+ return events;
+ }
+
+ @Override
public Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate )
{
List<Event> eventList = eventStore.getAll( program, programStage, organisationUnit, startDate, endDate );
@@ -353,6 +384,16 @@
}
@Override
+ public Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ List<Event> eventList = eventStore.getAll( program, programStage, organisationUnit, person, startDate, endDate );
+ Events events = new Events();
+ events.setEvents( eventList );
+
+ return events;
+ }
+
+ @Override
public Events getEvents( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits, Date startDate, Date endDate )
{
List<Event> eventList = eventStore.getAll( programs, programStages, organisationUnits, startDate, endDate );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java 2013-11-14 13:01:43 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/DefaultEventStore.java 2013-11-19 10:02:44 +0000
@@ -30,6 +30,7 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hisp.dhis.dxf2.events.person.Person;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramStage;
@@ -59,54 +60,84 @@
@Override
public List<Event> getAll( Program program, OrganisationUnit organisationUnit )
{
- return getAll( Arrays.asList( program ), new ArrayList<ProgramStage>(), Arrays.asList( organisationUnit ), null, null );
+ return getAll( Arrays.asList( program ), new ArrayList<ProgramStage>(), Arrays.asList( organisationUnit ), null, null, null );
}
@Override
public List<Event> getAll( Program program, OrganisationUnit organisationUnit, Date startDate, Date endDate )
{
- return getAll( Arrays.asList( program ), new ArrayList<ProgramStage>(), Arrays.asList( organisationUnit ), startDate, endDate );
+ return getAll( Arrays.asList( program ), new ArrayList<ProgramStage>(), Arrays.asList( organisationUnit ), null, startDate, endDate );
+ }
+
+ @Override
+ public List<Event> getAll( Program program, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ return getAll( Arrays.asList( program ), new ArrayList<ProgramStage>(), Arrays.asList( organisationUnit ), person, startDate, endDate );
}
@Override
public List<Event> getAll( ProgramStage programStage, OrganisationUnit organisationUnit )
{
- return getAll( new ArrayList<Program>(), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, null );
+ return getAll( new ArrayList<Program>(), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, null, null );
}
@Override
public List<Event> getAll( ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate )
{
- return getAll( new ArrayList<Program>(), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), startDate, endDate );
+ return getAll( new ArrayList<Program>(), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, startDate, endDate );
+ }
+
+ @Override
+ public List<Event> getAll( ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ return getAll( new ArrayList<Program>(), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), person, startDate, endDate );
}
@Override
public List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit )
{
- return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, null );
+ return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, null, null );
+ }
+
+ @Override
+ public List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person )
+ {
+ return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), person, null, null );
}
@Override
public List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate )
{
- return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), startDate, endDate );
+ return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), null, startDate, endDate );
+ }
+
+ @Override
+ public List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate )
+ {
+ return getAll( Arrays.asList( program ), Arrays.asList( programStage ), Arrays.asList( organisationUnit ), person, startDate, endDate );
}
@Override
public List<Event> getAll( Program program, List<ProgramStage> programStages, OrganisationUnit organisationUnit )
{
- return getAll( Arrays.asList( program ), programStages, Arrays.asList( organisationUnit ), null, null );
+ return getAll( Arrays.asList( program ), programStages, Arrays.asList( organisationUnit ), null, null, null );
}
@Override
public List<Event> getAll( Program program, List<ProgramStage> programStages, OrganisationUnit organisationUnit, Date startDate, Date endDate )
{
- return getAll( Arrays.asList( program ), programStages, Arrays.asList( organisationUnit ), startDate, endDate );
+ return getAll( Arrays.asList( program ), programStages, Arrays.asList( organisationUnit ), null, startDate, endDate );
}
@Override
public List<Event> getAll( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits, Date startDate, Date endDate )
{
+ return getAll( programs, programStages, organisationUnits, null, startDate, endDate );
+ }
+
+ @Override
+ public List<Event> getAll( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits, Person person, Date startDate, Date endDate )
+ {
List<Event> events = new ArrayList<Event>();
String sql = buildSql( getIdList( programs ), getIdList( programStages ), getIdList( organisationUnits ),
startDate, endDate );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java 2013-09-23 07:28:36 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java 2013-11-19 10:02:44 +0000
@@ -28,6 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.dxf2.events.person.Person;
import org.hisp.dhis.dxf2.importsummary.ImportSummaries;
import org.hisp.dhis.dxf2.importsummary.ImportSummary;
import org.hisp.dhis.dxf2.metadata.ImportOptions;
@@ -58,14 +59,22 @@
Events getEvents( Program program, OrganisationUnit organisationUnit, Date startDate, Date endDate );
+ Events getEvents( Program program, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
Events getEvents( ProgramStage programStage, OrganisationUnit organisationUnit );
Events getEvents( ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate );
+ Events getEvents( ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit );
+ Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person );
+
Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate );
+ Events getEvents( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
Events getEvents( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits, Date startDate, Date endDate );
Event getEvent( String uid );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java 2013-09-17 12:15:39 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java 2013-11-19 10:02:44 +0000
@@ -28,6 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.hisp.dhis.dxf2.events.person.Person;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.program.Program;
import org.hisp.dhis.program.ProgramStage;
@@ -50,6 +51,8 @@
List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit );
+ List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person );
+
List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Date startDate, Date endDate );
List<Event> getAll( Program program, List<ProgramStage> programStages, OrganisationUnit organisationUnit );
@@ -57,5 +60,13 @@
List<Event> getAll( Program program, List<ProgramStage> programStages, OrganisationUnit organisationUnit, Date startDate, Date endDate );
List<Event> getAll( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits,
- Date startDate, Date endDate );
+ Person person, Date startDate, Date endDate );
+
+ List<Event> getAll( Program program, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
+ List<Event> getAll( ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
+ List<Event> getAll( Program program, ProgramStage programStage, OrganisationUnit organisationUnit, Person person, Date startDate, Date endDate );
+
+ List<Event> getAll( List<Program> programs, List<ProgramStage> programStages, List<OrganisationUnit> organisationUnits, Date startDate, Date endDate );
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2013-10-15 07:40:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2013-11-19 10:02:44 +0000
@@ -31,9 +31,13 @@
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import org.hisp.dhis.dxf2.events.person.Person;
import org.hisp.dhis.dxf2.importsummary.ImportSummaries;
import org.hisp.dhis.dxf2.importsummary.ImportSummary;
import org.hisp.dhis.dxf2.metadata.ImportOptions;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.ProgramStage;
import org.hisp.dhis.scheduling.TaskId;
import org.hisp.dhis.system.notification.NotificationLevel;
import org.hisp.dhis.system.notification.Notifier;
=== 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-10-01 12:13:34 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java 2013-11-19 10:02:44 +0000
@@ -36,6 +36,8 @@
import org.hisp.dhis.dxf2.events.event.EventService;
import org.hisp.dhis.dxf2.events.event.Events;
import org.hisp.dhis.dxf2.events.event.ImportEventTask;
+import org.hisp.dhis.dxf2.events.person.Person;
+import org.hisp.dhis.dxf2.events.person.PersonService;
import org.hisp.dhis.dxf2.importsummary.ImportStatus;
import org.hisp.dhis.dxf2.importsummary.ImportSummaries;
import org.hisp.dhis.dxf2.importsummary.ImportSummary;
@@ -73,7 +75,7 @@
* @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
*/
@Controller
-@RequestMapping(value = EventController.RESOURCE_PATH)
+@RequestMapping( value = EventController.RESOURCE_PATH )
public class EventController
{
public static final String RESOURCE_PATH = "/events";
@@ -94,24 +96,29 @@
@Autowired
private EventService eventService;
+ @Autowired
+ private PersonService personService;
+
// -------------------------------------------------------------------------
// READ
// -------------------------------------------------------------------------
- @RequestMapping(value = "", method = RequestMethod.GET)
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
+ @RequestMapping( value = "", method = RequestMethod.GET )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
public String getEvents(
- @RequestParam(value = "program", required = false) String programUid,
- @RequestParam(value = "programStage", required = false) String programStageUid,
- @RequestParam(value = "orgUnit") String orgUnitUid,
- @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
- @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
+ @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 @DateTimeFormat( pattern = "yyyy-MM-dd" ) Date startDate,
+ @RequestParam @DateTimeFormat( pattern = "yyyy-MM-dd" ) Date endDate,
@RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) throws NotFoundException
{
WebOptions options = new WebOptions( parameters );
Program program = manager.get( Program.class, programUid );
ProgramStage programStage = manager.get( ProgramStage.class, programStageUid );
OrganisationUnit organisationUnit;
+ Person person = null;
if ( program == null && programStage == null )
{
@@ -119,6 +126,16 @@
"Both program and programStage is invalid or missing, needs at least one." );
}
+ if ( personUid != null )
+ {
+ person = personService.getPerson( personUid );
+
+ if ( person == null )
+ {
+ throw new NotFoundException( "Person", personUid );
+ }
+ }
+
organisationUnit = manager.get( OrganisationUnit.class, orgUnitUid );
if ( organisationUnit == null )
@@ -141,15 +158,36 @@
if ( program != null && programStage != null )
{
- events = eventService.getEvents( program, programStage, organisationUnit, startDate, endDate );
+ if ( person != null )
+ {
+ events = eventService.getEvents( program, programStage, organisationUnit, person, startDate, endDate );
+ }
+ else
+ {
+ events = eventService.getEvents( program, programStage, organisationUnit, startDate, endDate );
+ }
}
else if ( program != null )
{
- events = eventService.getEvents( program, organisationUnit, startDate, endDate );
+ if ( person != null )
+ {
+ events = eventService.getEvents( program, organisationUnit, person, startDate, endDate );
+ }
+ else
+ {
+ events = eventService.getEvents( program, organisationUnit, startDate, endDate );
+ }
}
else
{
- events = eventService.getEvents( programStage, organisationUnit, startDate, endDate );
+ if ( person != null )
+ {
+ events = eventService.getEvents( programStage, organisationUnit, person, startDate, endDate );
+ }
+ else
+ {
+ events = eventService.getEvents( programStage, organisationUnit, startDate, endDate );
+ }
}
if ( options.hasLinks() )
@@ -166,9 +204,9 @@
return "events";
}
- @RequestMapping(value = "/{uid}", method = RequestMethod.GET)
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
- public String getEvent( @PathVariable("uid") String uid, @RequestParam Map<String, String> parameters,
+ @RequestMapping( value = "/{uid}", method = RequestMethod.GET )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
+ public String getEvent( @PathVariable( "uid" ) String uid, @RequestParam Map<String, String> parameters,
Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception
{
WebOptions options = new WebOptions( parameters );
@@ -195,8 +233,8 @@
// CREATE
// -------------------------------------------------------------------------
- @RequestMapping(method = RequestMethod.POST, consumes = "application/xml")
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
+ @RequestMapping( method = RequestMethod.POST, consumes = "application/xml" )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
public void postXmlEvent( HttpServletResponse response, HttpServletRequest request, ImportOptions importOptions ) throws Exception
{
InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
@@ -240,8 +278,8 @@
}
}
- @RequestMapping(method = RequestMethod.POST, consumes = "application/json")
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
+ @RequestMapping( method = RequestMethod.POST, consumes = "application/json" )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
public void postJsonEvent( HttpServletResponse response, HttpServletRequest request, ImportOptions importOptions ) throws Exception
{
InputStream inputStream = StreamUtils.wrapAndCheckCompressionFormat( request.getInputStream() );
@@ -290,9 +328,9 @@
// UPDATE
// -------------------------------------------------------------------------
- @RequestMapping(value = "/{uid}", method = RequestMethod.PUT, consumes = { "application/xml", "text/xml" })
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
- public void putXmlEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable("uid") String uid ) throws IOException
+ @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = { "application/xml", "text/xml" } )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
+ public void putXmlEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid ) throws IOException
{
Event event = eventService.getEvent( uid );
@@ -309,9 +347,9 @@
ContextUtils.okResponse( response, "Event updated: " + uid );
}
- @RequestMapping(value = "/{uid}", method = RequestMethod.PUT, consumes = "application/json")
- @PreAuthorize("hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')")
- public void putJsonEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable("uid") String uid ) throws IOException
+ @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = "application/json" )
+ @PreAuthorize( "hasRole('ALL') or hasRole('F_PATIENT_DATAVALUE_ADD')" )
+ public void putJsonEvent( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid ) throws IOException
{
Event event = eventService.getEvent( uid );
