From 6647aca7983a2e06c8f1ca0076b0fd213a3c84c7 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Sat, 9 Mar 2024 16:51:12 +0100 Subject: [PATCH] renderInquiriesSignup() "inquiryTrialId" param - rest-api --- .../web/jersey/resource/proband/ProbandResource.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/org/phoenixctms/ctsms/web/jersey/resource/proband/ProbandResource.java b/web/src/main/java/org/phoenixctms/ctsms/web/jersey/resource/proband/ProbandResource.java index 7b2d573a93f9..81d83ac0f2b9 100644 --- a/web/src/main/java/org/phoenixctms/ctsms/web/jersey/resource/proband/ProbandResource.java +++ b/web/src/main/java/org/phoenixctms/ctsms/web/jersey/resource/proband/ProbandResource.java @@ -310,10 +310,11 @@ public InquiriesPDFVO renderInquiriesHead(@PathParam("id") Long id, @PathParam(" @GET @Path("{id}/inquiryvalues/signuppdf") - public Response renderInquiriesSignup(@PathParam("id") Long id, @QueryParam("department_id") Long departmentId, @QueryParam("active_signup") Boolean activeSignup) + public Response renderInquiriesSignup(@PathParam("id") Long id, @QueryParam("department_id") Long departmentId, @QueryParam("inquiry_trial_id") Long inquiryTrialId, + @QueryParam("active_signup") Boolean activeSignup) throws AuthenticationException, AuthorisationException, ServiceException { - InquiriesPDFVO vo = WebUtil.getServiceLocator().getProbandService().renderInquiriesSignup(auth, departmentId, id, activeSignup); + InquiriesPDFVO vo = WebUtil.getServiceLocator().getProbandService().renderInquiriesSignup(auth, departmentId, inquiryTrialId, id, activeSignup); // http://stackoverflow.com/questions/9204287/how-to-return-a-png-image-from-jersey-rest-service-method-to-the-browser // non-streamed ResponseBuilder response = Response.ok(vo.getDocumentDatas(), vo.getContentType().getMimeType()); @@ -324,10 +325,11 @@ public Response renderInquiriesSignup(@PathParam("id") Long id, @QueryParam("dep @GET @Produces({ MediaType.APPLICATION_JSON }) @Path("{id}/inquiryvalues/signuppdf/head") - public InquiriesPDFVO renderInquiriesSignupHead(@PathParam("id") Long id, @QueryParam("department_id") Long departmentId, @QueryParam("active_signup") Boolean activeSignup) + public InquiriesPDFVO renderInquiriesSignupHead(@PathParam("id") Long id, @QueryParam("department_id") Long departmentId, @QueryParam("inquiry_trial_id") Long inquiryTrialId, + @QueryParam("active_signup") Boolean activeSignup) throws AuthenticationException, AuthorisationException, ServiceException { - InquiriesPDFVO result = WebUtil.getServiceLocator().getProbandService().renderInquiriesSignup(auth, departmentId, id, activeSignup); + InquiriesPDFVO result = WebUtil.getServiceLocator().getProbandService().renderInquiriesSignup(auth, departmentId, inquiryTrialId, id, activeSignup); result.setDocumentDatas(null); return result; }